Changeset 65395 in webkit

Timestamp:

Aug 16, 2010 12:30:02 AM (14 years ago)

Author:

morrita@google.com

Message:

2010-08-13 MORITA Hajime <​morrita@google.com>

Reviewed by Tony Chang.

​https://bugs.webkit.org/show_bug.cgi?id=43778
Dropping should fire textInput event.

• editing/pasteboard/drop-text-events-expected.txt: Added.
• editing/pasteboard/drop-text-events-sideeffect-expected.txt: Added.
• editing/pasteboard/drop-text-events-sideeffect.html: Added.
• editing/pasteboard/drop-text-events.html: Added.
• editing/pasteboard/script-tests/drop-text-events-sideeffect.js: Added.
• editing/pasteboard/script-tests/drop-text-events.js: Added.

2010-08-13 MORITA Hajime <​morrita@google.com>

Reviewed by Tony Chang.

​https://bugs.webkit.org/show_bug.cgi?id=43778
Dropping should fire textInput event

This change:

• added TextEvent::m_isDrop to distinguish drop-initiated events.
• added to dispatch TextEvent from DragController before making a side effect and cancel the side effect if the event prevents default

Tests: editing/pasteboard/drop-text-events-sideeffect.html

editing/pasteboard/drop-text-events.html

• dom/TextEvent.cpp: (WebCore::TextEvent::createForDrop): Added. (WebCore::TextEvent::TextEvent):
• dom/TextEvent.h: (WebCore::TextEvent::isDrop): Added.
• editing/Editor.cpp: (WebCore::Editor::handleTextEvent): (WebCore::Editor::findEventTargetFrom): Extracted from findEventTargetFromSelection(). (WebCore::Editor::findEventTargetFromSelection):
• editing/Editor.h:
• page/DragController.cpp: (WebCore::DragController::dispatchTextInputEventFor): Added. (WebCore::DragController::concludeEditDrag): Added an event dispatch path.
• page/DragController.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/drop-text-events-expected.txt (added)
• LayoutTests/editing/pasteboard/drop-text-events-sideeffect-expected.txt (added)
• LayoutTests/editing/pasteboard/drop-text-events-sideeffect.html (added)
• LayoutTests/editing/pasteboard/drop-text-events.html (added)
• LayoutTests/editing/pasteboard/script-tests/drop-text-events-sideeffect.js (added)
• LayoutTests/editing/pasteboard/script-tests/drop-text-events.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/TextEvent.cpp (modified) (1 diff)
• WebCore/dom/TextEvent.h (modified) (4 diffs)
• WebCore/editing/Editor.cpp (modified) (3 diffs)
• WebCore/editing/Editor.h (modified) (1 diff)
• WebCore/page/DragController.cpp (modified) (3 diffs)
• WebCore/page/DragController.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-13  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Tony Chang.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43778
+        Dropping should fire textInput event.
+
+        * editing/pasteboard/drop-text-events-expected.txt: Added.
+        * editing/pasteboard/drop-text-events-sideeffect-expected.txt: Added.
+        * editing/pasteboard/drop-text-events-sideeffect.html: Added.
+        * editing/pasteboard/drop-text-events.html: Added.
+        * editing/pasteboard/script-tests/drop-text-events-sideeffect.js: Added.
+        * editing/pasteboard/script-tests/drop-text-events.js: Added.
+
 2010-08-15  Ariya Hidayat  <ariya@sencha.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-13  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Tony Chang.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43778
+        Dropping should fire textInput event
+
+        This change:
+        - added TextEvent::m_isDrop to distinguish drop-initiated events.
+        - added to dispatch TextEvent from DragController before making a side effect
+          and cancel the side effect if the event prevents default
+
+        Tests: editing/pasteboard/drop-text-events-sideeffect.html
+               editing/pasteboard/drop-text-events.html
+
+        * dom/TextEvent.cpp:
+        (WebCore::TextEvent::createForDrop): Added.
+        (WebCore::TextEvent::TextEvent):
+        * dom/TextEvent.h:
+        (WebCore::TextEvent::isDrop): Added.
+        * editing/Editor.cpp:
+        (WebCore::Editor::handleTextEvent):
+        (WebCore::Editor::findEventTargetFrom): Extracted from findEventTargetFromSelection().
+        (WebCore::Editor::findEventTargetFromSelection): 
+        * editing/Editor.h:
+        * page/DragController.cpp:
+        (WebCore::DragController::dispatchTextInputEventFor): Added.
+        (WebCore::DragController::concludeEditDrag): Added an event dispatch path.
+        * page/DragController.h:
+
 2010-08-15  Ariya Hidayat  <ariya@sencha.com>
 

