Changeset 161087 in webkit

Timestamp:

Dec 26, 2013 7:04:22 AM (10 years ago)

Author:

thiago.lacerda@openbossa.org

Message:

[WK2][CoordinatedGraphics] Removing duplicate scale information from WebVIew.cpp
​https://bugs.webkit.org/show_bug.cgi?id=126243

Reviewed by Benjamin Poulain.

The scale factor of the WebView must reflect the same information present in
WebPageProxy.
Previously, in WebView.cpp, there was a m_contentScaleFactor member, which adds
information duplication and needs to be synchronizing with pageScaleFactor in
WebPageProxy. We can avoid this by just making WebView access and set WebPageProxy's
pageScaleFactor directly.

• UIProcess/CoordinatedGraphics/WebView.cpp:

(WebKit::WebView::WebView):
(WebKit::WebView::setContentScaleFactor):
(WebKit::WebView::transformToScene):
(WebKit::WebView::visibleContentsSize):

• UIProcess/CoordinatedGraphics/WebView.h:

(WebKit::WebView::contentScaleFactor):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/CoordinatedGraphics/WebView.cpp (modified) (4 diffs)
• UIProcess/CoordinatedGraphics/WebView.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-26  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
+
+        [WK2][CoordinatedGraphics] Removing duplicate scale information from WebVIew.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=126243
+
+        Reviewed by Benjamin Poulain.
+
+        The scale factor of the WebView must reflect the same information present in
+        WebPageProxy.
+        Previously, in WebView.cpp, there was a m_contentScaleFactor member, which adds
+        information duplication and needs to be synchronizing with pageScaleFactor in
+        WebPageProxy. We can avoid this by just making WebView access and set WebPageProxy's
+        pageScaleFactor directly.
+
+        * UIProcess/CoordinatedGraphics/WebView.cpp:
+        (WebKit::WebView::WebView):
+        (WebKit::WebView::setContentScaleFactor):
+        (WebKit::WebView::transformToScene):
+        (WebKit::WebView::visibleContentsSize):
+        * UIProcess/CoordinatedGraphics/WebView.h:
+        (WebKit::WebView::contentScaleFactor):
+
 2013-12-25  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp

@@ -49 +49 @@
     : m_focused(false)
     , m_visible(false)
-    , m_contentScaleFactor(1.0)
     , m_opacity(1.0)
 {
@@ -78 +77 @@
 }
 
+void WebView::setContentScaleFactor(float scaleFactor)
+{
+    m_page->scalePage(scaleFactor, roundedIntPoint(contentPosition()));
+    updateViewportSize();
+}
+
 void WebView::setActive(bool active)
 {
@@ -239 +244 @@
 {
     FloatPoint position = -m_contentPosition;
-    float effectiveScale = m_contentScaleFactor * m_page->deviceScaleFactor();
+    float effectiveScale = contentScaleFactor() * m_page->deviceScaleFactor();
     position.scale(effectiveScale, effectiveScale);
 
@@ -279 +284 @@
 {
     FloatSize visibleContentsSize(dipSize());
-    visibleContentsSize.scale(1 / m_contentScaleFactor);
+    visibleContentsSize.scale(1 / contentScaleFactor());
 
     return visibleContentsSize;

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h

@@ -71 +71 @@
     void setVisible(bool);
 
-    void setContentScaleFactor(float scaleFactor) { m_contentScaleFactor = scaleFactor; }
-    float contentScaleFactor() const { return m_contentScaleFactor; }
+    void setContentScaleFactor(float);
+    float contentScaleFactor() const { return m_page->pageScaleFactor(); }
 
     void setContentPosition(const WebCore::FloatPoint& position) { m_contentPosition = position; }
@@ -214 +214 @@
     bool m_focused;
     bool m_visible;
-    float m_contentScaleFactor;
     double m_opacity;
     WebCore::FloatPoint m_contentPosition; // Position in UI units.