Changeset 99076 in webkit

Timestamp:

Nov 2, 2011, 10:12:07 AM (14 years ago)

Author:

rniwa@webkit.org

Message:

div { display: none; } makes pasting into text fields impossible
​https://bugs.webkit.org/show_bug.cgi?id=27683

Reviewed by Enrica Casucci.

Source/WebCore:

The bug was caused by insertFragmentForTestRendering's always inserting a node for test rendering
into document's body.

Fixed the bug by inserting the node for test rendering into the root editable element. In addition,
remove the node before dispatching beforeTextInserted event to avoid event listeners, in particular
TextFieldInputType::handleBeforeTextInsertedEvent, from seeing the test node.

Test: editing/pasteboard/input-with-display-none-div.html

• editing/ReplaceSelectionCommand.cpp:

(WebCore::ReplacementFragment::ReplacementFragment):
(WebCore::ReplacementFragment::insertFragmentForTestRendering):
(WebCore::ReplacementFragment::restoreAndRemoveTestRenderingNodesToFragment):

LayoutTests:

Add a test to insert contents into an input element inside a page
with div { display: none; }

• editing/pasteboard/input-with-display-none-div-expected.txt: Added.
• editing/pasteboard/input-with-display-none-div.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/input-with-display-none-div-expected.txt (added)
• LayoutTests/editing/pasteboard/input-with-display-none-div.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/ReplaceSelectionCommand.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        div { display: none; } makes pasting into text fields impossible
+        https://bugs.webkit.org/show_bug.cgi?id=27683
+
+        Reviewed by Enrica Casucci.
+
+        Add a test to insert contents into an input element inside a page
+        with div { display: none; }
+
+        * editing/pasteboard/input-with-display-none-div-expected.txt: Added.
+        * editing/pasteboard/input-with-display-none-div.html: Added.
+
 2011-11-02  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        div { display: none; } makes pasting into text fields impossible
+        https://bugs.webkit.org/show_bug.cgi?id=27683
+
+        Reviewed by Enrica Casucci.
+
+        The bug was caused by insertFragmentForTestRendering's always inserting a node for test rendering
+        into document's body.
+
+        Fixed the bug by inserting the node for test rendering into the root editable element. In addition,
+        remove the node before dispatching beforeTextInserted event to avoid event listeners, in particular
+        TextFieldInputType::handleBeforeTextInsertedEvent, from seeing the test node.
+
+        Test: editing/pasteboard/input-with-display-none-div.html
+
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplacementFragment::ReplacementFragment):
+        (WebCore::ReplacementFragment::insertFragmentForTestRendering):
+        (WebCore::ReplacementFragment::restoreAndRemoveTestRenderingNodesToFragment):
+
 2011-11-02  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -84 +84 @@
 
 private:
-    PassRefPtr<StyledElement> insertFragmentForTestRendering(Node* context);
+    PassRefPtr<StyledElement> insertFragmentForTestRendering(Node* rootEditableNode);
     void removeUnrenderedNodes(Node*);
-    void restoreTestRenderingNodesToFragment(StyledElement*);
+    void restoreAndRemoveTestRenderingNodesToFragment(StyledElement*);
     void removeInterchangeNodes(Node*);
     
@@ -157 +157 @@
     }
 
-    RefPtr<Node> styleNode = selection.base().deprecatedNode();
-    RefPtr<StyledElement> holder = insertFragmentForTestRendering(styleNode.get());
+    RefPtr<StyledElement> holder = insertFragmentForTestRendering(editableRoot.get());
     if (!holder) {
         removeInterchangeNodes(m_fragment.get());
@@ -166 +165 @@
     RefPtr<Range> range = VisibleSelection::selectionFromContentsOfNode(holder.get()).toNormalizedRange();
     String text = plainText(range.get());
+
+    removeInterchangeNodes(holder.get());
+    removeUnrenderedNodes(holder.get());
+    restoreAndRemoveTestRenderingNodesToFragment(holder.get());
+
     // Give the root a chance to change the text.
     RefPtr<BeforeTextInsertedEvent> evt = BeforeTextInsertedEvent::create(text);
@@ -172 +176 @@
     ASSERT(ec == 0);
     if (text != evt->text() || !editableRoot->rendererIsRichlyEditable()) {
-        restoreTestRenderingNodesToFragment(holder.get());
-        removeNode(holder);
+        restoreAndRemoveTestRenderingNodesToFragment(holder.get());
 
         m_fragment = createFragmentFromText(selection.toNormalizedRange().get(), evt->text());
         if (!m_fragment->firstChild())
             return;
-        holder = insertFragmentForTestRendering(styleNode.get());
-    }
-    
-    removeInterchangeNodes(holder.get());
-    
-    removeUnrenderedNodes(holder.get());
-    restoreTestRenderingNodesToFragment(holder.get());
-    removeNode(holder);
+
+        holder = insertFragmentForTestRendering(editableRoot.get());
+        removeInterchangeNodes(holder.get());
+        removeUnrenderedNodes(holder.get());
+        restoreAndRemoveTestRenderingNodesToFragment(holder.get());
+    }
 }
 
@@ -243 +244 @@
 }
 
-PassRefPtr<StyledElement> ReplacementFragment::insertFragmentForTestRendering(Node* context)
-{
-    HTMLElement* body = m_document->body();
-    if (!body)
-        return 0;
-
+PassRefPtr<StyledElement> ReplacementFragment::insertFragmentForTestRendering(Node* rootEditableElement)
+{
     RefPtr<StyledElement> holder = createDefaultParagraphElement(m_document.get());
     
     ExceptionCode ec = 0;
 
-    // Copy the whitespace and user-select style from the context onto this element.
-    // Walk up past <br> elements which may be placeholders and might have their own specified styles.
-    // FIXME: We should examine other style properties to see if they would be appropriate to consider during the test rendering.
-    Node* n = context;
-    while (n && (!n->isElementNode() || n->hasTagName(brTag)))
-        n = n->parentNode();
-    if (n) {
-        RefPtr<CSSComputedStyleDeclaration> conFontStyle = computedStyle(n);
-        CSSStyleDeclaration* style = holder->style();
-        style->setProperty(CSSPropertyWhiteSpace, conFontStyle->getPropertyValue(CSSPropertyWhiteSpace), false, ec);
-        ASSERT(ec == 0);
-        style->setProperty(CSSPropertyWebkitUserSelect, conFontStyle->getPropertyValue(CSSPropertyWebkitUserSelect), false, ec);
-        ASSERT(ec == 0);
-    }
-    
     holder->appendChild(m_fragment, ec);
     ASSERT(ec == 0);
-    
-    body->appendChild(holder.get(), ec);
+
+    rootEditableElement->appendChild(holder.get(), ec);
     ASSERT(ec == 0);
-    
+
     m_document->updateLayoutIgnorePendingStylesheets();
-    
+
     return holder.release();
 }
 
-void ReplacementFragment::restoreTestRenderingNodesToFragment(StyledElement* holder)
+void ReplacementFragment::restoreAndRemoveTestRenderingNodesToFragment(StyledElement* holder)
 {
     if (!holder)
@@ -291 +273 @@
         ASSERT(ec == 0);
     }
+
+    removeNode(holder);
 }