OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/renderer_host/render_widget_host_view_mac.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_mac.h" |
6 | 6 |
7 #include "base/mac/scoped_nsautorelease_pool.h" | 7 #include "base/mac/scoped_nsautorelease_pool.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "content/browser/browser_thread_impl.h" | 9 #include "content/browser/browser_thread_impl.h" |
10 #include "content/browser/renderer_host/test_render_view_host.h" | 10 #include "content/browser/renderer_host/test_render_view_host.h" |
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
244 | 244 |
245 // Clean up. | 245 // Clean up. |
246 rwhv_mac_->DestroyFakePluginWindowHandle(accelerated_handle); | 246 rwhv_mac_->DestroyFakePluginWindowHandle(accelerated_handle); |
247 } | 247 } |
248 | 248 |
249 TEST_F(RenderWidgetHostViewMacTest, Fullscreen) { | 249 TEST_F(RenderWidgetHostViewMacTest, Fullscreen) { |
250 rwhv_mac_->InitAsFullscreen(NULL); | 250 rwhv_mac_->InitAsFullscreen(NULL); |
251 EXPECT_TRUE(rwhv_mac_->pepper_fullscreen_window()); | 251 EXPECT_TRUE(rwhv_mac_->pepper_fullscreen_window()); |
252 } | 252 } |
253 | 253 |
254 TEST_F(RenderWidgetHostViewMacTest, GetFirstRectForCharaacterRangeCaretCase) { | 254 TEST_F(RenderWidgetHostViewMacTest, GetFirstRectForCharacterRangeCaretCase) { |
255 const string16 kDummyString = UTF8ToUTF16("hogehoge"); | 255 const string16 kDummyString = UTF8ToUTF16("hogehoge"); |
256 const size_t kDummyOffset = 0; | 256 const size_t kDummyOffset = 0; |
257 | 257 |
258 gfx::Rect caret_rect(10, 11, 0, 10); | 258 gfx::Rect caret_rect(10, 11, 0, 10); |
259 ui::Range caret_range(0, 0); | 259 ui::Range caret_range(0, 0); |
260 | 260 |
261 NSRect rect; | 261 NSRect rect; |
262 NSRange actual_range; | 262 NSRange actual_range; |
263 rwhv_mac_->SelectionChanged(kDummyString, kDummyOffset, caret_range); | 263 rwhv_mac_->SelectionChanged(kDummyString, kDummyOffset, caret_range); |
264 rwhv_mac_->SelectionBoundsChanged(caret_rect, caret_rect); | 264 rwhv_mac_->SelectionBoundsChanged( |
| 265 caret_rect, WebKit::WebTextDirectionLeftToRight, |
| 266 caret_rect, WebKit::WebTextDirectionLeftToRight); |
265 EXPECT_TRUE(rwhv_mac_->GetCachedFirstRectForCharacterRange( | 267 EXPECT_TRUE(rwhv_mac_->GetCachedFirstRectForCharacterRange( |
266 caret_range.ToNSRange(), | 268 caret_range.ToNSRange(), |
267 &rect, | 269 &rect, |
268 &actual_range)); | 270 &actual_range)); |
269 EXPECT_EQ(caret_rect, gfx::Rect(NSRectToCGRect(rect))); | 271 EXPECT_EQ(caret_rect, gfx::Rect(NSRectToCGRect(rect))); |
270 EXPECT_EQ(caret_range, ui::Range(actual_range)); | 272 EXPECT_EQ(caret_range, ui::Range(actual_range)); |
271 | 273 |
272 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( | 274 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( |
273 ui::Range(0, 1).ToNSRange(), | 275 ui::Range(0, 1).ToNSRange(), |
274 &rect, | 276 &rect, |
275 &actual_range)); | 277 &actual_range)); |
276 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( | 278 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( |
277 ui::Range(1, 1).ToNSRange(), | 279 ui::Range(1, 1).ToNSRange(), |
278 &rect, | 280 &rect, |
279 &actual_range)); | 281 &actual_range)); |
280 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( | 282 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( |
281 ui::Range(2, 3).ToNSRange(), | 283 ui::Range(2, 3).ToNSRange(), |
282 &rect, | 284 &rect, |
283 &actual_range)); | 285 &actual_range)); |
284 | 286 |
285 // Caret moved. | 287 // Caret moved. |
286 caret_rect = gfx::Rect(20, 11, 0, 10); | 288 caret_rect = gfx::Rect(20, 11, 0, 10); |
287 caret_range = ui::Range(1, 1); | 289 caret_range = ui::Range(1, 1); |
288 rwhv_mac_->SelectionChanged(kDummyString, kDummyOffset, caret_range); | 290 rwhv_mac_->SelectionChanged(kDummyString, kDummyOffset, caret_range); |
289 rwhv_mac_->SelectionBoundsChanged(caret_rect, caret_rect); | 291 rwhv_mac_->SelectionBoundsChanged( |
| 292 caret_rect, WebKit::WebTextDirectionLeftToRight, |
| 293 caret_rect, WebKit::WebTextDirectionLeftToRight); |
290 EXPECT_TRUE(rwhv_mac_->GetCachedFirstRectForCharacterRange( | 294 EXPECT_TRUE(rwhv_mac_->GetCachedFirstRectForCharacterRange( |
291 caret_range.ToNSRange(), | 295 caret_range.ToNSRange(), |
292 &rect, | 296 &rect, |
293 &actual_range)); | 297 &actual_range)); |
294 EXPECT_EQ(caret_rect, gfx::Rect(NSRectToCGRect(rect))); | 298 EXPECT_EQ(caret_rect, gfx::Rect(NSRectToCGRect(rect))); |
295 EXPECT_EQ(caret_range, ui::Range(actual_range)); | 299 EXPECT_EQ(caret_range, ui::Range(actual_range)); |
296 | 300 |
297 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( | 301 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( |
298 ui::Range(0, 0).ToNSRange(), | 302 ui::Range(0, 0).ToNSRange(), |
299 &rect, | 303 &rect, |
300 &actual_range)); | 304 &actual_range)); |
301 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( | 305 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( |
302 ui::Range(1, 2).ToNSRange(), | 306 ui::Range(1, 2).ToNSRange(), |
303 &rect, | 307 &rect, |
304 &actual_range)); | 308 &actual_range)); |
305 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( | 309 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( |
306 ui::Range(2, 3).ToNSRange(), | 310 ui::Range(2, 3).ToNSRange(), |
307 &rect, | 311 &rect, |
308 &actual_range)); | 312 &actual_range)); |
309 | 313 |
310 // No caret. | 314 // No caret. |
311 caret_range = ui::Range(1, 2); | 315 caret_range = ui::Range(1, 2); |
312 rwhv_mac_->SelectionChanged(kDummyString, kDummyOffset, caret_range); | 316 rwhv_mac_->SelectionChanged(kDummyString, kDummyOffset, caret_range); |
313 rwhv_mac_->SelectionBoundsChanged(caret_rect, gfx::Rect(30, 11, 0, 10)); | 317 rwhv_mac_->SelectionBoundsChanged( |
| 318 caret_rect, WebKit::WebTextDirectionLeftToRight, |
| 319 gfx::Rect(30, 11, 0, 10), WebKit::WebTextDirectionLeftToRight); |
314 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( | 320 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( |
315 ui::Range(0, 0).ToNSRange(), | 321 ui::Range(0, 0).ToNSRange(), |
316 &rect, | 322 &rect, |
317 &actual_range)); | 323 &actual_range)); |
318 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( | 324 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( |
319 ui::Range(0, 1).ToNSRange(), | 325 ui::Range(0, 1).ToNSRange(), |
320 &rect, | 326 &rect, |
321 &actual_range)); | 327 &actual_range)); |
322 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( | 328 EXPECT_FALSE(rwhv_mac_->GetCachedFirstRectForCharacterRange( |
323 ui::Range(1, 1).ToNSRange(), | 329 ui::Range(1, 1).ToNSRange(), |
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
555 range = ui::Range(10, 20); | 561 range = ui::Range(10, 20); |
556 EXPECT_TRUE(rwhv_mac_->GetCachedFirstRectForCharacterRange(range.ToNSRange(), | 562 EXPECT_TRUE(rwhv_mac_->GetCachedFirstRectForCharacterRange(range.ToNSRange(), |
557 &rect, | 563 &rect, |
558 &actual_range)); | 564 &actual_range)); |
559 EXPECT_EQ(ui::Range(10, 20), ui::Range(actual_range)); | 565 EXPECT_EQ(ui::Range(10, 20), ui::Range(actual_range)); |
560 EXPECT_EQ( | 566 EXPECT_EQ( |
561 GetExpectedRect(kOrigin, kBoundsUnit, ui::Range(0, 10), 1), | 567 GetExpectedRect(kOrigin, kBoundsUnit, ui::Range(0, 10), 1), |
562 gfx::Rect(NSRectToCGRect(rect))); | 568 gfx::Rect(NSRectToCGRect(rect))); |
563 } | 569 } |
564 } // namespace content | 570 } // namespace content |
OLD | NEW |