[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[darin at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 059c67b6d7885fa22a41346b9bec187c83a279c7
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 21:11:34 2010 +0000

    2010-03-04  Darin Fisher  <darin at chromium.org>
    
            Reviewed by Dmitry Titov.
    
            [chromium] make history.{push,replace}State enabled at runtime
            https://bugs.webkit.org/show_bug.cgi?id=35753
    
            * bindings/generic/RuntimeEnabledFeatures.cpp:
            * bindings/generic/RuntimeEnabledFeatures.h:
            (WebCore::RuntimeEnabledFeatures::setPushStateEnabled):
            (WebCore::RuntimeEnabledFeatures::pushStateEnabled):
            (WebCore::RuntimeEnabledFeatures::replaceStateEnabled):
            * page/History.idl:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55549 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index eed2463..4c4fbce 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-04  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        [chromium] make history.{push,replace}State enabled at runtime
+        https://bugs.webkit.org/show_bug.cgi?id=35753
+
+        * bindings/generic/RuntimeEnabledFeatures.cpp:
+        * bindings/generic/RuntimeEnabledFeatures.h:
+        (WebCore::RuntimeEnabledFeatures::setPushStateEnabled):
+        (WebCore::RuntimeEnabledFeatures::pushStateEnabled):
+        (WebCore::RuntimeEnabledFeatures::replaceStateEnabled):
+        * page/History.idl:
+
 2010-03-04  Antonio Gomes  <tonikitoo at webkit.org>
 
         Unreviewed attempt to (again) fix Mac build.
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
index 84a1460..6ba85da 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
@@ -45,6 +45,7 @@ bool RuntimeEnabledFeatures::isApplicationCacheEnabled = true;
 bool RuntimeEnabledFeatures::isGeolocationEnabled = true;
 bool RuntimeEnabledFeatures::isIndexedDBEnabled = false;
 bool RuntimeEnabledFeatures::isWebGLEnabled = false;
+bool RuntimeEnabledFeatures::isPushStateEnabled = false;
 
 #if ENABLE(VIDEO)
 
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
index 4541105..37dceff 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.h
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
@@ -90,6 +90,10 @@ public:
     static bool webGLFloatArrayEnabled() { return isWebGLEnabled; }
 #endif
 
+    static void setPushStateEnabled(bool isEnabled) { isPushStateEnabled = isEnabled; }
+    static bool pushStateEnabled() { return isPushStateEnabled; }
+    static bool replaceStateEnabled() { return isPushStateEnabled; }
+
 private:
     // Never instantiate.
     RuntimeEnabledFeatures() { }
@@ -101,6 +105,7 @@ private:
     static bool isGeolocationEnabled;
     static bool isIndexedDBEnabled;
     static bool isWebGLEnabled;
+    static bool isPushStateEnabled;
 };
 
 } // namespace WebCore
diff --git a/WebCore/page/History.idl b/WebCore/page/History.idl
index 3fc2771..d1be5ae 100644
--- a/WebCore/page/History.idl
+++ b/WebCore/page/History.idl
@@ -41,9 +41,9 @@ module window {
         [DoNotCheckDomainSecurity] void forward();
         [DoNotCheckDomainSecurity] void go(in long distance);
         
-        [Custom] void pushState(in any data, in DOMString title, in optional DOMString url)
+        [Custom, EnabledAtRuntime] void pushState(in any data, in DOMString title, in optional DOMString url)
             raises(DOMException);
-        [Custom] void replaceState(in any data, in DOMString title, in optional DOMString url)
+        [Custom, EnabledAtRuntime] void replaceState(in any data, in DOMString title, in optional DOMString url)
             raises(DOMException);
     };
 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index adf96b9..a4778d9 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-04  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        [chromium] make history.{push,replace}State enabled at runtime
+        https://bugs.webkit.org/show_bug.cgi?id=35753
+
+        * public/WebRuntimeFeatures.h:
+        * src/WebRuntimeFeatures.cpp:
+        (WebKit::WebRuntimeFeatures::enablePushState):
+        (WebKit::WebRuntimeFeatures::isPushStateEnabled):
+
 2010-03-04  Pavel Feldman  <pfeldman at chromium.org>
 
         Not reviewed: chromium tests fix.
diff --git a/WebKit/chromium/public/WebRuntimeFeatures.h b/WebKit/chromium/public/WebRuntimeFeatures.h
index 0e6ccec..40a5952 100644
--- a/WebKit/chromium/public/WebRuntimeFeatures.h
+++ b/WebKit/chromium/public/WebRuntimeFeatures.h
@@ -71,6 +71,9 @@ public:
     WEBKIT_API static void enableWebGL(bool);
     WEBKIT_API static bool isWebGLEnabled();
 
+    WEBKIT_API static void enablePushState(bool);
+    WEBKIT_API static bool isPushStateEnabled(bool);
+
 private:
     WebRuntimeFeatures();
 };
diff --git a/WebKit/chromium/src/WebRuntimeFeatures.cpp b/WebKit/chromium/src/WebRuntimeFeatures.cpp
index 79ee2e1..464834d 100644
--- a/WebKit/chromium/src/WebRuntimeFeatures.cpp
+++ b/WebKit/chromium/src/WebRuntimeFeatures.cpp
@@ -200,4 +200,14 @@ bool WebRuntimeFeatures::isWebGLEnabled()
 #endif
 }
 
+void WebRuntimeFeatures::enablePushState(bool enable)
+{
+    RuntimeEnabledFeatures::setPushStateEnabled(enable);
+}
+
+bool WebRuntimeFeatures::isPushStateEnabled(bool enable)
+{
+    return RuntimeEnabledFeatures::pushStateEnabled();
+}
+
 } // namespace WebKit

-- 
WebKit Debian packaging