Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Side by Side Diff: ui/gfx/render_text_unittest.cc

Issue 2251893004: Use parameterized tests to test multiple render text implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@selection_direction
Patch Set: Address nits. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/gfx/render_text_mac.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ui/gfx/render_text.h" 5 #include "ui/gfx/render_text.h"
6 6
7 #include <limits.h> 7 #include <limits.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <algorithm> 11 #include <algorithm>
12 #include <memory> 12 #include <memory>
13 13
14 #include "base/format_macros.h" 14 #include "base/format_macros.h"
15 #include "base/i18n/break_iterator.h" 15 #include "base/i18n/break_iterator.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "base/memory/ptr_util.h"
17 #include "base/run_loop.h" 18 #include "base/run_loop.h"
18 #include "base/strings/string_split.h" 19 #include "base/strings/string_split.h"
19 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
20 #include "base/strings/stringprintf.h" 21 #include "base/strings/stringprintf.h"
21 #include "base/strings/utf_string_conversions.h" 22 #include "base/strings/utf_string_conversions.h"
22 #include "build/build_config.h" 23 #include "build/build_config.h"
23 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
24 #include "third_party/skia/include/core/SkRefCnt.h" 25 #include "third_party/skia/include/core/SkRefCnt.h"
25 #include "third_party/skia/include/core/SkSurface.h" 26 #include "third_party/skia/include/core/SkSurface.h"
26 #include "third_party/skia/include/core/SkTypeface.h" 27 #include "third_party/skia/include/core/SkTypeface.h"
(...skipping 28 matching lines...) Expand all
55 namespace test { 56 namespace test {
56 57
57 class RenderTextTestApi { 58 class RenderTextTestApi {
58 public: 59 public:
59 RenderTextTestApi(RenderText* render_text) : render_text_(render_text) {} 60 RenderTextTestApi(RenderText* render_text) : render_text_(render_text) {}
60 61
61 static SkPaint& GetRendererPaint(internal::SkiaTextRenderer* renderer) { 62 static SkPaint& GetRendererPaint(internal::SkiaTextRenderer* renderer) {
62 return renderer->paint_; 63 return renderer->paint_;
63 } 64 }
64 65
65 static internal::TextRunList* GetHarfbuzzRunList( 66 // Callers should ensure that the associated RenderText object is a
66 RenderTextHarfBuzz* harfbuzz) { 67 // RenderTextHarfBuzz instance.
67 return harfbuzz->GetRunList(); 68 internal::TextRunList* GetHarfBuzzRunList() {
69 RenderTextHarfBuzz* render_text =
70 static_cast<RenderTextHarfBuzz*>(render_text_);
71 return render_text->GetRunList();
68 } 72 }
69 73
70 void DrawVisualText(internal::SkiaTextRenderer* renderer) { 74 void DrawVisualText(internal::SkiaTextRenderer* renderer) {
71 render_text_->EnsureLayout(); 75 render_text_->EnsureLayout();
72 render_text_->DrawVisualText(renderer); 76 render_text_->DrawVisualText(renderer);
73 } 77 }
74 78
75 private: 79 private:
76 RenderText* render_text_; 80 RenderText* render_text_;
77 81
78 DISALLOW_COPY_AND_ASSIGN(RenderTextTestApi); 82 DISALLOW_COPY_AND_ASSIGN(RenderTextTestApi);
79 }; 83 };
80 84
81 } // namespace test 85 } // namespace test
82 86
83 namespace { 87 namespace {
84 88
89 // An enum specifying the different RenderText implementations to be tested.
90 enum RenderTextBackend {
91 RENDER_TEXT_HARFBUZZ,
92 RENDER_TEXT_MAC,
93 };
94
95 // Parameterised test name generator for tests depending on RenderTextBackend.
96 struct PrintRenderTextBackend {
97 template <class ParamType>
98 std::string operator()(const testing::TestParamInfo<ParamType>& info) const {
99 switch (info.param) {
100 case RENDER_TEXT_HARFBUZZ:
101 return "HarfBuzz";
102 case RENDER_TEXT_MAC:
103 return "Mac";
104 }
105 NOTREACHED();
106 return std::string();
107 }
108 };
109
85 // Various weak, LTR, RTL, and Bidi string cases with three characters each. 110 // Various weak, LTR, RTL, and Bidi string cases with three characters each.
86 const wchar_t kWeak[] = L" . "; 111 const wchar_t kWeak[] = L" . ";
87 const wchar_t kLtr[] = L"abc"; 112 const wchar_t kLtr[] = L"abc";
88 const wchar_t kRtl[] = L"\x5d0\x5d1\x5d2"; 113 const wchar_t kRtl[] = L"\x5d0\x5d1\x5d2";
89 const wchar_t kLtrRtl[] = L"a" L"\x5d0\x5d1"; 114 const wchar_t kLtrRtl[] = L"a" L"\x5d0\x5d1";
90 const wchar_t kLtrRtlLtr[] = L"a" L"\x5d1" L"b"; 115 const wchar_t kLtrRtlLtr[] = L"a" L"\x5d1" L"b";
91 const wchar_t kRtlLtr[] = L"\x5d0\x5d1" L"a"; 116 const wchar_t kRtlLtr[] = L"\x5d0\x5d1" L"a";
92 const wchar_t kRtlLtrRtl[] = L"\x5d0" L"a" L"\x5d1"; 117 const wchar_t kRtlLtrRtl[] = L"\x5d0" L"a" L"\x5d1";
93 118
94 // Checks whether |range| contains |index|. This is not the same as calling 119 // Checks whether |range| contains |index|. This is not the same as calling
(...skipping 26 matching lines...) Expand all
121 SCOPED_TRACE(base::StringPrintf( 146 SCOPED_TRACE(base::StringPrintf(
122 "BreakType-%d VisualCursorDirection-%d SelectionBehavior-%d Case-%d.", 147 "BreakType-%d VisualCursorDirection-%d SelectionBehavior-%d Case-%d.",
123 break_type, direction, selection_behavior, static_cast<int>(i))); 148 break_type, direction, selection_behavior, static_cast<int>(i)));
124 149
125 render_text->MoveCursor(break_type, direction, selection_behavior); 150 render_text->MoveCursor(break_type, direction, selection_behavior);
126 EXPECT_EQ(expected->at(i), render_text->selection()); 151 EXPECT_EQ(expected->at(i), render_text->selection());
127 } 152 }
128 expected->clear(); 153 expected->clear();
129 } 154 }
130 155
131 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
132 #if !defined(OS_MACOSX)
133 // Ensure cursor movement in the specified |direction| yields |expected| values. 156 // Ensure cursor movement in the specified |direction| yields |expected| values.
134 void RunMoveCursorLeftRightTest(RenderText* render_text, 157 void RunMoveCursorLeftRightTest(RenderText* render_text,
135 const std::vector<SelectionModel>& expected, 158 const std::vector<SelectionModel>& expected,
136 VisualCursorDirection direction) { 159 VisualCursorDirection direction) {
137 for (size_t i = 0; i < expected.size(); ++i) { 160 for (size_t i = 0; i < expected.size(); ++i) {
138 SCOPED_TRACE(base::StringPrintf("Going %s; expected value index %d.", 161 SCOPED_TRACE(base::StringPrintf("Going %s; expected value index %d.",
139 direction == CURSOR_LEFT ? "left" : "right", static_cast<int>(i))); 162 direction == CURSOR_LEFT ? "left" : "right", static_cast<int>(i)));
140 EXPECT_EQ(expected[i], render_text->selection_model()); 163 EXPECT_EQ(expected[i], render_text->selection_model());
141 render_text->MoveCursor(CHARACTER_BREAK, direction, SELECTION_NONE); 164 render_text->MoveCursor(CHARACTER_BREAK, direction, SELECTION_NONE);
142 } 165 }
143 // Check that cursoring is clamped at the line edge. 166 // Check that cursoring is clamped at the line edge.
144 EXPECT_EQ(expected.back(), render_text->selection_model()); 167 EXPECT_EQ(expected.back(), render_text->selection_model());
145 // Check that it is the line edge. 168 // Check that it is the line edge.
146 render_text->MoveCursor(LINE_BREAK, direction, SELECTION_NONE); 169 render_text->MoveCursor(LINE_BREAK, direction, SELECTION_NONE);
147 EXPECT_EQ(expected.back(), render_text->selection_model()); 170 EXPECT_EQ(expected.back(), render_text->selection_model());
148 } 171 }
149 #endif // !defined(OS_MACOSX)
150 172
151 // The class which records the drawing operations so that the test case can 173 // The class which records the drawing operations so that the test case can
152 // verify where exactly the glyphs are drawn. 174 // verify where exactly the glyphs are drawn.
153 class TestSkiaTextRenderer : public internal::SkiaTextRenderer { 175 class TestSkiaTextRenderer : public internal::SkiaTextRenderer {
154 public: 176 public:
155 struct TextLog { 177 struct TextLog {
156 TextLog() : glyph_count(0u), color(SK_ColorTRANSPARENT) {} 178 TextLog() : glyph_count(0u), color(SK_ColorTRANSPARENT) {}
157 PointF origin; 179 PointF origin;
158 size_t glyph_count; 180 size_t glyph_count;
159 SkColor color; 181 SkColor color;
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 278
257 private: 279 private:
258 const wchar_t* string_; 280 const wchar_t* string_;
259 const SkColor* buffer_; 281 const SkColor* buffer_;
260 int stride_; 282 int stride_;
261 int row_count_; 283 int row_count_;
262 284
263 DISALLOW_COPY_AND_ASSIGN(TestRectangleBuffer); 285 DISALLOW_COPY_AND_ASSIGN(TestRectangleBuffer);
264 }; 286 };
265 287
266 // Helper to run the same test expectations on all RenderText backends.
267 class RenderTextAllBackends {
268 public:
269 RenderTextAllBackends() : renderer_(&canvas_), current_(nullptr) {}
270
271 bool Advance() {
272 if (!current_) {
273 current_ = &render_text_harfbuzz_;
274 return true;
275 }
276 #if defined(OS_MACOSX)
277 if (current_ == &render_text_harfbuzz_) {
278 current_ = &render_text_mac_;
279 return true;
280 }
281 #endif
282
283 return false;
284 }
285
286 const char* GetName() const {
287 return current_ == &render_text_harfbuzz_ ? "Harfbuzz" : "Mac";
288 }
289
290 RenderText* operator->() {
291 return current_;
292 }
293
294 void DrawVisualText() {
295 test::RenderTextTestApi test_api(current_);
296 test_api.DrawVisualText(&renderer_);
297 }
298
299 void GetTextLogAndReset(std::vector<TestSkiaTextRenderer::TextLog>* log) {
300 renderer_.GetTextLogAndReset(log);
301 }
302
303 SkPaint& paint() {
304 return test::RenderTextTestApi::GetRendererPaint(&renderer_);
305 }
306
307 internal::TextRunList* GetHarfbuzzRunList() {
308 return test::RenderTextTestApi::GetHarfbuzzRunList(&render_text_harfbuzz_);
309 }
310
311 private:
312 Canvas canvas_;
313 TestSkiaTextRenderer renderer_;
314 RenderText* current_;
315
316 RenderTextHarfBuzz render_text_harfbuzz_;
317 #if defined(OS_MACOSX)
318 RenderTextMac render_text_mac_;
319 #endif
320
321 DISALLOW_COPY_AND_ASSIGN(RenderTextAllBackends);
322 };
323
324 } // namespace 288 } // namespace
325 289
326 class RenderTextTest : public testing::Test { 290 // Test fixture class used to run parameterized tests for all RenderText
291 // implementations.
292 class RenderTextTest : public testing::Test,
293 public ::testing::WithParamInterface<RenderTextBackend> {
294 public:
295 RenderTextTest()
296 : render_text_(CreateRenderTextInstance()),
297 test_api_(new test::RenderTextTestApi(render_text_.get())),
298 renderer_(canvas()) {}
299
300 protected:
301 std::unique_ptr<RenderText> CreateRenderTextInstance() const {
302 switch (GetParam()) {
303 case RENDER_TEXT_HARFBUZZ:
304 return base::WrapUnique(new RenderTextHarfBuzz());
msw 2016/08/25 15:20:37 nit: prefer MakeUnique over WrapUnique.
karandeepb 2016/08/26 00:47:29 Done.
305
306 case RENDER_TEXT_MAC:
307 #if defined(OS_MACOSX)
308 return base::WrapUnique(new RenderTextMac());
309 #else
310 break;
311 #endif
312 }
313 NOTREACHED();
314 return nullptr;
315 }
316
317 SkPaint& GetRendererPaint() {
318 return test::RenderTextTestApi::GetRendererPaint(renderer());
319 }
320
321 void DrawVisualText() { test_api_->DrawVisualText(renderer()); }
322
323 internal::TextRunList* GetHarfBuzzRunList() {
324 DCHECK_EQ(RENDER_TEXT_HARFBUZZ, GetParam());
325 return test_api_->GetHarfBuzzRunList();
326 }
327
328 void ResetRenderTextInstance() {
329 render_text_ = CreateRenderTextInstance();
330 test_api_.reset(new test::RenderTextTestApi(GetRenderText()));
331 }
332
333 RenderText* GetRenderText() { return render_text_.get(); };
334
335 RenderTextHarfBuzz* GetRenderTextHarfBuzz() {
336 DCHECK_EQ(RENDER_TEXT_HARFBUZZ, GetParam());
337 return static_cast<RenderTextHarfBuzz*>(GetRenderText());
338 }
339
340 #if defined(OS_MACOSX)
341 RenderTextMac* GetRenderTextMac() {
342 DCHECK_EQ(RENDER_TEXT_MAC, GetParam());
343 return static_cast<RenderTextMac*>(GetRenderText());
344 }
345 #endif
346
347 Canvas* canvas() { return &canvas_; }
348 TestSkiaTextRenderer* renderer() { return &renderer_; }
349
327 private: 350 private:
351 std::unique_ptr<RenderText> render_text_;
352 std::unique_ptr<test::RenderTextTestApi> test_api_;
353 Canvas canvas_;
354 TestSkiaTextRenderer renderer_;
355
328 #if defined(OS_WIN) 356 #if defined(OS_WIN)
329 // Needed to bypass DCHECK in GetFallbackFont. 357 // Needed to bypass DCHECK in GetFallbackFont.
330 base::MessageLoopForUI message_loop_; 358 base::MessageLoopForUI message_loop_;
331 #endif 359 #endif
360
361 DISALLOW_COPY_AND_ASSIGN(RenderTextTest);
332 }; 362 };
333 363
334 TEST_F(RenderTextTest, DefaultStyles) { 364 // Test fixture class. Use for tests which are only to be run for
365 // RenderTextHarfBuzz.
366 class RenderTextHarfBuzzTest : public RenderTextTest {
367 public:
368 RenderTextHarfBuzzTest() {}
369
370 // Overridden from testing::Test:
371 void SetUp() override { DCHECK_EQ(RENDER_TEXT_HARFBUZZ, GetParam()); }
372
373 private:
374 DISALLOW_COPY_AND_ASSIGN(RenderTextHarfBuzzTest);
375 };
376
377 // Test fixture class. Use for tests which are only to be run for RenderTextMac.
378 class RenderTextMacTest : public RenderTextTest {
379 public:
380 RenderTextMacTest() {}
381
382 // Overridden from testing::Test:
383 void SetUp() override { DCHECK_EQ(RENDER_TEXT_MAC, GetParam()); }
384
385 private:
386 DISALLOW_COPY_AND_ASSIGN(RenderTextMacTest);
387 };
388
389 TEST_P(RenderTextTest, DefaultStyles) {
335 // Check the default styles applied to new instances and adjusted text. 390 // Check the default styles applied to new instances and adjusted text.
336 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 391 RenderText* render_text = GetRenderText();
337 EXPECT_TRUE(render_text->text().empty()); 392 EXPECT_TRUE(render_text->text().empty());
338 const wchar_t* const cases[] = { kWeak, kLtr, L"Hello", kRtl, L"", L"" }; 393 const wchar_t* const cases[] = { kWeak, kLtr, L"Hello", kRtl, L"", L"" };
339 for (size_t i = 0; i < arraysize(cases); ++i) { 394 for (size_t i = 0; i < arraysize(cases); ++i) {
340 EXPECT_TRUE(render_text->colors().EqualsValueForTesting(SK_ColorBLACK)); 395 EXPECT_TRUE(render_text->colors().EqualsValueForTesting(SK_ColorBLACK));
341 EXPECT_TRUE( 396 EXPECT_TRUE(
342 render_text->baselines().EqualsValueForTesting(NORMAL_BASELINE)); 397 render_text->baselines().EqualsValueForTesting(NORMAL_BASELINE));
343 for (size_t style = 0; style < NUM_TEXT_STYLES; ++style) 398 for (size_t style = 0; style < NUM_TEXT_STYLES; ++style)
344 EXPECT_TRUE(render_text->styles()[style].EqualsValueForTesting(false)); 399 EXPECT_TRUE(render_text->styles()[style].EqualsValueForTesting(false));
345 render_text->SetText(WideToUTF16(cases[i])); 400 render_text->SetText(WideToUTF16(cases[i]));
346 } 401 }
347 } 402 }
348 403
349 TEST_F(RenderTextTest, SetStyles) { 404 TEST_P(RenderTextTest, SetStyles) {
350 // Ensure custom default styles persist across setting and clearing text. 405 // Ensure custom default styles persist across setting and clearing text.
351 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 406 RenderText* render_text = GetRenderText();
352 const SkColor color = SK_ColorRED; 407 const SkColor color = SK_ColorRED;
353 render_text->SetColor(color); 408 render_text->SetColor(color);
354 render_text->SetBaselineStyle(SUPERSCRIPT); 409 render_text->SetBaselineStyle(SUPERSCRIPT);
355 render_text->SetWeight(Font::Weight::BOLD); 410 render_text->SetWeight(Font::Weight::BOLD);
356 render_text->SetStyle(UNDERLINE, false); 411 render_text->SetStyle(UNDERLINE, false);
357 const wchar_t* const cases[] = { kWeak, kLtr, L"Hello", kRtl, L"", L"" }; 412 const wchar_t* const cases[] = { kWeak, kLtr, L"Hello", kRtl, L"", L"" };
358 for (size_t i = 0; i < arraysize(cases); ++i) { 413 for (size_t i = 0; i < arraysize(cases); ++i) {
359 EXPECT_TRUE(render_text->colors().EqualsValueForTesting(color)); 414 EXPECT_TRUE(render_text->colors().EqualsValueForTesting(color));
360 EXPECT_TRUE(render_text->baselines().EqualsValueForTesting(SUPERSCRIPT)); 415 EXPECT_TRUE(render_text->baselines().EqualsValueForTesting(SUPERSCRIPT));
361 EXPECT_TRUE( 416 EXPECT_TRUE(
362 render_text->weights().EqualsValueForTesting(Font::Weight::BOLD)); 417 render_text->weights().EqualsValueForTesting(Font::Weight::BOLD));
363 EXPECT_TRUE(render_text->styles()[UNDERLINE].EqualsValueForTesting(false)); 418 EXPECT_TRUE(render_text->styles()[UNDERLINE].EqualsValueForTesting(false));
364 render_text->SetText(WideToUTF16(cases[i])); 419 render_text->SetText(WideToUTF16(cases[i]));
365 420
366 // Ensure custom default styles can be applied after text has been set. 421 // Ensure custom default styles can be applied after text has been set.
367 if (i == 1) 422 if (i == 1)
368 render_text->SetStyle(STRIKE, true); 423 render_text->SetStyle(STRIKE, true);
369 if (i >= 1) 424 if (i >= 1)
370 EXPECT_TRUE(render_text->styles()[STRIKE].EqualsValueForTesting(true)); 425 EXPECT_TRUE(render_text->styles()[STRIKE].EqualsValueForTesting(true));
371 } 426 }
372 } 427 }
373 428
374 TEST_F(RenderTextTest, ApplyStyles) { 429 TEST_P(RenderTextTest, ApplyStyles) {
375 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 430 RenderText* render_text = GetRenderText();
376 render_text->SetText(ASCIIToUTF16("012345678")); 431 render_text->SetText(ASCIIToUTF16("012345678"));
377 432
378 // Apply a ranged color and style and check the resulting breaks. 433 // Apply a ranged color and style and check the resulting breaks.
379 render_text->ApplyColor(SK_ColorRED, Range(1, 4)); 434 render_text->ApplyColor(SK_ColorRED, Range(1, 4));
380 render_text->ApplyBaselineStyle(SUPERIOR, Range(2, 4)); 435 render_text->ApplyBaselineStyle(SUPERIOR, Range(2, 4));
381 render_text->ApplyWeight(Font::Weight::BOLD, Range(2, 5)); 436 render_text->ApplyWeight(Font::Weight::BOLD, Range(2, 5));
382 std::vector<std::pair<size_t, SkColor> > expected_color; 437 std::vector<std::pair<size_t, SkColor> > expected_color;
383 expected_color.push_back(std::pair<size_t, SkColor>(0, SK_ColorBLACK)); 438 expected_color.push_back(std::pair<size_t, SkColor>(0, SK_ColorBLACK));
384 expected_color.push_back(std::pair<size_t, SkColor>(1, SK_ColorRED)); 439 expected_color.push_back(std::pair<size_t, SkColor>(1, SK_ColorRED));
385 expected_color.push_back(std::pair<size_t, SkColor>(4, SK_ColorBLACK)); 440 expected_color.push_back(std::pair<size_t, SkColor>(4, SK_ColorBLACK));
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 EXPECT_TRUE(render_text->styles()[ITALIC].EqualsForTesting(expected_italic)); 507 EXPECT_TRUE(render_text->styles()[ITALIC].EqualsForTesting(expected_italic));
453 render_text->ApplyStyle(ITALIC, false, Range(0, 1)); 508 render_text->ApplyStyle(ITALIC, false, Range(0, 1));
454 render_text->SetText(ASCIIToUTF16("0123456")); 509 render_text->SetText(ASCIIToUTF16("0123456"));
455 expected_italic.begin()->second = false; 510 expected_italic.begin()->second = false;
456 EXPECT_TRUE(render_text->styles()[ITALIC].EqualsForTesting(expected_italic)); 511 EXPECT_TRUE(render_text->styles()[ITALIC].EqualsForTesting(expected_italic));
457 render_text->ApplyStyle(ITALIC, true, Range(2, 4)); 512 render_text->ApplyStyle(ITALIC, true, Range(2, 4));
458 render_text->SetText(ASCIIToUTF16("012345678")); 513 render_text->SetText(ASCIIToUTF16("012345678"));
459 EXPECT_TRUE(render_text->styles()[ITALIC].EqualsForTesting(expected_italic)); 514 EXPECT_TRUE(render_text->styles()[ITALIC].EqualsForTesting(expected_italic));
460 515
461 // TODO(tmoniuszko): Enable when RenderTextMac::IsValidCursorIndex is 516 // TODO(tmoniuszko): Enable when RenderTextMac::IsValidCursorIndex is
462 // implemented. 517 // implemented. See http://crbug.com/131618.
463 #if !defined(OS_MACOSX) 518 if (GetParam() != RENDER_TEXT_MAC) {
464 // Styles shouldn't be changed mid-grapheme. 519 // Styles shouldn't be changed mid-grapheme.
465 render_text->SetText(WideToUTF16( 520 render_text->SetText(
466 L"0" L"\x0915\x093f" L"1" L"\x0915\x093f" L"2")); 521 WideToUTF16(L"0"
467 render_text->ApplyStyle(UNDERLINE, true, Range(2, 5)); 522 L"\x0915\x093f"
468 std::vector<std::pair<size_t, bool> > expected_underline; 523 L"1"
469 expected_underline.push_back(std::pair<size_t, bool>(0, false)); 524 L"\x0915\x093f"
470 expected_underline.push_back(std::pair<size_t, bool>(1, true)); 525 L"2"));
471 expected_underline.push_back(std::pair<size_t, bool>(6, false)); 526 render_text->ApplyStyle(UNDERLINE, true, Range(2, 5));
472 EXPECT_TRUE(render_text->styles()[UNDERLINE].EqualsForTesting( 527 std::vector<std::pair<size_t, bool>> expected_underline;
473 expected_underline)); 528 expected_underline.push_back(std::pair<size_t, bool>(0, false));
474 #endif // !defined(OS_MACOSX) 529 expected_underline.push_back(std::pair<size_t, bool>(1, true));
530 expected_underline.push_back(std::pair<size_t, bool>(6, false));
531 EXPECT_TRUE(
532 render_text->styles()[UNDERLINE].EqualsForTesting(expected_underline));
533 }
475 } 534 }
476 535
477 TEST_F(RenderTextTest, AppendTextKeepsStyles) { 536 TEST_P(RenderTextTest, AppendTextKeepsStyles) {
478 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 537 RenderText* render_text = GetRenderText();
479 // Setup basic functionality. 538 // Setup basic functionality.
480 render_text->SetText(ASCIIToUTF16("abc")); 539 render_text->SetText(ASCIIToUTF16("abc"));
481 render_text->ApplyColor(SK_ColorRED, Range(0, 1)); 540 render_text->ApplyColor(SK_ColorRED, Range(0, 1));
482 render_text->ApplyBaselineStyle(SUPERSCRIPT, Range(1, 2)); 541 render_text->ApplyBaselineStyle(SUPERSCRIPT, Range(1, 2));
483 render_text->ApplyStyle(UNDERLINE, true, Range(2, 3)); 542 render_text->ApplyStyle(UNDERLINE, true, Range(2, 3));
484 // Verify basic functionality. 543 // Verify basic functionality.
485 std::vector<std::pair<size_t, SkColor>> expected_color; 544 std::vector<std::pair<size_t, SkColor>> expected_color;
486 expected_color.push_back(std::pair<size_t, SkColor>(0, SK_ColorRED)); 545 expected_color.push_back(std::pair<size_t, SkColor>(0, SK_ColorRED));
487 expected_color.push_back(std::pair<size_t, SkColor>(1, SK_ColorBLACK)); 546 expected_color.push_back(std::pair<size_t, SkColor>(1, SK_ColorBLACK));
488 EXPECT_TRUE(render_text->colors().EqualsForTesting(expected_color)); 547 EXPECT_TRUE(render_text->colors().EqualsForTesting(expected_color));
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 render_text->selection_model()); 590 render_text->selection_model());
532 } 591 }
533 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, selection_behavior); 592 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, selection_behavior);
534 EXPECT_EQ(SelectionModel(Range(select ? 0 : len, len), CURSOR_FORWARD), 593 EXPECT_EQ(SelectionModel(Range(select ? 0 : len, len), CURSOR_FORWARD),
535 render_text->selection_model()); 594 render_text->selection_model());
536 render_text->MoveCursor(WORD_BREAK, CURSOR_LEFT, selection_behavior); 595 render_text->MoveCursor(WORD_BREAK, CURSOR_LEFT, selection_behavior);
537 EXPECT_EQ(SelectionModel(0, CURSOR_BACKWARD), render_text->selection_model()); 596 EXPECT_EQ(SelectionModel(0, CURSOR_BACKWARD), render_text->selection_model());
538 } 597 }
539 598
540 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618 599 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
541 #if !defined(OS_MACOSX) 600 TEST_P(RenderTextHarfBuzzTest, ObscuredText) {
542 TEST_F(RenderTextTest, ObscuredText) {
543 const base::string16 seuss = ASCIIToUTF16("hop on pop"); 601 const base::string16 seuss = ASCIIToUTF16("hop on pop");
544 const base::string16 no_seuss = ASCIIToUTF16("**********"); 602 const base::string16 no_seuss = ASCIIToUTF16("**********");
545 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 603 RenderText* render_text = GetRenderText();
546 604
547 // GetLayoutText() returns asterisks when the obscured bit is set. 605 // GetLayoutText() returns asterisks when the obscured bit is set.
548 render_text->SetText(seuss); 606 render_text->SetText(seuss);
549 render_text->SetObscured(true); 607 render_text->SetObscured(true);
550 EXPECT_EQ(seuss, render_text->text()); 608 EXPECT_EQ(seuss, render_text->text());
551 EXPECT_EQ(no_seuss, render_text->GetDisplayText()); 609 EXPECT_EQ(no_seuss, render_text->GetDisplayText());
552 render_text->SetObscured(false); 610 render_text->SetObscured(false);
553 EXPECT_EQ(seuss, render_text->text()); 611 EXPECT_EQ(seuss, render_text->text());
554 EXPECT_EQ(seuss, render_text->GetDisplayText()); 612 EXPECT_EQ(seuss, render_text->GetDisplayText());
555 613
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 static_cast<int>(render_text->GetGlyphBounds(0U).length())); 648 static_cast<int>(render_text->GetGlyphBounds(0U).length()));
591 649
592 // Cursoring is independent of underlying characters when text is obscured. 650 // Cursoring is independent of underlying characters when text is obscured.
593 const wchar_t* const texts[] = { 651 const wchar_t* const texts[] = {
594 kWeak, kLtr, kLtrRtl, kLtrRtlLtr, kRtl, kRtlLtr, kRtlLtrRtl, 652 kWeak, kLtr, kLtrRtl, kLtrRtlLtr, kRtl, kRtlLtr, kRtlLtrRtl,
595 L"hop on pop", // Check LTR word boundaries. 653 L"hop on pop", // Check LTR word boundaries.
596 L"\x05d0\x05d1 \x05d0\x05d2 \x05d1\x05d2", // Check RTL word boundaries. 654 L"\x05d0\x05d1 \x05d0\x05d2 \x05d1\x05d2", // Check RTL word boundaries.
597 }; 655 };
598 for (size_t i = 0; i < arraysize(texts); ++i) { 656 for (size_t i = 0; i < arraysize(texts); ++i) {
599 base::string16 text = WideToUTF16(texts[i]); 657 base::string16 text = WideToUTF16(texts[i]);
600 TestVisualCursorMotionInObscuredField(render_text.get(), text, 658 TestVisualCursorMotionInObscuredField(render_text, text, SELECTION_NONE);
601 SELECTION_NONE); 659 TestVisualCursorMotionInObscuredField(render_text, text, SELECTION_RETAIN);
602 TestVisualCursorMotionInObscuredField(render_text.get(), text,
603 SELECTION_RETAIN);
604 } 660 }
605 } 661 }
606 #endif // !defined(OS_MACOSX)
607 662
608 TEST_F(RenderTextTest, RevealObscuredText) { 663 TEST_P(RenderTextTest, RevealObscuredText) {
609 const base::string16 seuss = ASCIIToUTF16("hop on pop"); 664 const base::string16 seuss = ASCIIToUTF16("hop on pop");
610 const base::string16 no_seuss = ASCIIToUTF16("**********"); 665 const base::string16 no_seuss = ASCIIToUTF16("**********");
611 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 666 RenderText* render_text = GetRenderText();
612 667
613 render_text->SetText(seuss); 668 render_text->SetText(seuss);
614 render_text->SetObscured(true); 669 render_text->SetObscured(true);
615 EXPECT_EQ(seuss, render_text->text()); 670 EXPECT_EQ(seuss, render_text->text());
616 EXPECT_EQ(no_seuss, render_text->GetDisplayText()); 671 EXPECT_EQ(no_seuss, render_text->GetDisplayText());
617 672
618 // Valid reveal index and new revealed index clears previous one. 673 // Valid reveal index and new revealed index clears previous one.
619 render_text->RenderText::SetObscuredRevealIndex(0); 674 render_text->RenderText::SetObscuredRevealIndex(0);
620 EXPECT_EQ(ASCIIToUTF16("h*********"), render_text->GetDisplayText()); 675 EXPECT_EQ(ASCIIToUTF16("h*********"), render_text->GetDisplayText());
621 render_text->RenderText::SetObscuredRevealIndex(1); 676 render_text->RenderText::SetObscuredRevealIndex(1);
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 render_text->RenderText::SetObscuredRevealIndex(2); 727 render_text->RenderText::SetObscuredRevealIndex(2);
673 EXPECT_EQ(ASCIIToUTF16("*h***"), render_text->GetDisplayText()); 728 EXPECT_EQ(ASCIIToUTF16("*h***"), render_text->GetDisplayText());
674 render_text->RenderText::SetObscuredRevealIndex(5); 729 render_text->RenderText::SetObscuredRevealIndex(5);
675 const base::char16 valid_expect_5_and_6[] = 730 const base::char16 valid_expect_5_and_6[] =
676 {'*', '*', '*', '*', 0xD800, 0xDC00, 0}; 731 {'*', '*', '*', '*', 0xD800, 0xDC00, 0};
677 EXPECT_EQ(valid_expect_5_and_6, render_text->GetDisplayText()); 732 EXPECT_EQ(valid_expect_5_and_6, render_text->GetDisplayText());
678 render_text->RenderText::SetObscuredRevealIndex(6); 733 render_text->RenderText::SetObscuredRevealIndex(6);
679 EXPECT_EQ(valid_expect_5_and_6, render_text->GetDisplayText()); 734 EXPECT_EQ(valid_expect_5_and_6, render_text->GetDisplayText());
680 } 735 }
681 736
682 TEST_F(RenderTextTest, ObscuredEmoji) { 737 TEST_P(RenderTextTest, ObscuredEmoji) {
683 // Ensures text itemization doesn't crash on obscured multi-char glyphs. 738 // Ensures text itemization doesn't crash on obscured multi-char glyphs.
684 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 739 RenderText* render_text = GetRenderText();
685 render_text->SetObscured(true); 740 render_text->SetObscured(true);
686 Canvas canvas;
687 // Test the "Grinning face with smiling eyes" character followed by 'y'. 741 // Test the "Grinning face with smiling eyes" character followed by 'y'.
688 render_text->SetText(UTF8ToUTF16("\xF0\x9F\x98\x81y")); 742 render_text->SetText(UTF8ToUTF16("\xF0\x9F\x98\x81y"));
689 render_text->Draw(&canvas); 743 render_text->Draw(canvas());
690 // Test two "Camera" characters in a row. 744 // Test two "Camera" characters in a row.
691 render_text->SetText(UTF8ToUTF16("\xF0\x9F\x93\xB7\xF0\x9F\x93\xB7")); 745 render_text->SetText(UTF8ToUTF16("\xF0\x9F\x93\xB7\xF0\x9F\x93\xB7"));
692 render_text->Draw(&canvas); 746 render_text->Draw(canvas());
693 } 747 }
694 748
695 // TODO(PORT): Fails for RenderTextMac. 749 // TODO(PORT): Fails for RenderTextMac.
750 // Crashes on Mac with RenderTextHarfBuzz. See http://crbug.com/640068.
696 #if !defined(OS_MACOSX) 751 #if !defined(OS_MACOSX)
697 752
698 TEST_F(RenderTextTest, ElidedText) { 753 TEST_P(RenderTextTest, ElidedText) {
699 // TODO(skanuj) : Add more test cases for following 754 // TODO(skanuj) : Add more test cases for following
700 // - RenderText styles. 755 // - RenderText styles.
701 // - Cross interaction of truncate, elide and obscure. 756 // - Cross interaction of truncate, elide and obscure.
702 // - ElideText tests from text_elider.cc. 757 // - ElideText tests from text_elider.cc.
703 struct { 758 struct {
704 const wchar_t* text; 759 const wchar_t* text;
705 const wchar_t* display_text; 760 const wchar_t* display_text;
706 const bool elision_expected; 761 const bool elision_expected;
707 } cases[] = { 762 } cases[] = {
708 // Strings shorter than the elision width should be laid out in full. 763 // Strings shorter than the elision width should be laid out in full.
(...skipping 28 matching lines...) Expand all
737 // U+05E9 U+05BC U+05C1 U+05B8 forms a four-character compound glyph. Again, 792 // U+05E9 U+05BC U+05C1 U+05B8 forms a four-character compound glyph. Again,
738 // it should be either fully elided, or not elided at all. If completely 793 // it should be either fully elided, or not elided at all. If completely
739 // elided, an LTR Mark (U+200E) should be added. 794 // elided, an LTR Mark (U+200E) should be added.
740 { L"0\x05e9\x05bc\x05c1\x05b8", L"0\x05e9\x05bc\x05c1\x05b8", false }, 795 { L"0\x05e9\x05bc\x05c1\x05b8", L"0\x05e9\x05bc\x05c1\x05b8", false },
741 { L"0\x05e9\x05bc\x05c1\x05b8", L"0\x2026\x200E" , true }, 796 { L"0\x05e9\x05bc\x05c1\x05b8", L"0\x2026\x200E" , true },
742 { L"01\x05e9\x05bc\x05c1\x05b8", L"01\x2026\x200E" , true }, 797 { L"01\x05e9\x05bc\x05c1\x05b8", L"01\x2026\x200E" , true },
743 { L"012\x05e9\x05bc\x05c1\x05b8", L"012\x2026\x200E" , true }, 798 { L"012\x05e9\x05bc\x05c1\x05b8", L"012\x2026\x200E" , true },
744 { L"012\xF0\x9D\x84\x9E", L"012\xF0\x2026" , true }, 799 { L"012\xF0\x9D\x84\x9E", L"012\xF0\x2026" , true },
745 }; 800 };
746 801
747 std::unique_ptr<RenderText> expected_render_text( 802 std::unique_ptr<RenderText> expected_render_text(CreateRenderTextInstance());
748 RenderText::CreateInstance());
749 expected_render_text->SetFontList(FontList("serif, Sans serif, 12px")); 803 expected_render_text->SetFontList(FontList("serif, Sans serif, 12px"));
750 expected_render_text->SetDisplayRect(Rect(0, 0, 9999, 100)); 804 expected_render_text->SetDisplayRect(Rect(0, 0, 9999, 100));
751 805
752 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 806 RenderText* render_text = GetRenderText();
753 render_text->SetFontList(FontList("serif, Sans serif, 12px")); 807 render_text->SetFontList(FontList("serif, Sans serif, 12px"));
754 render_text->SetElideBehavior(ELIDE_TAIL); 808 render_text->SetElideBehavior(ELIDE_TAIL);
755 809
756 for (size_t i = 0; i < arraysize(cases); i++) { 810 for (size_t i = 0; i < arraysize(cases); i++) {
757 SCOPED_TRACE(base::StringPrintf("Testing cases[%" PRIuS "] '%ls'", i, 811 SCOPED_TRACE(base::StringPrintf("Testing cases[%" PRIuS "] '%ls'", i,
758 cases[i].text)); 812 cases[i].text));
759 813
760 // Compute expected width 814 // Compute expected width
761 expected_render_text->SetText(WideToUTF16(cases[i].display_text)); 815 expected_render_text->SetText(WideToUTF16(cases[i].display_text));
762 int expected_width = expected_render_text->GetContentWidth(); 816 int expected_width = expected_render_text->GetContentWidth();
763 817
764 base::string16 input = WideToUTF16(cases[i].text); 818 base::string16 input = WideToUTF16(cases[i].text);
765 // Extend the input text to ensure that it is wider than the display_text, 819 // Extend the input text to ensure that it is wider than the display_text,
766 // and so it will get elided. 820 // and so it will get elided.
767 if (cases[i].elision_expected) 821 if (cases[i].elision_expected)
768 input.append(WideToUTF16(L" MMMMMMMMMMM")); 822 input.append(WideToUTF16(L" MMMMMMMMMMM"));
769 render_text->SetText(input); 823 render_text->SetText(input);
770 render_text->SetDisplayRect(Rect(0, 0, expected_width, 100)); 824 render_text->SetDisplayRect(Rect(0, 0, expected_width, 100));
771 EXPECT_EQ(input, render_text->text()); 825 EXPECT_EQ(input, render_text->text());
772 EXPECT_EQ(WideToUTF16(cases[i].display_text), 826 EXPECT_EQ(WideToUTF16(cases[i].display_text),
773 render_text->GetDisplayText()); 827 render_text->GetDisplayText());
774 expected_render_text->SetText(base::string16()); 828 expected_render_text->SetText(base::string16());
775 } 829 }
776 } 830 }
777 831
778 TEST_F(RenderTextTest, ElidedObscuredText) { 832 TEST_P(RenderTextTest, ElidedObscuredText) {
779 std::unique_ptr<RenderText> expected_render_text( 833 std::unique_ptr<RenderText> expected_render_text(CreateRenderTextInstance());
780 RenderText::CreateInstance());
781 expected_render_text->SetFontList(FontList("serif, Sans serif, 12px")); 834 expected_render_text->SetFontList(FontList("serif, Sans serif, 12px"));
782 expected_render_text->SetDisplayRect(Rect(0, 0, 9999, 100)); 835 expected_render_text->SetDisplayRect(Rect(0, 0, 9999, 100));
783 expected_render_text->SetText(WideToUTF16(L"**\x2026")); 836 expected_render_text->SetText(WideToUTF16(L"**\x2026"));
784 837
785 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 838 RenderText* render_text = GetRenderText();
786 render_text->SetFontList(FontList("serif, Sans serif, 12px")); 839 render_text->SetFontList(FontList("serif, Sans serif, 12px"));
787 render_text->SetElideBehavior(ELIDE_TAIL); 840 render_text->SetElideBehavior(ELIDE_TAIL);
788 render_text->SetDisplayRect( 841 render_text->SetDisplayRect(
789 Rect(0, 0, expected_render_text->GetContentWidth(), 100)); 842 Rect(0, 0, expected_render_text->GetContentWidth(), 100));
790 render_text->SetObscured(true); 843 render_text->SetObscured(true);
791 render_text->SetText(WideToUTF16(L"abcdef")); 844 render_text->SetText(WideToUTF16(L"abcdef"));
792 EXPECT_EQ(WideToUTF16(L"abcdef"), render_text->text()); 845 EXPECT_EQ(WideToUTF16(L"abcdef"), render_text->text());
793 EXPECT_EQ(WideToUTF16(L"**\x2026"), render_text->GetDisplayText()); 846 EXPECT_EQ(WideToUTF16(L"**\x2026"), render_text->GetDisplayText());
794 } 847 }
795 848
796 TEST_F(RenderTextTest, MultilineElide) { 849 #endif // !defined(OS_MACOSX)
797 std::unique_ptr<RenderText> render_text(new RenderTextHarfBuzz); 850
851 // TODO(PORT): Fails for RenderTextMac.
852 TEST_P(RenderTextHarfBuzzTest, MultilineElide) {
853 RenderText* render_text = GetRenderText();
798 base::string16 input_text; 854 base::string16 input_text;
799 // Aim for 3 lines of text. 855 // Aim for 3 lines of text.
800 for (int i = 0; i < 20; ++i) 856 for (int i = 0; i < 20; ++i)
801 input_text.append(ASCIIToUTF16("hello world ")); 857 input_text.append(ASCIIToUTF16("hello world "));
802 render_text->SetText(input_text); 858 render_text->SetText(input_text);
803 // Apply a style that tweaks the layout to make sure elision is calculated 859 // Apply a style that tweaks the layout to make sure elision is calculated
804 // with these styles. This can expose a behavior in layout where text is 860 // with these styles. This can expose a behavior in layout where text is
805 // slightly different width. This must be done after |SetText()|. 861 // slightly different width. This must be done after |SetText()|.
806 render_text->ApplyWeight(Font::Weight::BOLD, Range(1, 20)); 862 render_text->ApplyWeight(Font::Weight::BOLD, Range(1, 20));
807 render_text->ApplyStyle(ITALIC, true, Range(1, 20)); 863 render_text->ApplyStyle(ITALIC, true, Range(1, 20));
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 EXPECT_EQ(input_text, render_text->GetDisplayText()); 895 EXPECT_EQ(input_text, render_text->GetDisplayText());
840 896
841 // And put it back. 897 // And put it back.
842 render_text->SetMaxLines(3); 898 render_text->SetMaxLines(3);
843 render_text->GetStringSize(); 899 render_text->GetStringSize();
844 EXPECT_LT(actual_text.size(), input_text.size()); 900 EXPECT_LT(actual_text.size(), input_text.size());
845 EXPECT_EQ(actual_text, input_text.substr(0, actual_text.size() - 1) + 901 EXPECT_EQ(actual_text, input_text.substr(0, actual_text.size() - 1) +
846 base::string16(kEllipsisUTF16)); 902 base::string16(kEllipsisUTF16));
847 } 903 }
848 904
849 #endif // !defined(OS_MACOSX) 905 TEST_P(RenderTextTest, ElidedEmail) {
850 906 RenderText* render_text = GetRenderText();
851 TEST_F(RenderTextTest, ElidedEmail) {
852 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance());
853 render_text->SetText(ASCIIToUTF16("test@example.com")); 907 render_text->SetText(ASCIIToUTF16("test@example.com"));
854 const Size size = render_text->GetStringSize(); 908 const Size size = render_text->GetStringSize();
855 909
856 const base::string16 long_email = 910 const base::string16 long_email =
857 ASCIIToUTF16("longemailaddresstest@example.com"); 911 ASCIIToUTF16("longemailaddresstest@example.com");
858 render_text->SetText(long_email); 912 render_text->SetText(long_email);
859 render_text->SetElideBehavior(ELIDE_EMAIL); 913 render_text->SetElideBehavior(ELIDE_EMAIL);
860 render_text->SetDisplayRect(Rect(size)); 914 render_text->SetDisplayRect(Rect(size));
861 EXPECT_GE(size.width(), render_text->GetStringSize().width()); 915 EXPECT_GE(size.width(), render_text->GetStringSize().width());
862 EXPECT_GT(long_email.size(), render_text->GetDisplayText().size()); 916 EXPECT_GT(long_email.size(), render_text->GetDisplayText().size());
863 } 917 }
864 918
865 TEST_F(RenderTextTest, TruncatedText) { 919 TEST_P(RenderTextTest, TruncatedText) {
866 struct { 920 struct {
867 const wchar_t* text; 921 const wchar_t* text;
868 const wchar_t* display_text; 922 const wchar_t* display_text;
869 } cases[] = { 923 } cases[] = {
870 // Strings shorter than the truncation length should be laid out in full. 924 // Strings shorter than the truncation length should be laid out in full.
871 { L"", L"" }, 925 { L"", L"" },
872 { kWeak, kWeak }, 926 { kWeak, kWeak },
873 { kLtr, kLtr }, 927 { kLtr, kLtr },
874 { kLtrRtl, kLtrRtl }, 928 { kLtrRtl, kLtrRtl },
875 { kLtrRtlLtr, kLtrRtlLtr }, 929 { kLtrRtlLtr, kLtrRtlLtr },
(...skipping 14 matching lines...) Expand all
890 // Surrogate pairs should be truncated reasonably enough. 944 // Surrogate pairs should be truncated reasonably enough.
891 { L"0123\x0915\x093f", L"0123\x2026" }, 945 { L"0123\x0915\x093f", L"0123\x2026" },
892 { L"0\x05e9\x05bc\x05c1\x05b8", L"0\x05e9\x05bc\x05c1\x05b8" }, 946 { L"0\x05e9\x05bc\x05c1\x05b8", L"0\x05e9\x05bc\x05c1\x05b8" },
893 { L"01\x05e9\x05bc\x05c1\x05b8", L"01\x05e9\x05bc\x2026" }, 947 { L"01\x05e9\x05bc\x05c1\x05b8", L"01\x05e9\x05bc\x2026" },
894 { L"012\x05e9\x05bc\x05c1\x05b8", L"012\x05e9\x2026" }, 948 { L"012\x05e9\x05bc\x05c1\x05b8", L"012\x05e9\x2026" },
895 { L"0123\x05e9\x05bc\x05c1\x05b8", L"0123\x2026" }, 949 { L"0123\x05e9\x05bc\x05c1\x05b8", L"0123\x2026" },
896 { L"01234\x05e9\x05bc\x05c1\x05b8", L"0123\x2026" }, 950 { L"01234\x05e9\x05bc\x05c1\x05b8", L"0123\x2026" },
897 { L"012\xF0\x9D\x84\x9E", L"012\xF0\x2026" }, 951 { L"012\xF0\x9D\x84\x9E", L"012\xF0\x2026" },
898 }; 952 };
899 953
900 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 954 RenderText* render_text = GetRenderText();
901 render_text->set_truncate_length(5); 955 render_text->set_truncate_length(5);
902 for (size_t i = 0; i < arraysize(cases); i++) { 956 for (size_t i = 0; i < arraysize(cases); i++) {
903 render_text->SetText(WideToUTF16(cases[i].text)); 957 render_text->SetText(WideToUTF16(cases[i].text));
904 EXPECT_EQ(WideToUTF16(cases[i].text), render_text->text()); 958 EXPECT_EQ(WideToUTF16(cases[i].text), render_text->text());
905 EXPECT_EQ(WideToUTF16(cases[i].display_text), render_text->GetDisplayText()) 959 EXPECT_EQ(WideToUTF16(cases[i].display_text), render_text->GetDisplayText())
906 << "For case " << i << ": " << cases[i].text; 960 << "For case " << i << ": " << cases[i].text;
907 } 961 }
908 } 962 }
909 963
910 TEST_F(RenderTextTest, TruncatedObscuredText) { 964 TEST_P(RenderTextTest, TruncatedObscuredText) {
911 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 965 RenderText* render_text = GetRenderText();
912 render_text->set_truncate_length(3); 966 render_text->set_truncate_length(3);
913 render_text->SetObscured(true); 967 render_text->SetObscured(true);
914 render_text->SetText(WideToUTF16(L"abcdef")); 968 render_text->SetText(WideToUTF16(L"abcdef"));
915 EXPECT_EQ(WideToUTF16(L"abcdef"), render_text->text()); 969 EXPECT_EQ(WideToUTF16(L"abcdef"), render_text->text());
916 EXPECT_EQ(WideToUTF16(L"**\x2026"), render_text->GetDisplayText()); 970 EXPECT_EQ(WideToUTF16(L"**\x2026"), render_text->GetDisplayText());
917 } 971 }
918 972
919 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618 973 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
920 #if !defined(OS_MACOSX) 974 TEST_P(RenderTextHarfBuzzTest, TruncatedCursorMovementLTR) {
921 TEST_F(RenderTextTest, TruncatedCursorMovementLTR) { 975 RenderText* render_text = GetRenderText();
922 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance());
923 render_text->set_truncate_length(2); 976 render_text->set_truncate_length(2);
924 render_text->SetText(WideToUTF16(L"abcd")); 977 render_text->SetText(WideToUTF16(L"abcd"));
925 978
926 EXPECT_EQ(SelectionModel(0, CURSOR_BACKWARD), render_text->selection_model()); 979 EXPECT_EQ(SelectionModel(0, CURSOR_BACKWARD), render_text->selection_model());
927 render_text->MoveCursor(LINE_BREAK, CURSOR_RIGHT, SELECTION_NONE); 980 render_text->MoveCursor(LINE_BREAK, CURSOR_RIGHT, SELECTION_NONE);
928 EXPECT_EQ(SelectionModel(4, CURSOR_FORWARD), render_text->selection_model()); 981 EXPECT_EQ(SelectionModel(4, CURSOR_FORWARD), render_text->selection_model());
929 render_text->MoveCursor(LINE_BREAK, CURSOR_LEFT, SELECTION_NONE); 982 render_text->MoveCursor(LINE_BREAK, CURSOR_LEFT, SELECTION_NONE);
930 EXPECT_EQ(SelectionModel(0, CURSOR_BACKWARD), render_text->selection_model()); 983 EXPECT_EQ(SelectionModel(0, CURSOR_BACKWARD), render_text->selection_model());
931 984
932 std::vector<SelectionModel> expected; 985 std::vector<SelectionModel> expected;
933 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 986 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
934 expected.push_back(SelectionModel(1, CURSOR_BACKWARD)); 987 expected.push_back(SelectionModel(1, CURSOR_BACKWARD));
935 // The cursor hops over the ellipsis and elided text to the line end. 988 // The cursor hops over the ellipsis and elided text to the line end.
936 expected.push_back(SelectionModel(4, CURSOR_BACKWARD)); 989 expected.push_back(SelectionModel(4, CURSOR_BACKWARD));
937 expected.push_back(SelectionModel(4, CURSOR_FORWARD)); 990 expected.push_back(SelectionModel(4, CURSOR_FORWARD));
938 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_RIGHT); 991 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_RIGHT);
939 992
940 expected.clear(); 993 expected.clear();
941 expected.push_back(SelectionModel(4, CURSOR_FORWARD)); 994 expected.push_back(SelectionModel(4, CURSOR_FORWARD));
942 // The cursor hops over the elided text to preceeding text. 995 // The cursor hops over the elided text to preceeding text.
943 expected.push_back(SelectionModel(1, CURSOR_FORWARD)); 996 expected.push_back(SelectionModel(1, CURSOR_FORWARD));
944 expected.push_back(SelectionModel(0, CURSOR_FORWARD)); 997 expected.push_back(SelectionModel(0, CURSOR_FORWARD));
945 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 998 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
946 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_LEFT); 999 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_LEFT);
947 } 1000 }
948 1001
949 TEST_F(RenderTextTest, TruncatedCursorMovementRTL) { 1002 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
950 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1003 TEST_P(RenderTextHarfBuzzTest, TruncatedCursorMovementRTL) {
1004 RenderText* render_text = GetRenderText();
951 render_text->set_truncate_length(2); 1005 render_text->set_truncate_length(2);
952 render_text->SetText(WideToUTF16(L"\x5d0\x5d1\x5d2\x5d3")); 1006 render_text->SetText(WideToUTF16(L"\x5d0\x5d1\x5d2\x5d3"));
953 1007
954 EXPECT_EQ(SelectionModel(0, CURSOR_BACKWARD), render_text->selection_model()); 1008 EXPECT_EQ(SelectionModel(0, CURSOR_BACKWARD), render_text->selection_model());
955 render_text->MoveCursor(LINE_BREAK, CURSOR_LEFT, SELECTION_NONE); 1009 render_text->MoveCursor(LINE_BREAK, CURSOR_LEFT, SELECTION_NONE);
956 EXPECT_EQ(SelectionModel(4, CURSOR_FORWARD), render_text->selection_model()); 1010 EXPECT_EQ(SelectionModel(4, CURSOR_FORWARD), render_text->selection_model());
957 render_text->MoveCursor(LINE_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1011 render_text->MoveCursor(LINE_BREAK, CURSOR_RIGHT, SELECTION_NONE);
958 EXPECT_EQ(SelectionModel(0, CURSOR_BACKWARD), render_text->selection_model()); 1012 EXPECT_EQ(SelectionModel(0, CURSOR_BACKWARD), render_text->selection_model());
959 1013
960 std::vector<SelectionModel> expected; 1014 std::vector<SelectionModel> expected;
961 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 1015 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
962 expected.push_back(SelectionModel(1, CURSOR_BACKWARD)); 1016 expected.push_back(SelectionModel(1, CURSOR_BACKWARD));
963 // The cursor hops over the ellipsis and elided text to the line end. 1017 // The cursor hops over the ellipsis and elided text to the line end.
964 expected.push_back(SelectionModel(4, CURSOR_BACKWARD)); 1018 expected.push_back(SelectionModel(4, CURSOR_BACKWARD));
965 expected.push_back(SelectionModel(4, CURSOR_FORWARD)); 1019 expected.push_back(SelectionModel(4, CURSOR_FORWARD));
966 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_LEFT); 1020 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_LEFT);
967 1021
968 expected.clear(); 1022 expected.clear();
969 expected.push_back(SelectionModel(4, CURSOR_FORWARD)); 1023 expected.push_back(SelectionModel(4, CURSOR_FORWARD));
970 // The cursor hops over the elided text to preceeding text. 1024 // The cursor hops over the elided text to preceeding text.
971 expected.push_back(SelectionModel(1, CURSOR_FORWARD)); 1025 expected.push_back(SelectionModel(1, CURSOR_FORWARD));
972 expected.push_back(SelectionModel(0, CURSOR_FORWARD)); 1026 expected.push_back(SelectionModel(0, CURSOR_FORWARD));
973 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 1027 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
974 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_RIGHT); 1028 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_RIGHT);
975 } 1029 }
976 #endif // !defined(OS_MACOSX)
977 1030
978 TEST_F(RenderTextTest, MoveCursor_Character) { 1031 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
979 std::unique_ptr<RenderText> render_text( 1032 TEST_P(RenderTextHarfBuzzTest, MoveCursor_Character) {
980 RenderText::CreateInstanceForEditing()); 1033 RenderText* render_text = GetRenderText();
981 render_text->SetText(WideToUTF16(L"123 456 789")); 1034 render_text->SetText(WideToUTF16(L"123 456 789"));
982 std::vector<Range> expected; 1035 std::vector<Range> expected;
983 1036
984 // SELECTION_NONE. 1037 // SELECTION_NONE.
985 render_text->SelectRange(Range(6)); 1038 render_text->SelectRange(Range(6));
986 1039
987 // Move right twice. 1040 // Move right twice.
988 expected.push_back(Range(7)); 1041 expected.push_back(Range(7));
989 expected.push_back(Range(8)); 1042 expected.push_back(Range(8));
990 RunMoveCursorTestAndClearExpectations(render_text.get(), CHARACTER_BREAK, 1043 RunMoveCursorTestAndClearExpectations(
991 CURSOR_RIGHT, SELECTION_NONE, 1044 render_text, CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE, &expected);
992 &expected);
993 1045
994 // Move left twice. 1046 // Move left twice.
995 expected.push_back(Range(7)); 1047 expected.push_back(Range(7));
996 expected.push_back(Range(6)); 1048 expected.push_back(Range(6));
997 RunMoveCursorTestAndClearExpectations(render_text.get(), CHARACTER_BREAK, 1049 RunMoveCursorTestAndClearExpectations(render_text, CHARACTER_BREAK,
998 CURSOR_LEFT, SELECTION_NONE, &expected); 1050 CURSOR_LEFT, SELECTION_NONE, &expected);
999 1051
1000 // SELECTION_CARET. 1052 // SELECTION_CARET.
1001 render_text->SelectRange(Range(6)); 1053 render_text->SelectRange(Range(6));
1002 expected.push_back(Range(6, 7)); 1054 expected.push_back(Range(6, 7));
1003 1055
1004 // Move right. 1056 // Move right.
1005 RunMoveCursorTestAndClearExpectations(render_text.get(), CHARACTER_BREAK, 1057 RunMoveCursorTestAndClearExpectations(
1006 CURSOR_RIGHT, SELECTION_CARET, 1058 render_text, CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_CARET, &expected);
1007 &expected);
1008 1059
1009 // Move left twice. 1060 // Move left twice.
1010 expected.push_back(Range(6)); 1061 expected.push_back(Range(6));
1011 expected.push_back(Range(6, 5)); 1062 expected.push_back(Range(6, 5));
1012 RunMoveCursorTestAndClearExpectations(render_text.get(), CHARACTER_BREAK, 1063 RunMoveCursorTestAndClearExpectations(
1013 CURSOR_LEFT, SELECTION_CARET, 1064 render_text, CHARACTER_BREAK, CURSOR_LEFT, SELECTION_CARET, &expected);
1014 &expected);
1015 1065
1016 // SELECTION_RETAIN. 1066 // SELECTION_RETAIN.
1017 render_text->SelectRange(Range(6)); 1067 render_text->SelectRange(Range(6));
1018 1068
1019 // Move right. 1069 // Move right.
1020 expected.push_back(Range(6, 7)); 1070 expected.push_back(Range(6, 7));
1021 RunMoveCursorTestAndClearExpectations(render_text.get(), CHARACTER_BREAK, 1071 RunMoveCursorTestAndClearExpectations(
1022 CURSOR_RIGHT, SELECTION_RETAIN, 1072 render_text, CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_RETAIN, &expected);
1023 &expected);
1024 1073
1025 // Move left twice. 1074 // Move left twice.
1026 expected.push_back(Range(6)); 1075 expected.push_back(Range(6));
1027 expected.push_back(Range(6, 5)); 1076 expected.push_back(Range(6, 5));
1028 RunMoveCursorTestAndClearExpectations(render_text.get(), CHARACTER_BREAK, 1077 RunMoveCursorTestAndClearExpectations(
1029 CURSOR_LEFT, SELECTION_RETAIN, 1078 render_text, CHARACTER_BREAK, CURSOR_LEFT, SELECTION_RETAIN, &expected);
1030 &expected);
1031 1079
1032 // SELECTION_EXTEND. 1080 // SELECTION_EXTEND.
1033 render_text->SelectRange(Range(6)); 1081 render_text->SelectRange(Range(6));
1034 1082
1035 // Move right. 1083 // Move right.
1036 expected.push_back(Range(6, 7)); 1084 expected.push_back(Range(6, 7));
1037 RunMoveCursorTestAndClearExpectations(render_text.get(), CHARACTER_BREAK, 1085 RunMoveCursorTestAndClearExpectations(
1038 CURSOR_RIGHT, SELECTION_EXTEND, 1086 render_text, CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_EXTEND, &expected);
1039 &expected);
1040 1087
1041 // Move left twice. 1088 // Move left twice.
1042 expected.push_back(Range(7, 6)); 1089 expected.push_back(Range(7, 6));
1043 expected.push_back(Range(7, 5)); 1090 expected.push_back(Range(7, 5));
1044 RunMoveCursorTestAndClearExpectations(render_text.get(), CHARACTER_BREAK, 1091 RunMoveCursorTestAndClearExpectations(
1045 CURSOR_LEFT, SELECTION_EXTEND, 1092 render_text, CHARACTER_BREAK, CURSOR_LEFT, SELECTION_EXTEND, &expected);
1046 &expected);
1047 } 1093 }
1048 1094
1049 TEST_F(RenderTextTest, MoveCursor_Word) { 1095 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1050 std::unique_ptr<RenderText> render_text( 1096 TEST_P(RenderTextHarfBuzzTest, MoveCursor_Word) {
1051 RenderText::CreateInstanceForEditing()); 1097 RenderText* render_text = GetRenderText();
1052 render_text->SetText(WideToUTF16(L"123 456 789")); 1098 render_text->SetText(WideToUTF16(L"123 456 789"));
1053 std::vector<Range> expected; 1099 std::vector<Range> expected;
1054 1100
1055 // SELECTION_NONE. 1101 // SELECTION_NONE.
1056 render_text->SelectRange(Range(6)); 1102 render_text->SelectRange(Range(6));
1057 1103
1058 // Move left twice. 1104 // Move left twice.
1059 expected.push_back(Range(4)); 1105 expected.push_back(Range(4));
1060 expected.push_back(Range(0)); 1106 expected.push_back(Range(0));
1061 RunMoveCursorTestAndClearExpectations(render_text.get(), WORD_BREAK, 1107 RunMoveCursorTestAndClearExpectations(render_text, WORD_BREAK, CURSOR_LEFT,
1062 CURSOR_LEFT, SELECTION_NONE, &expected); 1108 SELECTION_NONE, &expected);
1063 1109
1064 // Move right twice. 1110 // Move right twice.
1065 expected.push_back(Range(3)); 1111 expected.push_back(Range(3));
1066 expected.push_back(Range(7)); 1112 expected.push_back(Range(7));
1067 RunMoveCursorTestAndClearExpectations( 1113 RunMoveCursorTestAndClearExpectations(render_text, WORD_BREAK, CURSOR_RIGHT,
1068 render_text.get(), WORD_BREAK, CURSOR_RIGHT, SELECTION_NONE, &expected); 1114 SELECTION_NONE, &expected);
1069 1115
1070 // SELECTION_CARET. 1116 // SELECTION_CARET.
1071 render_text->SelectRange(Range(6)); 1117 render_text->SelectRange(Range(6));
1072 1118
1073 // Move left. 1119 // Move left.
1074 expected.push_back(Range(6, 4)); 1120 expected.push_back(Range(6, 4));
1075 RunMoveCursorTestAndClearExpectations( 1121 RunMoveCursorTestAndClearExpectations(render_text, WORD_BREAK, CURSOR_LEFT,
1076 render_text.get(), WORD_BREAK, CURSOR_LEFT, SELECTION_CARET, &expected); 1122 SELECTION_CARET, &expected);
1077 1123
1078 // Move right twice. 1124 // Move right twice.
1079 expected.push_back(Range(6)); 1125 expected.push_back(Range(6));
1080 expected.push_back(Range(6, 7)); 1126 expected.push_back(Range(6, 7));
1081 RunMoveCursorTestAndClearExpectations( 1127 RunMoveCursorTestAndClearExpectations(render_text, WORD_BREAK, CURSOR_RIGHT,
1082 render_text.get(), WORD_BREAK, CURSOR_RIGHT, SELECTION_CARET, &expected); 1128 SELECTION_CARET, &expected);
1083 1129
1084 // Move left. 1130 // Move left.
1085 expected.push_back(Range(6)); 1131 expected.push_back(Range(6));
1086 RunMoveCursorTestAndClearExpectations( 1132 RunMoveCursorTestAndClearExpectations(render_text, WORD_BREAK, CURSOR_LEFT,
1087 render_text.get(), WORD_BREAK, CURSOR_LEFT, SELECTION_CARET, &expected); 1133 SELECTION_CARET, &expected);
1088 1134
1089 // SELECTION_RETAIN. 1135 // SELECTION_RETAIN.
1090 render_text->SelectRange(Range(6)); 1136 render_text->SelectRange(Range(6));
1091 1137
1092 // Move left. 1138 // Move left.
1093 expected.push_back(Range(6, 4)); 1139 expected.push_back(Range(6, 4));
1094 RunMoveCursorTestAndClearExpectations( 1140 RunMoveCursorTestAndClearExpectations(render_text, WORD_BREAK, CURSOR_LEFT,
1095 render_text.get(), WORD_BREAK, CURSOR_LEFT, SELECTION_RETAIN, &expected); 1141 SELECTION_RETAIN, &expected);
1096 1142
1097 // Move right twice. 1143 // Move right twice.
1098 expected.push_back(Range(6, 7)); 1144 expected.push_back(Range(6, 7));
1099 expected.push_back(Range(6, 11)); 1145 expected.push_back(Range(6, 11));
1100 RunMoveCursorTestAndClearExpectations( 1146 RunMoveCursorTestAndClearExpectations(render_text, WORD_BREAK, CURSOR_RIGHT,
1101 render_text.get(), WORD_BREAK, CURSOR_RIGHT, SELECTION_RETAIN, &expected); 1147 SELECTION_RETAIN, &expected);
1102 1148
1103 // Move left. 1149 // Move left.
1104 expected.push_back(Range(6, 8)); 1150 expected.push_back(Range(6, 8));
1105 RunMoveCursorTestAndClearExpectations( 1151 RunMoveCursorTestAndClearExpectations(render_text, WORD_BREAK, CURSOR_LEFT,
1106 render_text.get(), WORD_BREAK, CURSOR_LEFT, SELECTION_RETAIN, &expected); 1152 SELECTION_RETAIN, &expected);
1107 1153
1108 // SELECTION_EXTEND. 1154 // SELECTION_EXTEND.
1109 render_text->SelectRange(Range(6)); 1155 render_text->SelectRange(Range(6));
1110 1156
1111 // Move left. 1157 // Move left.
1112 expected.push_back(Range(6, 4)); 1158 expected.push_back(Range(6, 4));
1113 RunMoveCursorTestAndClearExpectations( 1159 RunMoveCursorTestAndClearExpectations(render_text, WORD_BREAK, CURSOR_LEFT,
1114 render_text.get(), WORD_BREAK, CURSOR_LEFT, SELECTION_EXTEND, &expected); 1160 SELECTION_EXTEND, &expected);
1115 1161
1116 // Move right twice. 1162 // Move right twice.
1117 expected.push_back(Range(4, 7)); 1163 expected.push_back(Range(4, 7));
1118 expected.push_back(Range(4, 11)); 1164 expected.push_back(Range(4, 11));
1119 RunMoveCursorTestAndClearExpectations( 1165 RunMoveCursorTestAndClearExpectations(render_text, WORD_BREAK, CURSOR_RIGHT,
1120 render_text.get(), WORD_BREAK, CURSOR_RIGHT, SELECTION_EXTEND, &expected); 1166 SELECTION_EXTEND, &expected);
1121 1167
1122 // Move left. 1168 // Move left.
1123 expected.push_back(Range(4, 8)); 1169 expected.push_back(Range(4, 8));
1124 RunMoveCursorTestAndClearExpectations( 1170 RunMoveCursorTestAndClearExpectations(render_text, WORD_BREAK, CURSOR_LEFT,
1125 render_text.get(), WORD_BREAK, CURSOR_LEFT, SELECTION_EXTEND, &expected); 1171 SELECTION_EXTEND, &expected);
1126 } 1172 }
1127 1173
1128 TEST_F(RenderTextTest, MoveCursor_Line) { 1174 TEST_P(RenderTextTest, MoveCursor_Line) {
1129 std::unique_ptr<RenderText> render_text( 1175 RenderText* render_text = GetRenderText();
1130 RenderText::CreateInstanceForEditing());
1131 render_text->SetText(WideToUTF16(L"123 456 789")); 1176 render_text->SetText(WideToUTF16(L"123 456 789"));
1132 std::vector<Range> expected; 1177 std::vector<Range> expected;
1133 1178
1134 // SELECTION_NONE. 1179 // SELECTION_NONE.
1135 render_text->SelectRange(Range(6)); 1180 render_text->SelectRange(Range(6));
1136 1181
1137 // Move right twice. 1182 // Move right twice.
1138 expected.push_back(Range(11)); 1183 expected.push_back(Range(11));
1139 expected.push_back(Range(11)); 1184 expected.push_back(Range(11));
1140 RunMoveCursorTestAndClearExpectations( 1185 RunMoveCursorTestAndClearExpectations(render_text, LINE_BREAK, CURSOR_RIGHT,
1141 render_text.get(), LINE_BREAK, CURSOR_RIGHT, SELECTION_NONE, &expected); 1186 SELECTION_NONE, &expected);
1142 1187
1143 // Move left twice. 1188 // Move left twice.
1144 expected.push_back(Range(0)); 1189 expected.push_back(Range(0));
1145 expected.push_back(Range(0)); 1190 expected.push_back(Range(0));
1146 RunMoveCursorTestAndClearExpectations(render_text.get(), LINE_BREAK, 1191 RunMoveCursorTestAndClearExpectations(render_text, LINE_BREAK, CURSOR_LEFT,
1147 CURSOR_LEFT, SELECTION_NONE, &expected); 1192 SELECTION_NONE, &expected);
1148 1193
1149 // SELECTION_CARET. 1194 // SELECTION_CARET.
1150 render_text->SelectRange(Range(6)); 1195 render_text->SelectRange(Range(6));
1151 1196
1152 // Move right. 1197 // Move right.
1153 expected.push_back(Range(6, 11)); 1198 expected.push_back(Range(6, 11));
1154 RunMoveCursorTestAndClearExpectations( 1199 RunMoveCursorTestAndClearExpectations(render_text, LINE_BREAK, CURSOR_RIGHT,
1155 render_text.get(), LINE_BREAK, CURSOR_RIGHT, SELECTION_CARET, &expected); 1200 SELECTION_CARET, &expected);
1156 1201
1157 // Move left twice. 1202 // Move left twice.
1158 expected.push_back(Range(6)); 1203 expected.push_back(Range(6));
1159 expected.push_back(Range(6, 0)); 1204 expected.push_back(Range(6, 0));
1160 RunMoveCursorTestAndClearExpectations( 1205 RunMoveCursorTestAndClearExpectations(render_text, LINE_BREAK, CURSOR_LEFT,
1161 render_text.get(), LINE_BREAK, CURSOR_LEFT, SELECTION_CARET, &expected); 1206 SELECTION_CARET, &expected);
1162 1207
1163 // Move right. 1208 // Move right.
1164 expected.push_back(Range(6)); 1209 expected.push_back(Range(6));
1165 RunMoveCursorTestAndClearExpectations( 1210 RunMoveCursorTestAndClearExpectations(render_text, LINE_BREAK, CURSOR_RIGHT,
1166 render_text.get(), LINE_BREAK, CURSOR_RIGHT, SELECTION_CARET, &expected); 1211 SELECTION_CARET, &expected);
1167 1212
1168 // SELECTION_RETAIN. 1213 // SELECTION_RETAIN.
1169 render_text->SelectRange(Range(6)); 1214 render_text->SelectRange(Range(6));
1170 1215
1171 // Move right. 1216 // Move right.
1172 expected.push_back(Range(6, 11)); 1217 expected.push_back(Range(6, 11));
1173 RunMoveCursorTestAndClearExpectations( 1218 RunMoveCursorTestAndClearExpectations(render_text, LINE_BREAK, CURSOR_RIGHT,
1174 render_text.get(), LINE_BREAK, CURSOR_RIGHT, SELECTION_RETAIN, &expected); 1219 SELECTION_RETAIN, &expected);
1175 1220
1176 // Move left twice. 1221 // Move left twice.
1177 expected.push_back(Range(6, 0)); 1222 expected.push_back(Range(6, 0));
1178 expected.push_back(Range(6, 0)); 1223 expected.push_back(Range(6, 0));
1179 RunMoveCursorTestAndClearExpectations( 1224 RunMoveCursorTestAndClearExpectations(render_text, LINE_BREAK, CURSOR_LEFT,
1180 render_text.get(), LINE_BREAK, CURSOR_LEFT, SELECTION_RETAIN, &expected); 1225 SELECTION_RETAIN, &expected);
1181 1226
1182 // Move right. 1227 // Move right.
1183 expected.push_back(Range(6, 11)); 1228 expected.push_back(Range(6, 11));
1184 RunMoveCursorTestAndClearExpectations( 1229 RunMoveCursorTestAndClearExpectations(render_text, LINE_BREAK, CURSOR_RIGHT,
1185 render_text.get(), LINE_BREAK, CURSOR_RIGHT, SELECTION_RETAIN, &expected); 1230 SELECTION_RETAIN, &expected);
1186 1231
1187 // SELECTION_EXTEND. 1232 // SELECTION_EXTEND.
1188 render_text->SelectRange(Range(6)); 1233 render_text->SelectRange(Range(6));
1189 1234
1190 // Move right. 1235 // Move right.
1191 expected.push_back(Range(6, 11)); 1236 expected.push_back(Range(6, 11));
1192 RunMoveCursorTestAndClearExpectations( 1237 RunMoveCursorTestAndClearExpectations(render_text, LINE_BREAK, CURSOR_RIGHT,
1193 render_text.get(), LINE_BREAK, CURSOR_RIGHT, SELECTION_EXTEND, &expected); 1238 SELECTION_EXTEND, &expected);
1194 1239
1195 // Move left twice. 1240 // Move left twice.
1196 expected.push_back(Range(11, 0)); 1241 expected.push_back(Range(11, 0));
1197 expected.push_back(Range(11, 0)); 1242 expected.push_back(Range(11, 0));
1198 RunMoveCursorTestAndClearExpectations( 1243 RunMoveCursorTestAndClearExpectations(render_text, LINE_BREAK, CURSOR_LEFT,
1199 render_text.get(), LINE_BREAK, CURSOR_LEFT, SELECTION_EXTEND, &expected); 1244 SELECTION_EXTEND, &expected);
1200 1245
1201 // Move right. 1246 // Move right.
1202 expected.push_back(Range(0, 11)); 1247 expected.push_back(Range(0, 11));
1203 RunMoveCursorTestAndClearExpectations( 1248 RunMoveCursorTestAndClearExpectations(render_text, LINE_BREAK, CURSOR_RIGHT,
1204 render_text.get(), LINE_BREAK, CURSOR_RIGHT, SELECTION_EXTEND, &expected); 1249 SELECTION_EXTEND, &expected);
1205 } 1250 }
1206 1251
1207 TEST_F(RenderTextTest, GetDisplayTextDirection) { 1252 TEST_P(RenderTextTest, GetDisplayTextDirection) {
1208 struct { 1253 struct {
1209 const wchar_t* text; 1254 const wchar_t* text;
1210 const base::i18n::TextDirection text_direction; 1255 const base::i18n::TextDirection text_direction;
1211 } cases[] = { 1256 } cases[] = {
1212 // Blank strings and those with no/weak directionality default to LTR. 1257 // Blank strings and those with no/weak directionality default to LTR.
1213 { L"", base::i18n::LEFT_TO_RIGHT }, 1258 { L"", base::i18n::LEFT_TO_RIGHT },
1214 { kWeak, base::i18n::LEFT_TO_RIGHT }, 1259 { kWeak, base::i18n::LEFT_TO_RIGHT },
1215 // Strings that begin with strong LTR characters. 1260 // Strings that begin with strong LTR characters.
1216 { kLtr, base::i18n::LEFT_TO_RIGHT }, 1261 { kLtr, base::i18n::LEFT_TO_RIGHT },
1217 { kLtrRtl, base::i18n::LEFT_TO_RIGHT }, 1262 { kLtrRtl, base::i18n::LEFT_TO_RIGHT },
1218 { kLtrRtlLtr, base::i18n::LEFT_TO_RIGHT }, 1263 { kLtrRtlLtr, base::i18n::LEFT_TO_RIGHT },
1219 // Strings that begin with strong RTL characters. 1264 // Strings that begin with strong RTL characters.
1220 { kRtl, base::i18n::RIGHT_TO_LEFT }, 1265 { kRtl, base::i18n::RIGHT_TO_LEFT },
1221 { kRtlLtr, base::i18n::RIGHT_TO_LEFT }, 1266 { kRtlLtr, base::i18n::RIGHT_TO_LEFT },
1222 { kRtlLtrRtl, base::i18n::RIGHT_TO_LEFT }, 1267 { kRtlLtrRtl, base::i18n::RIGHT_TO_LEFT },
1223 }; 1268 };
1224 1269
1225 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1270 RenderText* render_text = GetRenderText();
1226 const bool was_rtl = base::i18n::IsRTL(); 1271 const bool was_rtl = base::i18n::IsRTL();
1227 1272
1228 for (size_t i = 0; i < 2; ++i) { 1273 for (size_t i = 0; i < 2; ++i) {
1229 // Toggle the application default text direction (to try each direction). 1274 // Toggle the application default text direction (to try each direction).
1230 SetRTL(!base::i18n::IsRTL()); 1275 SetRTL(!base::i18n::IsRTL());
1231 const base::i18n::TextDirection ui_direction = base::i18n::IsRTL() ? 1276 const base::i18n::TextDirection ui_direction = base::i18n::IsRTL() ?
1232 base::i18n::RIGHT_TO_LEFT : base::i18n::LEFT_TO_RIGHT; 1277 base::i18n::RIGHT_TO_LEFT : base::i18n::LEFT_TO_RIGHT;
1233 1278
1234 // Ensure that directionality modes yield the correct text directions. 1279 // Ensure that directionality modes yield the correct text directions.
1235 for (size_t j = 0; j < arraysize(cases); j++) { 1280 for (size_t j = 0; j < arraysize(cases); j++) {
(...skipping 15 matching lines...) Expand all
1251 1296
1252 // Ensure that text changes update the direction for DIRECTIONALITY_FROM_TEXT. 1297 // Ensure that text changes update the direction for DIRECTIONALITY_FROM_TEXT.
1253 render_text->SetDirectionalityMode(DIRECTIONALITY_FROM_TEXT); 1298 render_text->SetDirectionalityMode(DIRECTIONALITY_FROM_TEXT);
1254 render_text->SetText(WideToUTF16(kLtr)); 1299 render_text->SetText(WideToUTF16(kLtr));
1255 EXPECT_EQ(render_text->GetDisplayTextDirection(), base::i18n::LEFT_TO_RIGHT); 1300 EXPECT_EQ(render_text->GetDisplayTextDirection(), base::i18n::LEFT_TO_RIGHT);
1256 render_text->SetText(WideToUTF16(kRtl)); 1301 render_text->SetText(WideToUTF16(kRtl));
1257 EXPECT_EQ(render_text->GetDisplayTextDirection(), base::i18n::RIGHT_TO_LEFT); 1302 EXPECT_EQ(render_text->GetDisplayTextDirection(), base::i18n::RIGHT_TO_LEFT);
1258 } 1303 }
1259 1304
1260 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618 1305 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1261 #if !defined(OS_MACOSX) 1306 TEST_P(RenderTextHarfBuzzTest, MoveCursorLeftRightInLtr) {
1262 TEST_F(RenderTextTest, MoveCursorLeftRightInLtr) { 1307 RenderText* render_text = GetRenderText();
1263 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance());
1264
1265 // Pure LTR. 1308 // Pure LTR.
1266 render_text->SetText(ASCIIToUTF16("abc")); 1309 render_text->SetText(ASCIIToUTF16("abc"));
1267 // |expected| saves the expected SelectionModel when moving cursor from left 1310 // |expected| saves the expected SelectionModel when moving cursor from left
1268 // to right. 1311 // to right.
1269 std::vector<SelectionModel> expected; 1312 std::vector<SelectionModel> expected;
1270 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 1313 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
1271 expected.push_back(SelectionModel(1, CURSOR_BACKWARD)); 1314 expected.push_back(SelectionModel(1, CURSOR_BACKWARD));
1272 expected.push_back(SelectionModel(2, CURSOR_BACKWARD)); 1315 expected.push_back(SelectionModel(2, CURSOR_BACKWARD));
1273 expected.push_back(SelectionModel(3, CURSOR_BACKWARD)); 1316 expected.push_back(SelectionModel(3, CURSOR_BACKWARD));
1274 expected.push_back(SelectionModel(3, CURSOR_FORWARD)); 1317 expected.push_back(SelectionModel(3, CURSOR_FORWARD));
1275 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_RIGHT); 1318 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_RIGHT);
1276 1319
1277 expected.clear(); 1320 expected.clear();
1278 expected.push_back(SelectionModel(3, CURSOR_FORWARD)); 1321 expected.push_back(SelectionModel(3, CURSOR_FORWARD));
1279 expected.push_back(SelectionModel(2, CURSOR_FORWARD)); 1322 expected.push_back(SelectionModel(2, CURSOR_FORWARD));
1280 expected.push_back(SelectionModel(1, CURSOR_FORWARD)); 1323 expected.push_back(SelectionModel(1, CURSOR_FORWARD));
1281 expected.push_back(SelectionModel(0, CURSOR_FORWARD)); 1324 expected.push_back(SelectionModel(0, CURSOR_FORWARD));
1282 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 1325 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
1283 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_LEFT); 1326 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_LEFT);
1284 } 1327 }
1285 1328
1286 TEST_F(RenderTextTest, MoveCursorLeftRightInLtrRtl) { 1329 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1287 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1330 TEST_P(RenderTextHarfBuzzTest, MoveCursorLeftRightInLtrRtl) {
1331 RenderText* render_text = GetRenderText();
1288 // LTR-RTL 1332 // LTR-RTL
1289 render_text->SetText(WideToUTF16(L"abc\x05d0\x05d1\x05d2")); 1333 render_text->SetText(WideToUTF16(L"abc\x05d0\x05d1\x05d2"));
1290 // The last one is the expected END position. 1334 // The last one is the expected END position.
1291 std::vector<SelectionModel> expected; 1335 std::vector<SelectionModel> expected;
1292 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 1336 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
1293 expected.push_back(SelectionModel(1, CURSOR_BACKWARD)); 1337 expected.push_back(SelectionModel(1, CURSOR_BACKWARD));
1294 expected.push_back(SelectionModel(2, CURSOR_BACKWARD)); 1338 expected.push_back(SelectionModel(2, CURSOR_BACKWARD));
1295 expected.push_back(SelectionModel(3, CURSOR_BACKWARD)); 1339 expected.push_back(SelectionModel(3, CURSOR_BACKWARD));
1296 expected.push_back(SelectionModel(5, CURSOR_FORWARD)); 1340 expected.push_back(SelectionModel(5, CURSOR_FORWARD));
1297 expected.push_back(SelectionModel(4, CURSOR_FORWARD)); 1341 expected.push_back(SelectionModel(4, CURSOR_FORWARD));
1298 expected.push_back(SelectionModel(3, CURSOR_FORWARD)); 1342 expected.push_back(SelectionModel(3, CURSOR_FORWARD));
1299 expected.push_back(SelectionModel(6, CURSOR_FORWARD)); 1343 expected.push_back(SelectionModel(6, CURSOR_FORWARD));
1300 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_RIGHT); 1344 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_RIGHT);
1301 1345
1302 expected.clear(); 1346 expected.clear();
1303 expected.push_back(SelectionModel(6, CURSOR_FORWARD)); 1347 expected.push_back(SelectionModel(6, CURSOR_FORWARD));
1304 expected.push_back(SelectionModel(4, CURSOR_BACKWARD)); 1348 expected.push_back(SelectionModel(4, CURSOR_BACKWARD));
1305 expected.push_back(SelectionModel(5, CURSOR_BACKWARD)); 1349 expected.push_back(SelectionModel(5, CURSOR_BACKWARD));
1306 expected.push_back(SelectionModel(6, CURSOR_BACKWARD)); 1350 expected.push_back(SelectionModel(6, CURSOR_BACKWARD));
1307 expected.push_back(SelectionModel(2, CURSOR_FORWARD)); 1351 expected.push_back(SelectionModel(2, CURSOR_FORWARD));
1308 expected.push_back(SelectionModel(1, CURSOR_FORWARD)); 1352 expected.push_back(SelectionModel(1, CURSOR_FORWARD));
1309 expected.push_back(SelectionModel(0, CURSOR_FORWARD)); 1353 expected.push_back(SelectionModel(0, CURSOR_FORWARD));
1310 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 1354 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
1311 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_LEFT); 1355 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_LEFT);
1312 } 1356 }
1313 1357
1314 TEST_F(RenderTextTest, MoveCursorLeftRightInLtrRtlLtr) { 1358 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1315 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1359 TEST_P(RenderTextHarfBuzzTest, MoveCursorLeftRightInLtrRtlLtr) {
1360 RenderText* render_text = GetRenderText();
1316 // LTR-RTL-LTR. 1361 // LTR-RTL-LTR.
1317 render_text->SetText(WideToUTF16(L"a" L"\x05d1" L"b")); 1362 render_text->SetText(WideToUTF16(L"a" L"\x05d1" L"b"));
1318 std::vector<SelectionModel> expected; 1363 std::vector<SelectionModel> expected;
1319 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 1364 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
1320 expected.push_back(SelectionModel(1, CURSOR_BACKWARD)); 1365 expected.push_back(SelectionModel(1, CURSOR_BACKWARD));
1321 expected.push_back(SelectionModel(1, CURSOR_FORWARD)); 1366 expected.push_back(SelectionModel(1, CURSOR_FORWARD));
1322 expected.push_back(SelectionModel(3, CURSOR_BACKWARD)); 1367 expected.push_back(SelectionModel(3, CURSOR_BACKWARD));
1323 expected.push_back(SelectionModel(3, CURSOR_FORWARD)); 1368 expected.push_back(SelectionModel(3, CURSOR_FORWARD));
1324 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_RIGHT); 1369 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_RIGHT);
1325 1370
1326 expected.clear(); 1371 expected.clear();
1327 expected.push_back(SelectionModel(3, CURSOR_FORWARD)); 1372 expected.push_back(SelectionModel(3, CURSOR_FORWARD));
1328 expected.push_back(SelectionModel(2, CURSOR_FORWARD)); 1373 expected.push_back(SelectionModel(2, CURSOR_FORWARD));
1329 expected.push_back(SelectionModel(2, CURSOR_BACKWARD)); 1374 expected.push_back(SelectionModel(2, CURSOR_BACKWARD));
1330 expected.push_back(SelectionModel(0, CURSOR_FORWARD)); 1375 expected.push_back(SelectionModel(0, CURSOR_FORWARD));
1331 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 1376 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
1332 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_LEFT); 1377 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_LEFT);
1333 } 1378 }
1334 1379
1335 TEST_F(RenderTextTest, MoveCursorLeftRightInRtl) { 1380 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1336 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1381 TEST_P(RenderTextHarfBuzzTest, MoveCursorLeftRightInRtl) {
1382 RenderText* render_text = GetRenderText();
1337 // Pure RTL. 1383 // Pure RTL.
1338 render_text->SetText(WideToUTF16(L"\x05d0\x05d1\x05d2")); 1384 render_text->SetText(WideToUTF16(L"\x05d0\x05d1\x05d2"));
1339 render_text->MoveCursor(LINE_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1385 render_text->MoveCursor(LINE_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1340 std::vector<SelectionModel> expected; 1386 std::vector<SelectionModel> expected;
1341 1387
1342 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 1388 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
1343 expected.push_back(SelectionModel(1, CURSOR_BACKWARD)); 1389 expected.push_back(SelectionModel(1, CURSOR_BACKWARD));
1344 expected.push_back(SelectionModel(2, CURSOR_BACKWARD)); 1390 expected.push_back(SelectionModel(2, CURSOR_BACKWARD));
1345 expected.push_back(SelectionModel(3, CURSOR_BACKWARD)); 1391 expected.push_back(SelectionModel(3, CURSOR_BACKWARD));
1346 expected.push_back(SelectionModel(3, CURSOR_FORWARD)); 1392 expected.push_back(SelectionModel(3, CURSOR_FORWARD));
1347 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_LEFT); 1393 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_LEFT);
1348 1394
1349 expected.clear(); 1395 expected.clear();
1350 1396
1351 expected.push_back(SelectionModel(3, CURSOR_FORWARD)); 1397 expected.push_back(SelectionModel(3, CURSOR_FORWARD));
1352 expected.push_back(SelectionModel(2, CURSOR_FORWARD)); 1398 expected.push_back(SelectionModel(2, CURSOR_FORWARD));
1353 expected.push_back(SelectionModel(1, CURSOR_FORWARD)); 1399 expected.push_back(SelectionModel(1, CURSOR_FORWARD));
1354 expected.push_back(SelectionModel(0, CURSOR_FORWARD)); 1400 expected.push_back(SelectionModel(0, CURSOR_FORWARD));
1355 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 1401 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
1356 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_RIGHT); 1402 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_RIGHT);
1357 } 1403 }
1358 1404
1359 TEST_F(RenderTextTest, MoveCursorLeftRightInRtlLtr) { 1405 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1360 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1406 TEST_P(RenderTextHarfBuzzTest, MoveCursorLeftRightInRtlLtr) {
1407 RenderText* render_text = GetRenderText();
1361 // RTL-LTR 1408 // RTL-LTR
1362 render_text->SetText(WideToUTF16(L"\x05d0\x05d1\x05d2" L"abc")); 1409 render_text->SetText(WideToUTF16(L"\x05d0\x05d1\x05d2" L"abc"));
1363 render_text->MoveCursor(LINE_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1410 render_text->MoveCursor(LINE_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1364 std::vector<SelectionModel> expected; 1411 std::vector<SelectionModel> expected;
1365 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 1412 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
1366 expected.push_back(SelectionModel(1, CURSOR_BACKWARD)); 1413 expected.push_back(SelectionModel(1, CURSOR_BACKWARD));
1367 expected.push_back(SelectionModel(2, CURSOR_BACKWARD)); 1414 expected.push_back(SelectionModel(2, CURSOR_BACKWARD));
1368 expected.push_back(SelectionModel(3, CURSOR_BACKWARD)); 1415 expected.push_back(SelectionModel(3, CURSOR_BACKWARD));
1369 expected.push_back(SelectionModel(5, CURSOR_FORWARD)); 1416 expected.push_back(SelectionModel(5, CURSOR_FORWARD));
1370 expected.push_back(SelectionModel(4, CURSOR_FORWARD)); 1417 expected.push_back(SelectionModel(4, CURSOR_FORWARD));
1371 expected.push_back(SelectionModel(3, CURSOR_FORWARD)); 1418 expected.push_back(SelectionModel(3, CURSOR_FORWARD));
1372 expected.push_back(SelectionModel(6, CURSOR_FORWARD)); 1419 expected.push_back(SelectionModel(6, CURSOR_FORWARD));
1373 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_LEFT); 1420 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_LEFT);
1374 1421
1375 expected.clear(); 1422 expected.clear();
1376 expected.push_back(SelectionModel(6, CURSOR_FORWARD)); 1423 expected.push_back(SelectionModel(6, CURSOR_FORWARD));
1377 expected.push_back(SelectionModel(4, CURSOR_BACKWARD)); 1424 expected.push_back(SelectionModel(4, CURSOR_BACKWARD));
1378 expected.push_back(SelectionModel(5, CURSOR_BACKWARD)); 1425 expected.push_back(SelectionModel(5, CURSOR_BACKWARD));
1379 expected.push_back(SelectionModel(6, CURSOR_BACKWARD)); 1426 expected.push_back(SelectionModel(6, CURSOR_BACKWARD));
1380 expected.push_back(SelectionModel(2, CURSOR_FORWARD)); 1427 expected.push_back(SelectionModel(2, CURSOR_FORWARD));
1381 expected.push_back(SelectionModel(1, CURSOR_FORWARD)); 1428 expected.push_back(SelectionModel(1, CURSOR_FORWARD));
1382 expected.push_back(SelectionModel(0, CURSOR_FORWARD)); 1429 expected.push_back(SelectionModel(0, CURSOR_FORWARD));
1383 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 1430 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
1384 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_RIGHT); 1431 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_RIGHT);
1385 } 1432 }
1386 1433
1387 TEST_F(RenderTextTest, MoveCursorLeftRightInRtlLtrRtl) { 1434 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1388 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1435 TEST_P(RenderTextHarfBuzzTest, MoveCursorLeftRightInRtlLtrRtl) {
1436 RenderText* render_text = GetRenderText();
1389 // RTL-LTR-RTL. 1437 // RTL-LTR-RTL.
1390 render_text->SetText(WideToUTF16(L"\x05d0" L"a" L"\x05d1")); 1438 render_text->SetText(WideToUTF16(L"\x05d0" L"a" L"\x05d1"));
1391 render_text->MoveCursor(LINE_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1439 render_text->MoveCursor(LINE_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1392 std::vector<SelectionModel> expected; 1440 std::vector<SelectionModel> expected;
1393 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 1441 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
1394 expected.push_back(SelectionModel(1, CURSOR_BACKWARD)); 1442 expected.push_back(SelectionModel(1, CURSOR_BACKWARD));
1395 expected.push_back(SelectionModel(1, CURSOR_FORWARD)); 1443 expected.push_back(SelectionModel(1, CURSOR_FORWARD));
1396 expected.push_back(SelectionModel(3, CURSOR_BACKWARD)); 1444 expected.push_back(SelectionModel(3, CURSOR_BACKWARD));
1397 expected.push_back(SelectionModel(3, CURSOR_FORWARD)); 1445 expected.push_back(SelectionModel(3, CURSOR_FORWARD));
1398 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_LEFT); 1446 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_LEFT);
1399 1447
1400 expected.clear(); 1448 expected.clear();
1401 expected.push_back(SelectionModel(3, CURSOR_FORWARD)); 1449 expected.push_back(SelectionModel(3, CURSOR_FORWARD));
1402 expected.push_back(SelectionModel(2, CURSOR_FORWARD)); 1450 expected.push_back(SelectionModel(2, CURSOR_FORWARD));
1403 expected.push_back(SelectionModel(2, CURSOR_BACKWARD)); 1451 expected.push_back(SelectionModel(2, CURSOR_BACKWARD));
1404 expected.push_back(SelectionModel(0, CURSOR_FORWARD)); 1452 expected.push_back(SelectionModel(0, CURSOR_FORWARD));
1405 expected.push_back(SelectionModel(0, CURSOR_BACKWARD)); 1453 expected.push_back(SelectionModel(0, CURSOR_BACKWARD));
1406 RunMoveCursorLeftRightTest(render_text.get(), expected, CURSOR_RIGHT); 1454 RunMoveCursorLeftRightTest(render_text, expected, CURSOR_RIGHT);
1407 } 1455 }
1408 1456
1409 TEST_F(RenderTextTest, MoveCursorLeftRight_ComplexScript) { 1457 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1410 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1458 TEST_P(RenderTextHarfBuzzTest, MoveCursorLeftRight_ComplexScript) {
1411 1459 RenderText* render_text = GetRenderText();
1412 render_text->SetText(WideToUTF16(L"\x0915\x093f\x0915\x094d\x0915")); 1460 render_text->SetText(WideToUTF16(L"\x0915\x093f\x0915\x094d\x0915"));
1413 EXPECT_EQ(0U, render_text->cursor_position()); 1461 EXPECT_EQ(0U, render_text->cursor_position());
1414 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1462 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1415 EXPECT_EQ(2U, render_text->cursor_position()); 1463 EXPECT_EQ(2U, render_text->cursor_position());
1416 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1464 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1417 EXPECT_EQ(4U, render_text->cursor_position()); 1465 EXPECT_EQ(4U, render_text->cursor_position());
1418 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1466 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1419 EXPECT_EQ(5U, render_text->cursor_position()); 1467 EXPECT_EQ(5U, render_text->cursor_position());
1420 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1468 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1421 EXPECT_EQ(5U, render_text->cursor_position()); 1469 EXPECT_EQ(5U, render_text->cursor_position());
1422 1470
1423 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE); 1471 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE);
1424 EXPECT_EQ(4U, render_text->cursor_position()); 1472 EXPECT_EQ(4U, render_text->cursor_position());
1425 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE); 1473 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE);
1426 EXPECT_EQ(2U, render_text->cursor_position()); 1474 EXPECT_EQ(2U, render_text->cursor_position());
1427 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE); 1475 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE);
1428 EXPECT_EQ(0U, render_text->cursor_position()); 1476 EXPECT_EQ(0U, render_text->cursor_position());
1429 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE); 1477 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE);
1430 EXPECT_EQ(0U, render_text->cursor_position()); 1478 EXPECT_EQ(0U, render_text->cursor_position());
1431 } 1479 }
1432 1480
1433 TEST_F(RenderTextTest, MoveCursorLeftRight_MeiryoUILigatures) { 1481 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1434 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1482 // Crashes on Mac with RenderTextHarfBuzz. See http://crbug.com/640068.
1483 #if !defined(OS_MACOSX)
1484 TEST_P(RenderTextHarfBuzzTest, MoveCursorLeftRight_MeiryoUILigatures) {
1485 RenderText* render_text = GetRenderText();
1435 // Meiryo UI uses single-glyph ligatures for 'ff' and 'ffi', but each letter 1486 // Meiryo UI uses single-glyph ligatures for 'ff' and 'ffi', but each letter
1436 // (code point) has unique bounds, so mid-glyph cursoring should be possible. 1487 // (code point) has unique bounds, so mid-glyph cursoring should be possible.
1437 render_text->SetFontList(FontList("Meiryo UI, 12px")); 1488 render_text->SetFontList(FontList("Meiryo UI, 12px"));
1438 render_text->SetText(WideToUTF16(L"ff ffi")); 1489 render_text->SetText(WideToUTF16(L"ff ffi"));
1439 EXPECT_EQ(0U, render_text->cursor_position()); 1490 EXPECT_EQ(0U, render_text->cursor_position());
1440 for (size_t i = 0; i < render_text->text().length(); ++i) { 1491 for (size_t i = 0; i < render_text->text().length(); ++i) {
1441 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1492 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1442 EXPECT_EQ(i + 1, render_text->cursor_position()); 1493 EXPECT_EQ(i + 1, render_text->cursor_position());
1443 } 1494 }
1444 EXPECT_EQ(6U, render_text->cursor_position()); 1495 EXPECT_EQ(6U, render_text->cursor_position());
1445 } 1496 }
1497 #endif // !defined(OS_MACOSX)
1446 1498
1447 TEST_F(RenderTextTest, GraphemePositions) { 1499 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1500 TEST_P(RenderTextHarfBuzzTest, GraphemePositions) {
1448 // LTR 2-character grapheme, LTR abc, LTR 2-character grapheme. 1501 // LTR 2-character grapheme, LTR abc, LTR 2-character grapheme.
1449 const base::string16 kText1 = 1502 const base::string16 kText1 =
1450 WideToUTF16(L"\x0915\x093f" L"abc" L"\x0915\x093f"); 1503 WideToUTF16(L"\x0915\x093f" L"abc" L"\x0915\x093f");
1451 1504
1452 // LTR ab, LTR 2-character grapheme, LTR cd. 1505 // LTR ab, LTR 2-character grapheme, LTR cd.
1453 const base::string16 kText2 = WideToUTF16(L"ab" L"\x0915\x093f" L"cd"); 1506 const base::string16 kText2 = WideToUTF16(L"ab" L"\x0915\x093f" L"cd");
1454 1507
1455 // The below is 'MUSICAL SYMBOL G CLEF', which is represented in UTF-16 as 1508 // The below is 'MUSICAL SYMBOL G CLEF', which is represented in UTF-16 as
1456 // two characters forming the surrogate pair 0x0001D11E. 1509 // two characters forming the surrogate pair 0x0001D11E.
1457 const std::string kSurrogate = "\xF0\x9D\x84\x9E"; 1510 const std::string kSurrogate = "\xF0\x9D\x84\x9E";
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
1497 { kText3, 7, 6, 6 }, 1550 { kText3, 7, 6, 6 },
1498 { kText3, 50, 6, 6 }, 1551 { kText3, 50, 6, 6 },
1499 }; 1552 };
1500 1553
1501 #if defined(OS_WIN) 1554 #if defined(OS_WIN)
1502 // TODO(msw): XP fails due to lack of font support: http://crbug.com/106450 1555 // TODO(msw): XP fails due to lack of font support: http://crbug.com/106450
1503 if (base::win::GetVersion() < base::win::VERSION_VISTA) 1556 if (base::win::GetVersion() < base::win::VERSION_VISTA)
1504 return; 1557 return;
1505 #endif 1558 #endif
1506 1559
1507 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1560 RenderText* render_text = GetRenderText();
1508 for (size_t i = 0; i < arraysize(cases); i++) { 1561 for (size_t i = 0; i < arraysize(cases); i++) {
1509 SCOPED_TRACE(base::StringPrintf("Testing cases[%" PRIuS "]", i)); 1562 SCOPED_TRACE(base::StringPrintf("Testing cases[%" PRIuS "]", i));
1510 render_text->SetText(cases[i].text); 1563 render_text->SetText(cases[i].text);
1511 1564
1512 size_t next = render_text->IndexOfAdjacentGrapheme(cases[i].index, 1565 size_t next = render_text->IndexOfAdjacentGrapheme(cases[i].index,
1513 CURSOR_FORWARD); 1566 CURSOR_FORWARD);
1514 EXPECT_EQ(cases[i].expected_next, next); 1567 EXPECT_EQ(cases[i].expected_next, next);
1515 EXPECT_TRUE(render_text->IsValidCursorIndex(next)); 1568 EXPECT_TRUE(render_text->IsValidCursorIndex(next));
1516 1569
1517 size_t previous = render_text->IndexOfAdjacentGrapheme(cases[i].index, 1570 size_t previous = render_text->IndexOfAdjacentGrapheme(cases[i].index,
1518 CURSOR_BACKWARD); 1571 CURSOR_BACKWARD);
1519 EXPECT_EQ(cases[i].expected_previous, previous); 1572 EXPECT_EQ(cases[i].expected_previous, previous);
1520 EXPECT_TRUE(render_text->IsValidCursorIndex(previous)); 1573 EXPECT_TRUE(render_text->IsValidCursorIndex(previous));
1521 } 1574 }
1522 } 1575 }
1523 1576
1524 TEST_F(RenderTextTest, MidGraphemeSelectionBounds) { 1577 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1578 TEST_P(RenderTextHarfBuzzTest, MidGraphemeSelectionBounds) {
1525 #if defined(OS_WIN) 1579 #if defined(OS_WIN)
1526 // TODO(msw): XP fails due to lack of font support: http://crbug.com/106450 1580 // TODO(msw): XP fails due to lack of font support: http://crbug.com/106450
1527 if (base::win::GetVersion() < base::win::VERSION_VISTA) 1581 if (base::win::GetVersion() < base::win::VERSION_VISTA)
1528 return; 1582 return;
1529 #endif 1583 #endif
1530 1584
1531 // Test that selection bounds may be set amid multi-character graphemes. 1585 // Test that selection bounds may be set amid multi-character graphemes.
1532 const base::string16 kHindi = WideToUTF16(L"\x0915\x093f"); 1586 const base::string16 kHindi = WideToUTF16(L"\x0915\x093f");
1533 const base::string16 kThai = WideToUTF16(L"\x0e08\x0e33"); 1587 const base::string16 kThai = WideToUTF16(L"\x0e08\x0e33");
1534 const base::string16 cases[] = { kHindi, kThai }; 1588 const base::string16 cases[] = { kHindi, kThai };
1535 1589
1536 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1590 RenderText* render_text = GetRenderText();
1537 for (size_t i = 0; i < arraysize(cases); i++) { 1591 for (size_t i = 0; i < arraysize(cases); i++) {
1538 SCOPED_TRACE(base::StringPrintf("Testing cases[%" PRIuS "]", i)); 1592 SCOPED_TRACE(base::StringPrintf("Testing cases[%" PRIuS "]", i));
1539 render_text->SetText(cases[i]); 1593 render_text->SetText(cases[i]);
1540 EXPECT_TRUE(render_text->IsValidLogicalIndex(1)); 1594 EXPECT_TRUE(render_text->IsValidLogicalIndex(1));
1541 EXPECT_FALSE(render_text->IsValidCursorIndex(1)); 1595 EXPECT_FALSE(render_text->IsValidCursorIndex(1));
1542 EXPECT_TRUE(render_text->SelectRange(Range(2, 1))); 1596 EXPECT_TRUE(render_text->SelectRange(Range(2, 1)));
1543 EXPECT_EQ(Range(2, 1), render_text->selection()); 1597 EXPECT_EQ(Range(2, 1), render_text->selection());
1544 EXPECT_EQ(1U, render_text->cursor_position()); 1598 EXPECT_EQ(1U, render_text->cursor_position());
1545 // Although selection bounds may be set within a multi-character grapheme, 1599 // Although selection bounds may be set within a multi-character grapheme,
1546 // cursor movement (e.g. via arrow key) should avoid those indices. 1600 // cursor movement (e.g. via arrow key) should avoid those indices.
1547 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE); 1601 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE);
1548 EXPECT_EQ(0U, render_text->cursor_position()); 1602 EXPECT_EQ(0U, render_text->cursor_position());
1549 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1603 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1550 EXPECT_EQ(2U, render_text->cursor_position()); 1604 EXPECT_EQ(2U, render_text->cursor_position());
1551 } 1605 }
1552 } 1606 }
1553 1607
1554 TEST_F(RenderTextTest, FindCursorPosition) { 1608 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1609 TEST_P(RenderTextHarfBuzzTest, FindCursorPosition) {
1555 const wchar_t* kTestStrings[] = { kLtrRtl, kLtrRtlLtr, kRtlLtr, kRtlLtrRtl }; 1610 const wchar_t* kTestStrings[] = { kLtrRtl, kLtrRtlLtr, kRtlLtr, kRtlLtrRtl };
1556 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1611 RenderText* render_text = GetRenderText();
1557 render_text->SetDisplayRect(Rect(0, 0, 100, 20)); 1612 render_text->SetDisplayRect(Rect(0, 0, 100, 20));
1558 for (size_t i = 0; i < arraysize(kTestStrings); ++i) { 1613 for (size_t i = 0; i < arraysize(kTestStrings); ++i) {
1559 SCOPED_TRACE(base::StringPrintf("Testing case[%" PRIuS "]", i)); 1614 SCOPED_TRACE(base::StringPrintf("Testing case[%" PRIuS "]", i));
1560 render_text->SetText(WideToUTF16(kTestStrings[i])); 1615 render_text->SetText(WideToUTF16(kTestStrings[i]));
1561 for(size_t j = 0; j < render_text->text().length(); ++j) { 1616 for (size_t j = 0; j < render_text->text().length(); ++j) {
1562 const Range range(render_text->GetGlyphBounds(j)); 1617 const Range range(render_text->GetGlyphBounds(j));
1563 // Test a point just inside the leading edge of the glyph bounds. 1618 // Test a point just inside the leading edge of the glyph bounds.
1564 int x = range.is_reversed() ? range.GetMax() - 1 : range.GetMin() + 1; 1619 int x = range.is_reversed() ? range.GetMax() - 1 : range.GetMin() + 1;
1565 EXPECT_EQ(j, render_text->FindCursorPosition(Point(x, 0)).caret_pos()); 1620 EXPECT_EQ(j, render_text->FindCursorPosition(Point(x, 0)).caret_pos());
1566 } 1621 }
1567 } 1622 }
1568 } 1623 }
1569 #endif // !defined(OS_MACOSX)
1570 1624
1571 TEST_F(RenderTextTest, EdgeSelectionModels) { 1625 TEST_P(RenderTextTest, EdgeSelectionModels) {
1572 // Simple Latin text. 1626 // Simple Latin text.
1573 const base::string16 kLatin = WideToUTF16(L"abc"); 1627 const base::string16 kLatin = WideToUTF16(L"abc");
1574 // LTR 2-character grapheme. 1628 // LTR 2-character grapheme.
1575 const base::string16 kLTRGrapheme = WideToUTF16(L"\x0915\x093f"); 1629 const base::string16 kLTRGrapheme = WideToUTF16(L"\x0915\x093f");
1576 // LTR 2-character grapheme, LTR a, LTR 2-character grapheme. 1630 // LTR 2-character grapheme, LTR a, LTR 2-character grapheme.
1577 const base::string16 kHindiLatin = 1631 const base::string16 kHindiLatin =
1578 WideToUTF16(L"\x0915\x093f" L"a" L"\x0915\x093f"); 1632 WideToUTF16(L"\x0915\x093f" L"a" L"\x0915\x093f");
1579 // RTL 2-character grapheme. 1633 // RTL 2-character grapheme.
1580 const base::string16 kRTLGrapheme = WideToUTF16(L"\x05e0\x05b8"); 1634 const base::string16 kRTLGrapheme = WideToUTF16(L"\x05e0\x05b8");
1581 // RTL 2-character grapheme, LTR a, RTL 2-character grapheme. 1635 // RTL 2-character grapheme, LTR a, RTL 2-character grapheme.
(...skipping 11 matching lines...) Expand all
1593 { kRTLGrapheme, base::i18n::RIGHT_TO_LEFT }, 1647 { kRTLGrapheme, base::i18n::RIGHT_TO_LEFT },
1594 { kHebrewLatin, base::i18n::RIGHT_TO_LEFT }, 1648 { kHebrewLatin, base::i18n::RIGHT_TO_LEFT },
1595 }; 1649 };
1596 1650
1597 #if defined(OS_WIN) 1651 #if defined(OS_WIN)
1598 // TODO(msw): XP fails due to lack of font support: http://crbug.com/106450 1652 // TODO(msw): XP fails due to lack of font support: http://crbug.com/106450
1599 if (base::win::GetVersion() < base::win::VERSION_VISTA) 1653 if (base::win::GetVersion() < base::win::VERSION_VISTA)
1600 return; 1654 return;
1601 #endif 1655 #endif
1602 1656
1603 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1657 RenderText* render_text = GetRenderText();
1604 for (size_t i = 0; i < arraysize(cases); i++) { 1658 for (size_t i = 0; i < arraysize(cases); i++) {
1605 render_text->SetText(cases[i].text); 1659 render_text->SetText(cases[i].text);
1606 bool ltr = (cases[i].expected_text_direction == base::i18n::LEFT_TO_RIGHT); 1660 bool ltr = (cases[i].expected_text_direction == base::i18n::LEFT_TO_RIGHT);
1607 1661
1608 SelectionModel start_edge = 1662 SelectionModel start_edge =
1609 render_text->EdgeSelectionModel(ltr ? CURSOR_LEFT : CURSOR_RIGHT); 1663 render_text->EdgeSelectionModel(ltr ? CURSOR_LEFT : CURSOR_RIGHT);
1610 EXPECT_EQ(start_edge, SelectionModel(0, CURSOR_BACKWARD)); 1664 EXPECT_EQ(start_edge, SelectionModel(0, CURSOR_BACKWARD));
1611 1665
1612 SelectionModel end_edge = 1666 SelectionModel end_edge =
1613 render_text->EdgeSelectionModel(ltr ? CURSOR_RIGHT : CURSOR_LEFT); 1667 render_text->EdgeSelectionModel(ltr ? CURSOR_RIGHT : CURSOR_LEFT);
1614 EXPECT_EQ(end_edge, SelectionModel(cases[i].text.length(), CURSOR_FORWARD)); 1668 EXPECT_EQ(end_edge, SelectionModel(cases[i].text.length(), CURSOR_FORWARD));
1615 } 1669 }
1616 } 1670 }
1617 1671
1618 TEST_F(RenderTextTest, SelectAll) { 1672 TEST_P(RenderTextTest, SelectAll) {
1619 const wchar_t* const cases[] = 1673 const wchar_t* const cases[] =
1620 { kWeak, kLtr, kLtrRtl, kLtrRtlLtr, kRtl, kRtlLtr, kRtlLtrRtl }; 1674 { kWeak, kLtr, kLtrRtl, kLtrRtlLtr, kRtl, kRtlLtr, kRtlLtrRtl };
1621 1675
1622 // Ensure that SelectAll respects the |reversed| argument regardless of 1676 // Ensure that SelectAll respects the |reversed| argument regardless of
1623 // application locale and text content directionality. 1677 // application locale and text content directionality.
1624 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1678 RenderText* render_text = GetRenderText();
1625 const SelectionModel expected_reversed(Range(3, 0), CURSOR_FORWARD); 1679 const SelectionModel expected_reversed(Range(3, 0), CURSOR_FORWARD);
1626 const SelectionModel expected_forwards(Range(0, 3), CURSOR_BACKWARD); 1680 const SelectionModel expected_forwards(Range(0, 3), CURSOR_BACKWARD);
1627 const bool was_rtl = base::i18n::IsRTL(); 1681 const bool was_rtl = base::i18n::IsRTL();
1628 1682
1629 for (size_t i = 0; i < 2; ++i) { 1683 for (size_t i = 0; i < 2; ++i) {
1630 SetRTL(!base::i18n::IsRTL()); 1684 SetRTL(!base::i18n::IsRTL());
1631 // Test that an empty string produces an empty selection model. 1685 // Test that an empty string produces an empty selection model.
1632 render_text->SetText(base::string16()); 1686 render_text->SetText(base::string16());
1633 EXPECT_EQ(render_text->selection_model(), SelectionModel()); 1687 EXPECT_EQ(render_text->selection_model(), SelectionModel());
1634 1688
1635 // Test the weak, LTR, RTL, and Bidi string cases. 1689 // Test the weak, LTR, RTL, and Bidi string cases.
1636 for (size_t j = 0; j < arraysize(cases); j++) { 1690 for (size_t j = 0; j < arraysize(cases); j++) {
1637 render_text->SetText(WideToUTF16(cases[j])); 1691 render_text->SetText(WideToUTF16(cases[j]));
1638 render_text->SelectAll(false); 1692 render_text->SelectAll(false);
1639 EXPECT_EQ(render_text->selection_model(), expected_forwards); 1693 EXPECT_EQ(render_text->selection_model(), expected_forwards);
1640 render_text->SelectAll(true); 1694 render_text->SelectAll(true);
1641 EXPECT_EQ(render_text->selection_model(), expected_reversed); 1695 EXPECT_EQ(render_text->selection_model(), expected_reversed);
1642 } 1696 }
1643 } 1697 }
1644 1698
1645 EXPECT_EQ(was_rtl, base::i18n::IsRTL()); 1699 EXPECT_EQ(was_rtl, base::i18n::IsRTL());
1646 } 1700 }
1647 1701
1648 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618 1702 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1649 #if !defined(OS_MACOSX) 1703 TEST_P(RenderTextHarfBuzzTest, MoveCursorLeftRightWithSelection) {
1650 TEST_F(RenderTextTest, MoveCursorLeftRightWithSelection) { 1704 RenderText* render_text = GetRenderText();
1651 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance());
1652 render_text->SetText(WideToUTF16(L"abc\x05d0\x05d1\x05d2")); 1705 render_text->SetText(WideToUTF16(L"abc\x05d0\x05d1\x05d2"));
1653 // Left arrow on select ranging (6, 4). 1706 // Left arrow on select ranging (6, 4).
1654 render_text->MoveCursor(LINE_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1707 render_text->MoveCursor(LINE_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1655 EXPECT_EQ(Range(6), render_text->selection()); 1708 EXPECT_EQ(Range(6), render_text->selection());
1656 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE); 1709 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE);
1657 EXPECT_EQ(Range(4), render_text->selection()); 1710 EXPECT_EQ(Range(4), render_text->selection());
1658 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE); 1711 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE);
1659 EXPECT_EQ(Range(5), render_text->selection()); 1712 EXPECT_EQ(Range(5), render_text->selection());
1660 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE); 1713 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE);
1661 EXPECT_EQ(Range(6), render_text->selection()); 1714 EXPECT_EQ(Range(6), render_text->selection());
(...skipping 17 matching lines...) Expand all
1679 EXPECT_EQ(Range(5), render_text->selection()); 1732 EXPECT_EQ(Range(5), render_text->selection());
1680 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1733 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1681 EXPECT_EQ(Range(4), render_text->selection()); 1734 EXPECT_EQ(Range(4), render_text->selection());
1682 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_RETAIN); 1735 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_RETAIN);
1683 EXPECT_EQ(Range(4, 5), render_text->selection()); 1736 EXPECT_EQ(Range(4, 5), render_text->selection());
1684 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_RETAIN); 1737 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_RETAIN);
1685 EXPECT_EQ(Range(4, 6), render_text->selection()); 1738 EXPECT_EQ(Range(4, 6), render_text->selection());
1686 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1739 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1687 EXPECT_EQ(Range(4), render_text->selection()); 1740 EXPECT_EQ(Range(4), render_text->selection());
1688 } 1741 }
1689 #endif // !defined(OS_MACOSX)
1690 1742
1691 TEST_F(RenderTextTest, CenteredDisplayOffset) { 1743 TEST_P(RenderTextTest, CenteredDisplayOffset) {
1692 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1744 RenderText* render_text = GetRenderText();
1693 render_text->SetText(ASCIIToUTF16("abcdefghij")); 1745 render_text->SetText(ASCIIToUTF16("abcdefghij"));
1694 render_text->SetHorizontalAlignment(ALIGN_CENTER); 1746 render_text->SetHorizontalAlignment(ALIGN_CENTER);
1695 1747
1696 const int kEnlargement = 10; 1748 const int kEnlargement = 10;
1697 const int content_width = render_text->GetContentWidth(); 1749 const int content_width = render_text->GetContentWidth();
1698 Rect display_rect(0, 0, content_width / 2, 1750 Rect display_rect(0, 0, content_width / 2,
1699 render_text->font_list().GetHeight()); 1751 render_text->font_list().GetHeight());
1700 render_text->SetDisplayRect(display_rect); 1752 render_text->SetDisplayRect(display_rect);
1701 1753
1702 // Move the cursor to the beginning of the text and, by checking the cursor 1754 // Move the cursor to the beginning of the text and, by checking the cursor
1703 // bounds, make sure no empty space is to the left of the text. 1755 // bounds, make sure no empty space is to the left of the text.
1704 render_text->SetCursorPosition(0); 1756 render_text->SetCursorPosition(0);
1705 EXPECT_EQ(display_rect.x(), render_text->GetUpdatedCursorBounds().x()); 1757 EXPECT_EQ(display_rect.x(), render_text->GetUpdatedCursorBounds().x());
1706 1758
1707 // Widen the display rect and, by checking the cursor bounds, make sure no 1759 // Widen the display rect and, by checking the cursor bounds, make sure no
1708 // empty space is introduced to the left of the text. 1760 // empty space is introduced to the left of the text.
1709 display_rect.Inset(0, 0, -kEnlargement, 0); 1761 display_rect.Inset(0, 0, -kEnlargement, 0);
1710 render_text->SetDisplayRect(display_rect); 1762 render_text->SetDisplayRect(display_rect);
1711 EXPECT_EQ(display_rect.x(), render_text->GetUpdatedCursorBounds().x()); 1763 EXPECT_EQ(display_rect.x(), render_text->GetUpdatedCursorBounds().x());
1712 1764
1713 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618 1765 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1714 #if !defined(OS_MACOSX) 1766 if (GetParam() != RENDER_TEXT_MAC) {
1715 // Move the cursor to the end of the text and, by checking the cursor bounds, 1767 // Move the cursor to the end of the text and, by checking the cursor
1716 // make sure no empty space is to the right of the text. 1768 // bounds, make sure no empty space is to the right of the text.
1717 render_text->SetCursorPosition(render_text->text().length()); 1769 render_text->SetCursorPosition(render_text->text().length());
1718 EXPECT_EQ(display_rect.right(), 1770 EXPECT_EQ(display_rect.right(),
1719 render_text->GetUpdatedCursorBounds().right()); 1771 render_text->GetUpdatedCursorBounds().right());
1720 1772
1721 // Widen the display rect and, by checking the cursor bounds, make sure no 1773 // Widen the display rect and, by checking the cursor bounds, make sure no
1722 // empty space is introduced to the right of the text. 1774 // empty space is introduced to the right of the text.
1723 display_rect.Inset(0, 0, -kEnlargement, 0); 1775 display_rect.Inset(0, 0, -kEnlargement, 0);
1724 render_text->SetDisplayRect(display_rect); 1776 render_text->SetDisplayRect(display_rect);
1725 EXPECT_EQ(display_rect.right(), 1777 EXPECT_EQ(display_rect.right(),
1726 render_text->GetUpdatedCursorBounds().right()); 1778 render_text->GetUpdatedCursorBounds().right());
1727 #endif // !defined(OS_MACOSX) 1779 }
1728 } 1780 }
1729 1781
1730 void MoveLeftRightByWordVerifier(RenderText* render_text, 1782 void MoveLeftRightByWordVerifier(RenderText* render_text,
1731 const wchar_t* str) { 1783 const wchar_t* str) {
1732 render_text->SetText(WideToUTF16(str)); 1784 render_text->SetText(WideToUTF16(str));
1733 1785
1734 // Test moving by word from left ro right. 1786 // Test moving by word from left ro right.
1735 render_text->MoveCursor(LINE_BREAK, CURSOR_LEFT, SELECTION_NONE); 1787 render_text->MoveCursor(LINE_BREAK, CURSOR_LEFT, SELECTION_NONE);
1736 bool first_word = true; 1788 bool first_word = true;
1737 while (true) { 1789 while (true) {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
1783 render_text->MoveCursorTo(start); 1835 render_text->MoveCursorTo(start);
1784 for (int k = 0; k < j; ++k) 1836 for (int k = 0; k < j; ++k)
1785 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE); 1837 render_text->MoveCursor(CHARACTER_BREAK, CURSOR_LEFT, SELECTION_NONE);
1786 render_text->MoveCursor(WORD_BREAK, CURSOR_LEFT, SELECTION_NONE); 1838 render_text->MoveCursor(WORD_BREAK, CURSOR_LEFT, SELECTION_NONE);
1787 EXPECT_EQ(end, render_text->selection_model()); 1839 EXPECT_EQ(end, render_text->selection_model());
1788 } 1840 }
1789 } 1841 }
1790 } 1842 }
1791 1843
1792 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618 1844 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1793 #if !defined(OS_MACOSX) 1845 // TODO(msw): Make these work on Windows. http://crbug.com/196326
1794 // TODO(msw): Make these work on Windows.
1795 #if !defined(OS_WIN) 1846 #if !defined(OS_WIN)
1796 TEST_F(RenderTextTest, MoveLeftRightByWordInBidiText) { 1847 TEST_P(RenderTextHarfBuzzTest, MoveLeftRightByWordInBidiText) {
1797 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1848 RenderText* render_text = GetRenderText();
1798
1799 // For testing simplicity, each word is a 3-character word. 1849 // For testing simplicity, each word is a 3-character word.
1800 std::vector<const wchar_t*> test; 1850 std::vector<const wchar_t*> test;
1801 test.push_back(L"abc"); 1851 test.push_back(L"abc");
1802 test.push_back(L"abc def"); 1852 test.push_back(L"abc def");
1803 test.push_back(L"\x05E1\x05E2\x05E3"); 1853 test.push_back(L"\x05E1\x05E2\x05E3");
1804 test.push_back(L"\x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6"); 1854 test.push_back(L"\x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6");
1805 test.push_back(L"abc \x05E1\x05E2\x05E3"); 1855 test.push_back(L"abc \x05E1\x05E2\x05E3");
1806 test.push_back(L"abc def \x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6"); 1856 test.push_back(L"abc def \x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6");
1807 test.push_back(L"abc def hij \x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6" 1857 test.push_back(L"abc def hij \x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6"
1808 L" \x05E7\x05E8\x05E9"); 1858 L" \x05E7\x05E8\x05E9");
1809 1859
1810 test.push_back(L"abc \x05E1\x05E2\x05E3 hij"); 1860 test.push_back(L"abc \x05E1\x05E2\x05E3 hij");
1811 test.push_back(L"abc def \x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6 hij opq"); 1861 test.push_back(L"abc def \x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6 hij opq");
1812 test.push_back(L"abc def hij \x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6" 1862 test.push_back(L"abc def hij \x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6"
1813 L" \x05E7\x05E8\x05E9" L" opq rst uvw"); 1863 L" \x05E7\x05E8\x05E9" L" opq rst uvw");
1814 1864
1815 test.push_back(L"\x05E1\x05E2\x05E3 abc"); 1865 test.push_back(L"\x05E1\x05E2\x05E3 abc");
1816 test.push_back(L"\x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6 abc def"); 1866 test.push_back(L"\x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6 abc def");
1817 test.push_back(L"\x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6 \x05E7\x05E8\x05E9" 1867 test.push_back(L"\x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6 \x05E7\x05E8\x05E9"
1818 L" abc def hij"); 1868 L" abc def hij");
1819 1869
1820 test.push_back(L"\x05D1\x05D2\x05D3 abc \x05E1\x05E2\x05E3"); 1870 test.push_back(L"\x05D1\x05D2\x05D3 abc \x05E1\x05E2\x05E3");
1821 test.push_back(L"\x05D1\x05D2\x05D3 \x05D4\x05D5\x05D6 abc def" 1871 test.push_back(L"\x05D1\x05D2\x05D3 \x05D4\x05D5\x05D6 abc def"
1822 L" \x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6"); 1872 L" \x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6");
1823 test.push_back(L"\x05D1\x05D2\x05D3 \x05D4\x05D5\x05D6 \x05D7\x05D8\x05D9" 1873 test.push_back(L"\x05D1\x05D2\x05D3 \x05D4\x05D5\x05D6 \x05D7\x05D8\x05D9"
1824 L" abc def hij \x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6" 1874 L" abc def hij \x05E1\x05E2\x05E3 \x05E4\x05E5\x05E6"
1825 L" \x05E7\x05E8\x05E9"); 1875 L" \x05E7\x05E8\x05E9");
1826 1876
1827 for (size_t i = 0; i < test.size(); ++i) 1877 for (size_t i = 0; i < test.size(); ++i)
1828 MoveLeftRightByWordVerifier(render_text.get(), test[i]); 1878 MoveLeftRightByWordVerifier(render_text, test[i]);
1829 } 1879 }
1830 1880
1831 TEST_F(RenderTextTest, MoveLeftRightByWordInBidiText_TestEndOfText) { 1881 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1832 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1882 TEST_P(RenderTextHarfBuzzTest, MoveLeftRightByWordInBidiText_TestEndOfText) {
1883 RenderText* render_text = GetRenderText();
1833 1884
1834 render_text->SetText(WideToUTF16(L"ab\x05E1")); 1885 render_text->SetText(WideToUTF16(L"ab\x05E1"));
1835 // Moving the cursor by word from "abC|" to the left should return "|abC". 1886 // Moving the cursor by word from "abC|" to the left should return "|abC".
1836 // But since end of text is always treated as a word break, it returns 1887 // But since end of text is always treated as a word break, it returns
1837 // position "ab|C". 1888 // position "ab|C".
1838 // TODO(xji): Need to make it work as expected. 1889 // TODO(xji): Need to make it work as expected.
1839 render_text->MoveCursor(LINE_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1890 render_text->MoveCursor(LINE_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1840 render_text->MoveCursor(WORD_BREAK, CURSOR_LEFT, SELECTION_NONE); 1891 render_text->MoveCursor(WORD_BREAK, CURSOR_LEFT, SELECTION_NONE);
1841 // EXPECT_EQ(SelectionModel(), render_text->selection_model()); 1892 // EXPECT_EQ(SelectionModel(), render_text->selection_model());
1842 1893
(...skipping 11 matching lines...) Expand all
1854 1905
1855 // Moving the cursor by word from "|aCB" to the right should return "aCB|". 1906 // Moving the cursor by word from "|aCB" to the right should return "aCB|".
1856 // But since end of text is always treated as a word break, it returns 1907 // But since end of text is always treated as a word break, it returns
1857 // position "a|CB". 1908 // position "a|CB".
1858 // TODO(xji): Need to make it work as expected. 1909 // TODO(xji): Need to make it work as expected.
1859 render_text->MoveCursor(LINE_BREAK, CURSOR_LEFT, SELECTION_NONE); 1910 render_text->MoveCursor(LINE_BREAK, CURSOR_LEFT, SELECTION_NONE);
1860 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1911 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1861 // EXPECT_EQ(SelectionModel(), render_text->selection_model()); 1912 // EXPECT_EQ(SelectionModel(), render_text->selection_model());
1862 } 1913 }
1863 1914
1864 TEST_F(RenderTextTest, MoveLeftRightByWordInTextWithMultiSpaces) { 1915 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1865 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1916 TEST_P(RenderTextHarfBuzzTest, MoveLeftRightByWordInTextWithMultiSpaces) {
1917 RenderText* render_text = GetRenderText();
1866 render_text->SetText(WideToUTF16(L"abc def")); 1918 render_text->SetText(WideToUTF16(L"abc def"));
1867 render_text->MoveCursorTo(SelectionModel(5, CURSOR_FORWARD)); 1919 render_text->MoveCursorTo(SelectionModel(5, CURSOR_FORWARD));
1868 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1920 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1869 EXPECT_EQ(11U, render_text->cursor_position()); 1921 EXPECT_EQ(11U, render_text->cursor_position());
1870 1922
1871 render_text->MoveCursorTo(SelectionModel(5, CURSOR_FORWARD)); 1923 render_text->MoveCursorTo(SelectionModel(5, CURSOR_FORWARD));
1872 render_text->MoveCursor(WORD_BREAK, CURSOR_LEFT, SELECTION_NONE); 1924 render_text->MoveCursor(WORD_BREAK, CURSOR_LEFT, SELECTION_NONE);
1873 EXPECT_EQ(0U, render_text->cursor_position()); 1925 EXPECT_EQ(0U, render_text->cursor_position());
1874 } 1926 }
1875 #endif // !defined(OS_WIN) 1927 #endif // !defined(OS_WIN)
1876 1928
1877 TEST_F(RenderTextTest, MoveLeftRightByWordInChineseText) { 1929 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
1878 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1930 TEST_P(RenderTextHarfBuzzTest, MoveLeftRightByWordInChineseText) {
1931 RenderText* render_text = GetRenderText();
1879 render_text->SetText(WideToUTF16(L"\x6211\x4EEC\x53BB\x516C\x56ED\x73A9")); 1932 render_text->SetText(WideToUTF16(L"\x6211\x4EEC\x53BB\x516C\x56ED\x73A9"));
1880 render_text->MoveCursor(LINE_BREAK, CURSOR_LEFT, SELECTION_NONE); 1933 render_text->MoveCursor(LINE_BREAK, CURSOR_LEFT, SELECTION_NONE);
1881 EXPECT_EQ(0U, render_text->cursor_position()); 1934 EXPECT_EQ(0U, render_text->cursor_position());
1882 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1935 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1883 EXPECT_EQ(2U, render_text->cursor_position()); 1936 EXPECT_EQ(2U, render_text->cursor_position());
1884 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1937 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1885 EXPECT_EQ(3U, render_text->cursor_position()); 1938 EXPECT_EQ(3U, render_text->cursor_position());
1886 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1939 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1887 EXPECT_EQ(5U, render_text->cursor_position()); 1940 EXPECT_EQ(5U, render_text->cursor_position());
1888 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1941 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1889 EXPECT_EQ(6U, render_text->cursor_position()); 1942 EXPECT_EQ(6U, render_text->cursor_position());
1890 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, SELECTION_NONE); 1943 render_text->MoveCursor(WORD_BREAK, CURSOR_RIGHT, SELECTION_NONE);
1891 EXPECT_EQ(6U, render_text->cursor_position()); 1944 EXPECT_EQ(6U, render_text->cursor_position());
1892 } 1945 }
1893 #endif // !defined(OS_MACOSX)
1894 1946
1895 TEST_F(RenderTextTest, StringSizeSanity) { 1947 TEST_P(RenderTextTest, StringSizeSanity) {
1896 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1948 RenderText* render_text = GetRenderText();
1897 render_text->SetText(UTF8ToUTF16("Hello World")); 1949 render_text->SetText(UTF8ToUTF16("Hello World"));
1898 const Size string_size = render_text->GetStringSize(); 1950 const Size string_size = render_text->GetStringSize();
1899 EXPECT_GT(string_size.width(), 0); 1951 EXPECT_GT(string_size.width(), 0);
1900 EXPECT_GT(string_size.height(), 0); 1952 EXPECT_GT(string_size.height(), 0);
1901 } 1953 }
1902 1954
1903 TEST_F(RenderTextTest, StringSizeLongStrings) { 1955 TEST_P(RenderTextTest, StringSizeLongStrings) {
1904 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1956 RenderText* render_text = GetRenderText();
1905 Size previous_string_size; 1957 Size previous_string_size;
1906 for (size_t length = 10; length < 1000000; length *= 10) { 1958 for (size_t length = 10; length < 1000000; length *= 10) {
1907 render_text->SetText(base::string16(length, 'a')); 1959 render_text->SetText(base::string16(length, 'a'));
1908 const Size string_size = render_text->GetStringSize(); 1960 const Size string_size = render_text->GetStringSize();
1909 EXPECT_GT(string_size.width(), previous_string_size.width()); 1961 EXPECT_GT(string_size.width(), previous_string_size.width());
1910 EXPECT_GT(string_size.height(), 0); 1962 EXPECT_GT(string_size.height(), 0);
1911 previous_string_size = string_size; 1963 previous_string_size = string_size;
1912 } 1964 }
1913 } 1965 }
1914 1966
1915 // TODO(asvitkine): This test fails because PlatformFontMac uses point font 1967 TEST_P(RenderTextTest, StringSizeEmptyString) {
1916 // sizes instead of pixel sizes like other implementations.
1917 #if !defined(OS_MACOSX)
1918 TEST_F(RenderTextTest, StringSizeEmptyString) {
1919 // Ascent and descent of Arial and Symbol are different on most platforms. 1968 // Ascent and descent of Arial and Symbol are different on most platforms.
1920 const FontList font_list("Arial,Symbol, 16px"); 1969 const FontList font_list("Arial,Symbol, 16px");
1921 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 1970 RenderText* render_text = GetRenderText();
1922 render_text->SetFontList(font_list); 1971 render_text->SetFontList(font_list);
1923 render_text->SetDisplayRect(Rect(0, 0, 0, font_list.GetHeight())); 1972 render_text->SetDisplayRect(Rect(0, 0, 0, font_list.GetHeight()));
1924 1973
1925 // The empty string respects FontList metrics for non-zero height 1974 // The empty string respects FontList metrics for non-zero height
1926 // and baseline. 1975 // and baseline.
1927 render_text->SetText(base::string16()); 1976 render_text->SetText(base::string16());
1928 EXPECT_EQ(font_list.GetHeight(), render_text->GetStringSize().height()); 1977 EXPECT_EQ(font_list.GetHeight(), render_text->GetStringSize().height());
1929 EXPECT_EQ(0, render_text->GetStringSize().width()); 1978 EXPECT_EQ(0, render_text->GetStringSize().width());
1930 EXPECT_EQ(font_list.GetBaseline(), render_text->GetBaseline()); 1979 EXPECT_EQ(font_list.GetBaseline(), render_text->GetBaseline());
1931 1980
1932 render_text->SetText(UTF8ToUTF16(" ")); 1981 render_text->SetText(UTF8ToUTF16(" "));
1933 EXPECT_EQ(font_list.GetHeight(), render_text->GetStringSize().height()); 1982 EXPECT_EQ(font_list.GetHeight(), render_text->GetStringSize().height());
1934 EXPECT_EQ(font_list.GetBaseline(), render_text->GetBaseline()); 1983 EXPECT_EQ(font_list.GetBaseline(), render_text->GetBaseline());
1935 } 1984 }
1936 #endif // !defined(OS_MACOSX)
1937 1985
1938 TEST_F(RenderTextTest, StringSizeRespectsFontListMetrics) { 1986 TEST_P(RenderTextTest, StringSizeRespectsFontListMetrics) {
1939 // Check that Arial and Symbol have different font metrics. 1987 // Check that Arial and Symbol have different font metrics.
1940 Font arial_font("Arial", 16); 1988 Font arial_font("Arial", 16);
1941 ASSERT_EQ("arial", 1989 ASSERT_EQ("arial",
1942 base::ToLowerASCII(arial_font.GetActualFontNameForTesting())); 1990 base::ToLowerASCII(arial_font.GetActualFontNameForTesting()));
1943 Font symbol_font("Symbol", 16); 1991 Font symbol_font("Symbol", 16);
1944 ASSERT_EQ("symbol", 1992 ASSERT_EQ("symbol",
1945 base::ToLowerASCII(symbol_font.GetActualFontNameForTesting())); 1993 base::ToLowerASCII(symbol_font.GetActualFontNameForTesting()));
1946 EXPECT_NE(arial_font.GetHeight(), symbol_font.GetHeight()); 1994 EXPECT_NE(arial_font.GetHeight(), symbol_font.GetHeight());
1947 EXPECT_NE(arial_font.GetBaseline(), symbol_font.GetBaseline()); 1995 EXPECT_NE(arial_font.GetBaseline(), symbol_font.GetBaseline());
1948 // "a" should be rendered with Arial, not with Symbol. 1996 // "a" should be rendered with Arial, not with Symbol.
1949 const char* arial_font_text = "a"; 1997 const char* arial_font_text = "a";
1950 // "®" (registered trademark symbol) should be rendered with Symbol, 1998 // "®" (registered trademark symbol) should be rendered with Symbol,
1951 // not with Arial. 1999 // not with Arial.
1952 const char* symbol_font_text = "\xC2\xAE"; 2000 const char* symbol_font_text = "\xC2\xAE";
1953 2001
1954 Font smaller_font = arial_font; 2002 Font smaller_font = arial_font;
1955 Font larger_font = symbol_font; 2003 Font larger_font = symbol_font;
1956 const char* smaller_font_text = arial_font_text; 2004 const char* smaller_font_text = arial_font_text;
1957 const char* larger_font_text = symbol_font_text; 2005 const char* larger_font_text = symbol_font_text;
1958 if (symbol_font.GetHeight() < arial_font.GetHeight() && 2006 if (symbol_font.GetHeight() < arial_font.GetHeight() &&
1959 symbol_font.GetBaseline() < arial_font.GetBaseline()) { 2007 symbol_font.GetBaseline() < arial_font.GetBaseline()) {
1960 std::swap(smaller_font, larger_font); 2008 std::swap(smaller_font, larger_font);
1961 std::swap(smaller_font_text, larger_font_text); 2009 std::swap(smaller_font_text, larger_font_text);
1962 } 2010 }
1963 ASSERT_LT(smaller_font.GetHeight(), larger_font.GetHeight()); 2011 ASSERT_LT(smaller_font.GetHeight(), larger_font.GetHeight());
1964 ASSERT_LT(smaller_font.GetBaseline(), larger_font.GetBaseline()); 2012 ASSERT_LT(smaller_font.GetBaseline(), larger_font.GetBaseline());
1965 2013
1966 // Check |smaller_font_text| is rendered with the smaller font. 2014 // Check |smaller_font_text| is rendered with the smaller font.
1967 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2015 RenderText* render_text = GetRenderText();
1968 render_text->SetText(UTF8ToUTF16(smaller_font_text)); 2016 render_text->SetText(UTF8ToUTF16(smaller_font_text));
1969 render_text->SetFontList(FontList(smaller_font)); 2017 render_text->SetFontList(FontList(smaller_font));
1970 render_text->SetDisplayRect(Rect(0, 0, 0, 2018 render_text->SetDisplayRect(Rect(0, 0, 0,
1971 render_text->font_list().GetHeight())); 2019 render_text->font_list().GetHeight()));
1972 EXPECT_EQ(smaller_font.GetHeight(), render_text->GetStringSize().height()); 2020 EXPECT_EQ(smaller_font.GetHeight(), render_text->GetStringSize().height());
1973 EXPECT_EQ(smaller_font.GetBaseline(), render_text->GetBaseline()); 2021 EXPECT_EQ(smaller_font.GetBaseline(), render_text->GetBaseline());
1974 2022
1975 // Layout the same text with mixed fonts. The text should be rendered with 2023 // Layout the same text with mixed fonts. The text should be rendered with
1976 // the smaller font, but the height and baseline are determined with the 2024 // the smaller font, but the height and baseline are determined with the
1977 // metrics of the font list, which is equal to the larger font. 2025 // metrics of the font list, which is equal to the larger font.
1978 std::vector<Font> fonts; 2026 std::vector<Font> fonts;
1979 fonts.push_back(smaller_font); // The primary font is the smaller font. 2027 fonts.push_back(smaller_font); // The primary font is the smaller font.
1980 fonts.push_back(larger_font); 2028 fonts.push_back(larger_font);
1981 const FontList font_list(fonts); 2029 const FontList font_list(fonts);
1982 render_text->SetFontList(font_list); 2030 render_text->SetFontList(font_list);
1983 render_text->SetDisplayRect(Rect(0, 0, 0, 2031 render_text->SetDisplayRect(Rect(0, 0, 0,
1984 render_text->font_list().GetHeight())); 2032 render_text->font_list().GetHeight()));
1985 EXPECT_LT(smaller_font.GetHeight(), render_text->GetStringSize().height()); 2033 EXPECT_LT(smaller_font.GetHeight(), render_text->GetStringSize().height());
1986 EXPECT_LT(smaller_font.GetBaseline(), render_text->GetBaseline()); 2034 EXPECT_LT(smaller_font.GetBaseline(), render_text->GetBaseline());
1987 EXPECT_EQ(font_list.GetHeight(), render_text->GetStringSize().height()); 2035 EXPECT_EQ(font_list.GetHeight(), render_text->GetStringSize().height());
1988 EXPECT_EQ(font_list.GetBaseline(), render_text->GetBaseline()); 2036 EXPECT_EQ(font_list.GetBaseline(), render_text->GetBaseline());
1989 } 2037 }
1990 2038
1991 TEST_F(RenderTextTest, MinLineHeight) { 2039 TEST_P(RenderTextTest, MinLineHeight) {
1992 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2040 RenderText* render_text = GetRenderText();
1993
1994 render_text->SetText(ASCIIToUTF16("Hello!")); 2041 render_text->SetText(ASCIIToUTF16("Hello!"));
1995 SizeF default_size = render_text->GetStringSizeF(); 2042 SizeF default_size = render_text->GetStringSizeF();
1996 ASSERT_NE(0, default_size.height()); 2043 ASSERT_NE(0, default_size.height());
1997 ASSERT_NE(0, default_size.width()); 2044 ASSERT_NE(0, default_size.width());
1998 2045
1999 render_text->SetMinLineHeight(default_size.height() / 2); 2046 render_text->SetMinLineHeight(default_size.height() / 2);
2000 EXPECT_EQ(default_size.ToString(), render_text->GetStringSizeF().ToString()); 2047 EXPECT_EQ(default_size.ToString(), render_text->GetStringSizeF().ToString());
2001 2048
2002 render_text->SetMinLineHeight(default_size.height() * 2); 2049 render_text->SetMinLineHeight(default_size.height() * 2);
2003 SizeF taller_size = render_text->GetStringSizeF(); 2050 SizeF taller_size = render_text->GetStringSizeF();
2004 EXPECT_EQ(default_size.height() * 2, taller_size.height()); 2051 EXPECT_EQ(default_size.height() * 2, taller_size.height());
2005 EXPECT_EQ(default_size.width(), taller_size.width()); 2052 EXPECT_EQ(default_size.width(), taller_size.width());
2006 } 2053 }
2007 2054
2008 TEST_F(RenderTextTest, SetFontList) { 2055 TEST_P(RenderTextTest, SetFontList) {
2009 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2056 RenderText* render_text = GetRenderText();
2010 render_text->SetFontList(FontList("Arial,Symbol, 13px")); 2057 render_text->SetFontList(FontList("Arial,Symbol, 13px"));
2011 const std::vector<Font>& fonts = render_text->font_list().GetFonts(); 2058 const std::vector<Font>& fonts = render_text->font_list().GetFonts();
2012 ASSERT_EQ(2U, fonts.size()); 2059 ASSERT_EQ(2U, fonts.size());
2013 EXPECT_EQ("Arial", fonts[0].GetFontName()); 2060 EXPECT_EQ("Arial", fonts[0].GetFontName());
2014 EXPECT_EQ("Symbol", fonts[1].GetFontName()); 2061 EXPECT_EQ("Symbol", fonts[1].GetFontName());
2015 EXPECT_EQ(13, render_text->font_list().GetFontSize()); 2062 EXPECT_EQ(13, render_text->font_list().GetFontSize());
2016 } 2063 }
2017 2064
2018 // http://crbug/624513 2065 // http://crbug/624513
2019 #if defined(OS_WIN) 2066 #if !defined(OS_WIN)
2020 #define MAYBE_StringSizeBoldWidth DISABLED_StringSizeBoldWidth 2067 TEST_P(RenderTextTest, StringSizeBoldWidth) {
2021 #else
2022 #define MAYBE_StringSizeBoldWidth StringSizeBoldWidth
2023 #endif
2024 TEST_F(RenderTextTest, MAYBE_StringSizeBoldWidth) {
2025 // TODO(mboc): Add some unittests for other weights (currently not 2068 // TODO(mboc): Add some unittests for other weights (currently not
2026 // implemented because of test system font configuration). 2069 // implemented because of test system font configuration).
2027 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2070 RenderText* render_text = GetRenderText();
2028 render_text->SetText(UTF8ToUTF16("Hello World")); 2071 render_text->SetText(UTF8ToUTF16("Hello World"));
2029 2072
2030 const int plain_width = render_text->GetStringSize().width(); 2073 const int plain_width = render_text->GetStringSize().width();
2031 EXPECT_GT(plain_width, 0); 2074 EXPECT_GT(plain_width, 0);
2032 2075
2033 // Apply a bold style and check that the new width is greater. 2076 // Apply a bold style and check that the new width is greater.
2034 render_text->SetWeight(Font::Weight::BOLD); 2077 render_text->SetWeight(Font::Weight::BOLD);
2035 const int bold_width = render_text->GetStringSize().width(); 2078 const int bold_width = render_text->GetStringSize().width();
2036 EXPECT_GT(bold_width, plain_width); 2079 EXPECT_GT(bold_width, plain_width);
2037 2080
2038 #if defined(OS_WIN) 2081 #if defined(OS_WIN)
2039 render_text->SetWeight(Font::Weight::SEMIBOLD); 2082 render_text->SetWeight(Font::Weight::SEMIBOLD);
2040 const int semibold_width = render_text->GetStringSize().width(); 2083 const int semibold_width = render_text->GetStringSize().width();
2041 EXPECT_GT(bold_width, semibold_width); 2084 EXPECT_GT(bold_width, semibold_width);
2042 #endif 2085 #endif
2043 2086
2044 // Now, apply a plain style over the first word only. 2087 // Now, apply a plain style over the first word only.
2045 render_text->ApplyWeight(Font::Weight::NORMAL, Range(0, 5)); 2088 render_text->ApplyWeight(Font::Weight::NORMAL, Range(0, 5));
2046 const int plain_bold_width = render_text->GetStringSize().width(); 2089 const int plain_bold_width = render_text->GetStringSize().width();
2047 EXPECT_GT(plain_bold_width, plain_width); 2090 EXPECT_GT(plain_bold_width, plain_width);
2048 EXPECT_LT(plain_bold_width, bold_width); 2091 EXPECT_LT(plain_bold_width, bold_width);
2049 } 2092 }
2093 #endif // !defined(OS_WIN)
2050 2094
2051 TEST_F(RenderTextTest, StringSizeHeight) { 2095 TEST_P(RenderTextTest, StringSizeHeight) {
2052 base::string16 cases[] = { 2096 base::string16 cases[] = {
2053 WideToUTF16(L"Hello World!"), // English 2097 WideToUTF16(L"Hello World!"), // English
2054 WideToUTF16(L"\x6328\x62f6"), // Japanese 2098 WideToUTF16(L"\x6328\x62f6"), // Japanese
2055 WideToUTF16(L"\x0915\x093f"), // Hindi 2099 WideToUTF16(L"\x0915\x093f"), // Hindi
2056 WideToUTF16(L"\x05e0\x05b8"), // Hebrew 2100 WideToUTF16(L"\x05e0\x05b8"), // Hebrew
2057 }; 2101 };
2058 2102
2059 const FontList default_font_list; 2103 const FontList default_font_list;
2060 const FontList& larger_font_list = default_font_list.DeriveWithSizeDelta(24); 2104 const FontList& larger_font_list = default_font_list.DeriveWithSizeDelta(24);
2061 EXPECT_GT(larger_font_list.GetHeight(), default_font_list.GetHeight()); 2105 EXPECT_GT(larger_font_list.GetHeight(), default_font_list.GetHeight());
2062 2106
2063 for (size_t i = 0; i < arraysize(cases); i++) { 2107 for (size_t i = 0; i < arraysize(cases); i++) {
2064 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2108 ResetRenderTextInstance();
2109 RenderText* render_text = GetRenderText();
2065 render_text->SetFontList(default_font_list); 2110 render_text->SetFontList(default_font_list);
2066 render_text->SetText(cases[i]); 2111 render_text->SetText(cases[i]);
2067 2112
2068 const int height1 = render_text->GetStringSize().height(); 2113 const int height1 = render_text->GetStringSize().height();
2069 EXPECT_GT(height1, 0); 2114 EXPECT_GT(height1, 0);
2070 2115
2071 // Check that setting the larger font increases the height. 2116 // Check that setting the larger font increases the height.
2072 render_text->SetFontList(larger_font_list); 2117 render_text->SetFontList(larger_font_list);
2073 const int height2 = render_text->GetStringSize().height(); 2118 const int height2 = render_text->GetStringSize().height();
2074 EXPECT_GT(height2, height1); 2119 EXPECT_GT(height2, height1);
2075 } 2120 }
2076 } 2121 }
2077 2122
2078 TEST_F(RenderTextTest, GetBaselineSanity) { 2123 TEST_P(RenderTextTest, GetBaselineSanity) {
2079 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2124 RenderText* render_text = GetRenderText();
2080 render_text->SetText(UTF8ToUTF16("Hello World")); 2125 render_text->SetText(UTF8ToUTF16("Hello World"));
2081 const int baseline = render_text->GetBaseline(); 2126 const int baseline = render_text->GetBaseline();
2082 EXPECT_GT(baseline, 0); 2127 EXPECT_GT(baseline, 0);
2083 } 2128 }
2084 2129
2085 TEST_F(RenderTextTest, CursorBoundsInReplacementMode) { 2130 TEST_P(RenderTextTest, CursorBoundsInReplacementMode) {
2086 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2131 RenderText* render_text = GetRenderText();
2087 render_text->SetText(ASCIIToUTF16("abcdefg")); 2132 render_text->SetText(ASCIIToUTF16("abcdefg"));
2088 render_text->SetDisplayRect(Rect(100, 17)); 2133 render_text->SetDisplayRect(Rect(100, 17));
2089 SelectionModel sel_b(1, CURSOR_FORWARD); 2134 SelectionModel sel_b(1, CURSOR_FORWARD);
2090 SelectionModel sel_c(2, CURSOR_FORWARD); 2135 SelectionModel sel_c(2, CURSOR_FORWARD);
2091 Rect cursor_around_b = render_text->GetCursorBounds(sel_b, false); 2136 Rect cursor_around_b = render_text->GetCursorBounds(sel_b, false);
2092 Rect cursor_before_b = render_text->GetCursorBounds(sel_b, true); 2137 Rect cursor_before_b = render_text->GetCursorBounds(sel_b, true);
2093 Rect cursor_before_c = render_text->GetCursorBounds(sel_c, true); 2138 Rect cursor_before_c = render_text->GetCursorBounds(sel_c, true);
2094 EXPECT_EQ(cursor_around_b.x(), cursor_before_b.x()); 2139 EXPECT_EQ(cursor_around_b.x(), cursor_before_b.x());
2095 EXPECT_EQ(cursor_around_b.right(), cursor_before_c.x()); 2140 EXPECT_EQ(cursor_around_b.right(), cursor_before_c.x());
2096 } 2141 }
2097 2142
2098 TEST_F(RenderTextTest, GetTextOffset) { 2143 TEST_P(RenderTextTest, GetTextOffset) {
2099 // The default horizontal text offset differs for LTR and RTL, and is only set 2144 // The default horizontal text offset differs for LTR and RTL, and is only set
2100 // when the RenderText object is created. This test will check the default in 2145 // when the RenderText object is created. This test will check the default in
2101 // LTR mode, and the next test will check the RTL default. 2146 // LTR mode, and the next test will check the RTL default.
2102 const bool was_rtl = base::i18n::IsRTL(); 2147 const bool was_rtl = base::i18n::IsRTL();
2103 SetRTL(false); 2148 SetRTL(false);
2104 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2149
2150 // Reset the render text instance since the locale was changed.
2151 ResetRenderTextInstance();
2152 RenderText* render_text = GetRenderText();
2153
2105 render_text->SetText(ASCIIToUTF16("abcdefg")); 2154 render_text->SetText(ASCIIToUTF16("abcdefg"));
2106 render_text->SetFontList(FontList("Arial, 13px")); 2155 render_text->SetFontList(FontList("Arial, 13px"));
2107 2156
2108 // Set display area's size equal to the font size. 2157 // Set display area's size equal to the font size.
2109 const Size font_size(render_text->GetContentWidth(), 2158 const Size font_size(render_text->GetContentWidth(),
2110 render_text->font_list().GetHeight()); 2159 render_text->font_list().GetHeight());
2111 Rect display_rect(font_size); 2160 Rect display_rect(font_size);
2112 render_text->SetDisplayRect(display_rect); 2161 render_text->SetDisplayRect(display_rect);
2113 2162
2114 Vector2d offset = render_text->GetLineOffset(0); 2163 Vector2d offset = render_text->GetLineOffset(0);
(...skipping 24 matching lines...) Expand all
2139 render_text->SetDisplayRect(display_rect); 2188 render_text->SetDisplayRect(display_rect);
2140 const Vector2d prev_offset = render_text->GetLineOffset(0); 2189 const Vector2d prev_offset = render_text->GetLineOffset(0);
2141 display_rect.Inset(0, 0, 0, -2 * kEnlargementY); 2190 display_rect.Inset(0, 0, 0, -2 * kEnlargementY);
2142 render_text->SetDisplayRect(display_rect); 2191 render_text->SetDisplayRect(display_rect);
2143 offset = render_text->GetLineOffset(0); 2192 offset = render_text->GetLineOffset(0);
2144 EXPECT_EQ(prev_offset.y() + kEnlargementY, offset.y()); 2193 EXPECT_EQ(prev_offset.y() + kEnlargementY, offset.y());
2145 2194
2146 SetRTL(was_rtl); 2195 SetRTL(was_rtl);
2147 } 2196 }
2148 2197
2149 TEST_F(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL) { 2198 TEST_P(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL) {
2150 // This only checks the default horizontal alignment in RTL mode; all other 2199 // This only checks the default horizontal alignment in RTL mode; all other
2151 // GetLineOffset(0) attributes are checked by the test above. 2200 // GetLineOffset(0) attributes are checked by the test above.
2152 const bool was_rtl = base::i18n::IsRTL(); 2201 const bool was_rtl = base::i18n::IsRTL();
2153 SetRTL(true); 2202 SetRTL(true);
2154 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2203
2204 // Reset the render text instance since the locale was changed.
2205 ResetRenderTextInstance();
2206 RenderText* render_text = GetRenderText();
2207
2155 render_text->SetText(ASCIIToUTF16("abcdefg")); 2208 render_text->SetText(ASCIIToUTF16("abcdefg"));
2156 render_text->SetFontList(FontList("Arial, 13px")); 2209 render_text->SetFontList(FontList("Arial, 13px"));
2157 const int kEnlargement = 2; 2210 const int kEnlargement = 2;
2158 const Size font_size(render_text->GetContentWidth() + kEnlargement, 2211 const Size font_size(render_text->GetContentWidth() + kEnlargement,
2159 render_text->GetStringSize().height()); 2212 render_text->GetStringSize().height());
2160 Rect display_rect(font_size); 2213 Rect display_rect(font_size);
2161 render_text->SetDisplayRect(display_rect); 2214 render_text->SetDisplayRect(display_rect);
2162 Vector2d offset = render_text->GetLineOffset(0); 2215 Vector2d offset = render_text->GetLineOffset(0);
2163 EXPECT_EQ(kEnlargement, offset.x()); 2216 EXPECT_EQ(kEnlargement, offset.x());
2164 SetRTL(was_rtl); 2217 SetRTL(was_rtl);
2165 } 2218 }
2166 2219
2167 TEST_F(RenderTextTest, SetDisplayOffset) { 2220 TEST_P(RenderTextTest, SetDisplayOffset) {
2168 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2221 RenderText* render_text = GetRenderText();
2169 render_text->SetText(ASCIIToUTF16("abcdefg")); 2222 render_text->SetText(ASCIIToUTF16("abcdefg"));
2170 render_text->SetFontList(FontList("Arial, 13px")); 2223 render_text->SetFontList(FontList("Arial, 13px"));
2171 2224
2172 const Size font_size(render_text->GetContentWidth(), 2225 const Size font_size(render_text->GetContentWidth(),
2173 render_text->font_list().GetHeight()); 2226 render_text->font_list().GetHeight());
2174 const int kEnlargement = 10; 2227 const int kEnlargement = 10;
2175 2228
2176 // Set display width |kEnlargement| pixels greater than content width and test 2229 // Set display width |kEnlargement| pixels greater than content width and test
2177 // different possible situations. In this case the only possible display 2230 // different possible situations. In this case the only possible display
2178 // offset is zero. 2231 // offset is zero.
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
2231 }; 2284 };
2232 2285
2233 for (size_t i = 0; i < arraysize(large_content_cases); i++) { 2286 for (size_t i = 0; i < arraysize(large_content_cases); i++) {
2234 render_text->SetHorizontalAlignment(large_content_cases[i].alignment); 2287 render_text->SetHorizontalAlignment(large_content_cases[i].alignment);
2235 render_text->SetDisplayOffset(large_content_cases[i].offset); 2288 render_text->SetDisplayOffset(large_content_cases[i].offset);
2236 EXPECT_EQ(large_content_cases[i].expected_offset, 2289 EXPECT_EQ(large_content_cases[i].expected_offset,
2237 render_text->GetUpdatedDisplayOffset().x()); 2290 render_text->GetUpdatedDisplayOffset().x());
2238 } 2291 }
2239 } 2292 }
2240 2293
2241 TEST_F(RenderTextTest, SameFontForParentheses) { 2294 TEST_P(RenderTextTest, SameFontForParentheses) {
2242 struct { 2295 struct {
2243 const base::char16 left_char; 2296 const base::char16 left_char;
2244 const base::char16 right_char; 2297 const base::char16 right_char;
2245 } punctuation_pairs[] = { 2298 } punctuation_pairs[] = {
2246 { '(', ')' }, 2299 { '(', ')' },
2247 { '{', '}' }, 2300 { '{', '}' },
2248 { '<', '>' }, 2301 { '<', '>' },
2249 }; 2302 };
2250 struct { 2303 struct {
2251 base::string16 text; 2304 base::string16 text;
(...skipping 18 matching lines...) Expand all
2270 { WideToUTF16(L"Hello World(\x0915\x093f)Hello World") }, 2323 { WideToUTF16(L"Hello World(\x0915\x093f)Hello World") },
2271 2324
2272 // Hebrew(English) 2325 // Hebrew(English)
2273 { WideToUTF16(L"\x05e0\x05b8(a)") }, 2326 { WideToUTF16(L"\x05e0\x05b8(a)") },
2274 // Hebrew(English)Hebrew 2327 // Hebrew(English)Hebrew
2275 { WideToUTF16(L"\x05e0\x05b8(a)\x05e0\x05b8") }, 2328 { WideToUTF16(L"\x05e0\x05b8(a)\x05e0\x05b8") },
2276 // English(Hebrew)English 2329 // English(Hebrew)English
2277 { WideToUTF16(L"Hello World(\x05e0\x05b8)Hello World") }, 2330 { WideToUTF16(L"Hello World(\x05e0\x05b8)Hello World") },
2278 }; 2331 };
2279 2332
2280 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2333 RenderText* render_text = GetRenderText();
2281 for (size_t i = 0; i < arraysize(cases); ++i) { 2334 for (size_t i = 0; i < arraysize(cases); ++i) {
2282 base::string16 text = cases[i].text; 2335 base::string16 text = cases[i].text;
2283 const size_t start_paren_char_index = text.find('('); 2336 const size_t start_paren_char_index = text.find('(');
2284 ASSERT_NE(base::string16::npos, start_paren_char_index); 2337 ASSERT_NE(base::string16::npos, start_paren_char_index);
2285 const size_t end_paren_char_index = text.find(')'); 2338 const size_t end_paren_char_index = text.find(')');
2286 ASSERT_NE(base::string16::npos, end_paren_char_index); 2339 ASSERT_NE(base::string16::npos, end_paren_char_index);
2287 2340
2288 for (size_t j = 0; j < arraysize(punctuation_pairs); ++j) { 2341 for (size_t j = 0; j < arraysize(punctuation_pairs); ++j) {
2289 text[start_paren_char_index] = punctuation_pairs[j].left_char; 2342 text[start_paren_char_index] = punctuation_pairs[j].left_char;
2290 text[end_paren_char_index] = punctuation_pairs[j].right_char; 2343 text[end_paren_char_index] = punctuation_pairs[j].right_char;
(...skipping 17 matching lines...) Expand all
2308 const Font& end_font = spans[end_paren_span_index].first; 2361 const Font& end_font = spans[end_paren_span_index].first;
2309 EXPECT_EQ(start_font.GetFontName(), end_font.GetFontName()); 2362 EXPECT_EQ(start_font.GetFontName(), end_font.GetFontName());
2310 EXPECT_EQ(start_font.GetFontSize(), end_font.GetFontSize()); 2363 EXPECT_EQ(start_font.GetFontSize(), end_font.GetFontSize());
2311 EXPECT_EQ(start_font.GetStyle(), end_font.GetStyle()); 2364 EXPECT_EQ(start_font.GetStyle(), end_font.GetStyle());
2312 } 2365 }
2313 } 2366 }
2314 } 2367 }
2315 2368
2316 // Make sure the caret width is always >=1 so that the correct 2369 // Make sure the caret width is always >=1 so that the correct
2317 // caret is drawn at high DPI. crbug.com/164100. 2370 // caret is drawn at high DPI. crbug.com/164100.
2318 TEST_F(RenderTextTest, CaretWidth) { 2371 TEST_P(RenderTextTest, CaretWidth) {
2319 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2372 RenderText* render_text = GetRenderText();
2320 render_text->SetText(ASCIIToUTF16("abcdefg")); 2373 render_text->SetText(ASCIIToUTF16("abcdefg"));
2321 EXPECT_GE(render_text->GetUpdatedCursorBounds().width(), 1); 2374 EXPECT_GE(render_text->GetUpdatedCursorBounds().width(), 1);
2322 } 2375 }
2323 2376
2324 TEST_F(RenderTextTest, SelectWord) { 2377 TEST_P(RenderTextTest, SelectWord) {
2325 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2378 RenderText* render_text = GetRenderText();
2326 render_text->SetText(ASCIIToUTF16(" foo a.bc.d bar")); 2379 render_text->SetText(ASCIIToUTF16(" foo a.bc.d bar"));
2327 2380
2328 struct { 2381 struct {
2329 size_t cursor; 2382 size_t cursor;
2330 size_t selection_start; 2383 size_t selection_start;
2331 size_t selection_end; 2384 size_t selection_end;
2332 } cases[] = { 2385 } cases[] = {
2333 { 0, 0, 1 }, 2386 { 0, 0, 1 },
2334 { 1, 1, 4 }, 2387 { 1, 1, 4 },
2335 { 2, 1, 4 }, 2388 { 2, 1, 4 },
(...skipping 15 matching lines...) Expand all
2351 2404
2352 for (size_t i = 0; i < arraysize(cases); ++i) { 2405 for (size_t i = 0; i < arraysize(cases); ++i) {
2353 render_text->SetCursorPosition(cases[i].cursor); 2406 render_text->SetCursorPosition(cases[i].cursor);
2354 render_text->SelectWord(); 2407 render_text->SelectWord();
2355 EXPECT_EQ(Range(cases[i].selection_start, cases[i].selection_end), 2408 EXPECT_EQ(Range(cases[i].selection_start, cases[i].selection_end),
2356 render_text->selection()); 2409 render_text->selection());
2357 } 2410 }
2358 } 2411 }
2359 2412
2360 // Make sure the last word is selected when the cursor is at text.length(). 2413 // Make sure the last word is selected when the cursor is at text.length().
2361 TEST_F(RenderTextTest, LastWordSelected) { 2414 TEST_P(RenderTextTest, LastWordSelected) {
2362 const std::string kTestURL1 = "http://www.google.com"; 2415 const std::string kTestURL1 = "http://www.google.com";
2363 const std::string kTestURL2 = "http://www.google.com/something/"; 2416 const std::string kTestURL2 = "http://www.google.com/something/";
2364 2417
2365 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2418 RenderText* render_text = GetRenderText();
2366 2419
2367 render_text->SetText(ASCIIToUTF16(kTestURL1)); 2420 render_text->SetText(ASCIIToUTF16(kTestURL1));
2368 render_text->SetCursorPosition(kTestURL1.length()); 2421 render_text->SetCursorPosition(kTestURL1.length());
2369 render_text->SelectWord(); 2422 render_text->SelectWord();
2370 EXPECT_EQ(ASCIIToUTF16("com"), GetSelectedText(render_text.get())); 2423 EXPECT_EQ(ASCIIToUTF16("com"), GetSelectedText(render_text));
2371 EXPECT_FALSE(render_text->selection().is_reversed()); 2424 EXPECT_FALSE(render_text->selection().is_reversed());
2372 2425
2373 render_text->SetText(ASCIIToUTF16(kTestURL2)); 2426 render_text->SetText(ASCIIToUTF16(kTestURL2));
2374 render_text->SetCursorPosition(kTestURL2.length()); 2427 render_text->SetCursorPosition(kTestURL2.length());
2375 render_text->SelectWord(); 2428 render_text->SelectWord();
2376 EXPECT_EQ(ASCIIToUTF16("/"), GetSelectedText(render_text.get())); 2429 EXPECT_EQ(ASCIIToUTF16("/"), GetSelectedText(render_text));
2377 EXPECT_FALSE(render_text->selection().is_reversed()); 2430 EXPECT_FALSE(render_text->selection().is_reversed());
2378 } 2431 }
2379 2432
2380 // When given a non-empty selection, SelectWord should expand the selection to 2433 // When given a non-empty selection, SelectWord should expand the selection to
2381 // nearest word boundaries. 2434 // nearest word boundaries.
2382 TEST_F(RenderTextTest, SelectMultipleWords) { 2435 TEST_P(RenderTextTest, SelectMultipleWords) {
2383 const std::string kTestURL = "http://www.google.com"; 2436 const std::string kTestURL = "http://www.google.com";
2384 2437
2385 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2438 RenderText* render_text = GetRenderText();
2386 2439
2387 render_text->SetText(ASCIIToUTF16(kTestURL)); 2440 render_text->SetText(ASCIIToUTF16(kTestURL));
2388 render_text->SelectRange(Range(16, 20)); 2441 render_text->SelectRange(Range(16, 20));
2389 render_text->SelectWord(); 2442 render_text->SelectWord();
2390 EXPECT_EQ(ASCIIToUTF16("google.com"), GetSelectedText(render_text.get())); 2443 EXPECT_EQ(ASCIIToUTF16("google.com"), GetSelectedText(render_text));
2391 EXPECT_FALSE(render_text->selection().is_reversed()); 2444 EXPECT_FALSE(render_text->selection().is_reversed());
2392 2445
2393 // SelectWord should preserve the selection direction. 2446 // SelectWord should preserve the selection direction.
2394 render_text->SelectRange(Range(20, 16)); 2447 render_text->SelectRange(Range(20, 16));
2395 render_text->SelectWord(); 2448 render_text->SelectWord();
2396 EXPECT_EQ(ASCIIToUTF16("google.com"), GetSelectedText(render_text.get())); 2449 EXPECT_EQ(ASCIIToUTF16("google.com"), GetSelectedText(render_text));
2397 EXPECT_TRUE(render_text->selection().is_reversed()); 2450 EXPECT_TRUE(render_text->selection().is_reversed());
2398 } 2451 }
2399 2452
2400 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618 2453 // TODO(asvitkine): RenderTextMac cursor movements. http://crbug.com/131618
2401 #if !defined(OS_MACOSX) 2454 TEST_P(RenderTextHarfBuzzTest, DisplayRectShowsCursorLTR) {
2402 TEST_F(RenderTextTest, DisplayRectShowsCursorLTR) {
2403 ASSERT_FALSE(base::i18n::IsRTL()); 2455 ASSERT_FALSE(base::i18n::IsRTL());
2404 ASSERT_FALSE(base::i18n::ICUIsRTL()); 2456 ASSERT_FALSE(base::i18n::ICUIsRTL());
2405 2457
2406 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2458 RenderText* render_text = GetRenderText();
2407 render_text->SetText(WideToUTF16(L"abcdefghijklmnopqrstuvwxzyabcdefg")); 2459 render_text->SetText(WideToUTF16(L"abcdefghijklmnopqrstuvwxzyabcdefg"));
2408 render_text->MoveCursorTo(SelectionModel(render_text->text().length(), 2460 render_text->MoveCursorTo(SelectionModel(render_text->text().length(),
2409 CURSOR_FORWARD)); 2461 CURSOR_FORWARD));
2410 int width = render_text->GetStringSize().width(); 2462 int width = render_text->GetStringSize().width();
2411 ASSERT_GT(width, 10); 2463 ASSERT_GT(width, 10);
2412 2464
2413 // Ensure that the cursor is placed at the width of its preceding text. 2465 // Ensure that the cursor is placed at the width of its preceding text.
2414 render_text->SetDisplayRect(Rect(width + 10, 1)); 2466 render_text->SetDisplayRect(Rect(width + 10, 1));
2415 EXPECT_EQ(width, render_text->GetUpdatedCursorBounds().x()); 2467 EXPECT_EQ(width, render_text->GetUpdatedCursorBounds().x());
2416 2468
(...skipping 29 matching lines...) Expand all
2446 2498
2447 // Ensure that the text will pan to fill its expanding display rectangle. 2499 // Ensure that the text will pan to fill its expanding display rectangle.
2448 render_text->SetDisplayRect(Rect(width - 5, 1)); 2500 render_text->SetDisplayRect(Rect(width - 5, 1));
2449 EXPECT_EQ(render_text->display_rect().width(), 2501 EXPECT_EQ(render_text->display_rect().width(),
2450 render_text->GetUpdatedCursorBounds().right()); 2502 render_text->GetUpdatedCursorBounds().right());
2451 2503
2452 // Ensure that a sufficiently large display rectangle shows all the text. 2504 // Ensure that a sufficiently large display rectangle shows all the text.
2453 render_text->SetDisplayRect(Rect(width + 10, 1)); 2505 render_text->SetDisplayRect(Rect(width + 10, 1));
2454 EXPECT_EQ(width, render_text->GetUpdatedCursorBounds().x()); 2506 EXPECT_EQ(width, render_text->GetUpdatedCursorBounds().x());
2455 } 2507 }
2456 #endif // !defined(OS_MACOSX)
2457 2508
2458 TEST_F(RenderTextTest, DisplayRectShowsCursorRTL) { 2509 TEST_P(RenderTextTest, DisplayRectShowsCursorRTL) {
2459 // Set the application default text direction to RTL. 2510 // Set the application default text direction to RTL.
2460 const bool was_rtl = base::i18n::IsRTL(); 2511 const bool was_rtl = base::i18n::IsRTL();
2461 SetRTL(true); 2512 SetRTL(true);
2462 2513
2463 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2514 // Reset the render text instance since the locale was changed.
2515 ResetRenderTextInstance();
2516 RenderText* render_text = GetRenderText();
2464 render_text->SetText(WideToUTF16(L"abcdefghijklmnopqrstuvwxzyabcdefg")); 2517 render_text->SetText(WideToUTF16(L"abcdefghijklmnopqrstuvwxzyabcdefg"));
2465 render_text->MoveCursorTo(SelectionModel(0, CURSOR_FORWARD)); 2518 render_text->MoveCursorTo(SelectionModel(0, CURSOR_FORWARD));
2466 int width = render_text->GetStringSize().width(); 2519 int width = render_text->GetStringSize().width();
2467 ASSERT_GT(width, 10); 2520 ASSERT_GT(width, 10);
2468 2521
2469 // Ensure that the cursor is placed at the width of its preceding text. 2522 // Ensure that the cursor is placed at the width of its preceding text.
2470 render_text->SetDisplayRect(Rect(width + 10, 1)); 2523 render_text->SetDisplayRect(Rect(width + 10, 1));
2471 EXPECT_EQ(render_text->display_rect().width() - width - 1, 2524 EXPECT_EQ(render_text->display_rect().width() - width - 1,
2472 render_text->GetUpdatedCursorBounds().x()); 2525 render_text->GetUpdatedCursorBounds().x());
2473 2526
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
2509 render_text->SetDisplayRect(Rect(width + 10, 1)); 2562 render_text->SetDisplayRect(Rect(width + 10, 1));
2510 EXPECT_EQ(render_text->display_rect().width() - width - 1, 2563 EXPECT_EQ(render_text->display_rect().width() - width - 1,
2511 render_text->GetUpdatedCursorBounds().x()); 2564 render_text->GetUpdatedCursorBounds().x());
2512 2565
2513 // Reset the application default text direction to LTR. 2566 // Reset the application default text direction to LTR.
2514 SetRTL(was_rtl); 2567 SetRTL(was_rtl);
2515 EXPECT_EQ(was_rtl, base::i18n::IsRTL()); 2568 EXPECT_EQ(was_rtl, base::i18n::IsRTL());
2516 } 2569 }
2517 2570
2518 // Changing colors between or inside ligated glyphs should not break shaping. 2571 // Changing colors between or inside ligated glyphs should not break shaping.
2519 TEST_F(RenderTextTest, SelectionKeepsLigatures) { 2572 TEST_P(RenderTextTest, SelectionKeepsLigatures) {
2520 const wchar_t* kTestStrings[] = { L"\x644\x623", L"\x633\x627" }; 2573 const wchar_t* kTestStrings[] = { L"\x644\x623", L"\x633\x627" };
2521 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 2574 RenderText* render_text = GetRenderText();
2522 render_text->set_selection_color(SK_ColorRED); 2575 render_text->set_selection_color(SK_ColorRED);
2523 Canvas canvas;
2524 2576
2525 for (size_t i = 0; i < arraysize(kTestStrings); ++i) { 2577 for (size_t i = 0; i < arraysize(kTestStrings); ++i) {
2526 render_text->SetText(WideToUTF16(kTestStrings[i])); 2578 render_text->SetText(WideToUTF16(kTestStrings[i]));
2527 const int expected_width = render_text->GetStringSize().width(); 2579 const int expected_width = render_text->GetStringSize().width();
2528 render_text->MoveCursorTo(SelectionModel(Range(0, 1), CURSOR_FORWARD)); 2580 render_text->MoveCursorTo(SelectionModel(Range(0, 1), CURSOR_FORWARD));
2529 EXPECT_EQ(expected_width, render_text->GetStringSize().width()); 2581 EXPECT_EQ(expected_width, render_text->GetStringSize().width());
2530 // Drawing the text should not DCHECK or crash; see http://crbug.com/262119 2582 // Drawing the text should not DCHECK or crash; see http://crbug.com/262119
2531 render_text->Draw(&canvas); 2583 render_text->Draw(canvas());
2532 render_text->MoveCursorTo(SelectionModel(0, CURSOR_FORWARD)); 2584 render_text->MoveCursorTo(SelectionModel(0, CURSOR_FORWARD));
2533 } 2585 }
2534 } 2586 }
2535 2587
2536 // Ensure strings wrap onto multiple lines for a small available width. 2588 // Ensure strings wrap onto multiple lines for a small available width.
2537 TEST_F(RenderTextTest, Multiline_MinWidth) { 2589 TEST_P(RenderTextHarfBuzzTest, Multiline_MinWidth) {
2538 const wchar_t* kTestStrings[] = { kWeak, kLtr, kLtrRtl, kLtrRtlLtr, kRtl, 2590 const wchar_t* kTestStrings[] = { kWeak, kLtr, kLtrRtl, kLtrRtlLtr, kRtl,
2539 kRtlLtr, kRtlLtrRtl }; 2591 kRtlLtr, kRtlLtrRtl };
2540 2592
2541 RenderTextHarfBuzz render_text; 2593 RenderText* render_text = GetRenderText();
2542 render_text.SetDisplayRect(Rect(1, 1000)); 2594 render_text->SetDisplayRect(Rect(1, 1000));
2543 render_text.SetMultiline(true); 2595 render_text->SetMultiline(true);
2544 render_text.SetWordWrapBehavior(WRAP_LONG_WORDS); 2596 render_text->SetWordWrapBehavior(WRAP_LONG_WORDS);
2545 Canvas canvas;
2546 2597
2547 for (size_t i = 0; i < arraysize(kTestStrings); ++i) { 2598 for (size_t i = 0; i < arraysize(kTestStrings); ++i) {
2548 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i)); 2599 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i));
2549 render_text.SetText(WideToUTF16(kTestStrings[i])); 2600 render_text->SetText(WideToUTF16(kTestStrings[i]));
2550 render_text.Draw(&canvas); 2601 render_text->Draw(canvas());
2551 EXPECT_GT(render_text.lines_.size(), 1U); 2602 EXPECT_GT(render_text->lines_.size(), 1U);
2552 } 2603 }
2553 } 2604 }
2554 2605
2555 // Ensure strings wrap onto multiple lines for a normal available width. 2606 // Ensure strings wrap onto multiple lines for a normal available width.
2556 TEST_F(RenderTextTest, Multiline_NormalWidth) { 2607 TEST_P(RenderTextHarfBuzzTest, Multiline_NormalWidth) {
2557 const struct { 2608 const struct {
2558 const wchar_t* const text; 2609 const wchar_t* const text;
2559 const Range first_line_char_range; 2610 const Range first_line_char_range;
2560 const Range second_line_char_range; 2611 const Range second_line_char_range;
2561 bool is_ltr; 2612 bool is_ltr;
2562 } kTestStrings[] = { 2613 } kTestStrings[] = {
2563 { L"abc defg hijkl", Range(0, 9), Range(9, 14), true }, 2614 { L"abc defg hijkl", Range(0, 9), Range(9, 14), true },
2564 { L"qwertyzxcvbn", Range(0, 10), Range(10, 12), true }, 2615 { L"qwertyzxcvbn", Range(0, 10), Range(10, 12), true },
2565 { L"\x0627\x0644\x0644\x063A\x0629 " 2616 { L"\x0627\x0644\x0644\x063A\x0629 "
2566 L"\x0627\x0644\x0639\x0631\x0628\x064A\x0629", 2617 L"\x0627\x0644\x0639\x0631\x0628\x064A\x0629",
2567 Range(0, 6), Range(6, 13), false }, 2618 Range(0, 6), Range(6, 13), false },
2568 { L"\x062A\x0641\x0627\x062D \x05EA\x05E4\x05D5\x05D6\x05D9" 2619 { L"\x062A\x0641\x0627\x062D \x05EA\x05E4\x05D5\x05D6\x05D9"
2569 L"\x05DA\x05DB\x05DD", Range(0, 5), Range(5, 13), false } 2620 L"\x05DA\x05DB\x05DD", Range(0, 5), Range(5, 13), false }
2570 }; 2621 };
2571 2622
2572 RenderTextHarfBuzz render_text; 2623 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
2624
2573 // Specify the fixed width for characters to suppress the possible variations 2625 // Specify the fixed width for characters to suppress the possible variations
2574 // of linebreak results. 2626 // of linebreak results.
2575 render_text.set_glyph_width_for_test(5); 2627 render_text->set_glyph_width_for_test(5);
2576 render_text.SetDisplayRect(Rect(50, 1000)); 2628 render_text->SetDisplayRect(Rect(50, 1000));
2577 render_text.SetMultiline(true); 2629 render_text->SetMultiline(true);
2578 render_text.SetWordWrapBehavior(WRAP_LONG_WORDS); 2630 render_text->SetWordWrapBehavior(WRAP_LONG_WORDS);
2579 render_text.SetHorizontalAlignment(ALIGN_TO_HEAD); 2631 render_text->SetHorizontalAlignment(ALIGN_TO_HEAD);
2580
2581 Canvas canvas;
2582 TestSkiaTextRenderer renderer(&canvas);
2583 2632
2584 for (size_t i = 0; i < arraysize(kTestStrings); ++i) { 2633 for (size_t i = 0; i < arraysize(kTestStrings); ++i) {
2585 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i)); 2634 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i));
2586 render_text.SetText(WideToUTF16(kTestStrings[i].text)); 2635 render_text->SetText(WideToUTF16(kTestStrings[i].text));
2587 render_text.EnsureLayout(); 2636 DrawVisualText();
2588 render_text.DrawVisualText(&renderer);
2589 2637
2590 ASSERT_EQ(2U, render_text.lines_.size()); 2638 ASSERT_EQ(2U, render_text->lines_.size());
2591 ASSERT_EQ(1U, render_text.lines_[0].segments.size()); 2639 ASSERT_EQ(1U, render_text->lines_[0].segments.size());
2592 EXPECT_EQ(kTestStrings[i].first_line_char_range, 2640 EXPECT_EQ(kTestStrings[i].first_line_char_range,
2593 render_text.lines_[0].segments[0].char_range); 2641 render_text->lines_[0].segments[0].char_range);
2594 ASSERT_EQ(1U, render_text.lines_[1].segments.size()); 2642 ASSERT_EQ(1U, render_text->lines_[1].segments.size());
2595 EXPECT_EQ(kTestStrings[i].second_line_char_range, 2643 EXPECT_EQ(kTestStrings[i].second_line_char_range,
2596 render_text.lines_[1].segments[0].char_range); 2644 render_text->lines_[1].segments[0].char_range);
2597 2645
2598 std::vector<TestSkiaTextRenderer::TextLog> text_log; 2646 std::vector<TestSkiaTextRenderer::TextLog> text_log;
2599 renderer.GetTextLogAndReset(&text_log); 2647 renderer()->GetTextLogAndReset(&text_log);
2600 ASSERT_EQ(2U, text_log.size()); 2648 ASSERT_EQ(2U, text_log.size());
2601 // NOTE: this expectation compares the character length and glyph counts, 2649 // NOTE: this expectation compares the character length and glyph counts,
2602 // which isn't always equal. This is okay only because all the test 2650 // which isn't always equal. This is okay only because all the test
2603 // strings are simple (like, no compound characters nor UTF16-surrogate 2651 // strings are simple (like, no compound characters nor UTF16-surrogate
2604 // pairs). Be careful in case more complicated test strings are added. 2652 // pairs). Be careful in case more complicated test strings are added.
2605 EXPECT_EQ(kTestStrings[i].first_line_char_range.length(), 2653 EXPECT_EQ(kTestStrings[i].first_line_char_range.length(),
2606 text_log[0].glyph_count); 2654 text_log[0].glyph_count);
2607 EXPECT_EQ(kTestStrings[i].second_line_char_range.length(), 2655 EXPECT_EQ(kTestStrings[i].second_line_char_range.length(),
2608 text_log[1].glyph_count); 2656 text_log[1].glyph_count);
2609 EXPECT_LT(text_log[0].origin.y(), text_log[1].origin.y()); 2657 EXPECT_LT(text_log[0].origin.y(), text_log[1].origin.y());
2610 if (kTestStrings[i].is_ltr) { 2658 if (kTestStrings[i].is_ltr) {
2611 EXPECT_EQ(0, text_log[0].origin.x()); 2659 EXPECT_EQ(0, text_log[0].origin.x());
2612 EXPECT_EQ(0, text_log[1].origin.x()); 2660 EXPECT_EQ(0, text_log[1].origin.x());
2613 } else { 2661 } else {
2614 EXPECT_LT(0, text_log[0].origin.x()); 2662 EXPECT_LT(0, text_log[0].origin.x());
2615 EXPECT_LT(0, text_log[1].origin.x()); 2663 EXPECT_LT(0, text_log[1].origin.x());
2616 } 2664 }
2617 } 2665 }
2618 } 2666 }
2619 2667
2620 // Ensure strings don't wrap onto multiple lines for a sufficient available 2668 // Ensure strings don't wrap onto multiple lines for a sufficient available
2621 // width. 2669 // width.
2622 TEST_F(RenderTextTest, Multiline_SufficientWidth) { 2670 TEST_P(RenderTextHarfBuzzTest, Multiline_SufficientWidth) {
2623 const wchar_t* kTestStrings[] = { L"", L" ", L".", L" . ", L"abc", L"a b c", 2671 const wchar_t* kTestStrings[] = { L"", L" ", L".", L" . ", L"abc", L"a b c",
2624 L"\x62E\x628\x632", L"\x62E \x628 \x632" }; 2672 L"\x62E\x628\x632", L"\x62E \x628 \x632" };
2625 2673
2626 RenderTextHarfBuzz render_text; 2674 RenderText* render_text = GetRenderText();
2627 render_text.SetDisplayRect(Rect(1000, 1000)); 2675 render_text->SetDisplayRect(Rect(1000, 1000));
2628 render_text.SetMultiline(true); 2676 render_text->SetMultiline(true);
2629 Canvas canvas;
2630 2677
2631 for (size_t i = 0; i < arraysize(kTestStrings); ++i) { 2678 for (size_t i = 0; i < arraysize(kTestStrings); ++i) {
2632 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i)); 2679 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i));
2633 render_text.SetText(WideToUTF16(kTestStrings[i])); 2680 render_text->SetText(WideToUTF16(kTestStrings[i]));
2634 render_text.Draw(&canvas); 2681 render_text->Draw(canvas());
2635 EXPECT_EQ(1U, render_text.lines_.size()); 2682 EXPECT_EQ(1U, render_text->lines_.size());
2636 } 2683 }
2637 } 2684 }
2638 2685
2639 TEST_F(RenderTextTest, Multiline_Newline) { 2686 TEST_P(RenderTextHarfBuzzTest, Multiline_Newline) {
2640 const struct { 2687 const struct {
2641 const wchar_t* const text; 2688 const wchar_t* const text;
2642 const size_t lines_count; 2689 const size_t lines_count;
2643 // Ranges of the characters on each line preceding the newline. 2690 // Ranges of the characters on each line preceding the newline.
2644 const Range line_char_ranges[3]; 2691 const Range line_char_ranges[3];
2645 } kTestStrings[] = { 2692 } kTestStrings[] = {
2646 {L"abc\ndef", 2ul, { Range(0, 3), Range(4, 7), Range::InvalidRange() } }, 2693 {L"abc\ndef", 2ul, { Range(0, 3), Range(4, 7), Range::InvalidRange() } },
2647 {L"a \n b ", 2ul, { Range(0, 2), Range(3, 6), Range::InvalidRange() } }, 2694 {L"a \n b ", 2ul, { Range(0, 2), Range(3, 6), Range::InvalidRange() } },
2648 {L"ab\n", 2ul, { Range(0, 2), Range(), Range::InvalidRange() } }, 2695 {L"ab\n", 2ul, { Range(0, 2), Range(), Range::InvalidRange() } },
2649 {L"a\n\nb", 3ul, { Range(0, 1), Range(), Range(3, 4) } }, 2696 {L"a\n\nb", 3ul, { Range(0, 1), Range(), Range(3, 4) } },
2650 {L"\nab", 2ul, { Range(), Range(1, 3), Range::InvalidRange() } }, 2697 {L"\nab", 2ul, { Range(), Range(1, 3), Range::InvalidRange() } },
2651 {L"\n", 2ul, { Range(), Range(), Range::InvalidRange() } }, 2698 {L"\n", 2ul, { Range(), Range(), Range::InvalidRange() } },
2652 }; 2699 };
2653 2700
2654 RenderTextHarfBuzz render_text; 2701 RenderText* render_text = GetRenderText();
2655 render_text.SetDisplayRect(Rect(200, 1000)); 2702 render_text->SetDisplayRect(Rect(200, 1000));
2656 render_text.SetMultiline(true); 2703 render_text->SetMultiline(true);
2657 Canvas canvas;
2658 2704
2659 for (size_t i = 0; i < arraysize(kTestStrings); ++i) { 2705 for (size_t i = 0; i < arraysize(kTestStrings); ++i) {
2660 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i)); 2706 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i));
2661 render_text.SetText(WideToUTF16(kTestStrings[i].text)); 2707 render_text->SetText(WideToUTF16(kTestStrings[i].text));
2662 render_text.Draw(&canvas); 2708 render_text->Draw(canvas());
2663 EXPECT_EQ(kTestStrings[i].lines_count, render_text.lines_.size()); 2709 EXPECT_EQ(kTestStrings[i].lines_count, render_text->lines_.size());
2664 if (kTestStrings[i].lines_count != render_text.lines_.size()) 2710 if (kTestStrings[i].lines_count != render_text->lines_.size())
2665 continue; 2711 continue;
2666 2712
2667 for (size_t j = 0; j < kTestStrings[i].lines_count; ++j) { 2713 for (size_t j = 0; j < kTestStrings[i].lines_count; ++j) {
2668 SCOPED_TRACE(base::StringPrintf("Line %" PRIuS "", j)); 2714 SCOPED_TRACE(base::StringPrintf("Line %" PRIuS "", j));
2669 // There might be multiple segments in one line. Merge all the segments 2715 // There might be multiple segments in one line. Merge all the segments
2670 // ranges in the same line. 2716 // ranges in the same line.
2671 const size_t segment_size = render_text.lines()[j].segments.size(); 2717 const size_t segment_size = render_text->lines()[j].segments.size();
2672 Range line_range; 2718 Range line_range;
2673 if (segment_size > 0) 2719 if (segment_size > 0)
2674 line_range = Range( 2720 line_range =
2675 render_text.lines()[j].segments[0].char_range.start(), 2721 Range(render_text->lines()[j].segments[0].char_range.start(),
2676 render_text.lines()[j].segments[segment_size - 1].char_range.end()); 2722 render_text->lines()[j]
2723 .segments[segment_size - 1]
2724 .char_range.end());
2677 EXPECT_EQ(kTestStrings[i].line_char_ranges[j], line_range); 2725 EXPECT_EQ(kTestStrings[i].line_char_ranges[j], line_range);
2678 } 2726 }
2679 } 2727 }
2680 } 2728 }
2681 2729
2682 // Make sure that multiline mode ignores elide behavior. 2730 // Make sure that multiline mode ignores elide behavior.
2683 TEST_F(RenderTextTest, Multiline_IgnoreElide) { 2731 TEST_P(RenderTextHarfBuzzTest, Multiline_IgnoreElide) {
2684 const wchar_t kTestString[] = 2732 const wchar_t kTestString[] =
2685 L"very very very long string xxxxxxxxxxxxxxxxxxxxxxxxxx"; 2733 L"very very very long string xxxxxxxxxxxxxxxxxxxxxxxxxx";
2686 const wchar_t kEllipsis[] = L"\x2026"; 2734 const wchar_t kEllipsis[] = L"\x2026";
2687 2735
2688 RenderTextHarfBuzz render_text; 2736 RenderText* render_text = GetRenderText();
2689 render_text.SetElideBehavior(ELIDE_TAIL); 2737 render_text->SetElideBehavior(ELIDE_TAIL);
2690 render_text.SetDisplayRect(Rect(20, 1000)); 2738 render_text->SetDisplayRect(Rect(20, 1000));
2691 render_text.SetText(base::WideToUTF16(kTestString)); 2739 render_text->SetText(base::WideToUTF16(kTestString));
2692 EXPECT_NE(base::string16::npos, 2740 EXPECT_NE(base::string16::npos,
2693 render_text.GetDisplayText().find(base::WideToUTF16(kEllipsis))); 2741 render_text->GetDisplayText().find(base::WideToUTF16(kEllipsis)));
2694 2742
2695 render_text.SetMultiline(true); 2743 render_text->SetMultiline(true);
2696 EXPECT_EQ(base::string16::npos, 2744 EXPECT_EQ(base::string16::npos,
2697 render_text.GetDisplayText().find(base::WideToUTF16(kEllipsis))); 2745 render_text->GetDisplayText().find(base::WideToUTF16(kEllipsis)));
2698 } 2746 }
2699 2747
2700 TEST_F(RenderTextTest, Multiline_NewlineCharacterReplacement) { 2748 TEST_P(RenderTextHarfBuzzTest, Multiline_NewlineCharacterReplacement) {
2701 const wchar_t* kTestStrings[] = { 2749 const wchar_t* kTestStrings[] = {
2702 L"abc\ndef", L"a \n b ", L"ab\n", L"a\n\nb", L"\nab", L"\n", 2750 L"abc\ndef", L"a \n b ", L"ab\n", L"a\n\nb", L"\nab", L"\n",
2703 }; 2751 };
2704 2752
2705 for (size_t i = 0; i < arraysize(kTestStrings); ++i) { 2753 for (size_t i = 0; i < arraysize(kTestStrings); ++i) {
2706 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i)); 2754 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i));
2707 RenderTextHarfBuzz render_text; 2755 ResetRenderTextInstance();
2708 render_text.SetDisplayRect(Rect(200, 1000)); 2756 RenderText* render_text = GetRenderText();
2709 render_text.SetText(WideToUTF16(kTestStrings[i])); 2757 render_text->SetDisplayRect(Rect(200, 1000));
2758 render_text->SetText(WideToUTF16(kTestStrings[i]));
2710 2759
2711 base::string16 display_text = render_text.GetDisplayText(); 2760 base::string16 display_text = render_text->GetDisplayText();
2712 // If RenderText is not multiline, the newline characters are replaced 2761 // If RenderText is not multiline, the newline characters are replaced
2713 // by symbols, therefore the character should be changed. 2762 // by symbols, therefore the character should be changed.
2714 EXPECT_NE(WideToUTF16(kTestStrings[i]), render_text.GetDisplayText()); 2763 EXPECT_NE(WideToUTF16(kTestStrings[i]), render_text->GetDisplayText());
2715 2764
2716 // Setting multiline will fix this, the newline characters will be back 2765 // Setting multiline will fix this, the newline characters will be back
2717 // to the original text. 2766 // to the original text.
2718 render_text.SetMultiline(true); 2767 render_text->SetMultiline(true);
2719 EXPECT_EQ(WideToUTF16(kTestStrings[i]), render_text.GetDisplayText()); 2768 EXPECT_EQ(WideToUTF16(kTestStrings[i]), render_text->GetDisplayText());
2720 } 2769 }
2721 } 2770 }
2722 2771
2723 // Ensure horizontal alignment works in multiline mode. 2772 // Ensure horizontal alignment works in multiline mode.
2724 TEST_F(RenderTextTest, Multiline_HorizontalAlignment) { 2773 TEST_P(RenderTextHarfBuzzTest, Multiline_HorizontalAlignment) {
2725 const struct { 2774 const struct {
2726 const wchar_t* const text; 2775 const wchar_t* const text;
2727 const HorizontalAlignment alignment; 2776 const HorizontalAlignment alignment;
2728 } kTestStrings[] = { 2777 } kTestStrings[] = {
2729 { L"abcdefghij\nhijkl", ALIGN_LEFT }, 2778 { L"abcdefghij\nhijkl", ALIGN_LEFT },
2730 { L"nhijkl\nabcdefghij", ALIGN_LEFT }, 2779 { L"nhijkl\nabcdefghij", ALIGN_LEFT },
2731 // hebrew, 2nd line shorter 2780 // hebrew, 2nd line shorter
2732 { L"\x5d0\x5d1\x5d2\x5d3\x5d4\x5d5\x5d6\x5d7\n\x5d0\x5d1\x5d2\x5d3", 2781 { L"\x5d0\x5d1\x5d2\x5d3\x5d4\x5d5\x5d6\x5d7\n\x5d0\x5d1\x5d2\x5d3",
2733 ALIGN_RIGHT }, 2782 ALIGN_RIGHT },
2734 // hebrew, 2nd line longer 2783 // hebrew, 2nd line longer
2735 { L"\x5d0\x5d1\x5d2\x5d3\n\x5d0\x5d1\x5d2\x5d3\x5d4\x5d5\x5d6\x5d7", 2784 { L"\x5d0\x5d1\x5d2\x5d3\n\x5d0\x5d1\x5d2\x5d3\x5d4\x5d5\x5d6\x5d7",
2736 ALIGN_RIGHT }, 2785 ALIGN_RIGHT },
2737 // arabic, 2nd line shorter 2786 // arabic, 2nd line shorter
2738 { L"\x62a\x62b\x62c\x62d\x62e\x62f\x630\n\x660\x661\x662\x663\x664", 2787 { L"\x62a\x62b\x62c\x62d\x62e\x62f\x630\n\x660\x661\x662\x663\x664",
2739 ALIGN_RIGHT }, 2788 ALIGN_RIGHT },
2740 // arabic, 2nd line longer 2789 // arabic, 2nd line longer
2741 { L"\x660\x661\x662\x663\x664\n\x62a\x62b\x62c\x62d\x62e\x62f\x630", 2790 { L"\x660\x661\x662\x663\x664\n\x62a\x62b\x62c\x62d\x62e\x62f\x630",
2742 ALIGN_RIGHT }, 2791 ALIGN_RIGHT },
2743 }; 2792 };
2744 const int kGlyphSize = 5; 2793 const int kGlyphSize = 5;
2745 RenderTextHarfBuzz render_text; 2794 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
2746 render_text.SetHorizontalAlignment(ALIGN_TO_HEAD); 2795 render_text->SetHorizontalAlignment(ALIGN_TO_HEAD);
2747 render_text.set_glyph_width_for_test(kGlyphSize); 2796 render_text->set_glyph_width_for_test(kGlyphSize);
2748 render_text.SetDisplayRect(Rect(100, 1000)); 2797 render_text->SetDisplayRect(Rect(100, 1000));
2749 render_text.SetMultiline(true); 2798 render_text->SetMultiline(true);
2750 2799
2751 Canvas canvas;
2752 for (size_t i = 0; i < arraysize(kTestStrings); ++i) { 2800 for (size_t i = 0; i < arraysize(kTestStrings); ++i) {
2753 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "] %ls", i, 2801 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "] %ls", i,
2754 kTestStrings[i].text)); 2802 kTestStrings[i].text));
2755 render_text.SetText(WideToUTF16(kTestStrings[i].text)); 2803 render_text->SetText(WideToUTF16(kTestStrings[i].text));
2756 render_text.Draw(&canvas); 2804 render_text->Draw(canvas());
2757 ASSERT_LE(2u, render_text.lines().size()); 2805 ASSERT_LE(2u, render_text->lines().size());
2758 if (kTestStrings[i].alignment == ALIGN_LEFT) { 2806 if (kTestStrings[i].alignment == ALIGN_LEFT) {
2759 EXPECT_EQ(0, render_text.GetAlignmentOffset(0).x()); 2807 EXPECT_EQ(0, render_text->GetAlignmentOffset(0).x());
2760 EXPECT_EQ(0, render_text.GetAlignmentOffset(1).x()); 2808 EXPECT_EQ(0, render_text->GetAlignmentOffset(1).x());
2761 } else { 2809 } else {
2762 std::vector<base::string16> lines = base::SplitString( 2810 std::vector<base::string16> lines = base::SplitString(
2763 base::WideToUTF16(kTestStrings[i].text), 2811 base::WideToUTF16(kTestStrings[i].text),
2764 base::string16(1, '\n'), base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); 2812 base::string16(1, '\n'), base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
2765 ASSERT_EQ(2u, lines.size()); 2813 ASSERT_EQ(2u, lines.size());
2766 int difference = (lines[0].length() - lines[1].length()) * kGlyphSize; 2814 int difference = (lines[0].length() - lines[1].length()) * kGlyphSize;
2767 EXPECT_EQ(render_text.GetAlignmentOffset(0).x() + difference, 2815 EXPECT_EQ(render_text->GetAlignmentOffset(0).x() + difference,
2768 render_text.GetAlignmentOffset(1).x()); 2816 render_text->GetAlignmentOffset(1).x());
2769 } 2817 }
2770 } 2818 }
2771 } 2819 }
2772 2820
2773 TEST_F(RenderTextTest, Multiline_WordWrapBehavior) { 2821 TEST_P(RenderTextHarfBuzzTest, Multiline_WordWrapBehavior) {
2774 const int kGlyphSize = 5; 2822 const int kGlyphSize = 5;
2775 const struct { 2823 const struct {
2776 const WordWrapBehavior behavior; 2824 const WordWrapBehavior behavior;
2777 const size_t num_lines; 2825 const size_t num_lines;
2778 const Range char_ranges[4]; 2826 const Range char_ranges[4];
2779 } kTestScenarios[] = { 2827 } kTestScenarios[] = {
2780 { IGNORE_LONG_WORDS, 3u, 2828 { IGNORE_LONG_WORDS, 3u,
2781 { Range(0, 4), Range(4, 11), Range(11, 14), Range::InvalidRange() } }, 2829 { Range(0, 4), Range(4, 11), Range(11, 14), Range::InvalidRange() } },
2782 { TRUNCATE_LONG_WORDS, 3u, 2830 { TRUNCATE_LONG_WORDS, 3u,
2783 { Range(0, 4), Range(4, 8), Range(11, 14), Range::InvalidRange() } }, 2831 { Range(0, 4), Range(4, 8), Range(11, 14), Range::InvalidRange() } },
2784 { WRAP_LONG_WORDS, 4u, 2832 { WRAP_LONG_WORDS, 4u,
2785 { Range(0, 4), Range(4, 8), Range(8, 11), Range(11, 14) } }, 2833 { Range(0, 4), Range(4, 8), Range(8, 11), Range(11, 14) } },
2786 // TODO(mukai): implement ELIDE_LONG_WORDS. It's not used right now. 2834 // TODO(mukai): implement ELIDE_LONG_WORDS. It's not used right now.
2787 }; 2835 };
2788 RenderTextHarfBuzz render_text; 2836 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
2789 render_text.SetMultiline(true); 2837 render_text->SetMultiline(true);
2790 render_text.SetText(ASCIIToUTF16("foo fooooo foo")); 2838 render_text->SetText(ASCIIToUTF16("foo fooooo foo"));
2791 render_text.set_glyph_width_for_test(kGlyphSize); 2839 render_text->set_glyph_width_for_test(kGlyphSize);
2792 render_text.SetDisplayRect(Rect(0, 0, kGlyphSize * 4, 0)); 2840 render_text->SetDisplayRect(Rect(0, 0, kGlyphSize * 4, 0));
2793
2794 Canvas canvas;
2795 2841
2796 for (size_t i = 0; i < arraysize(kTestScenarios); ++i) { 2842 for (size_t i = 0; i < arraysize(kTestScenarios); ++i) {
2797 SCOPED_TRACE(base::StringPrintf( 2843 SCOPED_TRACE(base::StringPrintf(
2798 "kTestScenarios[%" PRIuS "] %d", i, kTestScenarios[i].behavior)); 2844 "kTestScenarios[%" PRIuS "] %d", i, kTestScenarios[i].behavior));
2799 render_text.SetWordWrapBehavior(kTestScenarios[i].behavior); 2845 render_text->SetWordWrapBehavior(kTestScenarios[i].behavior);
2800 render_text.Draw(&canvas); 2846 render_text->Draw(canvas());
2801 2847
2802 ASSERT_EQ(kTestScenarios[i].num_lines, render_text.lines().size()); 2848 ASSERT_EQ(kTestScenarios[i].num_lines, render_text->lines().size());
2803 for (size_t j = 0; j < render_text.lines().size(); ++j) { 2849 for (size_t j = 0; j < render_text->lines().size(); ++j) {
2804 SCOPED_TRACE(base::StringPrintf("%" PRIuS "-th line", j)); 2850 SCOPED_TRACE(base::StringPrintf("%" PRIuS "-th line", j));
2805 EXPECT_EQ(kTestScenarios[i].char_ranges[j], 2851 EXPECT_EQ(kTestScenarios[i].char_ranges[j],
2806 render_text.lines()[j].segments[0].char_range); 2852 render_text->lines()[j].segments[0].char_range);
2807 EXPECT_EQ(kTestScenarios[i].char_ranges[j].length() * kGlyphSize, 2853 EXPECT_EQ(kTestScenarios[i].char_ranges[j].length() * kGlyphSize,
2808 render_text.lines()[j].size.width()); 2854 render_text->lines()[j].size.width());
2809 } 2855 }
2810 } 2856 }
2811 } 2857 }
2812 2858
2813 TEST_F(RenderTextTest, Multiline_LineBreakerBehavior) { 2859 TEST_P(RenderTextHarfBuzzTest, Multiline_LineBreakerBehavior) {
2814 const int kGlyphSize = 5; 2860 const int kGlyphSize = 5;
2815 const struct { 2861 const struct {
2816 const wchar_t* const text; 2862 const wchar_t* const text;
2817 const WordWrapBehavior behavior; 2863 const WordWrapBehavior behavior;
2818 const Range char_ranges[3]; 2864 const Range char_ranges[3];
2819 } kTestScenarios[] = { 2865 } kTestScenarios[] = {
2820 { L"a single run", IGNORE_LONG_WORDS, 2866 { L"a single run", IGNORE_LONG_WORDS,
2821 {Range(0, 2), Range(2, 9), Range(9, 12) } }, 2867 {Range(0, 2), Range(2, 9), Range(9, 12) } },
2822 // 3 words: "That's ", ""good". ", "aaa" and 7 runs: "That", "'", "s ", 2868 // 3 words: "That's ", ""good". ", "aaa" and 7 runs: "That", "'", "s ",
2823 // """, "good", "". ", "aaa". They all mixed together. 2869 // """, "good", "". ", "aaa". They all mixed together.
(...skipping 14 matching lines...) Expand all
2838 { L"a \"good\" one.", TRUNCATE_LONG_WORDS, 2884 { L"a \"good\" one.", TRUNCATE_LONG_WORDS,
2839 {Range(0, 2), Range(2, 6), Range(9, 13) } }, 2885 {Range(0, 2), Range(2, 6), Range(9, 13) } },
2840 { L"asingleword", WRAP_LONG_WORDS, 2886 { L"asingleword", WRAP_LONG_WORDS,
2841 {Range(0, 4), Range(4, 8), Range(8, 11) } }, 2887 {Range(0, 4), Range(4, 8), Range(8, 11) } },
2842 { L"That's good", WRAP_LONG_WORDS, 2888 { L"That's good", WRAP_LONG_WORDS,
2843 {Range(0, 4), Range(4, 7), Range(7, 11) } }, 2889 {Range(0, 4), Range(4, 7), Range(7, 11) } },
2844 { L"That's \"g\".", WRAP_LONG_WORDS, 2890 { L"That's \"g\".", WRAP_LONG_WORDS,
2845 {Range(0, 4), Range(4, 7), Range(7, 11) } }, 2891 {Range(0, 4), Range(4, 7), Range(7, 11) } },
2846 }; 2892 };
2847 2893
2848 RenderTextHarfBuzz render_text; 2894 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
2849 render_text.SetMultiline(true); 2895 render_text->SetMultiline(true);
2850 render_text.set_glyph_width_for_test(kGlyphSize); 2896 render_text->set_glyph_width_for_test(kGlyphSize);
2851 render_text.SetDisplayRect(Rect(0, 0, kGlyphSize * 4, 0)); 2897 render_text->SetDisplayRect(Rect(0, 0, kGlyphSize * 4, 0));
2852
2853 Canvas canvas;
2854 2898
2855 for (size_t i = 0; i < arraysize(kTestScenarios); ++i) { 2899 for (size_t i = 0; i < arraysize(kTestScenarios); ++i) {
2856 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i)); 2900 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i));
2857 render_text.SetText(WideToUTF16(kTestScenarios[i].text)); 2901 render_text->SetText(WideToUTF16(kTestScenarios[i].text));
2858 render_text.SetWordWrapBehavior(kTestScenarios[i].behavior); 2902 render_text->SetWordWrapBehavior(kTestScenarios[i].behavior);
2859 render_text.Draw(&canvas); 2903 render_text->Draw(canvas());
2860 2904
2861 ASSERT_EQ(3u, render_text.lines().size()); 2905 ASSERT_EQ(3u, render_text->lines().size());
2862 for (size_t j = 0; j < render_text.lines().size(); ++j) { 2906 for (size_t j = 0; j < render_text->lines().size(); ++j) {
2863 SCOPED_TRACE(base::StringPrintf("%" PRIuS "-th line", j)); 2907 SCOPED_TRACE(base::StringPrintf("%" PRIuS "-th line", j));
2864 // Merge all the segments ranges in the same line. 2908 // Merge all the segments ranges in the same line.
2865 size_t segment_size = render_text.lines()[j].segments.size(); 2909 size_t segment_size = render_text->lines()[j].segments.size();
2866 Range line_range; 2910 Range line_range;
2867 if (segment_size > 0) 2911 if (segment_size > 0)
2868 line_range = Range( 2912 line_range =
2869 render_text.lines()[j].segments[0].char_range.start(), 2913 Range(render_text->lines()[j].segments[0].char_range.start(),
2870 render_text.lines()[j].segments[segment_size - 1].char_range.end()); 2914 render_text->lines()[j]
2915 .segments[segment_size - 1]
2916 .char_range.end());
2871 EXPECT_EQ(kTestScenarios[i].char_ranges[j], line_range); 2917 EXPECT_EQ(kTestScenarios[i].char_ranges[j], line_range);
2872 EXPECT_EQ(kTestScenarios[i].char_ranges[j].length() * kGlyphSize, 2918 EXPECT_EQ(kTestScenarios[i].char_ranges[j].length() * kGlyphSize,
2873 render_text.lines()[j].size.width()); 2919 render_text->lines()[j].size.width());
2874 } 2920 }
2875 } 2921 }
2876 } 2922 }
2877 2923
2878 // Test that Surrogate pairs or combining character sequences do not get 2924 // Test that Surrogate pairs or combining character sequences do not get
2879 // separated by line breaking. 2925 // separated by line breaking.
2880 TEST_F(RenderTextTest, Multiline_SurrogatePairsOrCombiningChars) { 2926 TEST_P(RenderTextHarfBuzzTest, Multiline_SurrogatePairsOrCombiningChars) {
2881 RenderTextHarfBuzz render_text; 2927 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
2882 render_text.SetMultiline(true); 2928 render_text->SetMultiline(true);
2883 render_text.SetWordWrapBehavior(WRAP_LONG_WORDS); 2929 render_text->SetWordWrapBehavior(WRAP_LONG_WORDS);
2884 2930
2885 // Below is 'MUSICAL SYMBOL G CLEF' (U+1D11E), which is represented in UTF-16 2931 // Below is 'MUSICAL SYMBOL G CLEF' (U+1D11E), which is represented in UTF-16
2886 // as two code units forming a surrogate pair: 0xD834 0xDD1E. 2932 // as two code units forming a surrogate pair: 0xD834 0xDD1E.
2887 const base::char16 kSurrogate[] = {0xD834, 0xDD1E, 0}; 2933 const base::char16 kSurrogate[] = {0xD834, 0xDD1E, 0};
2888 const base::string16 text_surrogate(kSurrogate); 2934 const base::string16 text_surrogate(kSurrogate);
2889 const int kSurrogateWidth = 2935 const int kSurrogateWidth =
2890 GetStringWidth(kSurrogate, render_text.font_list()); 2936 GetStringWidth(kSurrogate, render_text->font_list());
2891 2937
2892 // Below is a Devanagari two-character combining sequence U+0921 U+093F. The 2938 // Below is a Devanagari two-character combining sequence U+0921 U+093F. The
2893 // sequence forms a single display character and should not be separated. 2939 // sequence forms a single display character and should not be separated.
2894 const base::char16 kCombiningChars[] = {0x921, 0x93F, 0}; 2940 const base::char16 kCombiningChars[] = {0x921, 0x93F, 0};
2895 const base::string16 text_combining(kCombiningChars); 2941 const base::string16 text_combining(kCombiningChars);
2896 const int kCombiningCharsWidth = 2942 const int kCombiningCharsWidth =
2897 GetStringWidth(kCombiningChars, render_text.font_list()); 2943 GetStringWidth(kCombiningChars, render_text->font_list());
2898 2944
2899 const struct { 2945 const struct {
2900 const base::string16 text; 2946 const base::string16 text;
2901 const int display_width; 2947 const int display_width;
2902 const Range char_ranges[3]; 2948 const Range char_ranges[3];
2903 } kTestScenarios[] = { 2949 } kTestScenarios[] = {
2904 { text_surrogate + text_surrogate + text_surrogate, 2950 { text_surrogate + text_surrogate + text_surrogate,
2905 kSurrogateWidth / 2 * 3, 2951 kSurrogateWidth / 2 * 3,
2906 { Range(0, 2), Range(2, 4), Range(4, 6) } }, 2952 { Range(0, 2), Range(2, 4), Range(4, 6) } },
2907 { text_surrogate + UTF8ToUTF16(" ") + kCombiningChars, 2953 { text_surrogate + UTF8ToUTF16(" ") + kCombiningChars,
2908 std::min(kSurrogateWidth, kCombiningCharsWidth) / 2, 2954 std::min(kSurrogateWidth, kCombiningCharsWidth) / 2,
2909 { Range(0, 2), Range(2, 3), Range(3, 5) } }, 2955 { Range(0, 2), Range(2, 3), Range(3, 5) } },
2910 }; 2956 };
2911 2957
2912 Canvas canvas;
2913
2914 for (size_t i = 0; i < arraysize(kTestScenarios); ++i) { 2958 for (size_t i = 0; i < arraysize(kTestScenarios); ++i) {
2915 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i)); 2959 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i));
2916 render_text.SetText(kTestScenarios[i].text); 2960 render_text->SetText(kTestScenarios[i].text);
2917 render_text.SetDisplayRect(Rect(0, 0, kTestScenarios[i].display_width, 0)); 2961 render_text->SetDisplayRect(Rect(0, 0, kTestScenarios[i].display_width, 0));
2918 render_text.Draw(&canvas); 2962 render_text->Draw(canvas());
2919 2963
2920 ASSERT_EQ(3u, render_text.lines().size()); 2964 ASSERT_EQ(3u, render_text->lines().size());
2921 for (size_t j = 0; j < render_text.lines().size(); ++j) { 2965 for (size_t j = 0; j < render_text->lines().size(); ++j) {
2922 SCOPED_TRACE(base::StringPrintf("%" PRIuS "-th line", j)); 2966 SCOPED_TRACE(base::StringPrintf("%" PRIuS "-th line", j));
2923 // There is only one segment in each line. 2967 // There is only one segment in each line.
2924 EXPECT_EQ(kTestScenarios[i].char_ranges[j], 2968 EXPECT_EQ(kTestScenarios[i].char_ranges[j],
2925 render_text.lines()[j].segments[0].char_range); 2969 render_text->lines()[j].segments[0].char_range);
2926 } 2970 }
2927 } 2971 }
2928 } 2972 }
2929 2973
2930 // Test that Zero width characters have the correct line breaking behavior. 2974 // Test that Zero width characters have the correct line breaking behavior.
2931 TEST_F(RenderTextTest, Multiline_ZeroWidthChars) { 2975 TEST_P(RenderTextHarfBuzzTest, Multiline_ZeroWidthChars) {
2932 RenderTextHarfBuzz render_text; 2976 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
2933 render_text.SetMultiline(true); 2977 render_text->SetMultiline(true);
2934 render_text.SetWordWrapBehavior(WRAP_LONG_WORDS); 2978 render_text->SetWordWrapBehavior(WRAP_LONG_WORDS);
2935 2979
2936 const base::char16 kZeroWidthSpace = {0x200B}; 2980 const base::char16 kZeroWidthSpace = {0x200B};
2937 const base::string16 text(UTF8ToUTF16("test") + kZeroWidthSpace + 2981 const base::string16 text(UTF8ToUTF16("test") + kZeroWidthSpace +
2938 UTF8ToUTF16("\n") + kZeroWidthSpace + 2982 UTF8ToUTF16("\n") + kZeroWidthSpace +
2939 UTF8ToUTF16("test.")); 2983 UTF8ToUTF16("test."));
2940 const int kTestWidth = 2984 const int kTestWidth =
2941 GetStringWidth(UTF8ToUTF16("test"), render_text.font_list()); 2985 GetStringWidth(UTF8ToUTF16("test"), render_text->font_list());
2942 const Range char_ranges[3] = {Range(0, 5), Range(6, 11), Range(11, 12)}; 2986 const Range char_ranges[3] = {Range(0, 5), Range(6, 11), Range(11, 12)};
2943 2987
2944 Canvas canvas; 2988 render_text->SetText(text);
2945 render_text.SetText(text); 2989 render_text->SetDisplayRect(Rect(0, 0, kTestWidth, 0));
2946 render_text.SetDisplayRect(Rect(0, 0, kTestWidth, 0)); 2990 render_text->Draw(canvas());
2947 render_text.Draw(&canvas);
2948 2991
2949 ASSERT_EQ(3u, render_text.lines().size()); 2992 ASSERT_EQ(3u, render_text->lines().size());
2950 for (size_t j = 0; j < render_text.lines().size(); ++j) { 2993 for (size_t j = 0; j < render_text->lines().size(); ++j) {
2951 SCOPED_TRACE(base::StringPrintf("%" PRIuS "-th line", j)); 2994 SCOPED_TRACE(base::StringPrintf("%" PRIuS "-th line", j));
2952 int segment_size = render_text.lines()[j].segments.size(); 2995 int segment_size = render_text->lines()[j].segments.size();
2953 ASSERT_GT(segment_size, 0); 2996 ASSERT_GT(segment_size, 0);
2954 Range line_range( 2997 Range line_range(
2955 render_text.lines()[j].segments[0].char_range.start(), 2998 render_text->lines()[j].segments[0].char_range.start(),
2956 render_text.lines()[j].segments[segment_size - 1].char_range.end()); 2999 render_text->lines()[j].segments[segment_size - 1].char_range.end());
2957 EXPECT_EQ(char_ranges[j], line_range); 3000 EXPECT_EQ(char_ranges[j], line_range);
2958 } 3001 }
2959 } 3002 }
2960 3003
2961 TEST_F(RenderTextTest, NewlineWithoutMultilineFlag) { 3004 TEST_P(RenderTextHarfBuzzTest, NewlineWithoutMultilineFlag) {
2962 const wchar_t* kTestStrings[] = { 3005 const wchar_t* kTestStrings[] = {
2963 L"abc\ndef", L"a \n b ", L"ab\n", L"a\n\nb", L"\nab", L"\n", 3006 L"abc\ndef", L"a \n b ", L"ab\n", L"a\n\nb", L"\nab", L"\n",
2964 }; 3007 };
2965 3008
2966 RenderTextHarfBuzz render_text; 3009 RenderText* render_text = GetRenderText();
2967 render_text.SetDisplayRect(Rect(200, 1000)); 3010 render_text->SetDisplayRect(Rect(200, 1000));
2968 Canvas canvas;
2969 3011
2970 for (size_t i = 0; i < arraysize(kTestStrings); ++i) { 3012 for (size_t i = 0; i < arraysize(kTestStrings); ++i) {
2971 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i)); 3013 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i));
2972 render_text.SetText(WideToUTF16(kTestStrings[i])); 3014 render_text->SetText(WideToUTF16(kTestStrings[i]));
2973 render_text.Draw(&canvas); 3015 render_text->Draw(canvas());
2974 3016
2975 EXPECT_EQ(1U, render_text.lines_.size()); 3017 EXPECT_EQ(1U, render_text->lines_.size());
2976 } 3018 }
2977 } 3019 }
2978 3020
2979 // Make sure the horizontal positions of runs in a line (left-to-right for 3021 // Make sure the horizontal positions of runs in a line (left-to-right for
2980 // LTR languages and right-to-left for RTL languages). 3022 // LTR languages and right-to-left for RTL languages).
2981 TEST_F(RenderTextTest, HarfBuzz_HorizontalPositions) { 3023 TEST_P(RenderTextHarfBuzzTest, HarfBuzz_HorizontalPositions) {
2982 const struct { 3024 const struct {
2983 const wchar_t* const text; 3025 const wchar_t* const text;
2984 const Range first_run_char_range; 3026 const Range first_run_char_range;
2985 const Range second_run_char_range; 3027 const Range second_run_char_range;
2986 bool is_rtl; 3028 bool is_rtl;
2987 } kTestStrings[] = { 3029 } kTestStrings[] = {
2988 { L"abc\x3042\x3044\x3046\x3048\x304A", Range(0, 3), Range(3, 8), false }, 3030 { L"abc\x3042\x3044\x3046\x3048\x304A", Range(0, 3), Range(3, 8), false },
2989 { L"\x062A\x0641\x0627\x062D" 3031 { L"\x062A\x0641\x0627\x062D"
2990 L"\x05EA\x05E4\x05D5\x05D6\x05D9\x05DA\x05DB\x05DD", 3032 L"\x05EA\x05E4\x05D5\x05D6\x05D9\x05DA\x05DB\x05DD",
2991 Range(0, 4), Range(4, 12), true }, 3033 Range(0, 4), Range(4, 12), true },
2992 }; 3034 };
2993 3035
2994 RenderTextHarfBuzz render_text; 3036 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
2995 Canvas canvas;
2996 TestSkiaTextRenderer renderer(&canvas);
2997 3037
2998 for (size_t i = 0; i < arraysize(kTestStrings); ++i) { 3038 for (size_t i = 0; i < arraysize(kTestStrings); ++i) {
2999 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i)); 3039 SCOPED_TRACE(base::StringPrintf("kTestStrings[%" PRIuS "]", i));
3000 render_text.SetText(WideToUTF16(kTestStrings[i].text)); 3040 render_text->SetText(WideToUTF16(kTestStrings[i].text));
3001 3041
3002 render_text.EnsureLayout(); 3042 render_text->EnsureLayout();
3003 const internal::TextRunList* run_list = render_text.GetRunList(); 3043 const internal::TextRunList* run_list = render_text->GetRunList();
3004 ASSERT_EQ(2U, run_list->runs().size()); 3044 ASSERT_EQ(2U, run_list->runs().size());
3005 EXPECT_EQ(kTestStrings[i].first_run_char_range, run_list->runs()[0]->range); 3045 EXPECT_EQ(kTestStrings[i].first_run_char_range, run_list->runs()[0]->range);
3006 EXPECT_EQ(kTestStrings[i].second_run_char_range, 3046 EXPECT_EQ(kTestStrings[i].second_run_char_range,
3007 run_list->runs()[1]->range); 3047 run_list->runs()[1]->range);
3008 // If it's RTL, the visual order is reversed. 3048 // If it's RTL, the visual order is reversed.
3009 if (kTestStrings[i].is_rtl) { 3049 if (kTestStrings[i].is_rtl) {
3010 EXPECT_EQ(1U, run_list->logical_to_visual(0)); 3050 EXPECT_EQ(1U, run_list->logical_to_visual(0));
3011 EXPECT_EQ(0U, run_list->logical_to_visual(1)); 3051 EXPECT_EQ(0U, run_list->logical_to_visual(1));
3012 } else { 3052 } else {
3013 EXPECT_EQ(0U, run_list->logical_to_visual(0)); 3053 EXPECT_EQ(0U, run_list->logical_to_visual(0));
3014 EXPECT_EQ(1U, run_list->logical_to_visual(1)); 3054 EXPECT_EQ(1U, run_list->logical_to_visual(1));
3015 } 3055 }
3016 3056
3017 render_text.DrawVisualText(&renderer); 3057 render_text->DrawVisualText(renderer());
3018 3058
3019 std::vector<TestSkiaTextRenderer::TextLog> text_log; 3059 std::vector<TestSkiaTextRenderer::TextLog> text_log;
3020 renderer.GetTextLogAndReset(&text_log); 3060 renderer()->GetTextLogAndReset(&text_log);
3021 3061
3022 EXPECT_EQ(2U, text_log.size()); 3062 EXPECT_EQ(2U, text_log.size());
3023 3063
3024 // Verifies the DrawText happens in the visual order and left-to-right. 3064 // Verifies the DrawText happens in the visual order and left-to-right.
3025 // If the text is RTL, the logically first run should be drawn at last. 3065 // If the text is RTL, the logically first run should be drawn at last.
3026 EXPECT_EQ(run_list->runs()[run_list->logical_to_visual(0)]->glyph_count, 3066 EXPECT_EQ(run_list->runs()[run_list->logical_to_visual(0)]->glyph_count,
3027 text_log[0].glyph_count); 3067 text_log[0].glyph_count);
3028 EXPECT_EQ(run_list->runs()[run_list->logical_to_visual(1)]->glyph_count, 3068 EXPECT_EQ(run_list->runs()[run_list->logical_to_visual(1)]->glyph_count,
3029 text_log[1].glyph_count); 3069 text_log[1].glyph_count);
3030 EXPECT_LT(text_log[0].origin.x(), text_log[1].origin.x()); 3070 EXPECT_LT(text_log[0].origin.x(), text_log[1].origin.x());
3031 } 3071 }
3032 } 3072 }
3033 3073
3034 // Test TextRunHarfBuzz's cluster finding logic. 3074 // Test TextRunHarfBuzz's cluster finding logic.
3035 TEST_F(RenderTextTest, HarfBuzz_Clusters) { 3075 TEST_P(RenderTextHarfBuzzTest, HarfBuzz_Clusters) {
3036 struct { 3076 struct {
3037 uint32_t glyph_to_char[4]; 3077 uint32_t glyph_to_char[4];
3038 Range chars[4]; 3078 Range chars[4];
3039 Range glyphs[4]; 3079 Range glyphs[4];
3040 bool is_rtl; 3080 bool is_rtl;
3041 } cases[] = { 3081 } cases[] = {
3042 { // From string "A B C D" to glyphs "a b c d". 3082 { // From string "A B C D" to glyphs "a b c d".
3043 { 0, 1, 2, 3 }, 3083 { 0, 1, 2, 3 },
3044 { Range(0, 1), Range(1, 2), Range(2, 3), Range(3, 4) }, 3084 { Range(0, 1), Range(1, 2), Range(2, 3), Range(3, 4) },
3045 { Range(0, 1), Range(1, 2), Range(2, 3), Range(3, 4) }, 3085 { Range(0, 1), Range(1, 2), Range(2, 3), Range(3, 4) },
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
3081 Range glyphs; 3121 Range glyphs;
3082 run.GetClusterAt(j, &chars, &glyphs); 3122 run.GetClusterAt(j, &chars, &glyphs);
3083 EXPECT_EQ(cases[i].chars[j], chars); 3123 EXPECT_EQ(cases[i].chars[j], chars);
3084 EXPECT_EQ(cases[i].glyphs[j], glyphs); 3124 EXPECT_EQ(cases[i].glyphs[j], glyphs);
3085 EXPECT_EQ(cases[i].glyphs[j], run.CharRangeToGlyphRange(chars)); 3125 EXPECT_EQ(cases[i].glyphs[j], run.CharRangeToGlyphRange(chars));
3086 } 3126 }
3087 } 3127 }
3088 } 3128 }
3089 3129
3090 // Ensure that graphemes with multiple code points do not get split. 3130 // Ensure that graphemes with multiple code points do not get split.
3091 TEST_F(RenderTextTest, HarfBuzz_SubglyphGraphemeCases) { 3131 TEST_P(RenderTextHarfBuzzTest, HarfBuzz_SubglyphGraphemeCases) {
3092 const wchar_t* cases[] = { 3132 const wchar_t* cases[] = {
3093 // "A" with a combining umlaut, followed by a "B". 3133 // "A" with a combining umlaut, followed by a "B".
3094 L"A\x0308" L"B", 3134 L"A\x0308" L"B",
3095 // Devanagari biconsonantal conjunct "ki", followed by an "a". 3135 // Devanagari biconsonantal conjunct "ki", followed by an "a".
3096 L"\x0915\x093f\x0905", 3136 L"\x0915\x093f\x0905",
3097 // Thai consonant and vowel pair "cho chan" + "sara am", followed by Thai 3137 // Thai consonant and vowel pair "cho chan" + "sara am", followed by Thai
3098 // digit 0. 3138 // digit 0.
3099 L"\x0e08\x0e33\x0E50", 3139 L"\x0e08\x0e33\x0E50",
3100 }; 3140 };
3101 3141
3102 RenderTextHarfBuzz render_text; 3142 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
3103 3143
3104 for (size_t i = 0; i < arraysize(cases); ++i) { 3144 for (size_t i = 0; i < arraysize(cases); ++i) {
3105 SCOPED_TRACE(base::StringPrintf("Case %" PRIuS, i)); 3145 SCOPED_TRACE(base::StringPrintf("Case %" PRIuS, i));
3106 3146
3107 base::string16 text = WideToUTF16(cases[i]); 3147 base::string16 text = WideToUTF16(cases[i]);
3108 render_text.SetText(text); 3148 render_text->SetText(text);
3109 render_text.EnsureLayout(); 3149 render_text->EnsureLayout();
3110 internal::TextRunList* run_list = render_text.GetRunList(); 3150 internal::TextRunList* run_list = render_text->GetRunList();
3111 ASSERT_EQ(1U, run_list->size()); 3151 ASSERT_EQ(1U, run_list->size());
3112 internal::TextRunHarfBuzz* run = run_list->runs()[0]; 3152 internal::TextRunHarfBuzz* run = run_list->runs()[0];
3113 3153
3114 base::i18n::BreakIterator* iter = render_text.grapheme_iterator_.get(); 3154 base::i18n::BreakIterator* iter = render_text->grapheme_iterator_.get();
3115 auto first_grapheme_bounds = run->GetGraphemeBounds(iter, 0); 3155 auto first_grapheme_bounds = run->GetGraphemeBounds(iter, 0);
3116 EXPECT_EQ(first_grapheme_bounds, run->GetGraphemeBounds(iter, 1)); 3156 EXPECT_EQ(first_grapheme_bounds, run->GetGraphemeBounds(iter, 1));
3117 auto second_grapheme_bounds = run->GetGraphemeBounds(iter, 2); 3157 auto second_grapheme_bounds = run->GetGraphemeBounds(iter, 2);
3118 EXPECT_EQ(first_grapheme_bounds.end(), second_grapheme_bounds.start()); 3158 EXPECT_EQ(first_grapheme_bounds.end(), second_grapheme_bounds.start());
3119 } 3159 }
3120 } 3160 }
3121 3161
3122 // Test the partition of a multi-grapheme cluster into grapheme ranges. 3162 // Test the partition of a multi-grapheme cluster into grapheme ranges.
3123 TEST_F(RenderTextTest, HarfBuzz_SubglyphGraphemePartition) { 3163 TEST_P(RenderTextHarfBuzzTest, HarfBuzz_SubglyphGraphemePartition) {
3124 struct { 3164 struct {
3125 uint32_t glyph_to_char[2]; 3165 uint32_t glyph_to_char[2];
3126 Range bounds[4]; 3166 Range bounds[4];
3127 bool is_rtl; 3167 bool is_rtl;
3128 } cases[] = { 3168 } cases[] = {
3129 { // From string "A B C D" to glyphs "a bcd". 3169 { // From string "A B C D" to glyphs "a bcd".
3130 { 0, 1 }, 3170 { 0, 1 },
3131 { Range(0, 10), Range(10, 13), Range(13, 17), Range(17, 20) }, 3171 { Range(0, 10), Range(10, 13), Range(13, 17), Range(17, 20) },
3132 false 3172 false
3133 }, 3173 },
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
3168 run.positions[j].set(j * 10, 0); 3208 run.positions[j].set(j * 10, 0);
3169 3209
3170 for (size_t j = 0; j < 4; ++j) { 3210 for (size_t j = 0; j < 4; ++j) {
3171 SCOPED_TRACE(base::StringPrintf("Case %" PRIuS ", char %" PRIuS, i, j)); 3211 SCOPED_TRACE(base::StringPrintf("Case %" PRIuS ", char %" PRIuS, i, j));
3172 EXPECT_EQ(cases[i].bounds[j], 3212 EXPECT_EQ(cases[i].bounds[j],
3173 run.GetGraphemeBounds(iter.get(), j).Round()); 3213 run.GetGraphemeBounds(iter.get(), j).Round());
3174 } 3214 }
3175 } 3215 }
3176 } 3216 }
3177 3217
3178 TEST_F(RenderTextTest, HarfBuzz_RunDirection) { 3218 TEST_P(RenderTextHarfBuzzTest, HarfBuzz_RunDirection) {
3179 RenderTextHarfBuzz render_text; 3219 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
3180 const base::string16 mixed = WideToUTF16( 3220 const base::string16 mixed = WideToUTF16(
3181 L"\x05D0\x05D1" 3221 L"\x05D0\x05D1"
3182 L"1234" 3222 L"1234"
3183 L"\x05D2\x05D3" 3223 L"\x05D2\x05D3"
3184 L"abc"); 3224 L"abc");
3185 render_text.SetText(mixed); 3225 render_text->SetText(mixed);
3186 3226
3187 // Get the run list for both display directions. 3227 // Get the run list for both display directions.
3188 render_text.SetDirectionalityMode(DIRECTIONALITY_FORCE_LTR); 3228 render_text->SetDirectionalityMode(DIRECTIONALITY_FORCE_LTR);
3189 render_text.EnsureLayout(); 3229 render_text->EnsureLayout();
3190 internal::TextRunList* run_list = render_text.GetRunList(); 3230 internal::TextRunList* run_list = render_text->GetRunList();
3191 ASSERT_EQ(4U, run_list->size()); 3231 ASSERT_EQ(4U, run_list->size());
3192 EXPECT_TRUE(run_list->runs()[0]->is_rtl); 3232 EXPECT_TRUE(run_list->runs()[0]->is_rtl);
3193 EXPECT_FALSE(run_list->runs()[1]->is_rtl); 3233 EXPECT_FALSE(run_list->runs()[1]->is_rtl);
3194 EXPECT_TRUE(run_list->runs()[2]->is_rtl); 3234 EXPECT_TRUE(run_list->runs()[2]->is_rtl);
3195 EXPECT_FALSE(run_list->runs()[3]->is_rtl); 3235 EXPECT_FALSE(run_list->runs()[3]->is_rtl);
3196 3236
3197 // The Latin letters should appear to the right of the other runs. 3237 // The Latin letters should appear to the right of the other runs.
3198 EXPECT_EQ(2U, run_list->logical_to_visual(0)); 3238 EXPECT_EQ(2U, run_list->logical_to_visual(0));
3199 EXPECT_EQ(1U, run_list->logical_to_visual(1)); 3239 EXPECT_EQ(1U, run_list->logical_to_visual(1));
3200 EXPECT_EQ(0U, run_list->logical_to_visual(2)); 3240 EXPECT_EQ(0U, run_list->logical_to_visual(2));
3201 EXPECT_EQ(3U, run_list->logical_to_visual(3)); 3241 EXPECT_EQ(3U, run_list->logical_to_visual(3));
3202 3242
3203 render_text.SetDirectionalityMode(DIRECTIONALITY_FORCE_RTL); 3243 render_text->SetDirectionalityMode(DIRECTIONALITY_FORCE_RTL);
3204 render_text.EnsureLayout(); 3244 render_text->EnsureLayout();
3205 run_list = render_text.GetRunList(); 3245 run_list = render_text->GetRunList();
3206 ASSERT_EQ(4U, run_list->size()); 3246 ASSERT_EQ(4U, run_list->size());
3207 EXPECT_TRUE(run_list->runs()[0]->is_rtl); 3247 EXPECT_TRUE(run_list->runs()[0]->is_rtl);
3208 EXPECT_FALSE(run_list->runs()[1]->is_rtl); 3248 EXPECT_FALSE(run_list->runs()[1]->is_rtl);
3209 EXPECT_TRUE(run_list->runs()[2]->is_rtl); 3249 EXPECT_TRUE(run_list->runs()[2]->is_rtl);
3210 EXPECT_FALSE(run_list->runs()[3]->is_rtl); 3250 EXPECT_FALSE(run_list->runs()[3]->is_rtl);
3211 3251
3212 // The Latin letters should appear to the left of the other runs. 3252 // The Latin letters should appear to the left of the other runs.
3213 EXPECT_EQ(3U, run_list->logical_to_visual(0)); 3253 EXPECT_EQ(3U, run_list->logical_to_visual(0));
3214 EXPECT_EQ(2U, run_list->logical_to_visual(1)); 3254 EXPECT_EQ(2U, run_list->logical_to_visual(1));
3215 EXPECT_EQ(1U, run_list->logical_to_visual(2)); 3255 EXPECT_EQ(1U, run_list->logical_to_visual(2));
3216 EXPECT_EQ(0U, run_list->logical_to_visual(3)); 3256 EXPECT_EQ(0U, run_list->logical_to_visual(3));
3217 } 3257 }
3218 3258
3219 TEST_F(RenderTextTest, HarfBuzz_BreakRunsByUnicodeBlocks) { 3259 TEST_P(RenderTextHarfBuzzTest, HarfBuzz_BreakRunsByUnicodeBlocks) {
3220 RenderTextHarfBuzz render_text; 3260 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
3221 3261
3222 // The '\x25B6' "play character" should break runs. http://crbug.com/278913 3262 // The '\x25B6' "play character" should break runs. http://crbug.com/278913
3223 render_text.SetText(WideToUTF16(L"x\x25B6y")); 3263 render_text->SetText(WideToUTF16(L"x\x25B6y"));
3224 render_text.EnsureLayout(); 3264 render_text->EnsureLayout();
3225 internal::TextRunList* run_list = render_text.GetRunList(); 3265 internal::TextRunList* run_list = render_text->GetRunList();
3226 ASSERT_EQ(3U, run_list->size()); 3266 ASSERT_EQ(3U, run_list->size());
3227 EXPECT_EQ(Range(0, 1), run_list->runs()[0]->range); 3267 EXPECT_EQ(Range(0, 1), run_list->runs()[0]->range);
3228 EXPECT_EQ(Range(1, 2), run_list->runs()[1]->range); 3268 EXPECT_EQ(Range(1, 2), run_list->runs()[1]->range);
3229 EXPECT_EQ(Range(2, 3), run_list->runs()[2]->range); 3269 EXPECT_EQ(Range(2, 3), run_list->runs()[2]->range);
3230 3270
3231 render_text.SetText(WideToUTF16(L"x \x25B6 y")); 3271 render_text->SetText(WideToUTF16(L"x \x25B6 y"));
3232 render_text.EnsureLayout(); 3272 render_text->EnsureLayout();
3233 run_list = render_text.GetRunList(); 3273 run_list = render_text->GetRunList();
3234 ASSERT_EQ(4U, run_list->size()); 3274 ASSERT_EQ(4U, run_list->size());
3235 EXPECT_EQ(Range(0, 2), run_list->runs()[0]->range); 3275 EXPECT_EQ(Range(0, 2), run_list->runs()[0]->range);
3236 EXPECT_EQ(Range(2, 3), run_list->runs()[1]->range); 3276 EXPECT_EQ(Range(2, 3), run_list->runs()[1]->range);
3237 EXPECT_EQ(Range(3, 4), run_list->runs()[2]->range); 3277 EXPECT_EQ(Range(3, 4), run_list->runs()[2]->range);
3238 EXPECT_EQ(Range(4, 5), run_list->runs()[3]->range); 3278 EXPECT_EQ(Range(4, 5), run_list->runs()[3]->range);
3239 } 3279 }
3240 3280
3241 TEST_F(RenderTextTest, HarfBuzz_BreakRunsByEmoji) { 3281 TEST_P(RenderTextHarfBuzzTest, HarfBuzz_BreakRunsByEmoji) {
3242 RenderTextHarfBuzz render_text; 3282 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
3243 3283
3244 // \xF0\x9F\x98\x81 (U+1F601) is smile icon emoji. \xE2\x9C\xA8 (U+2728) is 3284 // \xF0\x9F\x98\x81 (U+1F601) is smile icon emoji. \xE2\x9C\xA8 (U+2728) is
3245 // a sparkle icon. Both can be drawn with color emoji fonts, so runs should be 3285 // a sparkle icon. Both can be drawn with color emoji fonts, so runs should be
3246 // separated. See crbug.com/448909 3286 // separated. See crbug.com/448909
3247 render_text.SetText(UTF8ToUTF16("x\xF0\x9F\x98\x81y\xE2\x9C\xA8")); 3287 render_text->SetText(UTF8ToUTF16("x\xF0\x9F\x98\x81y\xE2\x9C\xA8"));
3248 render_text.EnsureLayout(); 3288 render_text->EnsureLayout();
3249 internal::TextRunList* run_list = render_text.GetRunList(); 3289 internal::TextRunList* run_list = render_text->GetRunList();
3250 ASSERT_EQ(4U, run_list->size()); 3290 ASSERT_EQ(4U, run_list->size());
3251 EXPECT_EQ(Range(0, 1), run_list->runs()[0]->range); 3291 EXPECT_EQ(Range(0, 1), run_list->runs()[0]->range);
3252 // The length is 2 since U+1F601 is represented as a surrogate pair in UTF16. 3292 // The length is 2 since U+1F601 is represented as a surrogate pair in UTF16.
3253 EXPECT_EQ(Range(1, 3), run_list->runs()[1]->range); 3293 EXPECT_EQ(Range(1, 3), run_list->runs()[1]->range);
3254 EXPECT_EQ(Range(3, 4), run_list->runs()[2]->range); 3294 EXPECT_EQ(Range(3, 4), run_list->runs()[2]->range);
3255 EXPECT_EQ(Range(4, 5), run_list->runs()[3]->range); 3295 EXPECT_EQ(Range(4, 5), run_list->runs()[3]->range);
3256 } 3296 }
3257 3297
3258 TEST_F(RenderTextTest, HarfBuzz_BreakRunsByAscii) { 3298 TEST_P(RenderTextHarfBuzzTest, HarfBuzz_BreakRunsByAscii) {
3259 RenderTextHarfBuzz render_text; 3299 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
3260 3300
3261 // \xF0\x9F\x90\xB1 (U+1F431) is a cat face. It should be put into a separate 3301 // \xF0\x9F\x90\xB1 (U+1F431) is a cat face. It should be put into a separate
3262 // run from the ASCII period character. 3302 // run from the ASCII period character.
3263 render_text.SetText(UTF8ToUTF16("\xF0\x9F\x90\xB1.")); 3303 render_text->SetText(UTF8ToUTF16("\xF0\x9F\x90\xB1."));
3264 render_text.EnsureLayout(); 3304 render_text->EnsureLayout();
3265 internal::TextRunList* run_list = render_text.GetRunList(); 3305 internal::TextRunList* run_list = render_text->GetRunList();
3266 ASSERT_EQ(2U, run_list->size()); 3306 ASSERT_EQ(2U, run_list->size());
3267 // U+1F431 is represented as a surrogate pair in UTF16. 3307 // U+1F431 is represented as a surrogate pair in UTF16.
3268 EXPECT_EQ(Range(0, 2), run_list->runs()[0]->range); 3308 EXPECT_EQ(Range(0, 2), run_list->runs()[0]->range);
3269 EXPECT_EQ(Range(2, 3), run_list->runs()[1]->range); 3309 EXPECT_EQ(Range(2, 3), run_list->runs()[1]->range);
3270 } 3310 }
3271 3311
3272 TEST_F(RenderTextTest, GlyphBounds) { 3312 TEST_P(RenderTextHarfBuzzTest, GlyphBounds) {
3273 const wchar_t* kTestStrings[] = { 3313 const wchar_t* kTestStrings[] = {
3274 L"asdf 1234 qwer", L"\x0647\x0654", L"\x0645\x0631\x062D\x0628\x0627" 3314 L"asdf 1234 qwer", L"\x0647\x0654", L"\x0645\x0631\x062D\x0628\x0627"
3275 }; 3315 };
3276 std::unique_ptr<RenderText> render_text(new RenderTextHarfBuzz); 3316 RenderText* render_text = GetRenderText();
3277 3317
3278 for (size_t i = 0; i < arraysize(kTestStrings); ++i) { 3318 for (size_t i = 0; i < arraysize(kTestStrings); ++i) {
3279 render_text->SetText(WideToUTF16(kTestStrings[i])); 3319 render_text->SetText(WideToUTF16(kTestStrings[i]));
3280 render_text->EnsureLayout(); 3320 render_text->EnsureLayout();
3281 3321
3282 for (size_t j = 0; j < render_text->text().length(); ++j) 3322 for (size_t j = 0; j < render_text->text().length(); ++j)
3283 EXPECT_FALSE(render_text->GetGlyphBounds(j).is_empty()); 3323 EXPECT_FALSE(render_text->GetGlyphBounds(j).is_empty());
3284 } 3324 }
3285 } 3325 }
3286 3326
3287 // Ensure that shaping with a non-existent font does not cause a crash. 3327 // Ensure that shaping with a non-existent font does not cause a crash.
3288 TEST_F(RenderTextTest, HarfBuzz_NonExistentFont) { 3328 TEST_P(RenderTextHarfBuzzTest, HarfBuzz_NonExistentFont) {
3289 RenderTextHarfBuzz render_text; 3329 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
3290 render_text.SetText(ASCIIToUTF16("test")); 3330 render_text->SetText(ASCIIToUTF16("test"));
3291 render_text.EnsureLayout(); 3331 render_text->EnsureLayout();
3292 internal::TextRunList* run_list = render_text.GetRunList(); 3332 internal::TextRunList* run_list = render_text->GetRunList();
3293 ASSERT_EQ(1U, run_list->size()); 3333 ASSERT_EQ(1U, run_list->size());
3294 internal::TextRunHarfBuzz* run = run_list->runs()[0]; 3334 internal::TextRunHarfBuzz* run = run_list->runs()[0];
3295 render_text.ShapeRunWithFont(render_text.text(), 3335 render_text->ShapeRunWithFont(render_text->text(),
3296 Font("TheFontThatDoesntExist", 13), 3336 Font("TheFontThatDoesntExist", 13),
3297 FontRenderParams(), run); 3337 FontRenderParams(), run);
3298 } 3338 }
3299 3339
3300 // Ensure an empty run returns sane values to queries. 3340 // Ensure an empty run returns sane values to queries.
3301 TEST_F(RenderTextTest, HarfBuzz_EmptyRun) { 3341 TEST_P(RenderTextHarfBuzzTest, HarfBuzz_EmptyRun) {
3302 internal::TextRunHarfBuzz run((Font())); 3342 internal::TextRunHarfBuzz run((Font()));
3303 const base::string16 kString = ASCIIToUTF16("abcdefgh"); 3343 const base::string16 kString = ASCIIToUTF16("abcdefgh");
3304 std::unique_ptr<base::i18n::BreakIterator> iter(new base::i18n::BreakIterator( 3344 std::unique_ptr<base::i18n::BreakIterator> iter(new base::i18n::BreakIterator(
3305 kString, base::i18n::BreakIterator::BREAK_CHARACTER)); 3345 kString, base::i18n::BreakIterator::BREAK_CHARACTER));
3306 ASSERT_TRUE(iter->Init()); 3346 ASSERT_TRUE(iter->Init());
3307 3347
3308 run.range = Range(3, 8); 3348 run.range = Range(3, 8);
3309 run.glyph_count = 0; 3349 run.glyph_count = 0;
3310 EXPECT_EQ(Range(0, 0), run.CharRangeToGlyphRange(Range(4, 5))); 3350 EXPECT_EQ(Range(0, 0), run.CharRangeToGlyphRange(Range(4, 5)));
3311 EXPECT_EQ(Range(0, 0), run.GetGraphemeBounds(iter.get(), 4).Round()); 3351 EXPECT_EQ(Range(0, 0), run.GetGraphemeBounds(iter.get(), 4).Round());
3312 Range chars; 3352 Range chars;
3313 Range glyphs; 3353 Range glyphs;
3314 run.GetClusterAt(4, &chars, &glyphs); 3354 run.GetClusterAt(4, &chars, &glyphs);
3315 EXPECT_EQ(Range(3, 8), chars); 3355 EXPECT_EQ(Range(3, 8), chars);
3316 EXPECT_EQ(Range(0, 0), glyphs); 3356 EXPECT_EQ(Range(0, 0), glyphs);
3317 } 3357 }
3318 3358
3319 // Ensure the line breaker doesn't compute the word's width bigger than the 3359 // Ensure the line breaker doesn't compute the word's width bigger than the
3320 // actual size. See http://crbug.com/470073 3360 // actual size. See http://crbug.com/470073
3321 TEST_F(RenderTextTest, HarfBuzz_WordWidthWithDiacritics) { 3361 TEST_P(RenderTextHarfBuzzTest, HarfBuzz_WordWidthWithDiacritics) {
3322 RenderTextHarfBuzz render_text; 3362 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
3323 const base::string16 kWord = WideToUTF16(L"\u0906\u092A\u0915\u0947 "); 3363 const base::string16 kWord = WideToUTF16(L"\u0906\u092A\u0915\u0947 ");
3324 render_text.SetText(kWord); 3364 render_text->SetText(kWord);
3325 const SizeF text_size = render_text.GetStringSizeF(); 3365 const SizeF text_size = render_text->GetStringSizeF();
3326 3366
3327 render_text.SetText(kWord + kWord); 3367 render_text->SetText(kWord + kWord);
3328 render_text.SetMultiline(true); 3368 render_text->SetMultiline(true);
3329 EXPECT_EQ(text_size.width() * 2, render_text.GetStringSizeF().width()); 3369 EXPECT_EQ(text_size.width() * 2, render_text->GetStringSizeF().width());
3330 EXPECT_EQ(text_size.height(), render_text.GetStringSizeF().height()); 3370 EXPECT_EQ(text_size.height(), render_text->GetStringSizeF().height());
3331 render_text.SetDisplayRect(Rect(0, 0, std::ceil(text_size.width()), 0)); 3371 render_text->SetDisplayRect(Rect(0, 0, std::ceil(text_size.width()), 0));
3332 EXPECT_NEAR(text_size.width(), render_text.GetStringSizeF().width(), 1.0f); 3372 EXPECT_NEAR(text_size.width(), render_text->GetStringSizeF().width(), 1.0f);
3333 EXPECT_EQ(text_size.height() * 2, render_text.GetStringSizeF().height()); 3373 EXPECT_EQ(text_size.height() * 2, render_text->GetStringSizeF().height());
3334 } 3374 }
3335 3375
3336 // Ensure a string fits in a display rect with a width equal to the string's. 3376 // Ensure a string fits in a display rect with a width equal to the string's.
3337 TEST_F(RenderTextTest, StringFitsOwnWidth) { 3377 TEST_P(RenderTextTest, StringFitsOwnWidth) {
3338 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 3378 RenderText* render_text = GetRenderText();
3339 const base::string16 kString = ASCIIToUTF16("www.example.com"); 3379 const base::string16 kString = ASCIIToUTF16("www.example.com");
3340 3380
3341 render_text->SetText(kString); 3381 render_text->SetText(kString);
3342 render_text->ApplyWeight(Font::Weight::BOLD, Range(0, 3)); 3382 render_text->ApplyWeight(Font::Weight::BOLD, Range(0, 3));
3343 render_text->SetElideBehavior(ELIDE_TAIL); 3383 render_text->SetElideBehavior(ELIDE_TAIL);
3344 3384
3345 render_text->SetDisplayRect(Rect(0, 0, 500, 100)); 3385 render_text->SetDisplayRect(Rect(0, 0, 500, 100));
3346 EXPECT_EQ(kString, render_text->GetDisplayText()); 3386 EXPECT_EQ(kString, render_text->GetDisplayText());
3347 render_text->SetDisplayRect(Rect(0, 0, render_text->GetContentWidth(), 100)); 3387 render_text->SetDisplayRect(Rect(0, 0, render_text->GetContentWidth(), 100));
3348 EXPECT_EQ(kString, render_text->GetDisplayText()); 3388 EXPECT_EQ(kString, render_text->GetDisplayText());
3349 } 3389 }
3350 3390
3351 // TODO(derat): Figure out why this fails on Windows: http://crbug.com/427184 3391 // TODO(derat): Figure out why this fails on Windows: http://crbug.com/427184
3352 #if !defined(OS_WIN) 3392 #if !defined(OS_WIN)
3353 // Ensure that RenderText examines all of the fonts in its FontList before 3393 // Ensure that RenderText examines all of the fonts in its FontList before
3354 // falling back to other fonts. 3394 // falling back to other fonts.
3355 TEST_F(RenderTextTest, HarfBuzz_FontListFallback) { 3395 TEST_P(RenderTextHarfBuzzTest, HarfBuzz_FontListFallback) {
3356 // Double-check that the requested fonts are present. 3396 // Double-check that the requested fonts are present.
3357 FontList font_list("Arial, Symbol, 12px"); 3397 FontList font_list("Arial, Symbol, 12px");
3358 const std::vector<Font>& fonts = font_list.GetFonts(); 3398 const std::vector<Font>& fonts = font_list.GetFonts();
3359 ASSERT_EQ(2u, fonts.size()); 3399 ASSERT_EQ(2u, fonts.size());
3360 ASSERT_EQ("arial", 3400 ASSERT_EQ("arial",
3361 base::ToLowerASCII(fonts[0].GetActualFontNameForTesting())); 3401 base::ToLowerASCII(fonts[0].GetActualFontNameForTesting()));
3362 ASSERT_EQ("symbol", 3402 ASSERT_EQ("symbol",
3363 base::ToLowerASCII(fonts[1].GetActualFontNameForTesting())); 3403 base::ToLowerASCII(fonts[1].GetActualFontNameForTesting()));
3364 3404
3365 // "⊕" (CIRCLED PLUS) should be rendered with Symbol rather than falling back 3405 // "⊕" (CIRCLED PLUS) should be rendered with Symbol rather than falling back
3366 // to some other font that's present on the system. 3406 // to some other font that's present on the system.
3367 RenderTextHarfBuzz render_text; 3407 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
3368 render_text.SetFontList(font_list); 3408 render_text->SetFontList(font_list);
3369 render_text.SetText(UTF8ToUTF16("\xE2\x8A\x95")); 3409 render_text->SetText(UTF8ToUTF16("\xE2\x8A\x95"));
3370 const std::vector<RenderText::FontSpan> spans = 3410 const std::vector<RenderText::FontSpan> spans =
3371 render_text.GetFontSpansForTesting(); 3411 render_text->GetFontSpansForTesting();
3372 ASSERT_EQ(static_cast<size_t>(1), spans.size()); 3412 ASSERT_EQ(static_cast<size_t>(1), spans.size());
3373 EXPECT_EQ("Symbol", spans[0].first.GetFontName()); 3413 EXPECT_EQ("Symbol", spans[0].first.GetFontName());
3374 } 3414 }
3375 #endif // !defined(OS_WIN) 3415 #endif // !defined(OS_WIN)
3376 3416
3377 // Ensure that the fallback fonts of the Uniscribe font are tried for shaping. 3417 // Ensure that the fallback fonts of the Uniscribe font are tried for shaping.
3378 #if defined(OS_WIN) 3418 #if defined(OS_WIN)
3379 TEST_F(RenderTextTest, HarfBuzz_UniscribeFallback) { 3419 TEST_P(RenderTextHarfBuzzTest, HarfBuzz_UniscribeFallback) {
3380 RenderTextHarfBuzz render_text; 3420 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
3381 PlatformFontWin* font_win = new PlatformFontWin("Meiryo", 12); 3421 PlatformFontWin* font_win = new PlatformFontWin("Meiryo", 12);
3382 // Japanese name for Meiryo. This name won't be found in the system's linked 3422 // Japanese name for Meiryo. This name won't be found in the system's linked
3383 // fonts, forcing RTHB to try the Uniscribe font and its fallbacks. 3423 // fonts, forcing RTHB to try the Uniscribe font and its fallbacks.
3384 font_win->font_ref_->font_name_ = WideToUTF8(L"\x30e1\x30a4\x30ea\x30aa"); 3424 font_win->font_ref_->font_name_ = WideToUTF8(L"\x30e1\x30a4\x30ea\x30aa");
3385 FontList font_list((Font(font_win))); 3425 FontList font_list((Font(font_win)));
3386 3426
3387 render_text.SetFontList(font_list); 3427 render_text->SetFontList(font_list);
3388 // Korean character "han". 3428 // Korean character "han".
3389 render_text.SetText(WideToUTF16(L"\xd55c")); 3429 render_text->SetText(WideToUTF16(L"\xd55c"));
3390 render_text.EnsureLayout(); 3430 render_text->EnsureLayout();
3391 internal::TextRunList* run_list = render_text.GetRunList(); 3431 internal::TextRunList* run_list = render_text->GetRunList();
3392 ASSERT_EQ(1U, run_list->size()); 3432 ASSERT_EQ(1U, run_list->size());
3393 EXPECT_EQ(0U, run_list->runs()[0]->CountMissingGlyphs()); 3433 EXPECT_EQ(0U, run_list->runs()[0]->CountMissingGlyphs());
3394 } 3434 }
3395 #endif // defined(OS_WIN) 3435 #endif // defined(OS_WIN)
3396 3436
3397 // Ensure that the fallback fonts offered by GetFallbackFonts() are 3437 // Ensure that the fallback fonts offered by GetFallbackFonts() are
3398 // tried. Note this test assumes the font "Arial" doesn't provide a unicode 3438 // tried. Note this test assumes the font "Arial" doesn't provide a unicode
3399 // glyph for a particular character, and that there exists a system fallback 3439 // glyph for a particular character, and that there exists a system fallback
3400 // font which does. 3440 // font which does.
3401 // TODO(msw): Fallback doesn't find a glyph on Linux. 3441 // TODO(msw): Fallback doesn't find a glyph on Linux.
3402 #if !defined(OS_LINUX) 3442 #if !defined(OS_LINUX)
3403 TEST_F(RenderTextTest, HarfBuzz_UnicodeFallback) { 3443 TEST_P(RenderTextHarfBuzzTest, HarfBuzz_UnicodeFallback) {
3404 RenderTextHarfBuzz render_text; 3444 RenderTextHarfBuzz* render_text = GetRenderTextHarfBuzz();
3405 render_text.SetFontList(FontList("Arial, 12px")); 3445 render_text->SetFontList(FontList("Arial, 12px"));
3406 3446
3407 // Korean character "han". 3447 // Korean character "han".
3408 render_text.SetText(WideToUTF16(L"\xd55c")); 3448 render_text->SetText(WideToUTF16(L"\xd55c"));
3409 render_text.EnsureLayout(); 3449 render_text->EnsureLayout();
3410 internal::TextRunList* run_list = render_text.GetRunList(); 3450 internal::TextRunList* run_list = render_text->GetRunList();
3411 ASSERT_EQ(1U, run_list->size()); 3451 ASSERT_EQ(1U, run_list->size());
3412 EXPECT_EQ(0U, run_list->runs()[0]->CountMissingGlyphs()); 3452 EXPECT_EQ(0U, run_list->runs()[0]->CountMissingGlyphs());
3413 } 3453 }
3414 #endif // !defined(OS_LINUX) 3454 #endif // !defined(OS_LINUX)
3415 3455
3416 // http://crbug/624513 3456 // http://crbug/624513
3417 #if defined(OS_WIN) 3457 #if !defined(OS_WIN)
3418 #define MAYBE_TextDoesntClip DISABLED_TextDoesntClip
3419 #else
3420 #define MAYBE_TextDoesntClip TextDoesntClip
3421 #endif
3422 // Ensure that the width reported by RenderText is sufficient for drawing. Draws 3458 // Ensure that the width reported by RenderText is sufficient for drawing. Draws
3423 // to a canvas and checks if any pixel beyond the bounding rectangle is colored. 3459 // to a canvas and checks if any pixel beyond the bounding rectangle is colored.
3424 TEST_F(RenderTextTest, MAYBE_TextDoesntClip) { 3460 TEST_P(RenderTextTest, TextDoesntClip) {
3461 // Fails on Mac with RenderTextHarfBuzz. See http://crbug.com/640068.
3462 #if defined(OS_MACOSX)
3463 if (GetParam() == RENDER_TEXT_HARFBUZZ)
3464 return;
3465 #endif
3466
3425 const wchar_t* kTestStrings[] = { 3467 const wchar_t* kTestStrings[] = {
3426 L" ", 3468 L" ",
3427 // TODO(dschuyler): Underscores draw outside GetStringSize; 3469 // TODO(dschuyler): Underscores draw outside GetStringSize;
3428 // crbug.com/459812. This appears to be a preexisting issue that wasn't 3470 // crbug.com/459812. This appears to be a preexisting issue that wasn't
3429 // revealed by the prior unit tests. 3471 // revealed by the prior unit tests.
3430 // L"TEST_______", 3472 // L"TEST_______",
3431 L"TEST some stuff", 3473 L"TEST some stuff",
3432 L"WWWWWWWWWW", 3474 L"WWWWWWWWWW",
3433 L"gAXAXAXAXAXAXA", 3475 L"gAXAXAXAXAXAXA",
3434 // TODO(dschuyler): A-Ring draws outside GetStringSize; crbug.com/459812. 3476 // TODO(dschuyler): A-Ring draws outside GetStringSize; crbug.com/459812.
3435 // L"g\x00C5X\x00C5X\x00C5X\x00C5X\x00C5X\x00C5X\x00C5", 3477 // L"g\x00C5X\x00C5X\x00C5X\x00C5X\x00C5X\x00C5X\x00C5",
3436 L"\x0647\x0654\x0647\x0654\x0647\x0654\x0647\x0654\x0645\x0631\x062D" 3478 L"\x0647\x0654\x0647\x0654\x0647\x0654\x0647\x0654\x0645\x0631\x062D"
3437 L"\x0628\x0627"}; 3479 L"\x0628\x0627"};
3438 const Size kCanvasSize(300, 50); 3480 const Size kCanvasSize(300, 50);
3439 const int kTestSize = 10; 3481 const int kTestSize = 10;
3440 3482
3441 sk_sp<SkSurface> surface = 3483 sk_sp<SkSurface> surface =
3442 SkSurface::MakeRasterN32Premul(kCanvasSize.width(), kCanvasSize.height()); 3484 SkSurface::MakeRasterN32Premul(kCanvasSize.width(), kCanvasSize.height());
3443 Canvas canvas(sk_ref_sp(surface->getCanvas()), 1.0f); 3485 Canvas canvas(sk_ref_sp(surface->getCanvas()), 1.0f);
3444 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 3486 RenderText* render_text = GetRenderText();
3445 render_text->SetHorizontalAlignment(ALIGN_LEFT); 3487 render_text->SetHorizontalAlignment(ALIGN_LEFT);
3446 render_text->SetColor(SK_ColorBLACK); 3488 render_text->SetColor(SK_ColorBLACK);
3447 3489
3448 for (auto* string : kTestStrings) { 3490 for (auto* string : kTestStrings) {
3449 surface->getCanvas()->clear(SK_ColorWHITE); 3491 surface->getCanvas()->clear(SK_ColorWHITE);
3450 render_text->SetText(WideToUTF16(string)); 3492 render_text->SetText(WideToUTF16(string));
3451 const Size string_size = render_text->GetStringSize(); 3493 const Size string_size = render_text->GetStringSize();
3452 render_text->ApplyBaselineStyle(SUPERSCRIPT, Range(1, 2)); 3494 render_text->ApplyBaselineStyle(SUPERSCRIPT, Range(1, 2));
3453 render_text->ApplyBaselineStyle(SUPERIOR, Range(3, 4)); 3495 render_text->ApplyBaselineStyle(SUPERIOR, Range(3, 4));
3454 render_text->ApplyBaselineStyle(INFERIOR, Range(5, 6)); 3496 render_text->ApplyBaselineStyle(INFERIOR, Range(5, 6));
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
3515 // TODO(dschuyler): On Mac text draws to right of GetStringSize. This 3557 // TODO(dschuyler): On Mac text draws to right of GetStringSize. This
3516 // appears to be a preexisting issue that wasn't revealed by the prior 3558 // appears to be a preexisting issue that wasn't revealed by the prior
3517 // unit tests. 3559 // unit tests.
3518 rect_buffer.EnsureSolidRect(SK_ColorWHITE, 3560 rect_buffer.EnsureSolidRect(SK_ColorWHITE,
3519 kTestSize + string_size.width(), kTestSize, 3561 kTestSize + string_size.width(), kTestSize,
3520 kTestSize, string_size.height()); 3562 kTestSize, string_size.height());
3521 #endif 3563 #endif
3522 } 3564 }
3523 } 3565 }
3524 } 3566 }
3567 #endif // !defined(OS_WIN)
3525 3568
3526 // Ensure that the text will clip to the display rect. Draws to a canvas and 3569 // Ensure that the text will clip to the display rect. Draws to a canvas and
3527 // checks whether any pixel beyond the bounding rectangle is colored. 3570 // checks whether any pixel beyond the bounding rectangle is colored.
3528 TEST_F(RenderTextTest, TextDoesClip) { 3571 TEST_P(RenderTextTest, TextDoesClip) {
3529 const wchar_t* kTestStrings[] = {L"TEST", L"W", L"WWWW", L"gAXAXWWWW"}; 3572 const wchar_t* kTestStrings[] = {L"TEST", L"W", L"WWWW", L"gAXAXWWWW"};
3530 const Size kCanvasSize(300, 50); 3573 const Size kCanvasSize(300, 50);
3531 const int kTestSize = 10; 3574 const int kTestSize = 10;
3532 3575
3533 sk_sp<SkSurface> surface = 3576 sk_sp<SkSurface> surface =
3534 SkSurface::MakeRasterN32Premul(kCanvasSize.width(), kCanvasSize.height()); 3577 SkSurface::MakeRasterN32Premul(kCanvasSize.width(), kCanvasSize.height());
3535 Canvas canvas(sk_ref_sp(surface->getCanvas()), 1.0f); 3578 Canvas canvas(sk_ref_sp(surface->getCanvas()), 1.0f);
3536 std::unique_ptr<RenderText> render_text(RenderText::CreateInstance()); 3579 RenderText* render_text = GetRenderText();
3537 render_text->SetHorizontalAlignment(ALIGN_LEFT); 3580 render_text->SetHorizontalAlignment(ALIGN_LEFT);
3538 render_text->SetColor(SK_ColorBLACK); 3581 render_text->SetColor(SK_ColorBLACK);
3539 3582
3540 for (auto* string : kTestStrings) { 3583 for (auto* string : kTestStrings) {
3541 surface->getCanvas()->clear(SK_ColorWHITE); 3584 surface->getCanvas()->clear(SK_ColorWHITE);
3542 render_text->SetText(WideToUTF16(string)); 3585 render_text->SetText(WideToUTF16(string));
3543 const Size string_size = render_text->GetStringSize(); 3586 const Size string_size = render_text->GetStringSize();
3544 int fake_width = string_size.width() / 2; 3587 int fake_width = string_size.width() / 2;
3545 int fake_height = string_size.height() / 2; 3588 int fake_height = string_size.height() / 2;
3546 render_text->SetDisplayRect( 3589 render_text->SetDisplayRect(
(...skipping 25 matching lines...) Expand all
3572 } 3615 }
3573 { 3616 {
3574 SCOPED_TRACE("TextDoesClip Right Side"); 3617 SCOPED_TRACE("TextDoesClip Right Side");
3575 rect_buffer.EnsureSolidRect(SK_ColorWHITE, kTestSize + fake_width, 3618 rect_buffer.EnsureSolidRect(SK_ColorWHITE, kTestSize + fake_width,
3576 kTestSize, kTestSize, fake_height); 3619 kTestSize, kTestSize, fake_height);
3577 } 3620 }
3578 } 3621 }
3579 } 3622 }
3580 3623
3581 #if defined(OS_MACOSX) 3624 #if defined(OS_MACOSX)
3582 TEST_F(RenderTextTest, Mac_ElidedText) { 3625 TEST_P(RenderTextMacTest, Mac_ElidedText) {
3583 RenderTextMac render_text; 3626 RenderTextMac* render_text = GetRenderTextMac();
3584 base::string16 text(ASCIIToUTF16("This is an example.")); 3627 base::string16 text(ASCIIToUTF16("This is an example."));
3585 render_text.SetText(text); 3628 render_text->SetText(text);
3586 Size string_size = render_text.GetStringSize(); 3629 Size string_size = render_text->GetStringSize();
3587 render_text.SetDisplayRect(Rect(string_size)); 3630 render_text->SetDisplayRect(Rect(string_size));
3588 render_text.EnsureLayout(); 3631 render_text->EnsureLayout();
3589 // NOTE: Character and glyph counts are only comparable for simple text. 3632 // NOTE: Character and glyph counts are only comparable for simple text.
3590 EXPECT_EQ(text.size(), 3633 EXPECT_EQ(text.size(),
3591 static_cast<size_t>(CTLineGetGlyphCount(render_text.line_))); 3634 static_cast<size_t>(CTLineGetGlyphCount(render_text->line_)));
3592 3635
3593 render_text.SetElideBehavior(ELIDE_TAIL); 3636 render_text->SetElideBehavior(ELIDE_TAIL);
3594 string_size.set_width(string_size.width() / 2); 3637 string_size.set_width(string_size.width() / 2);
3595 render_text.SetDisplayRect(Rect(string_size)); 3638 render_text->SetDisplayRect(Rect(string_size));
3596 render_text.EnsureLayout(); 3639 render_text->EnsureLayout();
3597 CFIndex glyph_count = CTLineGetGlyphCount(render_text.line_); 3640 CFIndex glyph_count = CTLineGetGlyphCount(render_text->line_);
3598 EXPECT_GT(text.size(), static_cast<size_t>(glyph_count)); 3641 EXPECT_GT(text.size(), static_cast<size_t>(glyph_count));
3599 EXPECT_NE(0, glyph_count); 3642 EXPECT_NE(0, glyph_count);
3600 } 3643 }
3601 #endif 3644 #endif // defined(OS_MACOSX)
3602 3645
3603 // Ensure color changes are picked up by the RenderText implementation. 3646 // Ensure color changes are picked up by the RenderText implementation.
3604 TEST_F(RenderTextTest, ColorChange) { 3647 TEST_P(RenderTextTest, ColorChange) {
3605 RenderTextAllBackends backend; 3648 RenderText* render_text = GetRenderText();
3649 render_text->SetText(ASCIIToUTF16("x"));
3650 DrawVisualText();
3606 3651
3607 while (backend.Advance()) { 3652 std::vector<TestSkiaTextRenderer::TextLog> text_log;
3608 SCOPED_TRACE(testing::Message() << "backend: " << backend.GetName()); 3653 renderer()->GetTextLogAndReset(&text_log);
3609 backend->SetText(ASCIIToUTF16("x")); 3654 EXPECT_EQ(1u, text_log.size());
3610 backend.DrawVisualText(); 3655 EXPECT_EQ(SK_ColorBLACK, text_log[0].color);
3611 3656
3612 std::vector<TestSkiaTextRenderer::TextLog> text_log; 3657 render_text->SetColor(SK_ColorRED);
3613 backend.GetTextLogAndReset(&text_log); 3658 DrawVisualText();
3614 EXPECT_EQ(1u, text_log.size()); 3659 renderer()->GetTextLogAndReset(&text_log);
3615 EXPECT_EQ(SK_ColorBLACK, text_log[0].color);
3616 3660
3617 backend->SetColor(SK_ColorRED); 3661 EXPECT_EQ(1u, text_log.size());
3618 backend.DrawVisualText(); 3662 EXPECT_EQ(SK_ColorRED, text_log[0].color);
3619 backend.GetTextLogAndReset(&text_log);
3620
3621 EXPECT_EQ(1u, text_log.size());
3622 EXPECT_EQ(SK_ColorRED, text_log[0].color);
3623 }
3624 } 3663 }
3625 3664
3626 // Ensure style information propagates to the typeface on the text renderer. 3665 // Ensure style information propagates to the typeface on the text renderer.
3627 TEST_F(RenderTextTest, StylePropagated) { 3666 TEST_P(RenderTextTest, StylePropagated) {
3628 RenderTextAllBackends backend; 3667 RenderText* render_text = GetRenderText();
3629
3630 // Default-constructed fonts on Mac are system fonts. These can have all kinds 3668 // Default-constructed fonts on Mac are system fonts. These can have all kinds
3631 // of weird weights and style, which are preserved by PlatformFontMac, but do 3669 // of weird weights and style, which are preserved by PlatformFontMac, but do
3632 // not map simply to a SkTypeface::Style (the full details in SkFontStyle is 3670 // not map simply to a SkTypeface::Style (the full details in SkFontStyle is
3633 // needed). They also vary depending on the OS version, so set a known font. 3671 // needed). They also vary depending on the OS version, so set a known font.
3634 FontList font_list(Font("Arial", 10)); 3672 FontList font_list(Font("Arial", 10));
3635 3673
3636 while (backend.Advance()) { 3674 render_text->SetText(ASCIIToUTF16("x"));
3637 SCOPED_TRACE(testing::Message() << "backend: " << backend.GetName()); 3675 render_text->SetFontList(font_list);
3638 backend->SetText(ASCIIToUTF16("x"));
3639 backend->SetFontList(font_list);
3640 3676
3641 backend.DrawVisualText(); 3677 DrawVisualText();
3642 EXPECT_EQ(SkTypeface::kNormal, backend.paint().getTypeface()->style()); 3678 EXPECT_EQ(SkTypeface::kNormal, GetRendererPaint().getTypeface()->style());
3643 3679
3644 backend->SetWeight(Font::Weight::BOLD); 3680 render_text->SetWeight(Font::Weight::BOLD);
3645 backend.DrawVisualText(); 3681 DrawVisualText();
3646 EXPECT_EQ(SkTypeface::kBold, backend.paint().getTypeface()->style()); 3682 EXPECT_EQ(SkTypeface::kBold, GetRendererPaint().getTypeface()->style());
3647 3683
3648 backend->SetStyle(TextStyle::ITALIC, true); 3684 render_text->SetStyle(TextStyle::ITALIC, true);
3649 backend.DrawVisualText(); 3685 DrawVisualText();
3650 EXPECT_EQ(SkTypeface::kBoldItalic, backend.paint().getTypeface()->style()); 3686 EXPECT_EQ(SkTypeface::kBoldItalic, GetRendererPaint().getTypeface()->style());
3651 3687
3652 backend->SetWeight(Font::Weight::NORMAL); 3688 render_text->SetWeight(Font::Weight::NORMAL);
3653 backend.DrawVisualText(); 3689 DrawVisualText();
3654 EXPECT_EQ(SkTypeface::kItalic, backend.paint().getTypeface()->style()); 3690 EXPECT_EQ(SkTypeface::kItalic, GetRendererPaint().getTypeface()->style());
3655 }
3656 } 3691 }
3657 3692
3658 // Ensure the painter adheres to RenderText::subpixel_rendering_suppressed(). 3693 // Ensure the painter adheres to RenderText::subpixel_rendering_suppressed().
3659 TEST_F(RenderTextTest, SubpixelRenderingSuppressed) { 3694 TEST_P(RenderTextTest, SubpixelRenderingSuppressed) {
3660 RenderTextAllBackends backend; 3695 RenderText* render_text = GetRenderText();
3696 render_text->SetText(ASCIIToUTF16("x"));
3661 3697
3662 while (backend.Advance()) { 3698 DrawVisualText();
3663 SCOPED_TRACE(testing::Message() << "backend: " << backend.GetName()); 3699 #if defined(OS_LINUX)
3664 backend->SetText(ASCIIToUTF16("x")); 3700 // On Linux, whether subpixel AA is supported is determined by the platform
3701 // FontConfig. Force it into a particular style after computing runs. Other
3702 // platforms use a known default FontRenderParams from a static local.
3703 GetHarfBuzzRunList()->runs()[0]->render_params.subpixel_rendering =
3704 FontRenderParams::SUBPIXEL_RENDERING_RGB;
3705 DrawVisualText();
3706 #endif
3707 EXPECT_TRUE(GetRendererPaint().isLCDRenderText());
3665 3708
3666 backend.DrawVisualText(); 3709 render_text->set_subpixel_rendering_suppressed(true);
3667 #if defined(OS_LINUX) 3710 DrawVisualText();
3668 // On Linux, whether subpixel AA is supported is determined by the platform
3669 // FontConfig. Force it into a particular style after computing runs. Other
3670 // platforms use a known default FontRenderParams from a static local.
3671 backend.GetHarfbuzzRunList()->runs()[0]->render_params.subpixel_rendering =
3672 FontRenderParams::SUBPIXEL_RENDERING_RGB;
3673 backend.DrawVisualText();
3674 #endif
3675 EXPECT_TRUE(backend.paint().isLCDRenderText());
3676
3677 backend->set_subpixel_rendering_suppressed(true);
3678 backend.DrawVisualText();
3679 #if defined(OS_LINUX) 3711 #if defined(OS_LINUX)
3680 // For Linux, runs shouldn't be re-calculated, and the suppression of the 3712 // For Linux, runs shouldn't be re-calculated, and the suppression of the
3681 // SUBPIXEL_RENDERING_RGB set above should now take effect. But, after 3713 // SUBPIXEL_RENDERING_RGB set above should now take effect. But, after
3682 // checking, apply the override anyway to be explicit that it is suppressed. 3714 // checking, apply the override anyway to be explicit that it is suppressed.
3683 EXPECT_FALSE(backend.paint().isLCDRenderText()); 3715 EXPECT_FALSE(GetRendererPaint().isLCDRenderText());
3684 backend.GetHarfbuzzRunList()->runs()[0]->render_params.subpixel_rendering = 3716 GetHarfBuzzRunList()->runs()[0]->render_params.subpixel_rendering =
3685 FontRenderParams::SUBPIXEL_RENDERING_RGB; 3717 FontRenderParams::SUBPIXEL_RENDERING_RGB;
3686 backend.DrawVisualText(); 3718 DrawVisualText();
3687 #endif 3719 #endif
3688 EXPECT_FALSE(backend.paint().isLCDRenderText()); 3720 EXPECT_FALSE(GetRendererPaint().isLCDRenderText());
3689 }
3690 } 3721 }
3691 3722
3723 // Prefix for test instantiations intentionally left blank since each test
3724 // fixture class has a single parameterization.
3725 #if defined(OS_MACOSX)
3726 INSTANTIATE_TEST_CASE_P(,
3727 RenderTextTest,
3728 ::testing::Values(RENDER_TEXT_HARFBUZZ,
3729 RENDER_TEXT_MAC),
3730 PrintRenderTextBackend());
3731 INSTANTIATE_TEST_CASE_P(,
3732 RenderTextMacTest,
3733 ::testing::Values(RENDER_TEXT_MAC),
3734 PrintRenderTextBackend());
3735 #else
3736 INSTANTIATE_TEST_CASE_P(,
3737 RenderTextTest,
3738 ::testing::Values(RENDER_TEXT_HARFBUZZ),
3739 PrintRenderTextBackend());
3740 #endif
3741
3742 INSTANTIATE_TEST_CASE_P(,
3743 RenderTextHarfBuzzTest,
3744 ::testing::Values(RENDER_TEXT_HARFBUZZ),
3745 PrintRenderTextBackend());
3746
3692 } // namespace gfx 3747 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/render_text_mac.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698