Changeset 76098 in webkit

Timestamp:

Jan 18, 2011 8:11:18 PM (13 years ago)

Author:

morrita@google.com

Message:

2011-01-18 MORITA Hajime <​morrita@google.com>

Refactoring: EventHandler::handleTextInputEvent should accept an enum instead of bools.
​https://bugs.webkit.org/show_bug.cgi?id=52608

No new tests. no behavioral change.

• GNUmakefile.am:
• WebCore.gypi:
• WebCore.pro:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• dom/TextEvent.cpp: (WebCore::TextEvent::create): (WebCore::TextEvent::createForDrop): (WebCore::TextEvent::TextEvent):
• dom/TextEvent.h: (WebCore::TextEvent::isLineBreak): (WebCore::TextEvent::isBackTab): (WebCore::TextEvent::isPaste): (WebCore::TextEvent::isDrop):
• dom/TextEventInputType.h: Added. Extracted from TextEvent::TextInputType.
• editing/EditorCommand.cpp: (WebCore::executeInsertBacktab): (WebCore::executeInsertLineBreak): (WebCore::executeInsertNewline): (WebCore::executeInsertTab):
• page/EventHandler.cpp: (WebCore::EventHandler::handleTextInputEvent):
• page/EventHandler.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• WebCore.pro (modified) (1 diff)
• WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• dom/TextEvent.cpp (modified) (5 diffs)
• dom/TextEvent.h (modified) (4 diffs)
• dom/TextEventInputType.h (added)
• editing/EditorCommand.cpp (modified) (4 diffs)
• page/EventHandler.cpp (modified) (2 diffs)
• page/EventHandler.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-18 MORITA Hajime  <morrita@google.com>
+
+        Refactoring: EventHandler::handleTextInputEvent should accept an enum instead of bools.
+        https://bugs.webkit.org/show_bug.cgi?id=52608
+
+        No new tests. no behavioral change.
+
+        * GNUmakefile.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * dom/TextEvent.cpp:
+        (WebCore::TextEvent::create):
+        (WebCore::TextEvent::createForDrop):
+        (WebCore::TextEvent::TextEvent):
+        * dom/TextEvent.h:
+        (WebCore::TextEvent::isLineBreak):
+        (WebCore::TextEvent::isBackTab):
+        (WebCore::TextEvent::isPaste):
+        (WebCore::TextEvent::isDrop):
+        * dom/TextEventInputType.h: Added. Extracted from TextEvent::TextInputType.
+        * editing/EditorCommand.cpp:
+        (WebCore::executeInsertBacktab):
+        (WebCore::executeInsertLineBreak):
+        (WebCore::executeInsertNewline):
+        (WebCore::executeInsertTab):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleTextInputEvent):
+        * page/EventHandler.h:
+
 2011-01-18  Ben Vanik  <ben.vanik@gmail.com>
 

trunk/Source/WebCore/GNUmakefile.am

@@ -1301 +1301 @@
         Source/WebCore/dom/TextEvent.cpp \
         Source/WebCore/dom/TextEvent.h \
+        Source/WebCore/dom/TextEventInputType.h \
         Source/WebCore/dom/Text.h \
         Source/WebCore/dom/TouchList.h \

trunk/Source/WebCore/WebCore.gypi

@@ -1349 +1349 @@
             'dom/TextEvent.cpp',
             'dom/TextEvent.h',
+            'dom/TextEventInputType.h',
             'dom/Touch.cpp',
             'dom/Touch.h',

trunk/Source/WebCore/WebCore.pro

@@ -1715 +1715 @@
     dom/TagNodeList.h \
     dom/TextEvent.h \
+    dom/TextEventInputType.h \
     dom/Text.h \
     dom/Touch.h \

trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -46195 +46195 @@
                         </File>
                         <File
+                                RelativePath="..\dom\TextEventInputType.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\dom\TransformSource.h"
                                 >

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -3180 +3180 @@
                 A77979280D6B9E64003851B9 /* JSImageData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A77979240D6B9E64003851B9 /* JSImageData.cpp */; };
                 A77979290D6B9E64003851B9 /* JSImageData.h in Headers */ = {isa = PBXBuildFile; fileRef = A77979250D6B9E64003851B9 /* JSImageData.h */; };
+                A77B41A012E675A90054343D /* TextEventInputType.h in Headers */ = {isa = PBXBuildFile; fileRef = A77B419F12E675A90054343D /* TextEventInputType.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 A784941B0B5FE507001E237A /* Clipboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A784941A0B5FE507001E237A /* Clipboard.cpp */; };
                 A78FE13B12366B1000ACE8D0 /* SpellChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A78FE13912366B1000ACE8D0 /* SpellChecker.cpp */; };
