Pointer Lock: Page Settings unecessary
authorscheib@chromium.org <scheib@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 18 Nov 2011 04:55:18 +0000 (04:55 +0000)
committerscheib@chromium.org <scheib@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 18 Nov 2011 04:55:18 +0000 (04:55 +0000)
https://bugs.webkit.org/show_bug.cgi?id=72662

Reviewed by Darin Fisher.

Source/WebCore:

No new tests.

* page/Settings.cpp:
(WebCore::Settings::Settings):
* page/Settings.h:

Source/WebKit/chromium:

* public/WebSettings.h:
* src/WebSettingsImpl.cpp:
* src/WebSettingsImpl.h:

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

Source/WebCore/ChangeLog
Source/WebCore/page/Settings.cpp
Source/WebCore/page/Settings.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/public/WebSettings.h
Source/WebKit/chromium/src/WebSettingsImpl.cpp
Source/WebKit/chromium/src/WebSettingsImpl.h

index c277a88..b95366e 100644 (file)
@@ -1,3 +1,16 @@
+2011-11-17  Vincent Scheib  <scheib@chromium.org>
+
+        Pointer Lock: Page Settings unecessary
+        https://bugs.webkit.org/show_bug.cgi?id=72662
+
+        Reviewed by Darin Fisher.
+
+        No new tests.
+
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        * page/Settings.h:
+
 2011-11-17  James Robinson  <jamesr@chromium.org>
 
         [chromium] Disable incremental uploading in threaded compositing path
index 0736c66..4a77d0b 100644 (file)
@@ -198,9 +198,6 @@ Settings::Settings(Page* page)
 #if ENABLE(FULLSCREEN_API)
     , m_fullScreenAPIEnabled(false)
 #endif
-#if ENABLE(POINTER_LOCK)
-    , m_pointerLockEnabled(false)
-#endif
     , m_asynchronousSpellCheckingEnabled(false)
 #if USE(UNIFIED_TEXT_CHECKING)
     , m_unifiedTextCheckerEnabled(true)
index 78258c0..08f8c87 100644 (file)
@@ -382,11 +382,6 @@ namespace WebCore {
         bool fullScreenEnabled() const  { return m_fullScreenAPIEnabled; }
 #endif
 
-#if ENABLE(POINTER_LOCK)
-        void setPointerLockEnabled(bool flag) { m_pointerLockEnabled = flag; }
-        bool PointerLockEnabled() const  { return m_pointerLockEnabled; }
-#endif
-
 #if USE(AVFOUNDATION)
         static void setAVFoundationEnabled(bool flag) { gAVFoundationEnabled = flag; }
         static bool isAVFoundationEnabled() { return gAVFoundationEnabled; }
@@ -593,9 +588,6 @@ namespace WebCore {
 #if ENABLE(FULLSCREEN_API)
         bool m_fullScreenAPIEnabled : 1;
 #endif
-#if ENABLE(POINTER_LOCK)
-        bool m_pointerLockEnabled : 1;
-#endif
         bool m_asynchronousSpellCheckingEnabled: 1;
         bool m_unifiedTextCheckerEnabled: 1;
         bool m_memoryInfoEnabled: 1;
index 47a5177..f7dab6c 100644 (file)
@@ -1,3 +1,14 @@
+2011-11-17  Vincent Scheib  <scheib@chromium.org>
+
+        Pointer Lock: Page Settings unecessary
+        https://bugs.webkit.org/show_bug.cgi?id=72662
+
+        Reviewed by Darin Fisher.
+
+        * public/WebSettings.h:
+        * src/WebSettingsImpl.cpp:
+        * src/WebSettingsImpl.h:
+
 2011-11-17  Alexandre Elias  <aelias@google.com>
 
         [chromium] Don't clamp minimumPageScaleFactor when doc width is zero
index 8488894..1236b32 100644 (file)
@@ -127,7 +127,6 @@ public:
     virtual void setValidationMessageTimerMagnification(int) = 0;
     virtual void setMinimumTimerInterval(double) = 0;
     virtual void setFullScreenEnabled(bool) = 0;
-    virtual void setPointerLockEnabled(bool) = 0;
     virtual void setAllowDisplayOfInsecureContent(bool) = 0;
     virtual void setAllowRunningOfInsecureContent(bool) = 0;
     virtual void setShouldPrintBackgrounds(bool) = 0;
index 69dc108..242aed2 100644 (file)
@@ -428,15 +428,6 @@ void WebSettingsImpl::setFullScreenEnabled(bool enabled)
 #endif
 }
 
-void WebSettingsImpl::setPointerLockEnabled(bool enabled)
-{
-#if ENABLE(POINTER_LOCK)
-    m_settings->setPointerLockEnabled(enabled);
-#else
-    UNUSED_PARAM(enabled);
-#endif
-}
-
 void WebSettingsImpl::setAllowDisplayOfInsecureContent(bool enabled)
 {
     m_settings->setAllowDisplayOfInsecureContent(enabled);
index 129af16..fa34aa8 100644 (file)
@@ -119,7 +119,6 @@ public:
     virtual void setValidationMessageTimerMagnification(int);
     virtual void setMinimumTimerInterval(double);
     virtual void setFullScreenEnabled(bool);
-    virtual void setPointerLockEnabled(bool);
     virtual void setAllowDisplayOfInsecureContent(bool);
     virtual void setAllowRunningOfInsecureContent(bool);
     virtual void setShouldPrintBackgrounds(bool);