Title: [118883] trunk/Source/WebCore
- Revision
- 118883
- Author
- [email protected]
- Date
- 2012-05-29 19:28:17 -0700 (Tue, 29 May 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (118882 => 118883)
--- trunk/Source/WebCore/ChangeLog 2012-05-30 02:18:08 UTC (rev 118882)
+++ trunk/Source/WebCore/ChangeLog 2012-05-30 02:28:17 UTC (rev 118883)
@@ -1,3 +1,26 @@
+2012-05-29 Eric Seidel <[email protected]>
+
+ 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 <[email protected]>
Fix warning in preprocessing Source/WebCore/dom/DOMError.idl
Modified: trunk/Source/WebCore/dom/SecurityContext.h (118882 => 118883)
--- trunk/Source/WebCore/dom/SecurityContext.h 2012-05-30 02:18:08 UTC (rev 118882)
+++ trunk/Source/WebCore/dom/SecurityContext.h 2012-05-30 02:28:17 UTC (rev 118883)
@@ -67,8 +67,6 @@
static SandboxFlags parseSandboxPolicy(const String& policy);
- bool mayDisplaySeamlessWithParent() const { return m_mayDisplaySeamlessWithParent; }
-
protected:
SecurityContext();
~SecurityContext();
Modified: trunk/Source/WebCore/html/HTMLIFrameElement.cpp (118882 => 118883)
--- trunk/Source/WebCore/html/HTMLIFrameElement.cpp 2012-05-30 02:18:08 UTC (rev 118882)
+++ trunk/Source/WebCore/html/HTMLIFrameElement.cpp 2012-05-30 02:28:17 UTC (rev 118883)
@@ -122,7 +122,7 @@
bool HTMLIFrameElement::shouldDisplaySeamlessly() const
{
- return contentDocument() && contentDocument()->mayDisplaySeamlessWithParent() && hasAttribute(seamlessAttr);
+ return contentDocument() && contentDocument()->shouldDisplaySeamlesslyWithParent();
}
void HTMLIFrameElement::didRecalcStyle(StyleChange styleChange)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
