Diff
Modified: branches/safari-536-branch/Source/_javascript_Core/ChangeLog (117092 => 117093)
--- branches/safari-536-branch/Source/_javascript_Core/ChangeLog 2012-05-15 17:47:43 UTC (rev 117092)
+++ branches/safari-536-branch/Source/_javascript_Core/ChangeLog 2012-05-15 17:56:37 UTC (rev 117093)
@@ -1,3 +1,16 @@
+2012-05-15 Lucas Forschler <[email protected]>
+
+ Merge 116356
+
+ 2012-05-07 Eric Seidel <[email protected]>
+
+ Add ENABLE_IFRAME_SEAMLESS so Apple can turn off SEAMLESS if needed
+ https://bugs.webkit.org/show_bug.cgi?id=85822
+
+ Reviewed by Adam Barth.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2012-05-04 Filip Pizlo <[email protected]>
DFG should not Flush GetLocal's
Modified: branches/safari-536-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (117092 => 117093)
--- branches/safari-536-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2012-05-15 17:47:43 UTC (rev 117092)
+++ branches/safari-536-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2012-05-15 17:56:37 UTC (rev 117093)
@@ -54,6 +54,7 @@
ENABLE_HIGH_DPI_CANVAS = ENABLE_HIGH_DPI_CANVAS;
ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(REAL_PLATFORM_NAME));
ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
+ENABLE_IFRAME_SEAMLESS = ENABLE_IFRAME_SEAMLESS;
ENABLE_INDEXED_DATABASE = ;
ENABLE_INPUT_SPEECH = ;
ENABLE_INPUT_TYPE_COLOR = ;
Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (117092 => 117093)
--- branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-15 17:47:43 UTC (rev 117092)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-15 17:56:37 UTC (rev 117093)
@@ -1,3 +1,18 @@
+2012-05-15 Lucas Forschler <[email protected]>
+
+ Merge 116356
+
+ 2012-05-07 Eric Seidel <[email protected]>
+
+ Add ENABLE_IFRAME_SEAMLESS so Apple can turn off SEAMLESS if needed
+ https://bugs.webkit.org/show_bug.cgi?id=85822
+
+ Reviewed by Adam Barth.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * dom/Document.cpp:
+ (WebCore::Document::shouldDisplaySeamlesslyWithParent):
+
2012-05-04 Ilya Tikhonovsky <[email protected]>
Web Inspector: annotate ProfilerAgent.
Modified: branches/safari-536-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (117092 => 117093)
--- branches/safari-536-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2012-05-15 17:47:43 UTC (rev 117092)
+++ branches/safari-536-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2012-05-15 17:56:37 UTC (rev 117093)
@@ -54,6 +54,7 @@
ENABLE_HIGH_DPI_CANVAS = ENABLE_HIGH_DPI_CANVAS;
ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(REAL_PLATFORM_NAME));
ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
+ENABLE_IFRAME_SEAMLESS = ENABLE_IFRAME_SEAMLESS;
ENABLE_INDEXED_DATABASE = ;
ENABLE_INPUT_SPEECH = ;
ENABLE_INPUT_TYPE_COLOR = ;
Modified: branches/safari-536-branch/Source/WebCore/dom/Document.cpp (117092 => 117093)
--- branches/safari-536-branch/Source/WebCore/dom/Document.cpp 2012-05-15 17:47:43 UTC (rev 117092)
+++ branches/safari-536-branch/Source/WebCore/dom/Document.cpp 2012-05-15 17:56:37 UTC (rev 117093)
@@ -5898,10 +5898,14 @@
bool Document::shouldDisplaySeamlesslyWithParent() const
{
+#if ENABLE(IFRAME_SEAMLESS)
HTMLFrameOwnerElement* ownerElement = this->ownerElement();
if (!ownerElement)
return false;
return m_mayDisplaySeamlessWithParent && ownerElement->hasTagName(iframeTag) && ownerElement->fastHasAttribute(seamlessAttr);
+#else
+ return false;
+#endif
}
DocumentLoader* Document::loader() const
Modified: branches/safari-536-branch/Source/WebKit/chromium/features.gypi (117092 => 117093)
--- branches/safari-536-branch/Source/WebKit/chromium/features.gypi 2012-05-15 17:47:43 UTC (rev 117092)
+++ branches/safari-536-branch/Source/WebKit/chromium/features.gypi 2012-05-15 17:56:37 UTC (rev 117093)
@@ -55,6 +55,7 @@
'ENABLE_GEOLOCATION=1',
'ENABLE_GESTURE_EVENTS=1',
'ENABLE_ICONDATABASE=0',
+ 'ENABLE_IFRAME_SEAMLESS=1',
'ENABLE_INDEXED_DATABASE=1',
'ENABLE_INPUT_SPEECH=1',
'ENABLE_INPUT_TYPE_DATE=1',
Modified: branches/safari-536-branch/Source/WebKit/mac/ChangeLog (117092 => 117093)
--- branches/safari-536-branch/Source/WebKit/mac/ChangeLog 2012-05-15 17:47:43 UTC (rev 117092)
+++ branches/safari-536-branch/Source/WebKit/mac/ChangeLog 2012-05-15 17:56:37 UTC (rev 117093)
@@ -1,3 +1,16 @@
+2012-05-15 Lucas Forschler <[email protected]>
+
+ Merge 116356
+
+ 2012-05-07 Eric Seidel <[email protected]>
+
+ Add ENABLE_IFRAME_SEAMLESS so Apple can turn off SEAMLESS if needed
+ https://bugs.webkit.org/show_bug.cgi?id=85822
+
+ Reviewed by Adam Barth.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2012-05-04 Jer Noble <[email protected]>
REGRESSION (r116127-r116165): 6 tests failing on Lion Debug (Tests)
Modified: branches/safari-536-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (117092 => 117093)
--- branches/safari-536-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2012-05-15 17:47:43 UTC (rev 117092)
+++ branches/safari-536-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2012-05-15 17:56:37 UTC (rev 117093)
@@ -54,6 +54,7 @@
ENABLE_HIGH_DPI_CANVAS = ENABLE_HIGH_DPI_CANVAS;
ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(REAL_PLATFORM_NAME));
ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
+ENABLE_IFRAME_SEAMLESS = ENABLE_IFRAME_SEAMLESS;
ENABLE_INDEXED_DATABASE = ;
ENABLE_INPUT_SPEECH = ;
ENABLE_INPUT_TYPE_COLOR = ;
Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (117092 => 117093)
--- branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-15 17:47:43 UTC (rev 117092)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-15 17:56:37 UTC (rev 117093)
@@ -1,5 +1,18 @@
2012-05-15 Lucas Forschler <[email protected]>
+ Merge 116356
+
+ 2012-05-07 Eric Seidel <[email protected]>
+
+ Add ENABLE_IFRAME_SEAMLESS so Apple can turn off SEAMLESS if needed
+ https://bugs.webkit.org/show_bug.cgi?id=85822
+
+ Reviewed by Adam Barth.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2012-05-15 Lucas Forschler <[email protected]>
+
Merge 116226
2012-05-04 Jon Lee <[email protected]>
Modified: branches/safari-536-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig (117092 => 117093)
--- branches/safari-536-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2012-05-15 17:47:43 UTC (rev 117092)
+++ branches/safari-536-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2012-05-15 17:56:37 UTC (rev 117093)
@@ -54,6 +54,7 @@
ENABLE_HIGH_DPI_CANVAS = ENABLE_HIGH_DPI_CANVAS;
ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(REAL_PLATFORM_NAME));
ENABLE_ICONDATABASE_macosx = ENABLE_ICONDATABASE;
+ENABLE_IFRAME_SEAMLESS = ENABLE_IFRAME_SEAMLESS;
ENABLE_INDEXED_DATABASE = ;
ENABLE_INPUT_SPEECH = ;
ENABLE_INPUT_TYPE_COLOR = ;
Modified: branches/safari-536-branch/Tools/qmake/mkspecs/features/features.pri (117092 => 117093)
--- branches/safari-536-branch/Tools/qmake/mkspecs/features/features.pri 2012-05-15 17:47:43 UTC (rev 117092)
+++ branches/safari-536-branch/Tools/qmake/mkspecs/features/features.pri 2012-05-15 17:56:37 UTC (rev 117093)
@@ -31,6 +31,7 @@
ENABLE_GEOLOCATION=0 \
ENABLE_GESTURE_EVENTS=1 \
ENABLE_ICONDATABASE=1 \
+ ENABLE_IFRAME_SEAMLESS=1 \
ENABLE_INPUT_SPEECH=0 \
ENABLE_INPUT_TYPE_COLOR=0 \
ENABLE_INSPECTOR=1 \
Modified: branches/safari-536-branch/WebKitLibraries/ChangeLog (117092 => 117093)
--- branches/safari-536-branch/WebKitLibraries/ChangeLog 2012-05-15 17:47:43 UTC (rev 117092)
+++ branches/safari-536-branch/WebKitLibraries/ChangeLog 2012-05-15 17:56:37 UTC (rev 117093)
@@ -1,3 +1,16 @@
+2012-05-15 Lucas Forschler <[email protected]>
+
+ Merge 116356
+
+ 2012-05-07 Eric Seidel <[email protected]>
+
+ Add ENABLE_IFRAME_SEAMLESS so Apple can turn off SEAMLESS if needed
+ https://bugs.webkit.org/show_bug.cgi?id=85822
+
+ Reviewed by Adam Barth.
+
+ * win/tools/vsprops/FeatureDefines.vsprops:
+
2012-05-02 Eric Seidel <[email protected]>
Resort FeatureDefinesCairo.vcprops to actually be alphabetical (in preparation for autogeneration)
Modified: branches/safari-536-branch/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops (117092 => 117093)
--- branches/safari-536-branch/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops 2012-05-15 17:47:43 UTC (rev 117092)
+++ branches/safari-536-branch/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops 2012-05-15 17:56:37 UTC (rev 117093)
@@ -127,6 +127,11 @@
PerformEnvironmentSet="true"
/>
<UserMacro
+ Name="ENABLE_IFRAME_SEAMLESS"
+ Value="ENABLE_IFRAME_SEAMLESS"
+ PerformEnvironmentSet="true"
+ />
+ <UserMacro
Name="ENABLE_INDEXED_DATABASE"
Value=""
PerformEnvironmentSet="true"
