Changeset 130866 in webkit

Timestamp:

Oct 10, 2012 12:23:25 AM (12 years ago)

Author:

aelias@chromium.org

Message:

Text Autosizing: Counteract funky window sizing on Android.
​https://bugs.webkit.org/show_bug.cgi?id=98809

Reviewed by Adam Barth.

In Chrome for Android, the window sizes provided to WebCore are
currently in physical screen pixels instead of
device-scale-adjusted units. For example window width on a
Galaxy Nexus is 720 instead of 360. Text autosizing expects
device-independent pixels. When Chrome for Android cuts over to
the new coordinate space, it will be tied to the setting
applyPageScaleFactorInCompositor.

No new tests.

• rendering/TextAutosizer.cpp:

(WebCore::TextAutosizer::processSubtree):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/TextAutosizer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-10  Alexandre Elias  <aelias@chromium.org>
+
+        Text Autosizing: Counteract funky window sizing on Android.
+        https://bugs.webkit.org/show_bug.cgi?id=98809
+
+        Reviewed by Adam Barth.
+
+        In Chrome for Android, the window sizes provided to WebCore are
+        currently in physical screen pixels instead of
+        device-scale-adjusted units. For example window width on a
+        Galaxy Nexus is 720 instead of 360.  Text autosizing expects
+        device-independent pixels.  When Chrome for Android cuts over to
+        the new coordinate space, it will be tied to the setting
+        applyPageScaleFactorInCompositor.
+
+        No new tests.
+
+        * rendering/TextAutosizer.cpp:
+        (WebCore::TextAutosizer::processSubtree):
+
 2012-10-09  Philip Rogers  <pdr@google.com>
 

trunk/Source/WebCore/rendering/TextAutosizer.cpp

@@ -65 +65 @@
     if (windowInfo.windowSize.isEmpty()) {
         bool includeScrollbars = !InspectorInstrumentation::shouldApplyScreenWidthOverride(mainFrame);
-        windowInfo.windowSize = mainFrame->view()->visibleContentRect(includeScrollbars).size(); // FIXME: Check that this is always in logical (density-independent) pixels (see wkbug.com/87440).
+        windowInfo.windowSize = mainFrame->view()->visibleContentRect(includeScrollbars).size();
+        if (!m_document->settings()->applyPageScaleFactorInCompositor())
+            windowInfo.windowSize.scale(1 / m_document->page()->deviceScaleFactor());
     }