Changeset 90983 in webkit
- Timestamp:
- Jul 14, 2011 12:08:42 AM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r90980 r90983 1 2011-07-13 Ryosuke Niwa <rniwa@webkit.org> 2 3 Move forwardEvent from RenderTextControl to HTMLTextFormControlElement 4 https://bugs.webkit.org/show_bug.cgi?id=64475 5 6 Reviewed by Kent Tamura. 7 8 Moved forwardEvent from RenderTextControl, RenderTextControlSingleLine, and RenderTextControlMultiLine 9 to HTMLTextFormControlElement, HTMLInputElement, and HTMLTextAreaElement. 10 11 This removes the last dependency on Event.h and EventNames.h in the cpp files for the above render 12 objects classes. 13 14 * html/HTMLTextAreaElement.cpp: 15 (WebCore::HTMLTextAreaElement::defaultEventHandler): 16 * html/HTMLTextFormControlElement.cpp: 17 (WebCore::HTMLTextFormControlElement::forwardEvent): 18 * html/HTMLTextFormControlElement.h: 19 * html/TextFieldInputType.cpp: 20 (WebCore::TextFieldInputType::forwardEvent): 21 * rendering/RenderTextControl.cpp: 22 * rendering/RenderTextControl.h: 23 * rendering/RenderTextControlMultiLine.cpp: 24 * rendering/RenderTextControlMultiLine.h: 25 * rendering/RenderTextControlSingleLine.cpp: 26 * rendering/RenderTextControlSingleLine.h: 27 1 28 2011-07-13 Ilya Tikhonovsky <loislo@chromium.org> 2 29 -
trunk/Source/WebCore/html/HTMLTextAreaElement.cpp
r90971 r90983 236 236 { 237 237 if (renderer() && (event->isMouseEvent() || event->isDragEvent() || event->isWheelEvent() || event->type() == eventNames().blurEvent)) 238 toRenderTextControlMultiLine(renderer())->forwardEvent(event);238 forwardEvent(event); 239 239 else if (renderer() && event->isBeforeTextInsertedEvent()) 240 240 handleBeforeTextInsertedEvent(static_cast<BeforeTextInsertedEvent*>(event)); -
trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp
r90971 r90983 90 90 } 91 91 92 void HTMLTextFormControlElement::forwardEvent(Event* event) 93 { 94 if (event->type() == eventNames().blurEvent || event->type() == eventNames().focusEvent) 95 return; 96 innerTextElement()->defaultEventHandler(event); 97 } 98 92 99 String HTMLTextFormControlElement::strippedPlaceholder() const 93 100 { -
trunk/Source/WebCore/html/HTMLTextFormControlElement.h
r90971 r90983 40 40 virtual ~HTMLTextFormControlElement(); 41 41 42 void forwardEvent(Event*); 43 42 44 virtual void insertedIntoDocument(); 43 45 … … 75 77 protected: 76 78 HTMLTextFormControlElement(const QualifiedName&, Document*, HTMLFormElement*); 77 78 79 void updatePlaceholderVisibility(bool); 79 80 virtual void updatePlaceholderText() = 0; -
trunk/Source/WebCore/html/TextFieldInputType.cpp
r90971 r90983 38 38 #include "KeyboardEvent.h" 39 39 #include "Page.h" 40 #include "RenderLayer.h" 40 41 #include "RenderTextControlSingleLine.h" 41 42 #include "RenderTheme.h" … … 116 117 void TextFieldInputType::forwardEvent(Event* event) 117 118 { 118 if (element()->renderer() && (event->isMouseEvent() || event->isDragEvent() || event->isWheelEvent() || event->type() == eventNames().blurEvent || event->type() == eventNames().focusEvent)) 119 toRenderTextControlSingleLine(element()->renderer())->forwardEvent(event); 119 if (element()->renderer() && (event->isMouseEvent() || event->isDragEvent() || event->isWheelEvent() || event->type() == eventNames().blurEvent || event->type() == eventNames().focusEvent)) { 120 RenderTextControlSingleLine* renderTextControl = toRenderTextControlSingleLine(element()->renderer()); 121 if (event->type() == eventNames().blurEvent) { 122 if (RenderBox* innerTextRenderer = innerTextElement()->renderBox()) { 123 if (RenderLayer* innerLayer = innerTextRenderer->layer()) 124 innerLayer->scrollToOffset(!renderTextControl->style()->isLeftToRightDirection() ? innerLayer->scrollWidth() : 0, 0, RenderLayer::ScrollOffsetClamped); 125 } 126 127 renderTextControl->capsLockStateMayHaveChanged(); 128 } else if (event->type() == eventNames().focusEvent) 129 renderTextControl->capsLockStateMayHaveChanged(); 130 131 element()->forwardEvent(event); 132 } 120 133 } 121 134 -
trunk/Source/WebCore/rendering/RenderTextControl.cpp
r90971 r90983 25 25 #include "AXObjectCache.h" 26 26 #include "Editor.h" 27 #include "Event.h"28 #include "EventNames.h"29 27 #include "Frame.h" 30 #include "FrameSelection.h"31 28 #include "HTMLBRElement.h" 32 29 #include "HTMLInputElement.h" … … 317 314 result.setInnerNonSharedNode(innerText); 318 315 result.setLocalPoint(pointInContainer - toSize(adjustedLocation + innerText->renderBox()->location())); 319 }320 321 void RenderTextControl::forwardEvent(Event* event)322 {323 if (event->type() == eventNames().blurEvent || event->type() == eventNames().focusEvent)324 return;325 innerTextElement()->defaultEventHandler(event);326 316 } 327 317 -
trunk/Source/WebCore/rendering/RenderTextControl.h
r90971 r90983 58 58 59 59 void hitInnerTextElement(HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset); 60 void forwardEvent(Event*);61 60 62 61 int textBlockWidth() const; -
trunk/Source/WebCore/rendering/RenderTextControlMultiLine.cpp
r90971 r90983 23 23 #include "RenderTextControlMultiLine.h" 24 24 25 #include "Event.h"26 #include "EventNames.h"27 25 #include "Frame.h" 28 26 #include "HTMLNames.h" … … 69 67 70 68 return true; 71 }72 73 void RenderTextControlMultiLine::forwardEvent(Event* event)74 {75 RenderTextControl::forwardEvent(event);76 69 } 77 70 -
trunk/Source/WebCore/rendering/RenderTextControlMultiLine.h
r90971 r90983 32 32 virtual ~RenderTextControlMultiLine(); 33 33 34 void forwardEvent(Event*);35 36 34 private: 37 35 virtual bool isTextArea() const { return true; } -
trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp
r90971 r90983 28 28 #include "CSSStyleSelector.h" 29 29 #include "Chrome.h" 30 #include "Event.h"31 #include "EventNames.h"32 30 #include "Frame.h" 33 31 #include "FrameSelection.h" … … 37 35 #include "HitTestResult.h" 38 36 #include "LocalizedStrings.h" 39 #include "MouseEvent.h"40 37 #include "Page.h" 41 38 #include "PlatformKeyboardEvent.h" … … 43 40 #include "RenderScrollbar.h" 44 41 #include "RenderTheme.h" 42 #include "SearchPopupMenu.h" 45 43 #include "Settings.h" 46 44 #include "SimpleFontData.h" … … 362 360 } 363 361 return true; 364 }365 366 void RenderTextControlSingleLine::forwardEvent(Event* event)367 {368 RenderBox* innerTextRenderer = innerTextElement()->renderBox();369 370 if (event->type() == eventNames().blurEvent) {371 if (innerTextRenderer) {372 if (RenderLayer* innerLayer = innerTextRenderer->layer())373 innerLayer->scrollToOffset(!style()->isLeftToRightDirection() ? innerLayer->scrollWidth() : 0, 0, RenderLayer::ScrollOffsetClamped);374 }375 376 capsLockStateMayHaveChanged();377 } else if (event->type() == eventNames().focusEvent)378 capsLockStateMayHaveChanged();379 380 RenderTextControl::forwardEvent(event);381 362 } 382 363 -
trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h
r90971 r90983 24 24 #define RenderTextControlSingleLine_h 25 25 26 #include "HTMLInputElement.h"27 26 #include "PopupMenuClient.h" 28 27 #include "RenderTextControl.h" 29 #include "SearchPopupMenu.h"30 28 #include "Timer.h" 31 29 … … 33 31 34 32 class HTMLInputElement; 33 class SearchPopupMenu; 35 34 36 35 class RenderTextControlSingleLine : public RenderTextControl, private PopupMenuClient { … … 48 47 void showPopup(); 49 48 void hidePopup(); 50 51 void forwardEvent(Event*);52 49 53 50 void capsLockStateMayHaveChanged();
Note: See TracChangeset
for help on using the changeset viewer.