Changeset 68869 in webkit

Timestamp:

Oct 1, 2010 12:32:27 AM (14 years ago)

Author:

jam@chromium.org

Message:

2010-09-29 John Abd-El-Malek <​jam@chromium.org>

Reviewed by NOBODY (OOPS!).

[chromium] Changes to consolidate plugin zoom
​https://bugs.webkit.org/show_bug.cgi?id=46550

• public/WebPlugin.h: (WebKit::WebPlugin::setZoomLevel):
• public/WebPluginContainer.h:
• public/WebView.h:
• public/WebViewClient.h: (WebKit::WebViewClient::zoomLimitsChanged): (WebKit::WebViewClient::zoomLevelChanged):
• src/FrameLoaderClientImpl.cpp: (WebKit::FrameLoaderClientImpl::createPlugin):
• src/WebPluginContainerImpl.cpp: (WebKit::WebPluginContainerImpl::loadFrameRequest): (WebKit::WebPluginContainerImpl::zoomChanged): (WebKit::WebPluginContainerImpl::zoomLimitsChanged):
• src/WebPluginContainerImpl.h:
• src/WebViewImpl.cpp: (WebKit::WebViewImpl::WebViewImpl): (WebKit::WebViewImpl::zoomLevel): (WebKit::WebViewImpl::setZoomLevel): (WebKit::WebViewImpl::zoomLimitsChanged): (WebKit::WebViewImpl::fullFramePluginZoomLevelChanged): (WebKit::WebView::zoomLevelToZoomFactor): (WebKit::WebView::zoomFactorToZoomLevel):
• src/WebViewImpl.h:

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebPlugin.h (modified) (1 diff)
• public/WebPluginContainer.h (modified) (1 diff)
• public/WebView.h (modified) (4 diffs)
• public/WebViewClient.h (modified) (1 diff)
• src/FrameLoaderClientImpl.cpp (modified) (1 diff)
• src/WebPluginContainerImpl.cpp (modified) (2 diffs)
• src/WebPluginContainerImpl.h (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (3 diffs)
• src/WebViewImpl.h (modified) (3 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-09-29  John Abd-El-Malek  <jam@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Changes to consolidate plugin zoom
+        https://bugs.webkit.org/show_bug.cgi?id=46550
+
+        * public/WebPlugin.h:
+        (WebKit::WebPlugin::setZoomLevel):
+        * public/WebPluginContainer.h:
+        * public/WebView.h:
+        * public/WebViewClient.h:
+        (WebKit::WebViewClient::zoomLimitsChanged):
+        (WebKit::WebViewClient::zoomLevelChanged):
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::createPlugin):
+        * src/WebPluginContainerImpl.cpp:
+        (WebKit::WebPluginContainerImpl::loadFrameRequest):
+        (WebKit::WebPluginContainerImpl::zoomChanged):
+        (WebKit::WebPluginContainerImpl::zoomLimitsChanged):
+        * src/WebPluginContainerImpl.h:
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::WebViewImpl):
+        (WebKit::WebViewImpl::zoomLevel):
+        (WebKit::WebViewImpl::setZoomLevel):
+        (WebKit::WebViewImpl::zoomLimitsChanged):
+        (WebKit::WebViewImpl::fullFramePluginZoomLevelChanged):
+        (WebKit::WebView::zoomLevelToZoomFactor):
+        (WebKit::WebView::zoomFactorToZoomLevel):
+        * src/WebViewImpl.h:
+
 2010-09-30  MORITA Hajime  <morrita@google.com>
 

trunk/WebKit/chromium/public/WebPlugin.h

@@ -100 +100 @@
 
     // Used for zooming of full page plugins.
-    virtual void setZoomFactor(float scale, bool textOnly) { }
+    virtual void setZoomLevel(double level, bool textOnly) { }
 
     // Find interface.

trunk/WebKit/chromium/public/WebPluginContainer.h

@@ -79 +79 @@
         const WebURLRequest&, const WebString& target, bool notifyNeeded, void* notifyData) = 0;
 
+    // Notifies that the zoom level has changed.
+    virtual void zoomLevelChanged(double zoomLevel) = 0;
+
     virtual WebPlugin* plugin() = 0;
     virtual void setPlugin(WebPlugin*) = 0;

trunk/WebKit/chromium/public/WebView.h

@@ -37 +37 @@
 #include "WebWidget.h"
 
