Changeset 111419 in webkit

Timestamp:

Mar 20, 2012 11:37:58 AM (12 years ago)

Author:

mitz@apple.com

Message:

REGRESSION (r111229): css1/basic/inheritance.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=81684

Reverted r111229.

Rubber-stamped by Dave Hyatt.

Source/WebCore:

• dom/Document.cpp:

(WebCore::Document::webkitGetFlowByName):

• dom/Document.h:

(Document):

• dom/Element.cpp:

(WebCore::Element::detach):

• dom/NodeRenderingContext.cpp:

(WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):

• dom/WebKitNamedFlow.cpp:

(WebCore):

• dom/WebKitNamedFlow.h:

(WebCore):
(WebKitNamedFlow):

• dom/WebKitNamedFlow.idl:

LayoutTests:

• fast/regions/webkit-named-flow-content-nodes-expected.txt: Removed.
• fast/regions/webkit-named-flow-content-nodes.html: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/webkit-named-flow-content-nodes-expected.txt (deleted)
• LayoutTests/fast/regions/webkit-named-flow-content-nodes.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)
• Source/WebCore/dom/Document.h (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (2 diffs)
• Source/WebCore/dom/NodeRenderingContext.cpp (modified) (2 diffs)
• Source/WebCore/dom/WebKitNamedFlow.cpp (modified) (2 diffs)
• Source/WebCore/dom/WebKitNamedFlow.h (modified) (4 diffs)
• Source/WebCore/dom/WebKitNamedFlow.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-20  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r111229): css1/basic/inheritance.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=81684
+
+        Reverted r111229.
+
+        Rubber-stamped by Dave Hyatt.
+
+        * fast/regions/webkit-named-flow-content-nodes-expected.txt: Removed.
+        * fast/regions/webkit-named-flow-content-nodes.html: Removed.
+
 2012-03-20  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-20  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r111229): css1/basic/inheritance.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=81684
+
+        Reverted r111229.
+
+        Rubber-stamped by Dave Hyatt.
+
+        * dom/Document.cpp:
+        (WebCore::Document::webkitGetFlowByName):
+        * dom/Document.h:
+        (Document):
+        * dom/Element.cpp:
+        (WebCore::Element::detach):
+        * dom/NodeRenderingContext.cpp:
+        (WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):
+        * dom/WebKitNamedFlow.cpp:
+        (WebCore):
+        * dom/WebKitNamedFlow.h:
+        (WebCore):
+        (WebKitNamedFlow):
+        * dom/WebKitNamedFlow.idl:
+
 2012-03-20  Vineet Chaudhary  <rgf748@motorola.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1039 +1039 @@
 PassRefPtr<WebKitNamedFlow> Document::webkitGetFlowByName(const String& flowName)
 {
-    return webkitGetFlowByName(flowName, CheckFlowNameForInvalidValues);
-}
-
-PassRefPtr<WebKitNamedFlow> Document::webkitGetFlowByName(const String& flowName, FlowNameCheck flowNameCheck)
-{
-    if (!cssRegionsEnabled() || !renderer())
+    if (!cssRegionsEnabled() || flowName.isEmpty() || !validFlowName(flowName) || !renderer())
         return 0;
 
-    if (flowNameCheck == CheckFlowNameForInvalidValues) {
-        if (flowName.isEmpty() || !validFlowName(flowName))
-            return 0;
-
-        // Make a slower check for invalid flow name
-        CSSParser parser(true);
-        if (!parser.parseFlowThread(flowName, this))
-            return 0;
-    }
+    // Make a slower check for invalid flow name
+    CSSParser p(true);
+    if (!p.parseFlowThread(flowName, this))
+        return 0;
 
     if (RenderView* view = renderer()->view())

trunk/Source/WebCore/dom/Document.h

@@ -353 +353 @@
 
     bool cssRegionsEnabled() const;
-    enum FlowNameCheck {
-        CheckFlowNameForInvalidValues,
-        DoNotCheckFlowNameForInvalidValues
-    };
     PassRefPtr<WebKitNamedFlow> webkitGetFlowByName(const String&);
-    PassRefPtr<WebKitNamedFlow> webkitGetFlowByName(const String&, FlowNameCheck);
 
     bool regionBasedColumnsEnabled() const;

trunk/Source/WebCore/dom/Element.cpp

@@ -67 +67 @@
 #include "Text.h"
 #include "TextIterator.h"
+#include "WebKitMutationObserver.h"
 #include "WebKitAnimationList.h"
-#include "WebKitMutationObserver.h"
-#include "WebKitNamedFlow.h"
 #include "XMLNSNames.h"
 #include "XMLNames.h"
@@ -981 +980 @@
     RenderWidget::suspendWidgetHierarchyUpdates();
 
-    if (document()->cssRegionsEnabled()) {
-        RenderStyle* style = renderer() ? renderer()->style() : computedStyle();
-        if (style && !style->flowThread().isEmpty()) {
-            RefPtr<WebKitNamedFlow> namedFlow = document()->webkitGetFlowByName(style->flowThread(), Document::DoNotCheckFlowNameForInvalidValues);
-            if (namedFlow)
-                namedFlow->unregisterContentNode(this);
-        }
-    }
-
     cancelFocusAppearanceUpdate();
     if (hasRareData())

trunk/Source/WebCore/dom/NodeRenderingContext.cpp

@@ -39 +39 @@
 #include "ShadowRoot.h"
 #include "ShadowTree.h"
-#include "WebKitNamedFlow.h"
 
 #if ENABLE(SVG)
@@ -329 +328 @@
     ASSERT(m_node->document()->renderView());
     m_parentFlowRenderer = m_node->document()->renderView()->ensureRenderFlowThreadWithName(m_flowThread);
-    m_parentFlowRenderer->ensureNamedFlow()->registerContentNode(m_node);
 }
 

