Changeset 141481 in webkit

Timestamp:

Jan 31, 2013 1:57:00 PM (11 years ago)

Author:

zhajiang@rim.com

Message:

[BlackBerry] Bing Images viewport causes layout "fun"
​https://bugs.webkit.org/show_bug.cgi?id=108393

Patch by Jacky Jiang <​zhajiang@rim.com>.
Reviewed by Yong Li.
Internally reviewed by Arvid Nilsson and partially reviewed by Konrad Piascik.

Source/WebCore:

PR: 277855
On bing.com image search page, JS generated styles for the divs which
contained images based on the window.screen and window.innerWidth.
Unfortunately the styles for the divs weren't good enough on our device
which resulted in three images being overlapped in the same viewport.
On our port, we calculate the screen rect base on the physical screen
pixels. However, iOS and lastest Android Chrome port already changed it
to density-independent (logical) pixels. And also to my knowledge that
some websites would generate bad styles for us as well through
@media device-width/device-height.
To be consistent and fix such kinds of issues, we should use
density-independent pixels instead of physical screen pixels. Mainly
ported from Chrome port change r139356. The patch will affect
screen.width/height, window.outerWidth/outerHeight and
@media device-width/device-height.

• platform/blackberry/PlatformScreenBlackBerry.cpp:

(WebCore):
(WebCore::toUserSpace):
(WebCore::screenAvailableRect):
(WebCore::screenRect):

Source/WebKit/blackberry:

PR: 277855
Set applyPageScaleFactorInCompositor settting to false by default.
Scale down chrome window rect to density-independent pixels.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::didChangeSettings):

• Api/WebSettings.cpp:

(WebKit):
(BlackBerry::WebKit::WebSettings::standardSettings):
(BlackBerry::WebKit::WebSettings::applyDeviceScaleFactorInCompositor):
(BlackBerry::WebKit::WebSettings::setApplyPageScaleFactorInCompositor):

• Api/WebSettings.h:
• WebCoreSupport/ChromeClientBlackBerry.cpp:

(WebCore::ChromeClientBlackBerry::windowRect):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp (modified) (3 diffs)
• WebKit/blackberry/Api/WebPage.cpp (modified) (1 diff)
• WebKit/blackberry/Api/WebSettings.cpp (modified) (3 diffs)
• WebKit/blackberry/Api/WebSettings.h (modified) (1 diff)
• WebKit/blackberry/ChangeLog (modified) (1 diff)
• WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-31  Jacky Jiang  <zhajiang@rim.com>
+
+        [BlackBerry] Bing Images viewport causes layout "fun"
+        https://bugs.webkit.org/show_bug.cgi?id=108393
+
+        Reviewed by Yong Li.
+        Internally reviewed by Arvid Nilsson and partially reviewed by Konrad Piascik.
+
+        PR: 277855
+        On bing.com image search page, JS generated styles for the divs which
+        contained images based on the window.screen and window.innerWidth.
+        Unfortunately the styles for the divs weren't good enough on our device
+        which resulted in three images being overlapped in the same viewport.
+        On our port, we calculate the screen rect base on the physical screen
+        pixels. However, iOS and lastest Android Chrome port already changed it
+        to density-independent (logical) pixels. And also to my knowledge that
+        some websites would generate bad styles for us as well through
+        @media device-width/device-height.
+        To be consistent and fix such kinds of issues, we should use
+        density-independent pixels instead of physical screen pixels. Mainly
+        ported from Chrome port change r139356. The patch will affect
+        screen.width/height, window.outerWidth/outerHeight and
+        @media device-width/device-height.
+
+        * platform/blackberry/PlatformScreenBlackBerry.cpp:
+        (WebCore):
+        (WebCore::toUserSpace):
+        (WebCore::screenAvailableRect):
+        (WebCore::screenRect):
+
 2013-01-31  Max Vujovic  <mvujovic@adobe.com>
 

trunk/Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2009, 2010, 2011 Research In Motion Limited. All rights reserved.
+ * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -21 +22 @@
 
 #include "FloatRect.h"
+#include "Frame.h"
+#include "FrameView.h"
 #include "NotImplemented.h"
+#include "Page.h"
+#include "Settings.h"
 #include "Widget.h"
 
@@ -43 +48 @@
 }
 