@@ -9553 +9554 @@
                 A77979240D6B9E64003851B9 /* JSImageData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSImageData.cpp; sourceTree = "<group>"; };
                 A77979250D6B9E64003851B9 /* JSImageData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSImageData.h; sourceTree = "<group>"; };
+                A77B419F12E675A90054343D /* TextEventInputType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextEventInputType.h; sourceTree = "<group>"; };
                 A784941A0B5FE507001E237A /* Clipboard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Clipboard.cpp; sourceTree = "<group>"; };
                 A78FE13912366B1000ACE8D0 /* SpellChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpellChecker.cpp; sourceTree = "<group>"; };
@@ -19086 +19088 @@
                                 933A142D0B7D188600A53FFD /* TextEvent.h */,
                                 933A142C0B7D188600A53FFD /* TextEvent.idl */,
+                                A77B419F12E675A90054343D /* TextEventInputType.h */,
                                 5DB1BC6810715A6400EFAA49 /* TransformSource.h */,
                                 5DB1BC6910715A6400EFAA49 /* TransformSourceLibxslt.cpp */,
@@ -22146 +22149 @@
                                 B2C3DA490D006C1D00EF6F26 /* TextEncodingRegistry.h in Headers */,
                                 933A14300B7D188600A53FFD /* TextEvent.h in Headers */,
+                                A77B41A012E675A90054343D /* TextEventInputType.h in Headers */,
                                 F55B3DD81251F12D003EF269 /* TextFieldInputType.h in Headers */,
                                 93309E18099E64920056E581 /* TextGranularity.h in Headers */,

trunk/Source/WebCore/dom/TextEvent.cpp

@@ -32 +32 @@
 namespace WebCore {
 
-TextEvent::InputType TextEvent::selectInputType(bool isLineBreak, bool isBackTab)
-{
-    if (isLineBreak)
-        return TextEvent::InputTypeLineBreak;
-    if (isBackTab)
-        return TextEvent::InputTypeBackTab;
-    return TextEvent::InputTypeKeyboard;
-}
-
 PassRefPtr<TextEvent> TextEvent::create()
 {
@@ -46 +37 @@
 }
 
-PassRefPtr<TextEvent> TextEvent::create(PassRefPtr<AbstractView> view, const String& data, TextEvent::InputType inputType)
+PassRefPtr<TextEvent> TextEvent::create(PassRefPtr<AbstractView> view, const String& data, TextEventInputType inputType)
 {
     return adoptRef(new TextEvent(view, data, inputType));
@@ -63 +54 @@
 PassRefPtr<TextEvent> TextEvent::createForDrop(PassRefPtr<AbstractView> view, const String& data)
 {
-    return adoptRef(new TextEvent(view, data, TextEvent::InputTypeDrop));
+    return adoptRef(new TextEvent(view, data, TextEventInputDrop));
 }
 
 TextEvent::TextEvent()
-    : m_inputType(TextEvent::InputTypeKeyboard)
+    : m_inputType(TextEventInputKeyboard)
     , m_shouldSmartReplace(false)
     , m_shouldMatchStyle(false)
@@ -73 +64 @@
 }
 
-TextEvent::TextEvent(PassRefPtr<AbstractView> view, const String& data, InputType inputType)
+TextEvent::TextEvent(PassRefPtr<AbstractView> view, const String& data, TextEventInputType inputType)
     : UIEvent(eventNames().textInputEvent, true, true, view, 0)
     , m_inputType(inputType)
@@ -86 +77 @@
                      bool shouldSmartReplace, bool shouldMatchStyle)
     : UIEvent(eventNames().textInputEvent, true, true, view, 0)
-    , m_inputType(TextEvent::InputTypePaste)
+    , m_inputType(TextEventInputPaste)
     , m_data(data)
     , m_pastingFragment(pastingFragment)

trunk/Source/WebCore/dom/TextEvent.h

@@ -29 +29 @@
 
 #include "DocumentFragment.h"
+#include "TextEventInputType.h"
 #include "UIEvent.h"
 
