Expose pageScaleFactor() to Chromium's WebViewImpl

https://bugs.webkit.org/show_bug.cgi?id=66067

Reviewed by Darin Fisher.

* public/WebView.h:
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::pageScaleFactor):
* src/WebViewImpl.h:

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

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 2908cb293450c33764aef8ee3db8d6b4c6f02857..7c4dd58472fa84f90db8a2fac09ec4776c298630 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2011-08-12  Fady Samuel  <fsamuel@chromium.org>
+
+        Expose pageScaleFactor() to Chromium's WebViewImpl
+        https://bugs.webkit.org/show_bug.cgi?id=66067
+
+        Reviewed by Darin Fisher.
+
+        * public/WebView.h:
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::pageScaleFactor):
+        * src/WebViewImpl.h:
+
 2011-08-12  Sadrul Habib Chowdhury  <sadrul@chromium.org>
 
         Wire gesture tap events, add support for gesture events in the DRT and add a layout test for it.

diff --git a/Source/WebKit/chromium/public/WebView.h b/Source/WebKit/chromium/public/WebView.h
index 26599ac30199f8e45eaf6b4b3ca5e97cd6c070b8..52c9a6de190344be3d599343808f1cf9507e939a 100644 (file)
--- a/Source/WebKit/chromium/public/WebView.h
+++ b/Source/WebKit/chromium/public/WebView.h
@@ -203,6 +203,10 @@ public:
     WEBKIT_EXPORT static double zoomLevelToZoomFactor(double zoomLevel);
     WEBKIT_EXPORT static double zoomFactorToZoomLevel(double factor);
 
+    // Gets the scale factor of the page, where 1.0 is the normal size, > 1.0
+    // is scaled up, < 1.0 is scaled down.
+    virtual float pageScaleFactor() const = 0;
+
     // Scales a page by a factor of scaleFactor and then sets a scroll position to (x, y).
     // scalePage() magnifies and shrinks a page without affecting layout.
     // On the other hand, zooming affects layout of the page.

diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
index e15eb3974a493d93f06e9652b1def0c22f505e21..1f6ce634a3e1ef6397bbc0e16758d0d15b149701 100644 (file)
--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
@@ -1838,6 +1838,18 @@ double WebView::zoomFactorToZoomLevel(double factor)
     return log(factor) / log(textSizeMultiplierRatio);
 }
 
+float WebViewImpl::pageScaleFactor() const
+{
+    if (!page())
+        return 1.0;
+
+    Frame* frame = page()->mainFrame();
+    if (!frame)
+        return 1.0;
+
+    return frame->pageScaleFactor();
+}
+
 void WebViewImpl::scalePage(float scaleFactor, WebPoint origin)
 {
     if (!page())

diff --git a/Source/WebKit/chromium/src/WebViewImpl.h b/Source/WebKit/chromium/src/WebViewImpl.h
index 4a2a29ecb982f7b6617d64594ec85725c3b502bc..c6040c0858cf0b9b4706ceba181f6ac69fcd091d 100644 (file)
--- a/Source/WebKit/chromium/src/WebViewImpl.h
+++ b/Source/WebKit/chromium/src/WebViewImpl.h
@@ -155,6 +155,7 @@ public:
     virtual double setZoomLevel(bool textOnly, double zoomLevel);
     virtual void zoomLimitsChanged(double minimumZoomLevel,
                                    double maximumZoomLevel);
+    virtual float pageScaleFactor() const;
     virtual void scalePage(float scaleFactor, WebPoint origin);
     virtual void performMediaPlayerAction(
         const WebMediaPlayerAction& action,