| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Google Inc. All rights reserved. | 3 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "core/html/shadow/TextControlInnerElements.h" | 27 #include "core/html/shadow/TextControlInnerElements.h" |
| 28 | 28 |
| 29 #include "core/HTMLNames.h" | 29 #include "core/HTMLNames.h" |
| 30 #include "core/css/resolver/StyleAdjuster.h" |
| 30 #include "core/dom/Document.h" | 31 #include "core/dom/Document.h" |
| 31 #include "core/dom/NodeComputedStyle.h" | 32 #include "core/dom/NodeComputedStyle.h" |
| 32 #include "core/events/MouseEvent.h" | 33 #include "core/events/MouseEvent.h" |
| 33 #include "core/events/TextEvent.h" | 34 #include "core/events/TextEvent.h" |
| 34 #include "core/events/TextEventInputType.h" | 35 #include "core/events/TextEventInputType.h" |
| 35 #include "core/frame/LocalFrame.h" | 36 #include "core/frame/LocalFrame.h" |
| 36 #include "core/html/HTMLInputElement.h" | 37 #include "core/html/HTMLInputElement.h" |
| 37 #include "core/html/shadow/ShadowElementNames.h" | 38 #include "core/html/shadow/ShadowElementNames.h" |
| 38 #include "core/input/EventHandler.h" | 39 #include "core/input/EventHandler.h" |
| 39 #include "core/layout/LayoutTextControlSingleLine.h" | 40 #include "core/layout/LayoutTextControlSingleLine.h" |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 { | 136 { |
| 136 return new LayoutTextControlInnerBlock(this); | 137 return new LayoutTextControlInnerBlock(this); |
| 137 } | 138 } |
| 138 | 139 |
| 139 PassRefPtr<ComputedStyle> TextControlInnerEditorElement::customStyleForLayoutObj
ect() | 140 PassRefPtr<ComputedStyle> TextControlInnerEditorElement::customStyleForLayoutObj
ect() |
| 140 { | 141 { |
| 141 LayoutObject* parentLayoutObject = shadowHost()->layoutObject(); | 142 LayoutObject* parentLayoutObject = shadowHost()->layoutObject(); |
| 142 if (!parentLayoutObject || !parentLayoutObject->isTextControl()) | 143 if (!parentLayoutObject || !parentLayoutObject->isTextControl()) |
| 143 return originalStyleForLayoutObject(); | 144 return originalStyleForLayoutObject(); |
| 144 LayoutTextControlItem textControlLayoutItem = LayoutTextControlItem(toLayout
TextControl(parentLayoutObject)); | 145 LayoutTextControlItem textControlLayoutItem = LayoutTextControlItem(toLayout
TextControl(parentLayoutObject)); |
| 145 return textControlLayoutItem.createInnerEditorStyle(textControlLayoutItem.st
yleRef()); | 146 RefPtr<ComputedStyle> innerEditorStyle = textControlLayoutItem.createInnerEd
itorStyle(textControlLayoutItem.styleRef()); |
| 147 // Using StyleAdjuster::adjustComputedStyle updates unwanted style. We'd lik
e |
| 148 // to apply only editing-related. |
| 149 StyleAdjuster::adjustStyleForEditing(*innerEditorStyle); |
| 150 return innerEditorStyle.release(); |
| 146 } | 151 } |
| 147 | 152 |
| 148 // ---------------------------- | 153 // ---------------------------- |
| 149 | 154 |
| 150 inline SearchFieldDecorationElement::SearchFieldDecorationElement(Document& docu
ment) | 155 inline SearchFieldDecorationElement::SearchFieldDecorationElement(Document& docu
ment) |
| 151 : HTMLDivElement(document) | 156 : HTMLDivElement(document) |
| 152 { | 157 { |
| 153 } | 158 } |
| 154 | 159 |
| 155 PassRefPtrWillBeRawPtr<SearchFieldDecorationElement> SearchFieldDecorationElemen
t::create(Document& document) | 160 PassRefPtrWillBeRawPtr<SearchFieldDecorationElement> SearchFieldDecorationElemen
t::create(Document& document) |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 bool SearchFieldCancelButtonElement::willRespondToMouseClickEvents() | 249 bool SearchFieldCancelButtonElement::willRespondToMouseClickEvents() |
| 245 { | 250 { |
| 246 const HTMLInputElement* input = toHTMLInputElement(shadowHost()); | 251 const HTMLInputElement* input = toHTMLInputElement(shadowHost()); |
| 247 if (input && !input->isDisabledOrReadOnly()) | 252 if (input && !input->isDisabledOrReadOnly()) |
| 248 return true; | 253 return true; |
| 249 | 254 |
| 250 return HTMLDivElement::willRespondToMouseClickEvents(); | 255 return HTMLDivElement::willRespondToMouseClickEvents(); |
| 251 } | 256 } |
| 252 | 257 |
| 253 } // namespace blink | 258 } // namespace blink |
| OLD | NEW |