Changeset 154326 in webkit

Timestamp:

Aug 20, 2013, 8:25:04 AM (11 years ago)

Author:

Antti Koivisto

Message:

<​https://webkit.org/b/120025> REGRESSION (r154254): fast/frames/frameset-frameborder-inheritance.html failing on Apple MountainLion Debug WK1 (Tests)

Reviewed by Anders Carlsson.

Source/WebCore:

• html/HTMLDocument.cpp:

(WebCore::HTMLDocument::isFrameSet):

• html/HTMLFrameElement.cpp:

(WebCore::HTMLFrameElement::didAttachRenderers):

Make helper public in HTMLFrameSetElement.

• html/HTMLFrameSetElement.cpp:

(WebCore::HTMLFrameSetElement::findContaining):

Static function for finding containing frameset, if any.

(WebCore::HTMLFrameSetElement::willAttachRenderers):

This broke in refactoring. We should exit the loop when the first containing frameset is found. Fix by refactoring more.

• html/HTMLFrameSetElement.h:

(WebCore::isHTMLFrameSetElement):
(WebCore::toHTMLFrameSetElement):

Add casting functions.

• rendering/RenderFrameSet.cpp:

(WebCore::RenderFrameSet::frameSet):

LayoutTests:

• platform/mac/TestExpectations: Unskip.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLDocument.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLFrameElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLFrameSetElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLFrameSetElement.h (modified) (2 diffs)
• Source/WebCore/rendering/RenderFrameSet.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-08-20  Antti Koivisto  <antti@apple.com>
+
+        <https://webkit.org/b/120025> REGRESSION (r154254): fast/frames/frameset-frameborder-inheritance.html failing on Apple MountainLion Debug WK1 (Tests)
+
+        Reviewed by Anders Carlsson.
+
+        * platform/mac/TestExpectations: Unskip.
+
 2013-08-20  Antti Koivisto  <antti@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1277 +1277 @@
 webkit.org/b/105988 [ Debug ] inspector/debugger/watch-expressions-preserve-expansion.html [ Pass Crash ]
 
-webkit.org/b/120025 fast/frames/frameset-frameborder-inheritance.html [ Failure ]
-
 # Fails with WebKit1 only.
 editing/secure-input/reset-state-on-navigation.html [ Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-20  Antti Koivisto  <antti@apple.com>
+
+        <https://webkit.org/b/120025> REGRESSION (r154254): fast/frames/frameset-frameborder-inheritance.html failing on Apple MountainLion Debug WK1 (Tests)
+
+        Reviewed by Anders Carlsson.
+
+        * html/HTMLDocument.cpp:
+        (WebCore::HTMLDocument::isFrameSet):
+        * html/HTMLFrameElement.cpp:
+        (WebCore::HTMLFrameElement::didAttachRenderers):
+        
+            Make helper public in HTMLFrameSetElement.
+
+        * html/HTMLFrameSetElement.cpp:
+        (WebCore::HTMLFrameSetElement::findContaining):
+        
+            Static function for finding containing frameset, if any.
+
+        (WebCore::HTMLFrameSetElement::willAttachRenderers):
+        
+            This broke in refactoring. We should exit the loop when the first containing frameset is found. Fix by refactoring more.
+
+        * html/HTMLFrameSetElement.h:
+        (WebCore::isHTMLFrameSetElement):
+        (WebCore::toHTMLFrameSetElement):
+        
+            Add casting functions.
+
+        * rendering/RenderFrameSet.cpp:
+        (WebCore::RenderFrameSet::frameSet):
+
 2013-08-20  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/html/HTMLDocument.cpp

@@ -69 +69 @@
 #include "HTMLElementFactory.h"
 #include "HTMLFrameOwnerElement.h"
+#include "HTMLFrameSetElement.h"
 #include "HTMLNames.h"
 #include "InspectorInstrumentation.h"
@@ -393 +394 @@
 {
     HTMLElement* bodyElement = body();
-    return bodyElement && bodyElement->hasTagName(framesetTag);
-}
-
-}
+    return bodyElement && isHTMLFrameSetElement(bodyElement);
+}
+
+}

trunk/Source/WebCore/html/HTMLFrameElement.cpp

