Attachment 140585 Details for Bug 85822 – Patch for landing

[patch] Patch for landing

bug-85822-20120507140552.patch (text/plain), 8.35 KB, created by Eric Seidel (no email) on 2012-05-07 14:05:54 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Seidel (no email)

Created: 2012-05-07 14:05:54 PDT

Size: 8.35 KB

patch

obsolete

>Subversion Revision: 116350
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 0774438d120939f8ddb743429ac1c7d1c68842e4..2d55bbda3867e3ec43d53f11774e1ef1ba6fd296 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -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
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index a904e2a8e03b56b09201f54b2ffdbaa44129c28c..8fa63896654590669d07ab57e000175d59ea0bd1 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -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  Rob Buis  <rbuis@rim.com>
> 
>         Shrink SVGInlineTextBox object size
>diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
>index e103b9942c0c4c094c797084d7257357af3cebb0..306c009273af18ecfd2ab876b8cf5130454e0fe9 100644
>--- a/Source/WebKit/mac/ChangeLog
>+++ b/Source/WebKit/mac/ChangeLog
>@@ -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
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 1f27c0a52b02f2057807c503a57e47c5176ca74d..8cfa7b261f664455c8f2c0049d6fdec9940e7453 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -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  Sheriff Bot  <webkit.review.bot@gmail.com>
> 
>         Unreviewed, rolling out r116299, r116301, and r116303.
>diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>index 2dc145f36b9c35e01c0d1d6e2c1f1fd01a21c5b5..07f54ab53c0a3a20000e0561ba81d5e1637ac60a 100644
>--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>@@ -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 = ;
>diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>index 9d76ca226feeebf6c529673abd1490d6c2dd5567..4f0c4d455b5d31ae366ade0943fcf15582331205 100644
>--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>@@ -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 = ;
>diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
>index b7a966bb147f2eb7e2143edd8c7357b882572ec7..35803fb4a415d546607c107376ee19b226651b8b 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -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
>diff --git a/Source/WebKit/chromium/features.gypi b/Source/WebKit/chromium/features.gypi
>index 86054fac195356695241a4bdf0c49f50062c01cc..bc730c6837f81d32dec380d66494483a5787d4fc 100644
>--- a/Source/WebKit/chromium/features.gypi
>+++ b/Source/WebKit/chromium/features.gypi
>@@ -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',
>diff --git a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>index 2dc145f36b9c35e01c0d1d6e2c1f1fd01a21c5b5..07f54ab53c0a3a20000e0561ba81d5e1637ac60a 100644
>--- a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>@@ -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 = ;
>diff --git a/Source/WebKit2/Configurations/FeatureDefines.xcconfig b/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>index 2dc145f36b9c35e01c0d1d6e2c1f1fd01a21c5b5..07f54ab53c0a3a20000e0561ba81d5e1637ac60a 100644
>--- a/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>@@ -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 = ;
>diff --git a/Tools/qmake/mkspecs/features/features.pri b/Tools/qmake/mkspecs/features/features.pri
>index f581a0c65f7cea7058725ece88e76961637cb6a6..becc38f82f11f5ad019e3758673cc60c69fe8436 100644
>--- a/Tools/qmake/mkspecs/features/features.pri
>+++ b/Tools/qmake/mkspecs/features/features.pri
>@@ -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 \
>diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
>index ed0fadb1790ec9c00c86eb8c6e559d77667edd7c..282049102e602e22cb7438096f866dad36391930 100644
>--- a/WebKitLibraries/ChangeLog
>+++ b/WebKitLibraries/ChangeLog
>@@ -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)
>diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
>index 342adff1eafe3ae971478215075241b75f267cad..5b3ac61eb36bd25208a73c16bdd3c40981a113a5 100644
>--- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
>+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
>@@ -122,6 +122,11 @@
> 		PerformEnvironmentSet="true"
> 	/>
>   <UserMacro
>+		Name="ENABLE_IFRAME_SEAMLESS"
>+		Value="ENABLE_IFRAME_SEAMLESS"
>+		PerformEnvironmentSet="true"
>+	/>
>+  <UserMacro
> 		Name="ENABLE_INDEXED_DATABASE"
> 		Value=""
> 		PerformEnvironmentSet="true"

Actions: View | Formatted Diff | Diff

Attachments on bug 85822: 140581 | 140583 | 140585