trunk/Source/WebCore/dom/WebKitNamedFlow.cpp

@@ -31 +31 @@
 #include "WebKitNamedFlow.h"
 
-#include "Node.h"
-#include "NodeList.h"
 #include "RenderFlowThread.h"
-#include "RenderRegion.h"
-#include "StaticNodeList.h"
 
 namespace WebCore {
@@ -52 +48 @@
     m_parentFlowThread->document()->updateLayoutIgnorePendingStylesheets();
     return m_parentFlowThread->overflow();
-}
-
-PassRefPtr<NodeList> WebKitNamedFlow::contentNodes() const
-{
-    m_parentFlowThread->document()->updateLayoutIgnorePendingStylesheets();
-
-    Vector<RefPtr<Node> > contentNodes;
-    for (NamedFlowContentNodes::const_iterator it = m_contentNodes.begin(); it != m_contentNodes.end(); ++it) {
-        Node* node = const_cast<Node*>(*it);
-        ASSERT(node->computedStyle()->flowThread() == m_parentFlowThread->flowThread());
-        contentNodes.append(node);
-    }
-
-    return StaticNodeList::adopt(contentNodes);
-}
-
-// The content nodes list contains those nodes with -webkit-flow-into: flow.
-// An element with display:none should also be listed among those nodes.
-// The list of nodes is orderer.
-void WebKitNamedFlow::registerContentNode(Node* contentNode)
-{
-    ASSERT(contentNode && contentNode->isElementNode());
-
-    // Find the first content node following the new content node.
-    for (NamedFlowContentNodes::iterator it = m_contentNodes.begin(); it != m_contentNodes.end(); ++it) {
-        Node* node = *it;
-        unsigned short position = contentNode->compareDocumentPosition(node);
-        if (position & Node::DOCUMENT_POSITION_FOLLOWING) {
-            m_contentNodes.insertBefore(node, contentNode);
-            return;
-        }
-    }
-    m_contentNodes.add(contentNode);
 }
 

trunk/Source/WebCore/dom/WebKitNamedFlow.h

@@ -31 +31 @@
 #define WebKitNamedFlow_h
 
-#include <Node.h>
-#include <wtf/ListHashSet.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
@@ -38 +36 @@
 namespace WebCore {
 
-class NodeList;
 class RenderFlowThread;
 
@@ -51 +48 @@
 
     bool overflow() const;
-    PassRefPtr<NodeList> contentNodes() const;
     PassRefPtr<NodeList> getRegionsByContentNode(Node*);
-
-    void registerContentNode(Node* contentNode);
-    void unregisterContentNode(Node* contentNode) { m_contentNodes.remove(contentNode); }
 
 private:
@@ -61 +54 @@
 
     RenderFlowThread* m_parentFlowThread;
-
-    typedef ListHashSet<Node*> NamedFlowContentNodes;
-    NamedFlowContentNodes m_contentNodes;
 };
 

trunk/Source/WebCore/dom/WebKitNamedFlow.idl

@@ -33 +33 @@
     ] WebKitNamedFlow {
         readonly attribute boolean overflow;
-        readonly attribute NodeList contentNodes;
         NodeList getRegionsByContentNode(in Node contentNode);
     };