Changeset 118883 in webkit

Timestamp:

May 29, 2012 7:28:17 PM (12 years ago)

Author:

eric@webkit.org

Message:

Fix ENABLE_IFRAME_SEAMLESS to actually fully disable <iframe seamless>
​https://bugs.webkit.org/show_bug.cgi?id=87646

Reviewed by Adam Barth.

In the process of moving the seamless feature out of github and into bugs.webkit.org
multiple versions of the shouldDisplaySeamlessly function got written
(and moved from HTMLIFrameElement to Document), but only one of them was wrapped
in ENABLE_IFRAME_SEAMLESS. HTMLIFrameElement was checking mayDisplaySeamlessly
directly (as was my original design), which got around the ENABLE_IFRAME_SEAMLESS check.
I've fixed this oversight, and the feature is now off when we tell it to be off.

This is covered by many existing tests. I've verified locally that
all tests fail when ENABLE_IFRAME_SEAMLESS is disabled instead of
only some of them.

• dom/SecurityContext.h:

(SecurityContext):

• html/HTMLIFrameElement.cpp:

(WebCore::HTMLIFrameElement::shouldDisplaySeamlessly):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/SecurityContext.h (modified) (1 diff)
• html/HTMLIFrameElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-29  Eric Seidel  <eric@webkit.org>
+
+        Fix ENABLE_IFRAME_SEAMLESS to actually fully disable <iframe seamless>
+        https://bugs.webkit.org/show_bug.cgi?id=87646
+
+        Reviewed by Adam Barth.
+
+        In the process of moving the seamless feature out of github and into bugs.webkit.org
+        multiple versions of the shouldDisplaySeamlessly function got written
+        (and moved from HTMLIFrameElement to Document), but only one of them was wrapped
+        in ENABLE_IFRAME_SEAMLESS.  HTMLIFrameElement was checking mayDisplaySeamlessly
+        directly (as was my original design), which got around the ENABLE_IFRAME_SEAMLESS check.
+        I've fixed this oversight, and the feature is now off when we tell it to be off.
+
+        This is covered by many existing tests.  I've verified locally that
+        all tests fail when ENABLE_IFRAME_SEAMLESS is disabled instead of
+        only some of them.
+
+        * dom/SecurityContext.h:
+        (SecurityContext):
+        * html/HTMLIFrameElement.cpp:
+        (WebCore::HTMLIFrameElement::shouldDisplaySeamlessly):
+
 2012-05-29  Scott Graham  <scottmg@chromium.org>
 

trunk/Source/WebCore/dom/SecurityContext.h

@@ -68 +68 @@
     static SandboxFlags parseSandboxPolicy(const String& policy);
 
-    bool mayDisplaySeamlessWithParent() const { return m_mayDisplaySeamlessWithParent; }
-
 protected:
     SecurityContext();

trunk/Source/WebCore/html/HTMLIFrameElement.cpp

@@ -123 +123 @@
 bool HTMLIFrameElement::shouldDisplaySeamlessly() const
 {
-    return contentDocument() && contentDocument()->mayDisplaySeamlessWithParent() && hasAttribute(seamlessAttr);
+    return contentDocument() && contentDocument()->shouldDisplaySeamlesslyWithParent();
 }