Title: [120030] trunk/Source
Revision
120030
Author
[email protected]
Date
2012-06-11 19:51:59 -0700 (Mon, 11 Jun 2012)

Log Message

Consolidate Pointer Lock runtime enabled flags to just one.
https://bugs.webkit.org/show_bug.cgi?id=88810

Reviewed by Dimitri Glazkov.

Source/WebCore:

No new tests.

* bindings/generic/RuntimeEnabledFeatures.h:
(WebCore::RuntimeEnabledFeatures::pointerLockEnabled):
(WebCore::RuntimeEnabledFeatures::setPointerLockEnabled):
* dom/MouseEvent.idl:
* page/Navigator.idl:

Source/WebKit/chromium:

* src/WebRuntimeFeatures.cpp:
(WebKit::WebRuntimeFeatures::enablePointerLock):
(WebKit::WebRuntimeFeatures::isPointerLockEnabled):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (120029 => 120030)


--- trunk/Source/WebCore/ChangeLog	2012-06-12 02:21:42 UTC (rev 120029)
+++ trunk/Source/WebCore/ChangeLog	2012-06-12 02:51:59 UTC (rev 120030)
@@ -1,3 +1,18 @@
+2012-06-11  Vincent Scheib  <[email protected]>
+
+        Consolidate Pointer Lock runtime enabled flags to just one.
+        https://bugs.webkit.org/show_bug.cgi?id=88810
+
+        Reviewed by Dimitri Glazkov.
+
+        No new tests.
+
+        * bindings/generic/RuntimeEnabledFeatures.h:
+        (WebCore::RuntimeEnabledFeatures::pointerLockEnabled):
+        (WebCore::RuntimeEnabledFeatures::setPointerLockEnabled):
+        * dom/MouseEvent.idl:
+        * page/Navigator.idl:
+
 2012-06-11  Alexis Menard  <[email protected]>
 
         [CSS3 Backgrounds and Borders] Protect box-decoration-break behind a feature flag.

Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h (120029 => 120030)


--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h	2012-06-12 02:21:42 UTC (rev 120029)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h	2012-06-12 02:51:59 UTC (rev 120030)
@@ -96,11 +96,8 @@
 #endif
 
 #if ENABLE(POINTER_LOCK)
-    static bool webkitPointerLockEnabled() { return isPointerLockEnabled; }
-    static void setWebkitPointerLockEnabled(bool isEnabled) { isPointerLockEnabled = isEnabled; }
-    static bool webkitPointerEnabled() { return isPointerLockEnabled; }
-    static bool webkitMovementXEnabled() { return isPointerLockEnabled; }
-    static bool webkitMovementYEnabled() { return isPointerLockEnabled; }
+    static bool pointerLockEnabled() { return isPointerLockEnabled; }
+    static void setPointerLockEnabled(bool isEnabled) { isPointerLockEnabled = isEnabled; }
 #endif
 
 #if ENABLE(VIDEO)

Modified: trunk/Source/WebCore/dom/Document.idl (120029 => 120030)


--- trunk/Source/WebCore/dom/Document.idl	2012-06-12 02:21:42 UTC (rev 120029)
+++ trunk/Source/WebCore/dom/Document.idl	2012-06-12 02:51:59 UTC (rev 120030)
@@ -334,8 +334,8 @@
         attribute [NotEnumerable,Conditional=TOUCH_EVENTS,V8EnabledAtRuntime] EventListener ontouchcancel;
         attribute [NotEnumerable, Conditional=FULLSCREEN_API] EventListener onwebkitfullscreenchange;
         attribute [NotEnumerable, Conditional=FULLSCREEN_API] EventListener onwebkitfullscreenerror;
-        attribute [NotEnumerable, Conditional=POINTER_LOCK] EventListener onwebkitpointerlockchange;
-        attribute [NotEnumerable, Conditional=POINTER_LOCK] EventListener onwebkitpointerlockerror;
+        attribute [NotEnumerable, Conditional=POINTER_LOCK, V8EnabledAtRuntime=pointerLock] EventListener onwebkitpointerlockchange;
+        attribute [NotEnumerable, Conditional=POINTER_LOCK, V8EnabledAtRuntime=pointerLock] EventListener onwebkitpointerlockerror;
 #endif
 
 #if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS

Modified: trunk/Source/WebCore/dom/MouseEvent.idl (120029 => 120030)


--- trunk/Source/WebCore/dom/MouseEvent.idl	2012-06-12 02:21:42 UTC (rev 120029)
+++ trunk/Source/WebCore/dom/MouseEvent.idl	2012-06-12 02:51:59 UTC (rev 120030)
@@ -25,8 +25,8 @@
         readonly attribute long             screenY;
         readonly attribute long             clientX;
         readonly attribute long             clientY;
-        readonly attribute [Conditional=POINTER_LOCK, V8EnabledAtRuntime] long webkitMovementX;
-        readonly attribute [Conditional=POINTER_LOCK, V8EnabledAtRuntime] long webkitMovementY;
+        readonly attribute [Conditional=POINTER_LOCK, V8EnabledAtRuntime=pointerLock] long webkitMovementX;
+        readonly attribute [Conditional=POINTER_LOCK, V8EnabledAtRuntime=pointerLock] long webkitMovementY;
         readonly attribute boolean          ctrlKey;
         readonly attribute boolean          shiftKey;
         readonly attribute boolean          altKey;

Modified: trunk/Source/WebCore/page/Navigator.idl (120029 => 120030)


--- trunk/Source/WebCore/page/Navigator.idl	2012-06-12 02:21:42 UTC (rev 120029)
+++ trunk/Source/WebCore/page/Navigator.idl	2012-06-12 02:51:59 UTC (rev 120030)
@@ -40,8 +40,8 @@
 
         readonly attribute boolean onLine;
 
-#if defined(ENABLE_POINTER_LOCK) && ENABLE_POINTER_LOCK
-        readonly attribute [V8EnabledAtRuntime] PointerLock webkitPointer;
+#if defined(ENABLE_POINTER_LOCK) && ENABLE_POINTER_LOCK // FIXME: Remove reliance on PointerLock.idl when removing old Pointer Lock API. (https://bugs.webkit.org/show_bug.cgi?id=84402)
+        readonly attribute [Conditional=POINTER_LOCK, V8EnabledAtRuntime=pointerLock] PointerLock webkitPointer;
 #endif
 
         void getStorageUpdates(); // FIXME: Remove this method or rename to yieldForStorageUpdates.

Modified: trunk/Source/WebKit/chromium/ChangeLog (120029 => 120030)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-06-12 02:21:42 UTC (rev 120029)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-06-12 02:51:59 UTC (rev 120030)
@@ -1,3 +1,14 @@
+2012-06-11  Vincent Scheib  <[email protected]>
+
+        Consolidate Pointer Lock runtime enabled flags to just one.
+        https://bugs.webkit.org/show_bug.cgi?id=88810
+
+        Reviewed by Dimitri Glazkov.
+
+        * src/WebRuntimeFeatures.cpp:
+        (WebKit::WebRuntimeFeatures::enablePointerLock):
+        (WebKit::WebRuntimeFeatures::isPointerLockEnabled):
+
 2012-06-11  Alexis Menard  <[email protected]>
 
         [CSS3 Backgrounds and Borders] Protect box-decoration-break behind a feature flag.

Modified: trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp (120029 => 120030)


--- trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp	2012-06-12 02:21:42 UTC (rev 120029)
+++ trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp	2012-06-12 02:51:59 UTC (rev 120030)
@@ -397,7 +397,7 @@
 void WebRuntimeFeatures::enablePointerLock(bool enable)
 {
 #if ENABLE(POINTER_LOCK)
-    RuntimeEnabledFeatures::setWebkitPointerLockEnabled(enable);
+    RuntimeEnabledFeatures::setPointerLockEnabled(enable);
 #else
     UNUSED_PARAM(enable);
 #endif
@@ -406,7 +406,7 @@
 bool WebRuntimeFeatures::isPointerLockEnabled()
 {
 #if ENABLE(POINTER_LOCK)
-    return RuntimeEnabledFeatures::webkitPointerLockEnabled();
+    return RuntimeEnabledFeatures::pointerLockEnabled();
 #else
     return false;
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to