Title: [119052] branches/safari-536-branch/Source/WebCore
- Revision
- 119052
- Author
- [email protected]
- Date
- 2012-05-30 21:39:36 -0700 (Wed, 30 May 2012)
Log Message
Merged r118883 -> <rdar://problem/11550608>
Modified Paths
Diff
Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (119051 => 119052)
--- branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-31 04:30:56 UTC (rev 119051)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-31 04:39:36 UTC (rev 119052)
@@ -1,5 +1,32 @@
2012-05-30 Lucas Forschler <[email protected]>
+ Merge 118883
+
+ 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-30 Lucas Forschler <[email protected]>
+
Merge 118820
2012-05-29 John Sullivan <[email protected]>
Modified: branches/safari-536-branch/Source/WebCore/dom/SecurityContext.h (119051 => 119052)
--- branches/safari-536-branch/Source/WebCore/dom/SecurityContext.h 2012-05-31 04:30:56 UTC (rev 119051)
+++ branches/safari-536-branch/Source/WebCore/dom/SecurityContext.h 2012-05-31 04:39:36 UTC (rev 119052)
@@ -67,8 +67,6 @@
static SandboxFlags parseSandboxPolicy(const String& policy);
- bool mayDisplaySeamlessWithParent() const { return m_mayDisplaySeamlessWithParent; }
-
protected:
SecurityContext();
~SecurityContext();
Modified: branches/safari-536-branch/Source/WebCore/html/HTMLIFrameElement.cpp (119051 => 119052)
--- branches/safari-536-branch/Source/WebCore/html/HTMLIFrameElement.cpp 2012-05-31 04:30:56 UTC (rev 119051)
+++ branches/safari-536-branch/Source/WebCore/html/HTMLIFrameElement.cpp 2012-05-31 04:39:36 UTC (rev 119052)
@@ -117,7 +117,7 @@
bool HTMLIFrameElement::shouldDisplaySeamlessly() const
{
- return contentDocument() && contentDocument()->mayDisplaySeamlessWithParent() && hasAttribute(seamlessAttr);
+ return contentDocument() && contentDocument()->shouldDisplaySeamlesslyWithParent();
}
#if ENABLE(MICRODATA)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
