Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (100179 => 100180)
--- trunk/Source/_javascript_Core/ChangeLog 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-11-14 20:50:14 UTC (rev 100180)
@@ -1,3 +1,12 @@
+2011-11-14 Vincent Scheib <sch...@chromium.org>
+
+ Mouse Lock: Renaming to 'Pointer Lock': ENABLE Flags
+ https://bugs.webkit.org/show_bug.cgi?id=72286
+
+ Reviewed by Adam Barth.
+
+ * wtf/Platform.h:
+
2011-11-14 Gavin Barraclough <barraclo...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=72280
Modified: trunk/Source/_javascript_Core/wtf/Platform.h (100179 => 100180)
--- trunk/Source/_javascript_Core/wtf/Platform.h 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/_javascript_Core/wtf/Platform.h 2011-11-14 20:50:14 UTC (rev 100180)
@@ -863,8 +863,8 @@
#define ENABLE_FULLSCREEN_API 0
#endif
-#if !defined(ENABLE_MOUSE_LOCK_API)
-#define ENABLE_MOUSE_LOCK_API 0
+#if !defined(ENABLE_POINTER_LOCK)
+#define ENABLE_POINTER_LOCK 0
#endif
#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64)
Modified: trunk/Source/WebCore/ChangeLog (100179 => 100180)
--- trunk/Source/WebCore/ChangeLog 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebCore/ChangeLog 2011-11-14 20:50:14 UTC (rev 100180)
@@ -1,3 +1,24 @@
+2011-11-14 Vincent Scheib <sch...@chromium.org>
+
+ Mouse Lock: Renaming to 'Pointer Lock': ENABLE Flags
+ https://bugs.webkit.org/show_bug.cgi?id=72286
+
+ Reviewed by Adam Barth.
+
+ * bindings/generic/RuntimeEnabledFeatures.cpp:
+ * bindings/generic/RuntimeEnabledFeatures.h:
+ * dom/MouseEvent.idl:
+ * dom/MouseRelatedEvent.h:
+ * page/MouseLockable.cpp:
+ * page/MouseLockable.h:
+ * page/MouseLockable.idl:
+ * page/Navigator.cpp:
+ * page/Navigator.h:
+ * page/Navigator.idl:
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ * page/Settings.h:
+
2011-11-14 Anna Cavender <ann...@chromium.org>
Remove TextTrackCueIndex and TextTrackCueSet. No longer needed.
Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp (100179 => 100180)
--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2011-11-14 20:50:14 UTC (rev 100180)
@@ -164,7 +164,7 @@
bool RuntimeEnabledFeatures::isFullScreenAPIEnabled = true;
#endif
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
bool RuntimeEnabledFeatures::isMouseLockAPIEnabled = false;
#endif
Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h (100179 => 100180)
--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2011-11-14 20:50:14 UTC (rev 100180)
@@ -80,7 +80,7 @@
static bool webkitCancelFullScreenEnabled() { return isFullScreenAPIEnabled; }
#endif
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
static bool webkitMouseLockAPIEnabled() { return isMouseLockAPIEnabled; }
static void setWebkitMouseLockAPIEnabled(bool isEnabled) { isMouseLockAPIEnabled = isEnabled; }
static bool webkitPointerEnabled() { return isMouseLockAPIEnabled; }
@@ -234,7 +234,7 @@
static bool isFullScreenAPIEnabled;
#endif
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
static bool isMouseLockAPIEnabled;
#endif
Modified: trunk/Source/WebCore/dom/MouseEvent.idl (100179 => 100180)
--- trunk/Source/WebCore/dom/MouseEvent.idl 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebCore/dom/MouseEvent.idl 2011-11-14 20:50:14 UTC (rev 100180)
@@ -25,7 +25,7 @@
readonly attribute long screenY;
readonly attribute long clientX;
readonly attribute long clientY;
-#if defined(ENABLE_MOUSE_LOCK_API) && ENABLE_MOUSE_LOCK_API
+#if defined(ENABLE_POINTER_LOCK) && ENABLE_POINTER_LOCK
readonly attribute long movementX;
readonly attribute long movementY;
#endif
Modified: trunk/Source/WebCore/dom/MouseRelatedEvent.h (100179 => 100180)
--- trunk/Source/WebCore/dom/MouseRelatedEvent.h 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebCore/dom/MouseRelatedEvent.h 2011-11-14 20:50:14 UTC (rev 100180)
@@ -39,7 +39,7 @@
const IntPoint& screenLocation() const { return m_screenLocation; }
int clientX() const { return m_clientLocation.x(); }
int clientY() const { return m_clientLocation.y(); }
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
int movementX() const { return m_movementDelta.x(); }
int movementY() const { return m_movementDelta.y(); }
#endif
@@ -76,7 +76,7 @@
// Expose these so MouseEvent::initMouseEvent can set them.
IntPoint m_screenLocation;
LayoutPoint m_clientLocation;
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
LayoutPoint m_movementDelta;
#endif
Modified: trunk/Source/WebCore/page/MouseLockable.cpp (100179 => 100180)
--- trunk/Source/WebCore/page/MouseLockable.cpp 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebCore/page/MouseLockable.cpp 2011-11-14 20:50:14 UTC (rev 100180)
@@ -25,7 +25,7 @@
#include "config.h"
#include "MouseLockable.h"
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
namespace WebCore {
@@ -55,4 +55,4 @@
}
-#endif // ENABLE(MOUSE_LOCK_API)
+#endif // ENABLE(POINTER_LOCK)
Modified: trunk/Source/WebCore/page/MouseLockable.h (100179 => 100180)
--- trunk/Source/WebCore/page/MouseLockable.h 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebCore/page/MouseLockable.h 2011-11-14 20:50:14 UTC (rev 100180)
@@ -25,7 +25,7 @@
#ifndef MouseLockable_h
#define MouseLockable_h
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
#include "VoidCallback.h"
#include <wtf/PassRefPtr.h>
@@ -51,7 +51,7 @@
} // namespace WebCore
-#endif // ENABLE(MOUSE_LOCK_API)
+#endif // ENABLE(POINTER_LOCK)
#endif // MouseLockable_h
Modified: trunk/Source/WebCore/page/MouseLockable.idl (100179 => 100180)
--- trunk/Source/WebCore/page/MouseLockable.idl 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebCore/page/MouseLockable.idl 2011-11-14 20:50:14 UTC (rev 100180)
@@ -25,7 +25,7 @@
module core {
interface [
- Conditional=MOUSE_LOCK_API,
+ Conditional=POINTER_LOCK,
OmitConstructor
] MouseLockable {
void webkitLock(in Element target, in [Callback, Optional] VoidCallback successCallback, in [Callback, Optional] VoidCallback failureCallback);
Modified: trunk/Source/WebCore/page/Navigator.cpp (100179 => 100180)
--- trunk/Source/WebCore/page/Navigator.cpp 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebCore/page/Navigator.cpp 2011-11-14 20:50:14 UTC (rev 100180)
@@ -171,7 +171,7 @@
return m_geolocation.get();
}
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
MouseLockable* Navigator::webkitPointer() const
{
if (!m_pointer)
Modified: trunk/Source/WebCore/page/Navigator.h (100179 => 100180)
--- trunk/Source/WebCore/page/Navigator.h 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebCore/page/Navigator.h 2011-11-14 20:50:14 UTC (rev 100180)
@@ -59,7 +59,7 @@
Geolocation* geolocation() const;
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
MouseLockable* webkitPointer() const;
#endif
@@ -80,7 +80,7 @@
mutable RefPtr<DOMPluginArray> m_plugins;
mutable RefPtr<DOMMimeTypeArray> m_mimeTypes;
mutable RefPtr<Geolocation> m_geolocation;
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
mutable RefPtr<MouseLockable> m_pointer;
#endif
};
Modified: trunk/Source/WebCore/page/Navigator.idl (100179 => 100180)
--- trunk/Source/WebCore/page/Navigator.idl 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebCore/page/Navigator.idl 2011-11-14 20:50:14 UTC (rev 100180)
@@ -44,7 +44,7 @@
readonly attribute [EnabledAtRuntime] Geolocation geolocation;
#endif
-#if defined(ENABLE_MOUSE_LOCK_API) && ENABLE_MOUSE_LOCK_API
+#if defined(ENABLE_POINTER_LOCK) && ENABLE_POINTER_LOCK
readonly attribute [EnabledAtRuntime] MouseLockable webkitPointer;
#endif
Modified: trunk/Source/WebCore/page/Settings.cpp (100179 => 100180)
--- trunk/Source/WebCore/page/Settings.cpp 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebCore/page/Settings.cpp 2011-11-14 20:50:14 UTC (rev 100180)
@@ -198,7 +198,7 @@
#if ENABLE(FULLSCREEN_API)
, m_fullScreenAPIEnabled(false)
#endif
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
, m_mouseLockAPIEnabled(false)
#endif
, m_asynchronousSpellCheckingEnabled(false)
Modified: trunk/Source/WebCore/page/Settings.h (100179 => 100180)
--- trunk/Source/WebCore/page/Settings.h 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebCore/page/Settings.h 2011-11-14 20:50:14 UTC (rev 100180)
@@ -382,7 +382,7 @@
bool fullScreenEnabled() const { return m_fullScreenAPIEnabled; }
#endif
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
void setMouseLockEnabled(bool flag) { m_mouseLockAPIEnabled = flag; }
bool mouseLockEnabled() const { return m_mouseLockAPIEnabled; }
#endif
@@ -593,7 +593,7 @@
#if ENABLE(FULLSCREEN_API)
bool m_fullScreenAPIEnabled : 1;
#endif
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
bool m_mouseLockAPIEnabled : 1;
#endif
bool m_asynchronousSpellCheckingEnabled: 1;
Modified: trunk/Source/WebKit/chromium/ChangeLog (100179 => 100180)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-14 20:50:14 UTC (rev 100180)
@@ -1,3 +1,17 @@
+2011-11-14 Vincent Scheib <sch...@chromium.org>
+
+ Mouse Lock: Renaming to 'Pointer Lock': ENABLE Flags
+ https://bugs.webkit.org/show_bug.cgi?id=72286
+
+ Reviewed by Adam Barth.
+
+ * features.gypi:
+ * src/WebRuntimeFeatures.cpp:
+ (WebKit::WebRuntimeFeatures::enableMouseLockAPI):
+ (WebKit::WebRuntimeFeatures::isMouseLockAPIEnabled):
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::setMouseLockEnabled):
+
2011-11-14 Gregg Tavares <g...@google.com>
Implement WEBGL_EXPERIMENTAL_compressed_textures WebGL extension
Modified: trunk/Source/WebKit/chromium/features.gypi (100179 => 100180)
--- trunk/Source/WebKit/chromium/features.gypi 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebKit/chromium/features.gypi 2011-11-14 20:50:14 UTC (rev 100180)
@@ -69,11 +69,11 @@
'ENABLE_METER_TAG=1',
'ENABLE_MHTML=1',
'ENABLE_MICRODATA=0',
- 'ENABLE_MOUSE_LOCK_API=1',
'ENABLE_MUTATION_OBSERVERS=<(enable_mutation_observers)',
'ENABLE_NOTIFICATIONS=1',
'ENABLE_ORIENTATION_EVENTS=0',
'ENABLE_PAGE_VISIBILITY_API=1',
+ 'ENABLE_POINTER_LOCK=1',
'ENABLE_PROGRESS_TAG=1',
'ENABLE_QUOTA=1',
'ENABLE_REQUEST_ANIMATION_FRAME=1',
Modified: trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp (100179 => 100180)
--- trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp 2011-11-14 20:50:14 UTC (rev 100180)
@@ -362,7 +362,7 @@
void WebRuntimeFeatures::enableMouseLockAPI(bool enable)
{
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
RuntimeEnabledFeatures::setWebkitMouseLockAPIEnabled(enable);
#else
UNUSED_PARAM(enable);
@@ -371,7 +371,7 @@
bool WebRuntimeFeatures::isMouseLockAPIEnabled()
{
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
return RuntimeEnabledFeatures::webkitMouseLockAPIEnabled();
#else
return false;
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (100179 => 100180)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2011-11-14 20:48:27 UTC (rev 100179)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2011-11-14 20:50:14 UTC (rev 100180)
@@ -425,7 +425,7 @@
void WebSettingsImpl::setMouseLockEnabled(bool enabled)
{
-#if ENABLE(MOUSE_LOCK_API)
+#if ENABLE(POINTER_LOCK)
m_settings->setMouseLockEnabled(enabled);
#else
UNUSED_PARAM(enabled);