@@ -60 +60 @@
 }
 
-static inline HTMLFrameSetElement* containingFrameSetElement(Node* node)
-{
-    while ((node = node->parentNode())) {
-        if (node->hasTagName(framesetTag))
-            return static_cast<HTMLFrameSetElement*>(node);
-    }
-    return 0;
-}
-
 bool HTMLFrameElement::noResize() const
 {
@@ -77 +68 @@
 {
     HTMLFrameElementBase::didAttachRenderers();
-    if (HTMLFrameSetElement* frameSetElement = containingFrameSetElement(this)) {
-        if (!m_frameBorderSet)
-            m_frameBorder = frameSetElement->hasFrameBorder();
-    }
+    const HTMLFrameSetElement* containingFrameSet = HTMLFrameSetElement::findContaining(this);
+    if (!containingFrameSet)
+        return;
+    if (!m_frameBorderSet)
+        m_frameBorder = containingFrameSet->hasFrameBorder();
 }
 

trunk/Source/WebCore/html/HTMLFrameSetElement.cpp

@@ -165 +165 @@
 }
 
+HTMLFrameSetElement* HTMLFrameSetElement::findContaining(Node* node)
+{
+    for (Element* parent = node->parentElement(); parent; parent = parent->parentElement()) {
+        if (isHTMLFrameSetElement(parent))
+            return toHTMLFrameSetElement(parent);
+    }
+    return 0;
+}
+
 void HTMLFrameSetElement::willAttachRenderers()
 {
-    // Inherit default settings from parent frameset
+    // Inherit default settings from parent frameset.
     // FIXME: This is not dynamic.
-    for (ContainerNode* node = parentNode(); node; node = node->parentNode()) {
-        if (!node->hasTagName(framesetTag))
-            continue;
-        HTMLFrameSetElement* frameset = static_cast<HTMLFrameSetElement*>(node);
-        if (!m_frameborderSet)
-            m_frameborder = frameset->hasFrameBorder();
-        if (m_frameborder) {
-            if (!m_borderSet)
-                m_border = frameset->border();
-            if (!m_borderColorSet)
-                m_borderColorSet = frameset->hasBorderColor();
-        }
-        if (!m_noresize)
-            m_noresize = frameset->noResize();
-    }
+    const HTMLFrameSetElement* containingFrameSet = findContaining(this);
+    if (!containingFrameSet)
+        return;
+    if (!m_frameborderSet)
+        m_frameborder = containingFrameSet->hasFrameBorder();
+    if (m_frameborder) {
+        if (!m_borderSet)
+            m_border = containingFrameSet->border();
+        if (!m_borderColorSet)
+            m_borderColorSet = containingFrameSet->hasBorderColor();
+    }
+    if (!m_noresize)
+        m_noresize = containingFrameSet->noResize();
 }
 

trunk/Source/WebCore/html/HTMLFrameSetElement.h

@@ -45 +45 @@
     const Length* rowLengths() const { return m_rowLengths.get(); }
     const Length* colLengths() const { return m_colLengths.get(); }
+
+    static HTMLFrameSetElement* findContaining(Node* descendant);
 
     // Declared virtual in Element
@@ -99 +101 @@
 };
 
+inline bool isHTMLFrameSetElement(const Node* node)
+{
+    return node->hasTagName(HTMLNames::framesetTag);
+}
+
+inline bool isHTMLFrameSetElement(const Element* element)
+{
+    return element->hasTagName(HTMLNames::framesetTag);
+}
+
+inline HTMLFrameSetElement* toHTMLFrameSetElement(Node* node)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(!node || isHTMLFrameSetElement(node));
+    return static_cast<HTMLFrameSetElement*>(node);
+}
+
+inline const HTMLFrameSetElement* toHTMLFrameSetElement(const Node* node)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(!node || isHTMLFrameSetElement(node));
+    return static_cast<const HTMLFrameSetElement*>(node);
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -64 +64 @@
 inline HTMLFrameSetElement* RenderFrameSet::frameSet() const
 {
-    return static_cast<HTMLFrameSetElement*>(node());
+    return toHTMLFrameSetElement(node());
 }