| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "config.h" | 5 #include "config.h" |
| 6 #include "core/html/HTMLFormControlElement.h" | 6 #include "core/html/HTMLFormControlElement.h" |
| 7 | 7 |
| 8 #include "core/frame/FrameView.h" | 8 #include "core/frame/FrameView.h" |
| 9 #include "core/html/HTMLDocument.h" | 9 #include "core/html/HTMLDocument.h" |
| 10 #include "core/html/HTMLInputElement.h" | 10 #include "core/html/HTMLInputElement.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 m_dummyPageHolder = DummyPageHolder::create(IntSize(800, 600), &pageClients)
; | 34 m_dummyPageHolder = DummyPageHolder::create(IntSize(800, 600), &pageClients)
; |
| 35 | 35 |
| 36 m_document = toHTMLDocument(&m_dummyPageHolder->document()); | 36 m_document = toHTMLDocument(&m_dummyPageHolder->document()); |
| 37 m_document->setMimeType("text/html"); | 37 m_document->setMimeType("text/html"); |
| 38 m_document->setCharset("utf-8"); | 38 m_document->setCharset("utf-8"); |
| 39 } | 39 } |
| 40 | 40 |
| 41 TEST_F(HTMLFormControlElementTest, customValidationMessageTextDirection) | 41 TEST_F(HTMLFormControlElementTest, customValidationMessageTextDirection) |
| 42 { | 42 { |
| 43 document().documentElement()->setInnerHTML("<body><input required id=input><
/body>", ASSERT_NO_EXCEPTION); | 43 document().documentElement()->setInnerHTML("<body><input required id=input><
/body>", ASSERT_NO_EXCEPTION); |
| 44 document().view()->updateLayoutAndStyleIfNeededRecursive(); | 44 document().view()->updateLayoutAndStyleForPainting(); |
| 45 | 45 |
| 46 HTMLInputElement* input = toHTMLInputElement(document().getElementById("inpu
t")); | 46 HTMLInputElement* input = toHTMLInputElement(document().getElementById("inpu
t")); |
| 47 input->setCustomValidity(String::fromUTF8("\xD8\xB9\xD8\xB1\xD8\xA8\xD9\x89"
)); | 47 input->setCustomValidity(String::fromUTF8("\xD8\xB9\xD8\xB1\xD8\xA8\xD9\x89"
)); |
| 48 input->setAttribute(HTMLNames::titleAttr, AtomicString::fromUTF8("\xD8\xB9\x
D8\xB1\xD8\xA8\xD9\x89")); | 48 input->setAttribute(HTMLNames::titleAttr, AtomicString::fromUTF8("\xD8\xB9\x
D8\xB1\xD8\xA8\xD9\x89")); |
| 49 | 49 |
| 50 String message = input->validationMessage().stripWhiteSpace(); | 50 String message = input->validationMessage().stripWhiteSpace(); |
| 51 String subMessage = String(); | 51 String subMessage = String(); |
| 52 TextDirection messageDir = RTL; | 52 TextDirection messageDir = RTL; |
| 53 TextDirection subMessageDir = LTR; | 53 TextDirection subMessageDir = LTR; |
| 54 | 54 |
| 55 input->findCustomValidationMessageTextDirection(message, messageDir, subMess
age, subMessageDir); | 55 input->findCustomValidationMessageTextDirection(message, messageDir, subMess
age, subMessageDir); |
| 56 EXPECT_EQ(RTL, messageDir); | 56 EXPECT_EQ(RTL, messageDir); |
| 57 EXPECT_EQ(LTR, subMessageDir); | 57 EXPECT_EQ(LTR, subMessageDir); |
| 58 | 58 |
| 59 input->layoutObject()->mutableStyleRef().setDirection(RTL); | 59 input->layoutObject()->mutableStyleRef().setDirection(RTL); |
| 60 input->findCustomValidationMessageTextDirection(message, messageDir, subMess
age, subMessageDir); | 60 input->findCustomValidationMessageTextDirection(message, messageDir, subMess
age, subMessageDir); |
| 61 EXPECT_EQ(RTL, messageDir); | 61 EXPECT_EQ(RTL, messageDir); |
| 62 EXPECT_EQ(RTL, subMessageDir); | 62 EXPECT_EQ(RTL, subMessageDir); |
| 63 | 63 |
| 64 input->setCustomValidity(String::fromUTF8("Main message.")); | 64 input->setCustomValidity(String::fromUTF8("Main message.")); |
| 65 message = input->validationMessage().stripWhiteSpace(); | 65 message = input->validationMessage().stripWhiteSpace(); |
| 66 input->findCustomValidationMessageTextDirection(message, messageDir, subMess
age, subMessageDir); | 66 input->findCustomValidationMessageTextDirection(message, messageDir, subMess
age, subMessageDir); |
| 67 EXPECT_EQ(LTR, messageDir); | 67 EXPECT_EQ(LTR, messageDir); |
| 68 EXPECT_EQ(RTL, subMessageDir); | 68 EXPECT_EQ(RTL, subMessageDir); |
| 69 } | 69 } |
| 70 | 70 |
| 71 } | 71 } |
| OLD | NEW |