Changeset 100194 in webkit
- Timestamp:
- Nov 14, 2011, 2:39:48 PM (15 years ago)
- Location:
- trunk/Source
- Files:
-
- 11 edited
-
WebCore/ChangeLog (modified) (1 diff)
-
WebCore/bindings/generic/RuntimeEnabledFeatures.cpp (modified) (1 diff)
-
WebCore/bindings/generic/RuntimeEnabledFeatures.h (modified) (2 diffs)
-
WebCore/page/Settings.cpp (modified) (1 diff)
-
WebCore/page/Settings.h (modified) (2 diffs)
-
WebKit/chromium/ChangeLog (modified) (1 diff)
-
WebKit/chromium/public/WebRuntimeFeatures.h (modified) (1 diff)
-
WebKit/chromium/public/WebSettings.h (modified) (1 diff)
-
WebKit/chromium/src/WebRuntimeFeatures.cpp (modified) (2 diffs)
-
WebKit/chromium/src/WebSettingsImpl.cpp (modified) (1 diff)
-
WebKit/chromium/src/WebSettingsImpl.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r100191 r100194 1 2011-11-14 Vincent Scheib <scheib@chromium.org> 2 3 Mouse Lock: Renaming to 'Pointer Lock': Runtime Enable Flags 4 https://bugs.webkit.org/show_bug.cgi?id=72303 5 6 Reviewed by Darin Fisher. 7 8 * bindings/generic/RuntimeEnabledFeatures.cpp: 9 * bindings/generic/RuntimeEnabledFeatures.h: 10 (WebCore::RuntimeEnabledFeatures::webkitPointerLockEnabled): 11 (WebCore::RuntimeEnabledFeatures::setWebkitPointerLockEnabled): 12 (WebCore::RuntimeEnabledFeatures::webkitPointerEnabled): 13 * page/Settings.cpp: 14 (WebCore::Settings::Settings): 15 * page/Settings.h: 16 (WebCore::Settings::setPointerLockEnabled): 17 (WebCore::Settings::PointerLockEnabled): 18 1 19 2011-11-14 Sheriff Bot <webkit.review.bot@gmail.com> 2 20 -
trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
r100180 r100194 166 166 167 167 #if ENABLE(POINTER_LOCK) 168 bool RuntimeEnabledFeatures::is MouseLockAPIEnabled = false;168 bool RuntimeEnabledFeatures::isPointerLockEnabled = false; 169 169 #endif 170 170 -
trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h
r100180 r100194 82 82 83 83 #if ENABLE(POINTER_LOCK) 84 static bool webkit MouseLockAPIEnabled() { return isMouseLockAPIEnabled; }85 static void setWebkit MouseLockAPIEnabled(bool isEnabled) { isMouseLockAPIEnabled = isEnabled; }86 static bool webkitPointerEnabled() { return is MouseLockAPIEnabled; }84 static bool webkitPointerLockEnabled() { return isPointerLockEnabled; } 85 static void setWebkitPointerLockEnabled(bool isEnabled) { isPointerLockEnabled = isEnabled; } 86 static bool webkitPointerEnabled() { return isPointerLockEnabled; } 87 87 #endif 88 88 … … 236 236 237 237 #if ENABLE(POINTER_LOCK) 238 static bool is MouseLockAPIEnabled;238 static bool isPointerLockEnabled; 239 239 #endif 240 240 -
trunk/Source/WebCore/page/Settings.cpp
r100180 r100194 200 200 #endif 201 201 #if ENABLE(POINTER_LOCK) 202 , m_ mouseLockAPIEnabled(false)202 , m_pointerLockEnabled(false) 203 203 #endif 204 204 , m_asynchronousSpellCheckingEnabled(false) -
trunk/Source/WebCore/page/Settings.h
r100180 r100194 384 384 385 385 #if ENABLE(POINTER_LOCK) 386 void set MouseLockEnabled(bool flag) { m_mouseLockAPIEnabled = flag; }387 bool mouseLockEnabled() const { return m_mouseLockAPIEnabled; }386 void setPointerLockEnabled(bool flag) { m_pointerLockEnabled = flag; } 387 bool PointerLockEnabled() const { return m_pointerLockEnabled; } 388 388 #endif 389 389 … … 595 595 #endif 596 596 #if ENABLE(POINTER_LOCK) 597 bool m_ mouseLockAPIEnabled : 1;597 bool m_pointerLockEnabled : 1; 598 598 #endif 599 599 bool m_asynchronousSpellCheckingEnabled: 1; -
trunk/Source/WebKit/chromium/ChangeLog
r100191 r100194 1 2011-11-14 Vincent Scheib <scheib@chromium.org> 2 3 Mouse Lock: Renaming to 'Pointer Lock': Runtime Enable Flags 4 https://bugs.webkit.org/show_bug.cgi?id=72303 5 6 Reviewed by Darin Fisher. 7 8 * public/WebRuntimeFeatures.h: 9 * public/WebSettings.h: 10 * src/WebRuntimeFeatures.cpp: 11 (WebKit::WebRuntimeFeatures::enablePointerLock): 12 (WebKit::WebRuntimeFeatures::isPointerLockEnabled): 13 * src/WebSettingsImpl.cpp: 14 (WebKit::WebSettingsImpl::setPointerLockEnabled): 15 * src/WebSettingsImpl.h: 16 1 17 2011-11-14 Sheriff Bot <webkit.review.bot@gmail.com> 2 18 -
trunk/Source/WebKit/chromium/public/WebRuntimeFeatures.h
r98016 r100194 110 110 WEBKIT_EXPORT static bool isFullScreenAPIEnabled(); 111 111 112 WEBKIT_EXPORT static void enable MouseLockAPI(bool);113 WEBKIT_EXPORT static bool is MouseLockAPIEnabled();112 WEBKIT_EXPORT static void enablePointerLock(bool); 113 WEBKIT_EXPORT static bool isPointerLockEnabled(); 114 114 115 115 WEBKIT_EXPORT static void enableMediaSource(bool); -
trunk/Source/WebKit/chromium/public/WebSettings.h
r99255 r100194 127 127 virtual void setMinimumTimerInterval(double) = 0; 128 128 virtual void setFullScreenEnabled(bool) = 0; 129 virtual void set MouseLockEnabled(bool) = 0;129 virtual void setPointerLockEnabled(bool) = 0; 130 130 virtual void setAllowDisplayOfInsecureContent(bool) = 0; 131 131 virtual void setAllowRunningOfInsecureContent(bool) = 0; -
trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
r100180 r100194 361 361 } 362 362 363 void WebRuntimeFeatures::enable MouseLockAPI(bool enable)363 void WebRuntimeFeatures::enablePointerLock(bool enable) 364 364 { 365 365 #if ENABLE(POINTER_LOCK) 366 RuntimeEnabledFeatures::setWebkit MouseLockAPIEnabled(enable);366 RuntimeEnabledFeatures::setWebkitPointerLockEnabled(enable); 367 367 #else 368 368 UNUSED_PARAM(enable); … … 370 370 } 371 371 372 bool WebRuntimeFeatures::is MouseLockAPIEnabled()372 bool WebRuntimeFeatures::isPointerLockEnabled() 373 373 { 374 374 #if ENABLE(POINTER_LOCK) 375 return RuntimeEnabledFeatures::webkit MouseLockAPIEnabled();375 return RuntimeEnabledFeatures::webkitPointerLockEnabled(); 376 376 #else 377 377 return false; -
trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp
r100180 r100194 424 424 } 425 425 426 void WebSettingsImpl::set MouseLockEnabled(bool enabled)426 void WebSettingsImpl::setPointerLockEnabled(bool enabled) 427 427 { 428 428 #if ENABLE(POINTER_LOCK) 429 m_settings->set MouseLockEnabled(enabled);429 m_settings->setPointerLockEnabled(enabled); 430 430 #else 431 431 UNUSED_PARAM(enabled); -
trunk/Source/WebKit/chromium/src/WebSettingsImpl.h
r99255 r100194 119 119 virtual void setMinimumTimerInterval(double); 120 120 virtual void setFullScreenEnabled(bool); 121 virtual void set MouseLockEnabled(bool);121 virtual void setPointerLockEnabled(bool); 122 122 virtual void setAllowDisplayOfInsecureContent(bool); 123 123 virtual void setAllowRunningOfInsecureContent(bool);
Note:
See TracChangeset
for help on using the changeset viewer.