[Qt][WK2] fast/viewport/viewport-91.html still fails after r121555 and r121661

https://bugs.webkit.org/show_bug.cgi?id=90376

Reviewed by Csaba Osztrogonác.

Source/WebCore:

No new tests, this is only a build alignment.

Export ViewportArguments::deprecatedTargetDPI since it is used in WebKit2.
* WebCore.exp.in:

Source/WebKit2:

layoutTestController.dumpConfigurationForViewport still need
to use the constant target DPI of 160.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::viewportConfigurationAsText):

LayoutTests:

Unskip passing test.
* platform/qt-5.0-wk2/Skipped:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121740 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5ca072d..3ae86bb 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2012-07-03  Balazs Kelemen  <kbalazs@webkit.org>
+
+        [Qt][WK2] fast/viewport/viewport-91.html still fails after r121555 and r121661
+        https://bugs.webkit.org/show_bug.cgi?id=90376
+
+        Reviewed by Csaba Osztrogonác.
+
+        Unskip passing test.
+        * platform/qt-5.0-wk2/Skipped:
+
 2012-07-03  Yoshifumi Inoue  <yosin@chromium.org>
 
         [Chromium] Rebaseline for Mac10.6

diff --git a/LayoutTests/platform/qt-5.0-wk2/Skipped b/LayoutTests/platform/qt-5.0-wk2/Skipped
index 54ac214..113f563 100644 (file)
--- a/LayoutTests/platform/qt-5.0-wk2/Skipped
+++ b/LayoutTests/platform/qt-5.0-wk2/Skipped
@@ -392,7 +392,3 @@ http/tests/cache/xhr-vary-header.html
 # https://bugs.webkit.org/show_bug.cgi?id=89473
 editing/pasteboard/copy-in-password-field.html
 editing/pasteboard/copy-element-with-conflicting-background-color-from-rule.html
-
-# [Qt][WK2] fast/viewport/viewport-91.html still fails after r121555 and r121661
-# https://bugs.webkit.org/show_bug.cgi?id=90376
-fast/viewport/viewport-91.html

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8f3fd46..bbb89ad 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2012-07-03  Balazs Kelemen  <kbalazs@webkit.org>
+
+        [Qt][WK2] fast/viewport/viewport-91.html still fails after r121555 and r121661
+        https://bugs.webkit.org/show_bug.cgi?id=90376
+
+        Reviewed by Csaba Osztrogonác.
+
+        No new tests, this is only a build alignment.
+
+        Export ViewportArguments::deprecatedTargetDPI since it is used in WebKit2.
+        * WebCore.exp.in:
+
 2012-07-02  Martin Robinson  <mrobinson@igalia.com>
 
         [TextureMapper] The TextureMapper should support edge-distance anti-antialiasing

diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
index e893974..30f3f2d 100644 (file)
--- a/Source/WebCore/WebCore.exp.in
+++ b/Source/WebCore/WebCore.exp.in
@@ -456,6 +456,7 @@ __ZN7WebCore17HistoryController33restoreScrollPositionAndViewStateEv
 __ZN7WebCore17JSDOMGlobalObject6s_infoE
 __ZN7WebCore17RegularExpressionC1ERKN3WTF6StringENS1_19TextCaseSensitivityE
 __ZN7WebCore17RegularExpressionD1Ev
+__ZN7WebCore17ViewportArguments19deprecatedTargetDPIE
 __ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE
 __ZN7WebCore17openTemporaryFileERKN3WTF6StringERi
 __ZN7WebCore17userVisibleStringEP5NSURL

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 870b5b7..a614070 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2012-07-03  Balazs Kelemen  <kbalazs@webkit.org>
+
+        [Qt][WK2] fast/viewport/viewport-91.html still fails after r121555 and r121661
+        https://bugs.webkit.org/show_bug.cgi?id=90376
+
+        Reviewed by Csaba Osztrogonác.
+
+        layoutTestController.dumpConfigurationForViewport still need
+        to use the constant target DPI of 160.
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::viewportConfigurationAsText):
+
 2012-07-03  Christophe Dumez  <christophe.dumez@intel.com>
 
         [EFL][WK2] Add API to deliver a Web Intent to a frame

diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
index 328422e..266746e 100644 (file)
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -3122,7 +3122,8 @@ void WebPage::simulateMouseMotion(WebCore::IntPoint position, double time)
 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, m_page->deviceScaleFactor(), IntSize(availableWidth, availableHeight));
+    ViewportAttributes attrs = WebCore::computeViewportAttributes(arguments, /* default layout width for non-mobile pages */ 980,
+                                                                  deviceWidth, deviceHeight, deviceDPI / ViewportArguments::deprecatedTargetDPI, 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);