@@ -35 +36 @@
     class TextEvent : public UIEvent {
     public:
-        enum InputType {
-            InputTypeKeyboard, // any newline characters in the text are line breaks only, not paragraph separators.
-            InputTypeLineBreak, // any tab characters in the text are backtabs.
-            InputTypeBackTab,
-            InputTypePaste,
-            InputTypeDrop,
-        };
 
-        static InputType selectInputType(bool isLineBreak, bool isBackTab);
         static PassRefPtr<TextEvent> create();
-        static PassRefPtr<TextEvent> create(PassRefPtr<AbstractView> view, const String& data, InputType = InputTypeKeyboard);
+        static PassRefPtr<TextEvent> create(PassRefPtr<AbstractView>, const String& data, TextEventInputType = TextEventInputKeyboard);
         static PassRefPtr<TextEvent> createForPlainTextPaste(PassRefPtr<AbstractView> view, const String& data, bool shouldSmartReplace);
         static PassRefPtr<TextEvent> createForFragmentPaste(PassRefPtr<AbstractView> view, PassRefPtr<DocumentFragment> data, bool shouldSmartReplace, bool shouldMatchStyle);
@@ -58 +51 @@
         virtual bool isTextEvent() const;
 
-        bool isLineBreak() const { return m_inputType == InputTypeLineBreak; }
-        bool isBackTab() const { return m_inputType == InputTypeBackTab; }
-        bool isPaste() const { return m_inputType == InputTypePaste; }
-        bool isDrop() const { return m_inputType == InputTypeDrop; }
+        bool isLineBreak() const { return m_inputType == TextEventInputLineBreak; }
+        bool isBackTab() const { return m_inputType == TextEventInputBackTab; }
+        bool isPaste() const { return m_inputType == TextEventInputPaste; }
+        bool isDrop() const { return m_inputType == TextEventInputDrop; }
 
         bool shouldSmartReplace() const { return m_shouldSmartReplace; }
@@ -70 +63 @@
         TextEvent();
 
-        TextEvent(PassRefPtr<AbstractView>, const String& data, InputType = InputTypeKeyboard);
+        TextEvent(PassRefPtr<AbstractView>, const String& data, TextEventInputType = TextEventInputKeyboard);
         TextEvent(PassRefPtr<AbstractView>, const String& data, PassRefPtr<DocumentFragment>,
                   bool shouldSmartReplace, bool shouldMatchStyle);
 
-        InputType m_inputType;
+        TextEventInputType m_inputType;
         String m_data;
 

trunk/Source/WebCore/editing/EditorCommand.cpp

@@ -478 +478 @@
 static bool executeInsertBacktab(Frame* frame, Event* event, EditorCommandSource, const String&)
 {
-    return targetFrame(frame, event)->eventHandler()->handleTextInputEvent("\t", event, false, true);
+    return targetFrame(frame, event)->eventHandler()->handleTextInputEvent("\t", event, TextEventInputBackTab);
 }
 
@@ -506 +506 @@
     switch (source) {
     case CommandFromMenuOrKeyBinding:
-        return targetFrame(frame, event)->eventHandler()->handleTextInputEvent("\n", event, true);
+        return targetFrame(frame, event)->eventHandler()->handleTextInputEvent("\n", event, TextEventInputLineBreak);
     case CommandFromDOM:
     case CommandFromDOMWithUserInterface:
@@ -522 +522 @@
 {
     Frame* targetFrame = WebCore::targetFrame(frame, event);
-    return targetFrame->eventHandler()->handleTextInputEvent("\n", event, !targetFrame->editor()->canEditRichly());
+    return targetFrame->eventHandler()->handleTextInputEvent("\n", event, targetFrame->editor()->canEditRichly() ? TextEventInputKeyboard : TextEventInputLineBreak);
 }
 
@@ -545 +545 @@
 static bool executeInsertTab(Frame* frame, Event* event, EditorCommandSource, const String&)
 {
-    return targetFrame(frame, event)->eventHandler()->handleTextInputEvent("\t", event, false, false);
+    return targetFrame(frame, event)->eventHandler()->handleTextInputEvent("\t", event);
 }
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2648 +2648 @@
 #endif // ENABLE(DRAG_SUPPORT)
   
-bool EventHandler::handleTextInputEvent(const String& text, Event* underlyingEvent, bool isLineBreak, bool isBackTab)
+bool EventHandler::handleTextInputEvent(const String& text, Event* underlyingEvent, TextEventInputType inputType)
 {
     // Platforms should differentiate real commands like selectAll from text input in disguise (like insertNewline),
     // and avoid dispatching text input events from keydown default handlers.
     ASSERT(!underlyingEvent || !underlyingEvent->isKeyboardEvent() || static_cast<KeyboardEvent*>(underlyingEvent)->type() == eventNames().keypressEvent);
-    ASSERT(!(isLineBreak && isBackTab));
 
     if (!m_frame)
@@ -2669 +2668 @@
         view->resetDeferredRepaintDelay();
 
-    RefPtr<TextEvent> event = TextEvent::create(m_frame->domWindow(), text, TextEvent::selectInputType(isLineBreak, isBackTab));
+    RefPtr<TextEvent> event = TextEvent::create(m_frame->domWindow(), text, inputType);
     event->setUnderlyingEvent(underlyingEvent);
 

trunk/Source/WebCore/page/EventHandler.h

@@ -32 +32 @@
 #include "PlatformMouseEvent.h"
 #include "ScrollTypes.h"
+#include "TextEventInputType.h"
 #include "Timer.h"
 #include <wtf/Forward.h>
@@ -174 +175 @@
     void defaultKeyboardEventHandler(KeyboardEvent*);
 
-    bool handleTextInputEvent(const String& text, Event* underlyingEvent = 0,
-        bool isLineBreak = false, bool isBackTab = false);
+    bool handleTextInputEvent(const String& text, Event* underlyingEvent = 0, TextEventInputType = TextEventInputKeyboard);
     void defaultTextInputEventHandler(TextEvent*);