+// FIXME(jam): take this out after Chrome is updated
+#define ZOOM_LEVEL_IS_DOUBLE
+
 namespace WebKit {
 
@@ -55 +58 @@
 class WebView : public WebWidget {
 public:
+    WEBKIT_API static const double textSizeMultiplierRatio;
+    WEBKIT_API static const double minTextSizeMultiplier;
+    WEBKIT_API static const double maxTextSizeMultiplier;
+
     // Controls the time that user scripts injected into the document run.
     enum UserScriptInjectAt {
@@ -162 +169 @@
 
     // 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.
-    virtual int zoomLevel() = 0;
+    // above or below represents zooming 20% larger or smaller to default limits
+    // of 300% and 50% of original size, respectively.  Only plugins use
+    // non whole-numbers, since they might choose to have specific zoom level so
+    // that fixed-width content is fit-to-page-width, for example.
+    virtual double zoomLevel() = 0;
 
     // Changes the zoom level to the specified level, clamping at the limits
@@ -174 +183 @@
     // at one time.  Changing the mode while the page is zoomed will have odd
     // effects.
-    virtual int setZoomLevel(bool textOnly, int zoomLevel) = 0;
+    virtual double setZoomLevel(bool textOnly, double zoomLevel) = 0;
+
+    // Updates the zoom limits for this view.
+    virtual void zoomLimitsChanged(double minimumZoomLevel,
+                                   double maximumZoomLevel) = 0;
+
+    // Helper functions to convert between zoom level and zoom factor.  zoom
+    // factor is zoom percent / 100, so 300% = 3.0.
+    WEBKIT_API static double zoomLevelToZoomFactor(double zoomLevel);
+    WEBKIT_API static double zoomFactorToZoomLevel(double factor);
 
 

trunk/WebKit/chromium/public/WebViewClient.h

@@ -349 +349 @@
     virtual WebDeviceOrientationClient* deviceOrientationClient() { return 0; }
 
+
+    // Zoom ----------------------------------------------------------------
+
+    // Informs the browser that the zoom levels for this frame have changed from
+    // the default values.
+    virtual void zoomLimitsChanged(double minimumLevel, double maximumLevel) { }
+
+    // Informs the browser that the zoom level has changed as a result of an
+    // action that wasn't initiated by the client.
+    virtual void zoomLevelChanged() { }
+
 protected:
     ~WebViewClient() { }

trunk/WebKit/chromium/src/FrameLoaderClientImpl.cpp

@@ -1412 +1412 @@
         return 0;
 
-    bool zoomTextOnly = m_webFrame->viewImpl()->zoomTextOnly();
-    float zoomFactor = zoomTextOnly ? m_webFrame->frame()->textZoomFactor() : m_webFrame->frame()->pageZoomFactor();
-    if (zoomFactor != 1) {
-        // There's a saved zoom level, so tell the plugin about it since
-        // WebViewImpl::setZoomLevel was called before the plugin was created.
-        webPlugin->setZoomFactor(zoomFactor, zoomTextOnly);
-    }
-
     // The element might have been removed during plugin initialization!
     if (!element->renderer())

trunk/WebKit/chromium/src/WebPluginContainerImpl.cpp

@@ -49 +49 @@
 #include "WebURLRequest.h"
 #include "WebVector.h"
+#include "WebViewImpl.h"
 #include "WrappedResourceResponse.h"
 
@@ -349 +350 @@
 }
 
+void WebPluginContainerImpl::zoomLevelChanged(double zoomLevel)
+{
+    WebViewImpl* view = WebViewImpl::fromPage(m_element->document()->frame()->page());
+    view->fullFramePluginZoomLevelChanged(zoomLevel);
+}
+
 void WebPluginContainerImpl::didReceiveResponse(const ResourceResponse& response)
 {

trunk/WebKit/chromium/src/WebPluginContainerImpl.h

@@ -84 +84 @@
     virtual WebString executeScriptURL(const WebURL&, bool popupsAllowed);
     virtual void loadFrameRequest(const WebURLRequest&, const WebString& target, bool notifyNeeded, void* notifyData);
+    virtual void zoomLevelChanged(double zoomLevel);
 
     // This cannot be null.

trunk/WebKit/chromium/src/WebViewImpl.cpp

@@ -147 +147 @@
 // text zoom to half and 3x the original text size.  These three values match
 // those in Apple's port in WebKit/WebKit/WebView/WebView.mm
-static const double textSizeMultiplierRatio = 1.2;
-static const double minTextSizeMultiplier = 0.5;
-static const double maxTextSizeMultiplier = 3.0;
+const double WebView::textSizeMultiplierRatio = 1.2;
+const double WebView::minTextSizeMultiplier = 0.5;
+const double WebView::maxTextSizeMultiplier = 3.0;
+
 
 // The group name identifies a namespace of pages.  Page group is used on OSX
@@ -254 +255 @@
 #endif
     , m_zoomLevel(0)
-    , m_zoomTextOnly(false)
+    , m_minimumZoomLevel(zoomFactorToZoomLevel(minTextSizeMultiplier))
+    , m_maximumZoomLevel(zoomFactorToZoomLevel(maxTextSizeMultiplier))
     , m_contextMenuAllowed(false)
     , m_doingDragAndDrop(false)
@@ -1528 +1530 @@
 }
 
-int WebViewImpl::zoomLevel()
+double WebViewImpl::zoomLevel()
 {
     return m_zoomLevel;
 }
 
-int WebViewImpl::setZoomLevel(bool textOnly, int zoomLevel)
-{
-    float zoomFactor = static_cast<float>(
-        std::max(std::min(std::pow(textSizeMultiplierRatio, zoomLevel),
-                          maxTextSizeMultiplier),
-                 minTextSizeMultiplier));
+double WebViewImpl::setZoomLevel(bool textOnly, double zoomLevel)
+{
+    if (zoomLevel < m_minimumZoomLevel)
+        m_zoomLevel = m_minimumZoomLevel;
+    else if (zoomLevel > m_maximumZoomLevel)
+        m_zoomLevel = m_maximumZoomLevel;
+    else
+        m_zoomLevel = zoomLevel;
+
     Frame* frame = mainFrameImpl()->frame();
-
-    float oldZoomFactor = m_zoomTextOnly ? frame->textZoomFactor() : frame->pageZoomFactor();
-
-    if (textOnly)
-        frame->setPageAndTextZoomFactors(1, zoomFactor);
-    else
-        frame->setPageAndTextZoomFactors(zoomFactor, 1);
-
-    if (oldZoomFactor != zoomFactor || textOnly != m_zoomTextOnly) {
-        WebPluginContainerImpl* pluginContainer = WebFrameImpl::pluginContainerFromFrame(frame);
-        if (pluginContainer)
-            pluginContainer->plugin()->setZoomFactor(zoomFactor, textOnly);
-    }
-
-    m_zoomLevel = zoomLevel;
-    m_zoomTextOnly = textOnly;
-
+    WebPluginContainerImpl* pluginContainer = WebFrameImpl::pluginContainerFromFrame(frame);
+    if (pluginContainer)
+        pluginContainer->plugin()->setZoomLevel(m_zoomLevel, textOnly);
+    else {
+        double zoomFactor = zoomLevelToZoomFactor(m_zoomLevel);
+        if (textOnly)
+            frame->setPageAndTextZoomFactors(1, zoomFactor);
+        else
+            frame->setPageAndTextZoomFactors(zoomFactor, 1);
+    }
     return m_zoomLevel;
+}
+
+void WebViewImpl::zoomLimitsChanged(double minimumZoomLevel,
+                                    double maximumZoomLevel)
+{
+    m_minimumZoomLevel = minimumZoomLevel;
+    m_maximumZoomLevel = maximumZoomLevel;
+    m_client->zoomLimitsChanged(m_minimumZoomLevel, m_maximumZoomLevel);
+}
+
+void WebViewImpl::fullFramePluginZoomLevelChanged(double zoomLevel)
+{
+    if (zoomLevel == m_zoomLevel)
+        return;
+
+    m_zoomLevel = std::max(std::min(zoomLevel, m_maximumZoomLevel), m_minimumZoomLevel);
+    m_client->zoomLevelChanged();
+}
+
+double WebView::zoomLevelToZoomFactor(double zoomLevel)
+{
+    return std::pow(textSizeMultiplierRatio, zoomLevel);
+}
+
+double WebView::zoomFactorToZoomLevel(double factor)
+{
+    // Since factor = 1.2^level, level = log(factor) / log(1.2)
+    return log(factor) / log(textSizeMultiplierRatio);
 }
 

trunk/WebKit/chromium/src/WebViewImpl.h

@@ -133 +133 @@
     virtual void setInitialFocus(bool reverse);
     virtual void clearFocusedNode();
-    virtual int zoomLevel();
-    virtual int setZoomLevel(bool textOnly, int zoomLevel);
+    virtual double zoomLevel();
+    virtual double setZoomLevel(bool textOnly, double zoomLevel);
+    virtual void zoomLimitsChanged(double minimumZoomLevel,
+                                   double maximumZoomLevel);
     virtual void performMediaPlayerAction(
         const WebMediaPlayerAction& action,
@@ -343 +345 @@
     WebCore::PopupContainer* selectPopup() const { return m_selectPopup.get(); }
 
-    bool zoomTextOnly() const { return m_zoomTextOnly; }
-
     // Returns true if the event leads to scrolling.
     static bool mapKeyCodeForScroll(int keyCode,
                                    WebCore::ScrollDirection* scrollDirection,
                                    WebCore::ScrollGranularity* scrollGranularity);
+
+    // Called by a full frame plugin inside this view to inform it that its
+    // zoom level has been updated.  The plugin should only call this function
+    // if the zoom change was triggered by the browser, it's only needed in case
+    // a plugin can update its own zoom, say because of its own UI.
+    void fullFramePluginZoomLevelChanged(double zoomLevel);
 
 private:
@@ -441 +447 @@
     // Keeps track of the current zoom level. 0 means no zoom, positive numbers
     // mean zoom in, negative numbers mean zoom out.
-    int m_zoomLevel;
-
-    bool m_zoomTextOnly;
+    double m_zoomLevel;
+
+    double m_minimumZoomLevel;
+
+    double m_maximumZoomLevel;
 
     bool m_contextMenuAllowed;