Add ENABLE_IFRAME_SEAMLESS so Apple can turn off SEAMLESS if needed
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 7 May 2012 22:02:47 +0000 (22:02 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 7 May 2012 22:02:47 +0000 (22:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=85822

Reviewed by Adam Barth.

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

* Configurations/FeatureDefines.xcconfig:
* dom/Document.cpp:
(WebCore::Document::shouldDisplaySeamlesslyWithParent):

Source/WebKit/mac:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

* Configurations/FeatureDefines.xcconfig:

WebKitLibraries:

* win/tools/vsprops/FeatureDefines.vsprops:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@116356 268f45cc-cd09-0410-ab3c-d52691b4dbfc

13 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/dom/Document.cpp
Source/WebKit/chromium/features.gypi
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/FeatureDefines.xcconfig
Tools/qmake/mkspecs/features/features.pri
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops

index 0774438..2d55bbd 100644 (file)
@@ -1,3 +1,12 @@
+2012-05-07  Eric Seidel  <eric@webkit.org>
+
+        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-05  Gavin Barraclough  <barraclough@apple.com>
 
         Remove TrustedImm32::m_isPointer
index 2dc145f..07f54ab 100644 (file)
@@ -54,6 +54,7 @@ ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 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 = ;
index dc549e9..6c941e3 100644 (file)
@@ -1,3 +1,14 @@
+2012-05-07  Eric Seidel  <eric@webkit.org>
+
+        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-07  Shezan Baig  <shezbaig.wk@gmail.com>
 
         Selection Background Color Error
index 9d76ca2..4f0c4d4 100644 (file)
@@ -54,6 +54,7 @@ ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 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 = ;
index b7a966b..35803fb 100644 (file)
@@ -5898,10 +5898,14 @@ HTMLIFrameElement* Document::seamlessParentIFrame() const
 
 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
index 86054fa..bc730c6 100644 (file)
@@ -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',
index e103b99..306c009 100644 (file)
@@ -1,3 +1,12 @@
+2012-05-07  Eric Seidel  <eric@webkit.org>
+
+        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-05  Dean Jackson  <dino@apple.com>
 
         Add new Setting/Preference to disable requestAnimationFrame
index 2dc145f..07f54ab 100644 (file)
@@ -54,6 +54,7 @@ ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 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 = ;
index d601ac0..d1b2d0a 100644 (file)
@@ -1,3 +1,12 @@
+2012-05-07  Eric Seidel  <eric@webkit.org>
+
+        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-07  Alexis Menard  <alexis.menard@openbossa.org>
 
         Unreviewed Qt build fix in Debug.
index 2dc145f..07f54ab 100644 (file)
@@ -54,6 +54,7 @@ ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 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 = ;
index f581a0c..becc38f 100644 (file)
@@ -42,6 +42,7 @@ FEATURE_DEFAULTS = \
     ENABLE_GESTURE_EVENTS=1 \
     ENABLE_HIGH_DPI_CANVAS=0 \
     ENABLE_ICONDATABASE=1 \
+    ENABLE_IFRAME_SEAMLESS=1 \
     ENABLE_INDEXED_DATABASE=0 \
     ENABLE_INPUT_SPEECH=0 \
     ENABLE_INPUT_TYPE_COLOR=0 \
index ed0fadb..2820491 100644 (file)
@@ -1,3 +1,12 @@
+2012-05-07  Eric Seidel  <eric@webkit.org>
+
+        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-06  Eric Seidel  <eric@webkit.org>
 
         Remove 3D_CANVAS define from vsprops files (it was renamed WEBGL many months ago)
index 342adff..5b3ac61 100644 (file)
                PerformEnvironmentSet="true"
        />
   <UserMacro
+               Name="ENABLE_IFRAME_SEAMLESS"
+               Value="ENABLE_IFRAME_SEAMLESS"
+               PerformEnvironmentSet="true"
+       />
+  <UserMacro
                Name="ENABLE_INDEXED_DATABASE"
                Value=""
                PerformEnvironmentSet="true"