+// Use logical (density-independent) pixels instead of physical screen pixels.
+static FloatRect toUserSpace(FloatRect rect, Widget* widget)
+{
+    if (widget->isFrameView()) {
+        Page* page = static_cast<FrameView*>(widget)->frame()->page();
+        if (page && !page->settings()->applyDeviceScaleFactorInCompositor())
+            rect.scale(1 / page->deviceScaleFactor());
+    }
+    return rect;
+}
+
 FloatRect screenAvailableRect(Widget* widget)
 {
-    return FloatRect(FloatPoint(), FloatSize(IntSize(BlackBerry::Platform::Graphics::Screen::primaryScreen()->size())));
+    if (!widget)
+        return FloatRect();
+    return toUserSpace(IntRect(IntPoint::zero(), IntSize(BlackBerry::Platform::Graphics::Screen::primaryScreen()->size())), widget);
 }
 
 FloatRect screenRect(Widget* widget)
 {
-    return FloatRect(FloatPoint(), FloatSize(IntSize(BlackBerry::Platform::Graphics::Screen::primaryScreen()->size())));
+    if (!widget)
+        return FloatRect();
+    return toUserSpace(IntRect(IntPoint::zero(), IntSize(BlackBerry::Platform::Graphics::Screen::primaryScreen()->size())), widget);
 }
 

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -6004 +6004 @@
     coreSettings->setShouldUseCrossOriginProtocolCheck(!webSettings->allowCrossSiteRequests());
     coreSettings->setWebSecurityEnabled(!webSettings->allowCrossSiteRequests());
+    coreSettings->setApplyPageScaleFactorInCompositor(webSettings->applyDeviceScaleFactorInCompositor());
 
     cookieManager().setPrivateMode(webSettings->isPrivateBrowsingEnabled());

trunk/Source/WebKit/blackberry/Api/WebSettings.cpp

@@ -37 +37 @@
 
 DEFINE_STATIC_LOCAL(String, BlackBerryAllowCrossSiteRequests, (ASCIILiteral("BlackBerryAllowCrossSiteRequests")));
+DEFINE_STATIC_LOCAL(String, BlackBerryApplyDeviceScaleFactorInCompositor, (ASCIILiteral("BlackBerryApplyDeviceScaleFactorInCompositor")));
 DEFINE_STATIC_LOCAL(String, BlackBerryAsynchronousSpellChecking, (ASCIILiteral("BlackBerryAsynchronousSpellChecking")));
 DEFINE_STATIC_LOCAL(String, BlackBerryBackgroundColor, (ASCIILiteral("BlackBerryBackgroundColor")));
@@ -180 +181 @@
     settings->m_private->setBoolean(BlackBerryFormAutofillEnabled, false);
     settings->m_private->setBoolean(BlackBerryAsynchronousSpellChecking, true);
+    settings->m_private->setBoolean(BlackBerryApplyDeviceScaleFactorInCompositor, false);
 
     if (BlackBerry::Platform::DeviceInfo::instance()->isMobile()) {
@@ -843 +845 @@
 }
 
+bool WebSettings::applyDeviceScaleFactorInCompositor() const
+{
+    return m_private->getBoolean(BlackBerryApplyDeviceScaleFactorInCompositor);
+}
+
+void WebSettings::setApplyPageScaleFactorInCompositor(bool applyDeviceScaleFactorInCompositor)
+{
+    m_private->setBoolean(BlackBerryApplyDeviceScaleFactorInCompositor, applyDeviceScaleFactorInCompositor);
+}
+
 } // namespace WebKit
 } // namespace BlackBerry

trunk/Source/WebKit/blackberry/Api/WebSettings.h

@@ -245 +245 @@
     void setBackingStoreEnabled(bool);
 
+    bool applyDeviceScaleFactorInCompositor() const;
+    void setApplyPageScaleFactorInCompositor(bool);
+
 private:
     WebSettingsPrivate* m_private;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-01-31  Jacky Jiang  <zhajiang@rim.com>
+
+        [BlackBerry] Bing Images viewport causes layout "fun"
+        https://bugs.webkit.org/show_bug.cgi?id=108393
+
+        Reviewed by Yong Li.
+        Internally reviewed by Arvid Nilsson and partially reviewed by Konrad Piascik.
+
+        PR: 277855
+        Set applyPageScaleFactorInCompositor settting to false by default.
+        Scale down chrome window rect to density-independent pixels.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::didChangeSettings):
+        * Api/WebSettings.cpp:
+        (WebKit):
+        (BlackBerry::WebKit::WebSettings::standardSettings):
+        (BlackBerry::WebKit::WebSettings::applyDeviceScaleFactorInCompositor):
+        (BlackBerry::WebKit::WebSettings::setApplyPageScaleFactorInCompositor):
+        * Api/WebSettings.h:
+        * WebCoreSupport/ChromeClientBlackBerry.cpp:
+        (WebCore::ChromeClientBlackBerry::windowRect):
+
 2013-01-31  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp

@@ -55 +55 @@
 #include "SearchPopupMenuBlackBerry.h"
 #include "SecurityOrigin.h"
+#include "Settings.h"
 #include "SharedPointer.h"
 #include "ViewportArguments.h"
@@ -166 +167 @@
         windowSize = window->windowSize();
 
-    return FloatRect(0, 0, windowSize.width(), windowSize.height());
+    // Use logical (density-independent) pixels instead of physical screen pixels.
+    FloatRect rect = FloatRect(0, 0, windowSize.width(), windowSize.height());
+    if (!m_webPagePrivate->m_page->settings()->applyDeviceScaleFactorInCompositor())
+        rect.scale(1 / m_webPagePrivate->m_page->deviceScaleFactor());
+    return rect;
 }