Mouse Lock: Renaming to 'Pointer Lock': Runtime Enable Flags
authorscheib@chromium.org <scheib@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Nov 2011 22:39:48 +0000 (22:39 +0000)
committerscheib@chromium.org <scheib@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Nov 2011 22:39:48 +0000 (22:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=72303

Reviewed by Darin Fisher.

Source/WebCore:

* bindings/generic/RuntimeEnabledFeatures.cpp:
* bindings/generic/RuntimeEnabledFeatures.h:
(WebCore::RuntimeEnabledFeatures::webkitPointerLockEnabled):
(WebCore::RuntimeEnabledFeatures::setWebkitPointerLockEnabled):
(WebCore::RuntimeEnabledFeatures::webkitPointerEnabled):
* page/Settings.cpp:
(WebCore::Settings::Settings):
* page/Settings.h:
(WebCore::Settings::setPointerLockEnabled):
(WebCore::Settings::PointerLockEnabled):

Source/WebKit/chromium:

* public/WebRuntimeFeatures.h:
* public/WebSettings.h:
* src/WebRuntimeFeatures.cpp:
(WebKit::WebRuntimeFeatures::enablePointerLock):
(WebKit::WebRuntimeFeatures::isPointerLockEnabled):
* src/WebSettingsImpl.cpp:
(WebKit::WebSettingsImpl::setPointerLockEnabled):
* src/WebSettingsImpl.h:

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

Source/WebCore/ChangeLog
Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h
Source/WebCore/page/Settings.cpp
Source/WebCore/page/Settings.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/public/WebRuntimeFeatures.h
Source/WebKit/chromium/public/WebSettings.h
Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
Source/WebKit/chromium/src/WebSettingsImpl.cpp
Source/WebKit/chromium/src/WebSettingsImpl.h

index 344a610..ec76b6a 100644 (file)
@@ -1,3 +1,21 @@
+2011-11-14  Vincent Scheib  <scheib@chromium.org>
+
+        Mouse Lock: Renaming to 'Pointer Lock': Runtime Enable Flags
+        https://bugs.webkit.org/show_bug.cgi?id=72303
+
+        Reviewed by Darin Fisher.
+
+        * bindings/generic/RuntimeEnabledFeatures.cpp:
+        * bindings/generic/RuntimeEnabledFeatures.h:
+        (WebCore::RuntimeEnabledFeatures::webkitPointerLockEnabled):
+        (WebCore::RuntimeEnabledFeatures::setWebkitPointerLockEnabled):
+        (WebCore::RuntimeEnabledFeatures::webkitPointerEnabled):
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        * page/Settings.h:
+        (WebCore::Settings::setPointerLockEnabled):
+        (WebCore::Settings::PointerLockEnabled):
+
 2011-11-14  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r100176.
index 17a7e8c..047ab00 100644 (file)
@@ -165,7 +165,7 @@ bool RuntimeEnabledFeatures::isFullScreenAPIEnabled = true;
 #endif
 
 #if ENABLE(POINTER_LOCK)
-bool RuntimeEnabledFeatures::isMouseLockAPIEnabled = false;
+bool RuntimeEnabledFeatures::isPointerLockEnabled = false;
 #endif
 
 #if ENABLE(MEDIA_SOURCE)
index a978200..a063e04 100644 (file)
@@ -81,9 +81,9 @@ public:
 #endif
 
 #if ENABLE(POINTER_LOCK)
-    static bool webkitMouseLockAPIEnabled() { return isMouseLockAPIEnabled; }
-    static void setWebkitMouseLockAPIEnabled(bool isEnabled) { isMouseLockAPIEnabled = isEnabled; }
-    static bool webkitPointerEnabled() { return isMouseLockAPIEnabled; }
+    static bool webkitPointerLockEnabled() { return isPointerLockEnabled; }
+    static void setWebkitPointerLockEnabled(bool isEnabled) { isPointerLockEnabled = isEnabled; }
+    static bool webkitPointerEnabled() { return isPointerLockEnabled; }
 #endif
 
 #if ENABLE(VIDEO)
@@ -235,7 +235,7 @@ private:
 #endif
 
 #if ENABLE(POINTER_LOCK)
-    static bool isMouseLockAPIEnabled;
+    static bool isPointerLockEnabled;
 #endif
 
 #if ENABLE(MEDIA_SOURCE)
index 092d73b..0736c66 100644 (file)
@@ -199,7 +199,7 @@ Settings::Settings(Page* page)
     , m_fullScreenAPIEnabled(false)
 #endif
 #if ENABLE(POINTER_LOCK)
-    , m_mouseLockAPIEnabled(false)
+    , m_pointerLockEnabled(false)
 #endif
     , m_asynchronousSpellCheckingEnabled(false)
 #if USE(UNIFIED_TEXT_CHECKING)
index dad60be..78258c0 100644 (file)
@@ -383,8 +383,8 @@ namespace WebCore {
 #endif
 
 #if ENABLE(POINTER_LOCK)
-        void setMouseLockEnabled(bool flag) { m_mouseLockAPIEnabled = flag; }
-        bool mouseLockEnabled() const  { return m_mouseLockAPIEnabled; }
+        void setPointerLockEnabled(bool flag) { m_pointerLockEnabled = flag; }
+        bool PointerLockEnabled() const  { return m_pointerLockEnabled; }
 #endif
 
 #if USE(AVFOUNDATION)
@@ -594,7 +594,7 @@ namespace WebCore {
         bool m_fullScreenAPIEnabled : 1;
 #endif
 #if ENABLE(POINTER_LOCK)
-        bool m_mouseLockAPIEnabled : 1;
+        bool m_pointerLockEnabled : 1;
 #endif
         bool m_asynchronousSpellCheckingEnabled: 1;
         bool m_unifiedTextCheckerEnabled: 1;
index 831b0c7..c200f9f 100644 (file)
@@ -1,3 +1,19 @@
+2011-11-14  Vincent Scheib  <scheib@chromium.org>
+
+        Mouse Lock: Renaming to 'Pointer Lock': Runtime Enable Flags
+        https://bugs.webkit.org/show_bug.cgi?id=72303
+
+        Reviewed by Darin Fisher.
+
+        * public/WebRuntimeFeatures.h:
+        * public/WebSettings.h:
+        * src/WebRuntimeFeatures.cpp:
+        (WebKit::WebRuntimeFeatures::enablePointerLock):
+        (WebKit::WebRuntimeFeatures::isPointerLockEnabled):
+        * src/WebSettingsImpl.cpp:
+        (WebKit::WebSettingsImpl::setPointerLockEnabled):
+        * src/WebSettingsImpl.h:
+
 2011-11-14  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r100176.
index 6c3d299..18f5af4 100644 (file)
@@ -109,8 +109,8 @@ public:
     WEBKIT_EXPORT static void enableFullScreenAPI(bool);
     WEBKIT_EXPORT static bool isFullScreenAPIEnabled();
 
-    WEBKIT_EXPORT static void enableMouseLockAPI(bool);
-    WEBKIT_EXPORT static bool isMouseLockAPIEnabled();
+    WEBKIT_EXPORT static void enablePointerLock(bool);
+    WEBKIT_EXPORT static bool isPointerLockEnabled();
 
     WEBKIT_EXPORT static void enableMediaSource(bool);
     WEBKIT_EXPORT static bool isMediaSourceEnabled();
index 393bb87..ca9a43c 100644 (file)
@@ -126,7 +126,7 @@ public:
     virtual void setValidationMessageTimerMagnification(int) = 0;
     virtual void setMinimumTimerInterval(double) = 0;
     virtual void setFullScreenEnabled(bool) = 0;
-    virtual void setMouseLockEnabled(bool) = 0;
+    virtual void setPointerLockEnabled(bool) = 0;
     virtual void setAllowDisplayOfInsecureContent(bool) = 0;
     virtual void setAllowRunningOfInsecureContent(bool) = 0;
     virtual void setShouldPrintBackgrounds(bool) = 0;
index 1dd4945..62249da 100644 (file)
@@ -360,19 +360,19 @@ bool WebRuntimeFeatures::isFullScreenAPIEnabled()
 #endif
 }
 
-void WebRuntimeFeatures::enableMouseLockAPI(bool enable)
+void WebRuntimeFeatures::enablePointerLock(bool enable)
 {
 #if ENABLE(POINTER_LOCK)
-    RuntimeEnabledFeatures::setWebkitMouseLockAPIEnabled(enable);
+    RuntimeEnabledFeatures::setWebkitPointerLockEnabled(enable);
 #else
     UNUSED_PARAM(enable);
 #endif
 }
 
-bool WebRuntimeFeatures::isMouseLockAPIEnabled()
+bool WebRuntimeFeatures::isPointerLockEnabled()
 {
 #if ENABLE(POINTER_LOCK)
-    return RuntimeEnabledFeatures::webkitMouseLockAPIEnabled();
+    return RuntimeEnabledFeatures::webkitPointerLockEnabled();
 #else
     return false;
 #endif
index f03084b..4c816af 100644 (file)
@@ -423,10 +423,10 @@ void WebSettingsImpl::setFullScreenEnabled(bool enabled)
 #endif
 }
 
-void WebSettingsImpl::setMouseLockEnabled(bool enabled)
+void WebSettingsImpl::setPointerLockEnabled(bool enabled)
 {
 #if ENABLE(POINTER_LOCK)
-    m_settings->setMouseLockEnabled(enabled);
+    m_settings->setPointerLockEnabled(enabled);
 #else
     UNUSED_PARAM(enabled);
 #endif
index 078a68c..f748e97 100644 (file)
@@ -118,7 +118,7 @@ public:
     virtual void setValidationMessageTimerMagnification(int);
     virtual void setMinimumTimerInterval(double);
     virtual void setFullScreenEnabled(bool);
-    virtual void setMouseLockEnabled(bool);
+    virtual void setPointerLockEnabled(bool);
     virtual void setAllowDisplayOfInsecureContent(bool);
     virtual void setAllowRunningOfInsecureContent(bool);
     virtual void setShouldPrintBackgrounds(bool);