[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 8cc13c2bb400a8e9281b46a7c429f4f04916f8ce
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 23 14:05:48 2010 +0000

    2010-02-23  Steve Block  <steveblock at google.com>
    
            Reviewed by Jeremy Orlow.
    
            Removes redundant Settings::setGeolocationEnabled and Settings::geolocationEnabled
            https://bugs.webkit.org/show_bug.cgi?id=35242
    
            No new tests, removing dead code only.
    
            * page/Settings.cpp:
            * page/Settings.h:
    2010-02-23  Steve Block  <steveblock at google.com>
    
            Reviewed by Jeremy Orlow.
    
            Removes redundant Settings::setGeolocationEnabled and Settings::geolocationEnabled
            https://bugs.webkit.org/show_bug.cgi?id=35242
    
            This removes Chromium's WebSettings::setGeolocationEnabled
    
            * public/WebSettings.h:
            * src/WebSettingsImpl.cpp:
            * src/WebSettingsImpl.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55147 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5162d91..ecef580 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-23  Steve Block  <steveblock at google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        Removes redundant Settings::setGeolocationEnabled and Settings::geolocationEnabled
+        https://bugs.webkit.org/show_bug.cgi?id=35242
+
+        No new tests, removing dead code only.
+
+        * page/Settings.cpp:
+        * page/Settings.h:
+
 2010-02-23  Ben Murdoch  <benm at google.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index c82b234..cc8f7af 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -123,7 +123,6 @@ Settings::Settings(Page* page)
     , m_showRepaintCounter(false)
     , m_experimentalNotificationsEnabled(false)
     , m_webGLEnabled(false)
-    , m_geolocationEnabled(true)
     , m_loadDeferringEnabled(true)
 {
     // A Frame may not have been created yet, so we initialize the AtomicString 
@@ -564,11 +563,6 @@ void Settings::setWebGLEnabled(bool enabled)
     m_webGLEnabled = enabled;
 }
 
-void Settings::setGeolocationEnabled(bool enabled)
-{
-    m_geolocationEnabled = enabled;
-}
-
 void Settings::setLoadDeferringEnabled(bool enabled)
 {
     m_loadDeferringEnabled = enabled;
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index 6648a08..06f4570 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -284,9 +284,6 @@ namespace WebCore {
         void setWebGLEnabled(bool);
         bool webGLEnabled() const { return m_webGLEnabled; }
 
-        void setGeolocationEnabled(bool);
-        bool geolocationEnabled() const { return m_geolocationEnabled; }
-
         void setLoadDeferringEnabled(bool);
         bool loadDeferringEnabled() const { return m_loadDeferringEnabled; }
 
@@ -362,7 +359,6 @@ namespace WebCore {
         bool m_showRepaintCounter : 1;
         bool m_experimentalNotificationsEnabled : 1;
         bool m_webGLEnabled : 1;
-        bool m_geolocationEnabled : 1;
         bool m_loadDeferringEnabled : 1;
 
 #if USE(SAFARI_THEME)
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 8b3c162..c671864 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-23  Steve Block  <steveblock at google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        Removes redundant Settings::setGeolocationEnabled and Settings::geolocationEnabled
+        https://bugs.webkit.org/show_bug.cgi?id=35242
+
+        This removes Chromium's WebSettings::setGeolocationEnabled
+
+        * public/WebSettings.h:
+        * src/WebSettingsImpl.cpp:
+        * src/WebSettingsImpl.h:
+
 2010-02-23  Dmitriy Belenko  <dbelenko at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebSettings.h b/WebKit/chromium/public/WebSettings.h
index d3a91d3..87b0188 100644
--- a/WebKit/chromium/public/WebSettings.h
+++ b/WebKit/chromium/public/WebSettings.h
@@ -82,7 +82,6 @@ public:
     virtual void setTextDirectionSubmenuInclusionBehaviorNeverIncluded() = 0;
     virtual void setOfflineWebApplicationCacheEnabled(bool) = 0;
     virtual void setExperimentalWebGLEnabled(bool) = 0;
-    virtual void setGeolocationEnabled(bool) = 0;
     virtual void setShowDebugBorders(bool) = 0;
 
 protected:
diff --git a/WebKit/chromium/src/WebSettingsImpl.cpp b/WebKit/chromium/src/WebSettingsImpl.cpp
index a680321..bafe741 100644
--- a/WebKit/chromium/src/WebSettingsImpl.cpp
+++ b/WebKit/chromium/src/WebSettingsImpl.cpp
@@ -264,9 +264,4 @@ void WebSettingsImpl::setShowDebugBorders(bool show)
     m_settings->setShowDebugBorders(show);
 }
 
-void WebSettingsImpl::setGeolocationEnabled(bool enabled)
-{
-    m_settings->setGeolocationEnabled(enabled);
-}
-
 } // namespace WebKit
diff --git a/WebKit/chromium/src/WebSettingsImpl.h b/WebKit/chromium/src/WebSettingsImpl.h
index 64ccab5..183afc3 100644
--- a/WebKit/chromium/src/WebSettingsImpl.h
+++ b/WebKit/chromium/src/WebSettingsImpl.h
@@ -84,7 +84,6 @@ public:
     virtual void setTextDirectionSubmenuInclusionBehaviorNeverIncluded();
     virtual void setOfflineWebApplicationCacheEnabled(bool);
     virtual void setExperimentalWebGLEnabled(bool);
-    virtual void setGeolocationEnabled(bool);
     virtual void setShowDebugBorders(bool);
 
 private:

-- 
WebKit Debian packaging