Diff
Modified: trunk/Source/WebCore/ChangeLog (121554 => 121555)
--- trunk/Source/WebCore/ChangeLog 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebCore/ChangeLog 2012-06-29 12:51:57 UTC (rev 121555)
@@ -1,3 +1,23 @@
+2012-06-29 Konrad Piascik <[email protected]>
+
+ Don't hardcode target dpi of 160 (it should be 96 on desktop)
+ https://bugs.webkit.org/show_bug.cgi?id=88114
+
+ Reviewed by Adam Barth.
+
+ No behavioural change, current tests in fast/viewport cover all
+ functionality.
+
+ * WebCore.exp.in: Updated symbol for computeViewportAttributes.
+ * dom/ViewportArguments.cpp: Use new parameter for devicePixelRatio
+ and don't calculate it anymore.
+ (WebCore::computeViewportAttributes):
+ * dom/ViewportArguments.h: Change the deviceDPI parameter to
+ devicePixelRatio and put the onus
+ on the embedder to supply the
+ correct value. Add temporary constant.
+ (WebCore):
+
2012-06-29 Vineet Chaudhary <[email protected]>
JS binding code generator doesn't handle "attribute unsigned long[]" well.
Modified: trunk/Source/WebCore/WebCore.exp.in (121554 => 121555)
--- trunk/Source/WebCore/WebCore.exp.in 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-06-29 12:51:57 UTC (rev 121555)
@@ -606,7 +606,7 @@
__ZN7WebCore25HistoryPropertyListWriter6bufferEm
__ZN7WebCore25HistoryPropertyListWriterC2Ev
__ZN7WebCore25addLanguageChangeObserverEPvPFvS0_E
-__ZN7WebCore25computeViewportAttributesENS_17ViewportArgumentsEiiiiNS_7IntSizeE
+__ZN7WebCore25computeViewportAttributesENS_17ViewportArgumentsEiiifNS_7IntSizeE
__ZN7WebCore26UserTypingGestureIndicator27processingUserTypingGestureEv
__ZN7WebCore26UserTypingGestureIndicator28focusedElementAtGestureStartEv
__ZN7WebCore26stopObservingCookieChangesEv
Modified: trunk/Source/WebCore/dom/ViewportArguments.cpp (121554 => 121555)
--- trunk/Source/WebCore/dom/ViewportArguments.cpp 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebCore/dom/ViewportArguments.cpp 2012-06-29 12:51:57 UTC (rev 121555)
@@ -41,11 +41,7 @@
namespace WebCore {
-// FIXME: We shouldn't hardcode the targetDPI to 160.
-// See https://bugs.webkit.org/show_bug.cgi?id=88114
-static float targetDPI = 160;
-
-ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport)
+ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, float devicePixelRatio, IntSize visibleViewport)
{
ViewportAttributes result;
@@ -54,7 +50,7 @@
ASSERT(availableWidth > 0 && availableHeight > 0);
- result.devicePixelRatio = deviceDPI / targetDPI;
+ result.devicePixelRatio = devicePixelRatio;
// Resolve non-'auto' width and height to pixel values.
if (result.devicePixelRatio != 1.0) {
Modified: trunk/Source/WebCore/dom/ViewportArguments.h (121554 => 121555)
--- trunk/Source/WebCore/dom/ViewportArguments.h 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebCore/dom/ViewportArguments.h 2012-06-29 12:51:57 UTC (rev 121555)
@@ -72,10 +72,6 @@
ValueDesktopWidth = -2,
ValueDeviceWidth = -3,
ValueDeviceHeight = -4,
- ValueDeviceDPI = -5,
- ValueLowDPI = -6,
- ValueMediumDPI = -7,
- ValueHighDPI = -8
};
ViewportArguments(Type type = Implicit)
@@ -112,9 +108,13 @@
{
return !(*this == other);
}
+ // FIXME: We're going to keep this constant around until all embedders
+ // refactor their code to no longer need it.
+ static const int deprecatedTargetDPI = 160;
};
-ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport);
+ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, float devicePixelRatio, IntSize visibleViewport);
+
void restrictMinimumScaleFactorToViewportSize(ViewportAttributes& result, IntSize visibleViewport);
void restrictScaleFactorToInitialScaleIfNotUserScalable(ViewportAttributes& result);
float computeMinimumScaleFactorForContentContained(const ViewportAttributes& result, const IntSize& viewportSize, const IntSize& contentSize);
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (121554 => 121555)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-06-29 12:51:57 UTC (rev 121555)
@@ -3444,9 +3444,7 @@
int desktopWidth = defaultMaxLayoutSize().width();
int deviceWidth = Platform::Graphics::Screen::primaryScreen()->width();
int deviceHeight = Platform::Graphics::Screen::primaryScreen()->height();
- FloatSize currentPPI = Platform::Graphics::Screen::primaryScreen()->pixelsPerInch(-1);
- int deviceDPI = int(roundf((currentPPI.width() + currentPPI.height()) / 2));
- ViewportAttributes result = computeViewportAttributes(m_viewportArguments, desktopWidth, deviceWidth, deviceHeight, deviceDPI, m_defaultLayoutSize);
+ ViewportAttributes result = computeViewportAttributes(m_viewportArguments, desktopWidth, deviceWidth, deviceHeight, m_webSettings->devicePixelRatio(), m_defaultLayoutSize);
m_page->setDeviceScaleFactor(result.devicePixelRatio);
return IntSize(result.layoutSize.width(), result.layoutSize.height());
}
Modified: trunk/Source/WebKit/blackberry/Api/WebSettings.cpp (121554 => 121555)
--- trunk/Source/WebKit/blackberry/Api/WebSettings.cpp 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/blackberry/Api/WebSettings.cpp 2012-06-29 12:51:57 UTC (rev 121555)
@@ -24,9 +24,13 @@
#include "WebString.h"
#include <Base64.h>
+#include <BlackBerryPlatformDeviceInfo.h>
#include <BlackBerryPlatformFontInfo.h>
+#include <BlackBerryPlatformScreen.h>
#include <Color.h>
+#include <FloatSize.h>
#include <PageCache.h>
+#include <ViewportArguments.h>
#include <wtf/HashSet.h>
#include <wtf/Vector.h>
@@ -58,6 +62,7 @@
DEFINE_STATIC_LOCAL(String, BlackBerryFullScreenVideoCapable, ("BlackBerryFullScreenVideoCapable"));
DEFINE_STATIC_LOCAL(String, BlackBerryCredentialAutofillEnabled, ("BlackBerryCredentialAutofillEnabled"));
DEFINE_STATIC_LOCAL(String, BlackBerryFormAutofillEnabled, ("BlackBerryFormAutofillEnabled"));
+DEFINE_STATIC_LOCAL(String, BlackBerryDevicePixelRatio, ("BlackBerryDevicePixelRatio"));
DEFINE_STATIC_LOCAL(String, SpatialNavigationEnabled, ("SpatialNavigationEnabled"));
DEFINE_STATIC_LOCAL(String, WebKitDatabasePath, ("WebKitDatabasePath"));
DEFINE_STATIC_LOCAL(String, WebKitDatabasesEnabled, ("WebKitDatabasesEnabled"));
@@ -173,6 +178,13 @@
settings->m_private->setBoolean(BlackBerryCredentialAutofillEnabled, false);
settings->m_private->setBoolean(BlackBerryFormAutofillEnabled, false);
+ if (BlackBerry::Platform::DeviceInfo::instance()->isMobile()) {
+ WebCore::FloatSize currentPPI = Platform::Graphics::Screen::primaryScreen()->pixelsPerInch(-1);
+ int deviceDPI = int(roundf((currentPPI.width() + currentPPI.height()) / 2));
+ settings->m_private->setDouble(BlackBerryDevicePixelRatio, deviceDPI / WebCore::ViewportArguments::deprecatedTargetDPI);
+ } else
+ settings->m_private->setDouble(BlackBerryDevicePixelRatio, 1);
+
settings->m_private->setInteger(WebKitDefaultFontSize, 16);
settings->m_private->setInteger(WebKitDefaultFixedFontSize, 13);
settings->m_private->setString(WebKitDefaultTextEncodingName, "iso-8859-1");
@@ -825,5 +837,15 @@
return m_private->setBoolean(BlackBerryFormAutofillEnabled, enable);
}
+double WebSettings::devicePixelRatio() const
+{
+ return m_private->getDouble(BlackBerryDevicePixelRatio);
+}
+
+void WebSettings::setDevicePixelRatio(double ratio)
+{
+ m_private->setDouble(BlackBerryDevicePixelRatio, ratio);
+}
+
} // namespace WebKit
} // namespace BlackBerry
Modified: trunk/Source/WebKit/blackberry/Api/WebSettings.h (121554 => 121555)
--- trunk/Source/WebKit/blackberry/Api/WebSettings.h 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/blackberry/Api/WebSettings.h 2012-06-29 12:51:57 UTC (rev 121555)
@@ -237,6 +237,9 @@
bool isFormAutofillEnabled() const;
void setFormAutofillEnabled(bool);
+ double devicePixelRatio() const;
+ void setDevicePixelRatio(double);
+
private:
WebSettingsPrivate* m_private;
WebSettings();
Modified: trunk/Source/WebKit/blackberry/Api/WebViewportArguments.cpp (121554 => 121555)
--- trunk/Source/WebKit/blackberry/Api/WebViewportArguments.cpp 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/blackberry/Api/WebViewportArguments.cpp 2012-06-29 12:51:57 UTC (rev 121555)
@@ -85,12 +85,12 @@
d->height = height;
}
-float WebViewportArguments::targetDensityDpi() const
+float WebViewportArguments::devicePixelRatio() const
{
return 0;
}
-void WebViewportArguments::setTargetDensityDpi(float)
+void WebViewportArguments::setDevicePixelRatio(float)
{
}
Modified: trunk/Source/WebKit/blackberry/Api/WebViewportArguments.h (121554 => 121555)
--- trunk/Source/WebKit/blackberry/Api/WebViewportArguments.h 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/blackberry/Api/WebViewportArguments.h 2012-06-29 12:51:57 UTC (rev 121555)
@@ -50,10 +50,6 @@
ValueDesktopWidth = -2,
ValueDeviceWidth = -3,
ValueDeviceHeight = -4,
- ValueDeviceDPI = -5,
- ValueLowDPI = -6,
- ValueMediumDPI = -7,
- ValueHighDPI = -8
};
float initialScale() const;
@@ -71,9 +67,8 @@
float height() const;
void setHeight(float);
- // FIXME: Can we remove these functions? WebKit no longer supports targetDensityDpi.
- float targetDensityDpi() const;
- void setTargetDensityDpi(float);
+ float devicePixelRatio() const;
+ void setDevicePixelRatio(float);
float userScalable() const;
void setUserScalable(float);
Modified: trunk/Source/WebKit/blackberry/ChangeLog (121554 => 121555)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-06-29 12:51:57 UTC (rev 121555)
@@ -1,3 +1,24 @@
+2012-06-29 Konrad Piascik <[email protected]>
+
+ Don't hardcode target dpi of 160 (it should be 96 on desktop)
+ https://bugs.webkit.org/show_bug.cgi?id=88114
+
+ Reviewed by Adam Barth.
+
+ Added new WebSetting to specify what the devicePixelRatio should be.
+ Updated the call to computeViewportAttributes.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::recomputeVirtualViewportFromViewportArguments):
+ * Api/WebSettings.cpp:
+ (WebKit):
+ (BlackBerry::WebKit::WebSettings::standardSettings):
+ (BlackBerry::WebKit::WebSettings::devicePixelRatio):
+ (BlackBerry::WebKit::WebSettings::setDevicePixelRatio):
+ * Api/WebSettings.h:
+ * WebKitSupport/DumpRenderTreeSupport.cpp:
+ (DumpRenderTreeSupport::dumpConfigurationForViewport):
+
2012-06-28 Jason Liu <[email protected]>
[BlackBerry] Selection items show as garbage for non-ascii characters.
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.cpp (121554 => 121555)
--- trunk/Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.cpp 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/DumpRenderTreeSupport.cpp 2012-06-29 12:51:57 UTC (rev 121555)
@@ -87,7 +87,7 @@
void DumpRenderTreeSupport::dumpConfigurationForViewport(Frame* mainFrame, int deviceDPI, int deviceWidth, int deviceHeight, int availableWidth, int availableHeight)
{
ViewportArguments arguments = mainFrame->page()->viewportArguments();
- ViewportAttributes attrs = computeViewportAttributes(arguments, /* default layout width for non-mobile pages */ 980, deviceWidth, deviceHeight, deviceDPI, IntSize(availableWidth, availableHeight));
+ ViewportAttributes attrs = computeViewportAttributes(arguments, /* default layout width for non-mobile pages */ 980, deviceWidth, deviceHeight, deviceDPI / ViewportArguments::deprecatedTargetDPI, IntSize(availableWidth, availableHeight));
restrictMinimumScaleFactorToViewportSize(attrs, IntSize(availableWidth, availableHeight));
restrictScaleFactorToInitialScaleIfNotUserScalable(attrs);
Modified: trunk/Source/WebKit/chromium/ChangeLog (121554 => 121555)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-29 12:51:57 UTC (rev 121555)
@@ -1,3 +1,15 @@
+2012-06-29 Konrad Piascik <[email protected]>
+
+ Don't hardcode target dpi of 160 (it should be 96 on desktop)
+ https://bugs.webkit.org/show_bug.cgi?id=88114
+
+ Reviewed by Adam Barth.
+
+ Updated the call to computeViewportAttributes.
+
+ * src/ChromeClientImpl.cpp:
+ (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):
+
2012-06-29 Amy Ousterhout <[email protected]>
Deleting unused function in WebDeviceOrientation
Modified: trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp (121554 => 121555)
--- trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2012-06-29 12:51:57 UTC (rev 121555)
@@ -655,7 +655,7 @@
// Call the common viewport computing logic in ViewportArguments.cpp.
ViewportAttributes computed = computeViewportAttributes(
args, settings->layoutFallbackWidth(), deviceRect.width, deviceRect.height,
- dpi, IntSize(deviceRect.width, deviceRect.height));
+ dpi / ViewportArguments::deprecatedTargetDPI, IntSize(deviceRect.width, deviceRect.height));
if (m_webView->ignoreViewportTagMaximumScale()) {
computed.maximumScale = max(computed.maximumScale, m_webView->maxPageScaleFactor);
Modified: trunk/Source/WebKit/efl/ChangeLog (121554 => 121555)
--- trunk/Source/WebKit/efl/ChangeLog 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-06-29 12:51:57 UTC (rev 121555)
@@ -1,3 +1,17 @@
+2012-06-29 Konrad Piascik <[email protected]>
+
+ Don't hardcode target dpi of 160 (it should be 96 on desktop)
+ https://bugs.webkit.org/show_bug.cgi?id=88114
+
+ Reviewed by Adam Barth.
+
+ Updated the call to computeViewportAttributes.
+
+ * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
+ (DumpRenderTreeSupportEfl::dumpConfigurationForViewport):
+ * ewk/ewk_view.cpp:
+ (_ewk_view_viewport_attributes_compute):
+
2012-06-27 Sheriff Bot <[email protected]>
Unreviewed, rolling out r121398.
Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (121554 => 121555)
--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2012-06-29 12:51:57 UTC (rev 121555)
@@ -587,7 +587,7 @@
WebCore::ViewportAttributes attributes = computeViewportAttributes(arguments,
/* default layout width for non-mobile pages */ 980,
deviceSize.width(), deviceSize.height(),
- deviceDPI,
+ deviceDPI / WebCore::ViewportArguments::deprecatedTargetDPI,
availableSize);
restrictMinimumScaleFactorToViewportSize(attributes, availableSize);
restrictScaleFactorToInitialScaleIfNotUserScalable(attributes);
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (121554 => 121555)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-06-29 12:51:57 UTC (rev 121555)
@@ -1237,7 +1237,7 @@
WebCore::IntRect availableRect = enclosingIntRect(priv->page->chrome()->client()->pageRect());
WebCore::IntRect deviceRect = enclosingIntRect(priv->page->chrome()->client()->windowRect());
- WebCore::ViewportAttributes attributes = WebCore::computeViewportAttributes(priv->viewportArguments, desktopWidth, deviceRect.width(), deviceRect.height(), deviceDPI, availableRect.size());
+ WebCore::ViewportAttributes attributes = WebCore::computeViewportAttributes(priv->viewportArguments, desktopWidth, deviceRect.width(), deviceRect.height(), deviceDPI / WebCore::ViewportArguments::deprecatedTargetDPI, availableRect.size());
WebCore::restrictMinimumScaleFactorToViewportSize(attributes, availableRect.size());
WebCore::restrictScaleFactorToInitialScaleIfNotUserScalable(attributes);
Modified: trunk/Source/WebKit/gtk/ChangeLog (121554 => 121555)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-06-29 12:51:57 UTC (rev 121555)
@@ -1,3 +1,17 @@
+2012-06-29 Konrad Piascik <[email protected]>
+
+ Don't hardcode target dpi of 160 (it should be 96 on desktop)
+ https://bugs.webkit.org/show_bug.cgi?id=88114
+
+ Reviewed by Adam Barth.
+
+ Updated the call to computeViewportAttributes.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::dumpConfigurationForViewport):
+ * webkit/webkitviewportattributes.cpp:
+ (webkitViewportAttributesRecompute):
+
2012-06-25 Mark Hahnenberg <[email protected]>
JSLock should be per-JSGlobalData
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (121554 => 121555)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-06-29 12:51:57 UTC (rev 121555)
@@ -623,7 +623,7 @@
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
ViewportArguments arguments = webView->priv->corePage->mainFrame()->document()->viewportArguments();
- ViewportAttributes attrs = computeViewportAttributes(arguments, /* default layout width for non-mobile pages */ 980, deviceWidth, deviceHeight, deviceDPI, IntSize(availableWidth, availableHeight));
+ ViewportAttributes attrs = computeViewportAttributes(arguments, /* default layout width for non-mobile pages */ 980, deviceWidth, deviceHeight, deviceDPI / ViewportArguments::deprecatedTargetDPI, IntSize(availableWidth, availableHeight));
restrictMinimumScaleFactorToViewportSize(attrs, IntSize(availableWidth, availableHeight));
restrictScaleFactorToInitialScaleIfNotUserScalable(attrs);
fprintf(stdout, "viewport size %dx%d scale %f with limits [%f, %f] and userScalable %f\n", static_cast<int>(attrs.layoutSize.width()), static_cast<int>(attrs.layoutSize.height()), attrs.initialScale, attrs.minimumScale, attrs.maximumScale, attrs.userScalable);
Modified: trunk/Source/WebKit/gtk/webkit/webkitviewportattributes.cpp (121554 => 121555)
--- trunk/Source/WebKit/gtk/webkit/webkitviewportattributes.cpp 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/gtk/webkit/webkitviewportattributes.cpp 2012-06-29 12:51:57 UTC (rev 121555)
@@ -534,7 +534,7 @@
ViewportArguments arguments = webView->priv->corePage->mainFrame()->document()->viewportArguments();
- ViewportAttributes attributes = computeViewportAttributes(arguments, priv->desktopWidth, priv->deviceWidth, priv->deviceHeight, priv->deviceDPI, IntSize(priv->availableWidth, priv->availableHeight));
+ ViewportAttributes attributes = computeViewportAttributes(arguments, priv->desktopWidth, priv->deviceWidth, priv->deviceHeight, priv->deviceDPI / ViewportArguments::deprecatedTargetDPI, IntSize(priv->availableWidth, priv->availableHeight));
restrictMinimumScaleFactorToViewportSize(attributes, IntSize(priv->availableWidth, priv->availableHeight));
restrictScaleFactorToInitialScaleIfNotUserScalable(attributes);
Modified: trunk/Source/WebKit/qt/Api/qwebpage.cpp (121554 => 121555)
--- trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-06-29 12:51:57 UTC (rev 121555)
@@ -2559,7 +2559,7 @@
deviceHeight = size.height();
}
- WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(d->viewportArguments(), desktopWidth, deviceWidth, deviceHeight, qt_defaultDpi(), availableSize);
+ WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(d->viewportArguments(), desktopWidth, deviceWidth, deviceHeight, qt_defaultDpi() / WebCore::ViewportArguments::deprecatedTargetDPI, availableSize);
WebCore::restrictMinimumScaleFactorToViewportSize(conf, availableSize);
WebCore::restrictScaleFactorToInitialScaleIfNotUserScalable(conf);
Modified: trunk/Source/WebKit/qt/ChangeLog (121554 => 121555)
--- trunk/Source/WebKit/qt/ChangeLog 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-06-29 12:51:57 UTC (rev 121555)
@@ -1,3 +1,17 @@
+2012-06-29 Konrad Piascik <[email protected]>
+
+ Don't hardcode target dpi of 160 (it should be 96 on desktop)
+ https://bugs.webkit.org/show_bug.cgi?id=88114
+
+ Reviewed by Adam Barth.
+
+ Updated the call to computeViewportAttributes.
+
+ * Api/qwebpage.cpp:
+ (QWebPage::viewportAttributesForSize):
+ * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+ (DumpRenderTreeSupportQt::viewportAsText):
+
2012-06-28 Alexander Pavlov <[email protected]>
[Qt] inspector/styles/inject-stylesheet.html makes 4 tests flakey (TEXT PASS)
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (121554 => 121555)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2012-06-29 12:51:57 UTC (rev 121555)
@@ -742,10 +742,10 @@
WebCore::ViewportArguments args = page->d->viewportArguments();
WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(args,
- /* desktop-width */ 980,
- /* device-width */ deviceSize.width(),
- /* device-height */ deviceSize.height(),
- /* device-dpi */ deviceDPI,
+ /* desktop-width */ 980,
+ /* device-width */ deviceSize.width(),
+ /* device-height */ deviceSize.height(),
+ /* devicePixelRatio */ deviceDPI / WebCore::ViewportArguments::deprecatedTargetDPI,
availableSize);
WebCore::restrictMinimumScaleFactorToViewportSize(conf, availableSize);
WebCore::restrictScaleFactorToInitialScaleIfNotUserScalable(conf);
Modified: trunk/Source/WebKit2/ChangeLog (121554 => 121555)
--- trunk/Source/WebKit2/ChangeLog 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-29 12:51:57 UTC (rev 121555)
@@ -1,3 +1,16 @@
+2012-06-29 Konrad Piascik <[email protected]>
+
+ Don't hardcode target dpi of 160 (it should be 96 on desktop)
+ https://bugs.webkit.org/show_bug.cgi?id=88114
+
+ Reviewed by Adam Barth.
+
+ Updated the call to computeViewportAttributes.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::sendViewportAttributesChanged):
+ (WebKit::WebPage::viewportConfigurationAsText):
+
2012-06-29 Sheriff Bot <[email protected]>
Unreviewed, rolling out r121529.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (121554 => 121555)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-06-29 12:25:52 UTC (rev 121554)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-06-29 12:51:57 UTC (rev 121555)
@@ -918,7 +918,7 @@
int deviceWidth = (settings->deviceWidth() > 0) ? settings->deviceWidth() : m_viewportSize.width();
int deviceHeight = (settings->deviceHeight() > 0) ? settings->deviceHeight() : m_viewportSize.height();
- ViewportAttributes attr = computeViewportAttributes(m_page->viewportArguments(), minimumLayoutFallbackWidth, deviceWidth, deviceHeight, static_cast<int>(160 * m_page->deviceScaleFactor()), m_viewportSize);
+ ViewportAttributes attr = computeViewportAttributes(m_page->viewportArguments(), minimumLayoutFallbackWidth, deviceWidth, deviceHeight, m_page->deviceScaleFactor(), m_viewportSize);
setResizesToContentsUsingLayoutSize(IntSize(static_cast<int>(attr.layoutSize.width()), static_cast<int>(attr.layoutSize.height())));
send(Messages::WebPageProxy::DidChangeViewportProperties(attr));
@@ -3122,7 +3122,7 @@
String WebPage::viewportConfigurationAsText(int deviceDPI, int deviceWidth, int deviceHeight, int availableWidth, int availableHeight)
{
ViewportArguments arguments = mainFrame()->document()->viewportArguments();
- ViewportAttributes attrs = WebCore::computeViewportAttributes(arguments, /* default layout width for non-mobile pages */ 980, deviceWidth, deviceHeight, deviceDPI, IntSize(availableWidth, availableHeight));
+ ViewportAttributes attrs = WebCore::computeViewportAttributes(arguments, /* default layout width for non-mobile pages */ 980, deviceWidth, deviceHeight, m_page->deviceScaleFactor(), IntSize(availableWidth, availableHeight));
WebCore::restrictMinimumScaleFactorToViewportSize(attrs, IntSize(availableWidth, availableHeight));
WebCore::restrictScaleFactorToInitialScaleIfNotUserScalable(attrs);
return String::format("viewport size %dx%d scale %f with limits [%f, %f] and userScalable %f\n", static_cast<int>(attrs.layoutSize.width()), static_cast<int>(attrs.layoutSize.height()), attrs.initialScale, attrs.minimumScale, attrs.maximumScale, attrs.userScalable);