trunk/WebCore/dom/TextEvent.cpp

@@ -61 +61 @@
 }
 
+PassRefPtr<TextEvent> TextEvent::createForDrop(PassRefPtr<AbstractView> view, const String& data)
+{
+    return adoptRef(new TextEvent(view, data, TextEvent::InputTypeDrop));
+}
+
 TextEvent::TextEvent()
     : m_inputType(TextEvent::InputTypeKeyboard)

trunk/WebCore/dom/TextEvent.h

@@ -39 +39 @@
             InputTypeLineBreak, // any tab characters in the text are backtabs.
             InputTypeBackTab,
-            InputTypePaste
+            InputTypePaste,
+            InputTypeDrop,
         };
 
@@ -47 +48 @@
         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);
+        static PassRefPtr<TextEvent> createForDrop(PassRefPtr<AbstractView> view, const String& data);
 
         virtual ~TextEvent();
@@ -59 +61 @@
         bool isBackTab() const { return m_inputType == InputTypeBackTab; }
         bool isPaste() const { return m_inputType == InputTypePaste; }
+        bool isDrop() const { return m_inputType == InputTypeDrop; }
 
         bool shouldSmartReplace() const { return m_shouldSmartReplace; }
@@ -66 +69 @@
     private:
         TextEvent();
+
         TextEvent(PassRefPtr<AbstractView>, const String& data, InputType = InputTypeKeyboard);
         TextEvent(PassRefPtr<AbstractView>, const String& data, PassRefPtr<DocumentFragment>,
                   bool shouldSmartReplace, bool shouldMatchStyle);
+
         InputType m_inputType;
         String m_data;

trunk/WebCore/editing/Editor.cpp

@@ -131 +131 @@
 bool Editor::handleTextEvent(TextEvent* event)
 {
+    // Default event handling for Drag and Drop will be handled by DragController
+    // so we leave the event for it.
+    if (event->isDrop())
+        return false;
+
     if (event->isPaste()) {
         if (event->pastingFragment())
@@ -763 +768 @@
 }
 
-Node* Editor::findEventTargetFromSelection() const
-{
-    Node* target = m_frame->selection()->start().element();
+Node* Editor::findEventTargetFrom(const VisibleSelection& selection) const
+{
+    Node* target = selection.start().element();
     if (!target)
         target = m_frame->document()->body();
@@ -771 +776 @@
         return 0;
     return target->shadowAncestorNode();
+
+}
+
+Node* Editor::findEventTargetFromSelection() const
+{
+    return findEventTargetFrom(m_frame->selection()->selection());
 }
 

trunk/WebCore/editing/Editor.h

@@ -300 +300 @@
     void pasteAsPlainText(const String&, bool smartReplace);
 
+    Node* findEventTargetFrom(const VisibleSelection& selection) const;
 private:
     Frame* m_frame;

trunk/WebCore/page/DragController.cpp

@@ -64 +64 @@
 #include "Settings.h"
 #include "Text.h"
+#include "TextEvent.h"
 #include "htmlediting.h"
 #include "markup.h"
@@ -364 +365 @@
 }
 
+bool DragController::dispatchTextInputEventFor(Frame* innerFrame, DragData* dragData)
+{
+    VisibleSelection dragCaret(m_page->dragCaretController()->selection());
+    String text = dragCaret.isContentRichlyEditable() ? "" : dragData->asPlainText();
+    Node* target = innerFrame->editor()->findEventTargetFrom(dragCaret);
+    ExceptionCode ec = 0;
+    return target->dispatchEvent(TextEvent::createForDrop(innerFrame->domWindow(), text), ec);
+}
+
 bool DragController::concludeEditDrag(DragData* dragData)
 {
@@ -377 +387 @@
     ASSERT(innerFrame);
 
+    if (!dispatchTextInputEventFor(innerFrame, dragData))
+        return true;
+
     if (dragData->containsColor()) {
         Color color = dragData->asColor();
         if (!color.isValid())
-            return false;
-        if (!innerFrame)
             return false;
         RefPtr<Range> innerRange = innerFrame->selection()->toNormalizedRange();

trunk/WebCore/page/DragController.h

@@ -91 +91 @@
 
     private:
+        bool dispatchTextInputEventFor(Frame*, DragData*);
         bool canProcessDrag(DragData*);
         bool concludeEditDrag(DragData*);