Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 88 } | 88 } |
| 89 | 89 |
| 90 void SearchInputType::createShadowSubtree() | 90 void SearchInputType::createShadowSubtree() |
| 91 { | 91 { |
| 92 TextFieldInputType::createShadowSubtree(); | 92 TextFieldInputType::createShadowSubtree(); |
| 93 Element* container = containerElement(); | 93 Element* container = containerElement(); |
| 94 Element* viewPort = element().userAgentShadowRoot()->getElementById(ShadowEl ementNames::editingViewPort()); | 94 Element* viewPort = element().userAgentShadowRoot()->getElementById(ShadowEl ementNames::editingViewPort()); |
| 95 ASSERT(container); | 95 ASSERT(container); |
| 96 ASSERT(viewPort); | 96 ASSERT(viewPort); |
| 97 | 97 |
| 98 container->insertBefore(SearchFieldDecorationElement::create(element().docum ent()), viewPort); | 98 AtomicString dirAttributeValue = element().fastGetAttribute(dirAttr); |
|
tkent
2013/10/28 10:17:09
This works only for <input type=search dir=rtl>, a
| |
| 99 container->insertBefore(SearchFieldCancelButtonElement::create(element().doc ument()), viewPort->nextSibling()); | 99 if (dirAttributeValue.isEmpty() || equalIgnoringCase(dirAttributeValue, "ltr ")) { |
| 100 container->insertBefore(SearchFieldDecorationElement::create(element().d ocument()), viewPort); | |
| 101 container->insertBefore(SearchFieldCancelButtonElement::create(element() .document()), viewPort->nextSibling()); | |
| 102 } else { | |
| 103 container->insertBefore(SearchFieldCancelButtonElement::create(element() .document()), viewPort); | |
| 104 container->insertBefore(SearchFieldDecorationElement::create(element().d ocument()), viewPort->nextSibling()); | |
| 105 } | |
| 100 } | 106 } |
| 101 | 107 |
| 102 void SearchInputType::handleKeydownEvent(KeyboardEvent* event) | 108 void SearchInputType::handleKeydownEvent(KeyboardEvent* event) |
| 103 { | 109 { |
| 104 if (element().isDisabledOrReadOnly()) { | 110 if (element().isDisabledOrReadOnly()) { |
| 105 TextFieldInputType::handleKeydownEvent(event); | 111 TextFieldInputType::handleKeydownEvent(event); |
| 106 return; | 112 return; |
| 107 } | 113 } |
| 108 | 114 |
| 109 const String& key = event->keyIdentifier(); | 115 const String& key = event->keyIdentifier(); |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 175 else | 181 else |
| 176 button->removeInlineStyleProperty(CSSPropertyVisibility); | 182 button->removeInlineStyleProperty(CSSPropertyVisibility); |
| 177 } | 183 } |
| 178 | 184 |
| 179 bool SearchInputType::supportsInputModeAttribute() const | 185 bool SearchInputType::supportsInputModeAttribute() const |
| 180 { | 186 { |
| 181 return true; | 187 return true; |
| 182 } | 188 } |
| 183 | 189 |
| 184 } // namespace WebCore | 190 } // namespace WebCore |
| OLD | NEW |