Changeset 100180 in webkit
- Timestamp:
- Nov 14, 2011, 12:50:14 PM (15 years ago)
- Location:
- trunk/Source
- Files:
-
- 19 edited
-
JavaScriptCore/ChangeLog (modified) (1 diff)
-
JavaScriptCore/wtf/Platform.h (modified) (1 diff)
-
WebCore/ChangeLog (modified) (1 diff)
-
WebCore/bindings/generic/RuntimeEnabledFeatures.cpp (modified) (1 diff)
-
WebCore/bindings/generic/RuntimeEnabledFeatures.h (modified) (2 diffs)
-
WebCore/dom/MouseEvent.idl (modified) (1 diff)
-
WebCore/dom/MouseRelatedEvent.h (modified) (2 diffs)
-
WebCore/page/MouseLockable.cpp (modified) (2 diffs)
-
WebCore/page/MouseLockable.h (modified) (2 diffs)
-
WebCore/page/MouseLockable.idl (modified) (1 diff)
-
WebCore/page/Navigator.cpp (modified) (1 diff)
-
WebCore/page/Navigator.h (modified) (2 diffs)
-
WebCore/page/Navigator.idl (modified) (1 diff)
-
WebCore/page/Settings.cpp (modified) (1 diff)
-
WebCore/page/Settings.h (modified) (2 diffs)
-
WebKit/chromium/ChangeLog (modified) (1 diff)
-
WebKit/chromium/features.gypi (modified) (1 diff)
-
WebKit/chromium/src/WebRuntimeFeatures.cpp (modified) (2 diffs)
-
WebKit/chromium/src/WebSettingsImpl.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r100175 r100180 1 2011-11-14 Vincent Scheib <scheib@chromium.org> 2 3 Mouse Lock: Renaming to 'Pointer Lock': ENABLE Flags 4 https://bugs.webkit.org/show_bug.cgi?id=72286 5 6 Reviewed by Adam Barth. 7 8 * wtf/Platform.h: 9 1 10 2011-11-14 Gavin Barraclough <barraclough@apple.com> 2 11 -
trunk/Source/JavaScriptCore/wtf/Platform.h
r100159 r100180 864 864 #endif 865 865 866 #if !defined(ENABLE_ MOUSE_LOCK_API)867 #define ENABLE_ MOUSE_LOCK_API0866 #if !defined(ENABLE_POINTER_LOCK) 867 #define ENABLE_POINTER_LOCK 0 868 868 #endif 869 869 -
trunk/Source/WebCore/ChangeLog
r100178 r100180 1 2011-11-14 Vincent Scheib <scheib@chromium.org> 2 3 Mouse Lock: Renaming to 'Pointer Lock': ENABLE Flags 4 https://bugs.webkit.org/show_bug.cgi?id=72286 5 6 Reviewed by Adam Barth. 7 8 * bindings/generic/RuntimeEnabledFeatures.cpp: 9 * bindings/generic/RuntimeEnabledFeatures.h: 10 * dom/MouseEvent.idl: 11 * dom/MouseRelatedEvent.h: 12 * page/MouseLockable.cpp: 13 * page/MouseLockable.h: 14 * page/MouseLockable.idl: 15 * page/Navigator.cpp: 16 * page/Navigator.h: 17 * page/Navigator.idl: 18 * page/Settings.cpp: 19 (WebCore::Settings::Settings): 20 * page/Settings.h: 21 1 22 2011-11-14 Anna Cavender <annacc@chromium.org> 2 23 -
trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
r100159 r100180 165 165 #endif 166 166 167 #if ENABLE( MOUSE_LOCK_API)167 #if ENABLE(POINTER_LOCK) 168 168 bool RuntimeEnabledFeatures::isMouseLockAPIEnabled = false; 169 169 #endif -
trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h
r100159 r100180 81 81 #endif 82 82 83 #if ENABLE( MOUSE_LOCK_API)83 #if ENABLE(POINTER_LOCK) 84 84 static bool webkitMouseLockAPIEnabled() { return isMouseLockAPIEnabled; } 85 85 static void setWebkitMouseLockAPIEnabled(bool isEnabled) { isMouseLockAPIEnabled = isEnabled; } … … 235 235 #endif 236 236 237 #if ENABLE( MOUSE_LOCK_API)237 #if ENABLE(POINTER_LOCK) 238 238 static bool isMouseLockAPIEnabled; 239 239 #endif -
trunk/Source/WebCore/dom/MouseEvent.idl
r100093 r100180 26 26 readonly attribute long clientX; 27 27 readonly attribute long clientY; 28 #if defined(ENABLE_ MOUSE_LOCK_API) && ENABLE_MOUSE_LOCK_API28 #if defined(ENABLE_POINTER_LOCK) && ENABLE_POINTER_LOCK 29 29 readonly attribute long movementX; 30 30 readonly attribute long movementY; -
trunk/Source/WebCore/dom/MouseRelatedEvent.h
r100093 r100180 40 40 int clientX() const { return m_clientLocation.x(); } 41 41 int clientY() const { return m_clientLocation.y(); } 42 #if ENABLE( MOUSE_LOCK_API)42 #if ENABLE(POINTER_LOCK) 43 43 int movementX() const { return m_movementDelta.x(); } 44 44 int movementY() const { return m_movementDelta.y(); } … … 77 77 IntPoint m_screenLocation; 78 78 LayoutPoint m_clientLocation; 79 #if ENABLE( MOUSE_LOCK_API)79 #if ENABLE(POINTER_LOCK) 80 80 LayoutPoint m_movementDelta; 81 81 #endif -
trunk/Source/WebCore/page/MouseLockable.cpp
r100091 r100180 26 26 #include "MouseLockable.h" 27 27 28 #if ENABLE( MOUSE_LOCK_API)28 #if ENABLE(POINTER_LOCK) 29 29 30 30 namespace WebCore { … … 56 56 } 57 57 58 #endif // ENABLE( MOUSE_LOCK_API)58 #endif // ENABLE(POINTER_LOCK) -
trunk/Source/WebCore/page/MouseLockable.h
r100091 r100180 26 26 #define MouseLockable_h 27 27 28 #if ENABLE( MOUSE_LOCK_API)28 #if ENABLE(POINTER_LOCK) 29 29 30 30 #include "VoidCallback.h" … … 52 52 } // namespace WebCore 53 53 54 #endif // ENABLE( MOUSE_LOCK_API)54 #endif // ENABLE(POINTER_LOCK) 55 55 56 56 #endif // MouseLockable_h -
trunk/Source/WebCore/page/MouseLockable.idl
r100091 r100180 26 26 27 27 interface [ 28 Conditional= MOUSE_LOCK_API,28 Conditional=POINTER_LOCK, 29 29 OmitConstructor 30 30 ] MouseLockable { -
trunk/Source/WebCore/page/Navigator.cpp
r100091 r100180 172 172 } 173 173 174 #if ENABLE( MOUSE_LOCK_API)174 #if ENABLE(POINTER_LOCK) 175 175 MouseLockable* Navigator::webkitPointer() const 176 176 { -
trunk/Source/WebCore/page/Navigator.h
r100091 r100180 60 60 Geolocation* geolocation() const; 61 61 62 #if ENABLE( MOUSE_LOCK_API)62 #if ENABLE(POINTER_LOCK) 63 63 MouseLockable* webkitPointer() const; 64 64 #endif … … 81 81 mutable RefPtr<DOMMimeTypeArray> m_mimeTypes; 82 82 mutable RefPtr<Geolocation> m_geolocation; 83 #if ENABLE( MOUSE_LOCK_API)83 #if ENABLE(POINTER_LOCK) 84 84 mutable RefPtr<MouseLockable> m_pointer; 85 85 #endif -
trunk/Source/WebCore/page/Navigator.idl
r100091 r100180 45 45 #endif 46 46 47 #if defined(ENABLE_ MOUSE_LOCK_API) && ENABLE_MOUSE_LOCK_API47 #if defined(ENABLE_POINTER_LOCK) && ENABLE_POINTER_LOCK 48 48 readonly attribute [EnabledAtRuntime] MouseLockable webkitPointer; 49 49 #endif -
trunk/Source/WebCore/page/Settings.cpp
r99485 r100180 199 199 , m_fullScreenAPIEnabled(false) 200 200 #endif 201 #if ENABLE( MOUSE_LOCK_API)201 #if ENABLE(POINTER_LOCK) 202 202 , m_mouseLockAPIEnabled(false) 203 203 #endif -
trunk/Source/WebCore/page/Settings.h
r99485 r100180 383 383 #endif 384 384 385 #if ENABLE( MOUSE_LOCK_API)385 #if ENABLE(POINTER_LOCK) 386 386 void setMouseLockEnabled(bool flag) { m_mouseLockAPIEnabled = flag; } 387 387 bool mouseLockEnabled() const { return m_mouseLockAPIEnabled; } … … 594 594 bool m_fullScreenAPIEnabled : 1; 595 595 #endif 596 #if ENABLE( MOUSE_LOCK_API)596 #if ENABLE(POINTER_LOCK) 597 597 bool m_mouseLockAPIEnabled : 1; 598 598 #endif -
trunk/Source/WebKit/chromium/ChangeLog
r100176 r100180 1 2011-11-14 Vincent Scheib <scheib@chromium.org> 2 3 Mouse Lock: Renaming to 'Pointer Lock': ENABLE Flags 4 https://bugs.webkit.org/show_bug.cgi?id=72286 5 6 Reviewed by Adam Barth. 7 8 * features.gypi: 9 * src/WebRuntimeFeatures.cpp: 10 (WebKit::WebRuntimeFeatures::enableMouseLockAPI): 11 (WebKit::WebRuntimeFeatures::isMouseLockAPIEnabled): 12 * src/WebSettingsImpl.cpp: 13 (WebKit::WebSettingsImpl::setMouseLockEnabled): 14 1 15 2011-11-14 Gregg Tavares <gman@google.com> 2 16 -
trunk/Source/WebKit/chromium/features.gypi
r98562 r100180 70 70 'ENABLE_MHTML=1', 71 71 'ENABLE_MICRODATA=0', 72 'ENABLE_MOUSE_LOCK_API=1',73 72 'ENABLE_MUTATION_OBSERVERS=<(enable_mutation_observers)', 74 73 'ENABLE_NOTIFICATIONS=1', 75 74 'ENABLE_ORIENTATION_EVENTS=0', 76 75 'ENABLE_PAGE_VISIBILITY_API=1', 76 'ENABLE_POINTER_LOCK=1', 77 77 'ENABLE_PROGRESS_TAG=1', 78 78 'ENABLE_QUOTA=1', -
trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
r98016 r100180 363 363 void WebRuntimeFeatures::enableMouseLockAPI(bool enable) 364 364 { 365 #if ENABLE( MOUSE_LOCK_API)365 #if ENABLE(POINTER_LOCK) 366 366 RuntimeEnabledFeatures::setWebkitMouseLockAPIEnabled(enable); 367 367 #else … … 372 372 bool WebRuntimeFeatures::isMouseLockAPIEnabled() 373 373 { 374 #if ENABLE( MOUSE_LOCK_API)374 #if ENABLE(POINTER_LOCK) 375 375 return RuntimeEnabledFeatures::webkitMouseLockAPIEnabled(); 376 376 #else -
trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp
r99255 r100180 426 426 void WebSettingsImpl::setMouseLockEnabled(bool enabled) 427 427 { 428 #if ENABLE( MOUSE_LOCK_API)428 #if ENABLE(POINTER_LOCK) 429 429 m_settings->setMouseLockEnabled(enabled); 430 430 #else
Note:
See TracChangeset
for help on using the changeset viewer.