[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[pkasting at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit d8d60d7614ebdea6118670b184d5635103604fd2
Author: pkasting at chromium.org <pkasting at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 4 23:56:21 2009 +0000

    [Chromium] Simplify zoom-related APIs and add a zoom level getter,
    part two: Remove deprecated APIs.
    https://bugs.webkit.org/show_bug.cgi?id=31893
    
    Reviewed by Darin Fisher.
    
    * public/WebView.h:
    * src/WebViewImpl.cpp:
    * src/WebViewImpl.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51719 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 43e634d..2697e6d 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-04  Peter Kasting  <pkasting at google.com>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Simplify zoom-related APIs and add a zoom level getter,
+        part two: Remove deprecated APIs.
+        https://bugs.webkit.org/show_bug.cgi?id=31893
+
+        * public/WebView.h:
+        * src/WebViewImpl.cpp:
+        * src/WebViewImpl.h:
+
 2009-12-03  Jonathan Dixon  <joth at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/public/WebView.h b/WebKit/chromium/public/WebView.h
index 215797f..6f6ffff 100644
--- a/WebKit/chromium/public/WebView.h
+++ b/WebKit/chromium/public/WebView.h
@@ -135,11 +135,6 @@ public:
 
     // Zoom ----------------------------------------------------------------
 
-    // DEPRECATED: Will be removed very soon!
-    virtual void zoomIn(bool textOnly) = 0;
-    virtual void zoomOut(bool textOnly) = 0;
-    virtual void zoomDefault() = 0;
-
     // Returns the current zoom level.  0 is "original size", and each increment
     // above or below represents zooming 20% larger or smaller to limits of 300%
     // and 50% of original size, respectively.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 7f31397..834e1ca 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -1246,42 +1246,6 @@ void WebViewImpl::clearFocusedNode()
     }
 }
 
-// DEPRECATED
-void WebViewImpl::zoomIn(bool textOnly)
-{
-    Frame* frame = mainFrameImpl()->frame();
-    double multiplier = std::min(std::pow(textSizeMultiplierRatio, m_zoomLevel + 1),
-                                 maxTextSizeMultiplier);
-    float zoomFactor = static_cast<float>(multiplier);
-    if (zoomFactor != frame->zoomFactor()) {
-        ++m_zoomLevel;
-        frame->setZoomFactor(zoomFactor, textOnly);
-    }
-}
-
-// DEPRECATED
-void WebViewImpl::zoomOut(bool textOnly)
-{
-    Frame* frame = mainFrameImpl()->frame();
-    double multiplier = std::max(std::pow(textSizeMultiplierRatio, m_zoomLevel - 1),
-                                 minTextSizeMultiplier);
-    float zoomFactor = static_cast<float>(multiplier);
-    if (zoomFactor != frame->zoomFactor()) {
-        --m_zoomLevel;
-        frame->setZoomFactor(zoomFactor, textOnly);
-    }
-}
-
-// DEPRECATED
-void WebViewImpl::zoomDefault()
-{
-    // We don't change the zoom mode (text only vs. full page) here. We just want
-    // to reset whatever is already set.
-    m_zoomLevel = 0;
-    mainFrameImpl()->frame()->setZoomFactor(
-        1.0f, mainFrameImpl()->frame()->isZoomFactorTextOnly());
-}
-
 int WebViewImpl::zoomLevel()
 {
     return m_zoomLevel;
diff --git a/WebKit/chromium/src/WebViewImpl.h b/WebKit/chromium/src/WebViewImpl.h
index de0ad0c..fe209c7 100644
--- a/WebKit/chromium/src/WebViewImpl.h
+++ b/WebKit/chromium/src/WebViewImpl.h
@@ -116,9 +116,6 @@ public:
     virtual void setFocusedFrame(WebFrame* frame);
     virtual void setInitialFocus(bool reverse);
     virtual void clearFocusedNode();
-    virtual void zoomIn(bool textOnly);   // DEPRECATED
-    virtual void zoomOut(bool textOnly);  // DEPRECATED
-    virtual void zoomDefault();           // DEPRECATED
     virtual int zoomLevel();
     virtual int setZoomLevel(bool textOnly, int zoomLevel);
     virtual void performMediaPlayerAction(

-- 
WebKit Debian packaging