Diff
Modified: trunk/Source/WebCore/ChangeLog (100193 => 100194)
--- trunk/Source/WebCore/ChangeLog 2011-11-14 22:32:51 UTC (rev 100193)
+++ trunk/Source/WebCore/ChangeLog 2011-11-14 22:39:48 UTC (rev 100194)
@@ -1,3 +1,21 @@
+2011-11-14 Vincent Scheib <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r100176.
Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp (100193 => 100194)
--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2011-11-14 22:32:51 UTC (rev 100193)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2011-11-14 22:39:48 UTC (rev 100194)
@@ -165,7 +165,7 @@
#endif
#if ENABLE(POINTER_LOCK)
-bool RuntimeEnabledFeatures::isMouseLockAPIEnabled = false;
+bool RuntimeEnabledFeatures::isPointerLockEnabled = false;
#endif
#if ENABLE(MEDIA_SOURCE)
Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h (100193 => 100194)
--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2011-11-14 22:32:51 UTC (rev 100193)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2011-11-14 22:39:48 UTC (rev 100194)
@@ -81,9 +81,9 @@
#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 @@
#endif
#if ENABLE(POINTER_LOCK)
- static bool isMouseLockAPIEnabled;
+ static bool isPointerLockEnabled;
#endif
#if ENABLE(MEDIA_SOURCE)
Modified: trunk/Source/WebCore/page/Settings.cpp (100193 => 100194)
--- trunk/Source/WebCore/page/Settings.cpp 2011-11-14 22:32:51 UTC (rev 100193)
+++ trunk/Source/WebCore/page/Settings.cpp 2011-11-14 22:39:48 UTC (rev 100194)
@@ -199,7 +199,7 @@
, m_fullScreenAPIEnabled(false)
#endif
#if ENABLE(POINTER_LOCK)
- , m_mouseLockAPIEnabled(false)
+ , m_pointerLockEnabled(false)
#endif
, m_asynchronousSpellCheckingEnabled(false)
#if USE(UNIFIED_TEXT_CHECKING)
Modified: trunk/Source/WebCore/page/Settings.h (100193 => 100194)
--- trunk/Source/WebCore/page/Settings.h 2011-11-14 22:32:51 UTC (rev 100193)
+++ trunk/Source/WebCore/page/Settings.h 2011-11-14 22:39:48 UTC (rev 100194)
@@ -383,8 +383,8 @@
#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 @@
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;
Modified: trunk/Source/WebKit/chromium/ChangeLog (100193 => 100194)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-14 22:32:51 UTC (rev 100193)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-14 22:39:48 UTC (rev 100194)
@@ -1,3 +1,19 @@
+2011-11-14 Vincent Scheib <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r100176.
Modified: trunk/Source/WebKit/chromium/public/WebRuntimeFeatures.h (100193 => 100194)
--- trunk/Source/WebKit/chromium/public/WebRuntimeFeatures.h 2011-11-14 22:32:51 UTC (rev 100193)
+++ trunk/Source/WebKit/chromium/public/WebRuntimeFeatures.h 2011-11-14 22:39:48 UTC (rev 100194)
@@ -109,8 +109,8 @@
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();
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (100193 => 100194)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2011-11-14 22:32:51 UTC (rev 100193)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2011-11-14 22:39:48 UTC (rev 100194)
@@ -126,7 +126,7 @@
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;
Modified: trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp (100193 => 100194)
--- trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp 2011-11-14 22:32:51 UTC (rev 100193)
+++ trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp 2011-11-14 22:39:48 UTC (rev 100194)
@@ -360,19 +360,19 @@
#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
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (100193 => 100194)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2011-11-14 22:32:51 UTC (rev 100193)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2011-11-14 22:39:48 UTC (rev 100194)
@@ -423,10 +423,10 @@
#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
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (100193 => 100194)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2011-11-14 22:32:51 UTC (rev 100193)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2011-11-14 22:39:48 UTC (rev 100194)
@@ -118,7 +118,7 @@
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);
