Changeset 177048 in webkit

Timestamp:

Dec 9, 2014 4:47:51 PM (9 years ago)

Author:

akling@apple.com

Message:

Roll out r165076.
<rdar://problem/18490587>

This change broke selection when editing Confluence wiki pages.

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::nodeOrItsAncestorNeedsStyleRecalc):
(WebCore::ComputedStyleExtractor::propertyValue):

• dom/Document.cpp:

(WebCore::nodeOrItsAncestorNeedsStyleRecalc): Deleted.
(WebCore::Document::updateStyleIfNeededForNode): Deleted.

• dom/Document.h:
• editing/htmlediting.cpp:

(WebCore::isEditablePosition):

• html/TextFieldInputType.cpp:

(WebCore::TextFieldInputType::forwardEvent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSComputedStyleDeclaration.cpp (modified) (2 diffs)
• dom/Document.cpp (modified) (1 diff)
• dom/Document.h (modified) (1 diff)
• editing/htmlediting.cpp (modified) (1 diff)
• html/TextFieldInputType.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-12-09  Andreas Kling  <akling@apple.com>
+
+        Roll out r165076.
+        <rdar://problem/18490587>
+
+        This change broke selection when editing Confluence wiki pages.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::nodeOrItsAncestorNeedsStyleRecalc):
+        (WebCore::ComputedStyleExtractor::propertyValue):
+        * dom/Document.cpp:
+        (WebCore::nodeOrItsAncestorNeedsStyleRecalc): Deleted.
+        (WebCore::Document::updateStyleIfNeededForNode): Deleted.
+        * dom/Document.h:
+        * editing/htmlediting.cpp:
+        (WebCore::isEditablePosition):
+        * html/TextFieldInputType.cpp:
+        (WebCore::TextFieldInputType::forwardEvent):
+
 2014-12-09  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -1672 +1672 @@
 }
 
+static inline bool nodeOrItsAncestorNeedsStyleRecalc(Node* styledNode)
+{
+    if (styledNode->document().hasPendingForcedStyleRecalc())
+        return true;
+    for (Node* n = styledNode; n; n = n->parentNode()) {// FIXME: parentOrShadowHostNode() instead
+        if (n->needsStyleRecalc())
+            return true;
+    }
+    return false;
+}
+
 static inline PassRefPtr<RenderStyle> computeRenderStyleForProperty(Node* styledNode, PseudoId pseudoElementSpecifier, CSSPropertyID propertyID)
 {
@@ -1726 +1737 @@
         Document& document = styledNode->document();
 
-        if (document.updateStyleIfNeededForNode(*styledNode)) {
+        if (nodeOrItsAncestorNeedsStyleRecalc(styledNode)) {
+            document.updateStyleIfNeeded();
             // The style recalc could have caused the styled node to be discarded or replaced
             // if it was a PseudoElement so we need to update it.

trunk/Source/WebCore/dom/Document.cpp

@@ -6283 +6283 @@
 #endif // ENABLE(SUBTLE_CRYPTO)
 
-static inline bool nodeOrItsAncestorNeedsStyleRecalc(const Node& node)
-{
-    if (node.needsStyleRecalc())
-        return true;
-
-    const Node* currentNode = &node;
-    const Element* ancestor = currentNode->parentOrShadowHostElement();
-    while (ancestor) {
-        if (ancestor->needsStyleRecalc())
-            return true;
-
-        if (ancestor->directChildNeedsStyleRecalc() && currentNode->styleIsAffectedByPreviousSibling())
-            return true;
-
-        currentNode = ancestor;
-        ancestor = currentNode->parentOrShadowHostElement();
-    }
-    return false;
-}
-
-bool Document::updateStyleIfNeededForNode(const Node& node)
-{
-    if (!hasPendingForcedStyleRecalc() && !(childNeedsStyleRecalc() && nodeOrItsAncestorNeedsStyleRecalc(node)))
-        return false;
-    updateStyleIfNeeded();
-    return true;
-}
-
 Element* Document::activeElement()
 {

trunk/Source/WebCore/dom/Document.h

@@ -594 +594 @@
     void recalcStyle(Style::Change = Style::NoChange);
     WEBCORE_EXPORT void updateStyleIfNeeded();
-    bool updateStyleIfNeededForNode(const Node&);
 
     WEBCORE_EXPORT void updateLayout();

trunk/Source/WebCore/editing/htmlediting.cpp

@@ -148 +148 @@
         return false;
     if (updateStyle == UpdateStyle)
-        node->document().updateStyleIfNeededForNode(*node);
+        node->document().updateStyleIfNeeded();
     else
         ASSERT(updateStyle == DoNotUpdateStyle);

trunk/Source/WebCore/html/TextFieldInputType.cpp

@@ -191 +191 @@
         || event->type() == eventNames().focusEvent)
     {
-        element().document().updateStyleIfNeededForNode(element());
+        element().document().updateStyleIfNeeded();
 
         if (element().renderer()) {