- Revision
- 121740
- Author
- [email protected]
- Date
- 2012-07-03 01:22:34 -0700 (Tue, 03 Jul 2012)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (121739 => 121740)
--- trunk/LayoutTests/ChangeLog 2012-07-03 08:20:09 UTC (rev 121739)
+++ trunk/LayoutTests/ChangeLog 2012-07-03 08:22:34 UTC (rev 121740)
@@ -1,3 +1,13 @@
+2012-07-03 Balazs Kelemen <[email protected]>
+
+ [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 <[email protected]>
[Chromium] Rebaseline for Mac10.6
Modified: trunk/LayoutTests/platform/qt-5.0-wk2/Skipped (121739 => 121740)
--- trunk/LayoutTests/platform/qt-5.0-wk2/Skipped 2012-07-03 08:20:09 UTC (rev 121739)
+++ trunk/LayoutTests/platform/qt-5.0-wk2/Skipped 2012-07-03 08:22:34 UTC (rev 121740)
@@ -392,7 +392,3 @@
# 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
Modified: trunk/Source/WebCore/ChangeLog (121739 => 121740)
--- trunk/Source/WebCore/ChangeLog 2012-07-03 08:20:09 UTC (rev 121739)
+++ trunk/Source/WebCore/ChangeLog 2012-07-03 08:22:34 UTC (rev 121740)
@@ -1,3 +1,15 @@
+2012-07-03 Balazs Kelemen <[email protected]>
+
+ [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 <[email protected]>
[TextureMapper] The TextureMapper should support edge-distance anti-antialiasing
Modified: trunk/Source/WebCore/WebCore.exp.in (121739 => 121740)
--- trunk/Source/WebCore/WebCore.exp.in 2012-07-03 08:20:09 UTC (rev 121739)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-07-03 08:22:34 UTC (rev 121740)
@@ -456,6 +456,7 @@
__ZN7WebCore17JSDOMGlobalObject6s_infoE
__ZN7WebCore17RegularExpressionC1ERKN3WTF6StringENS1_19TextCaseSensitivityE
__ZN7WebCore17RegularExpressionD1Ev
+__ZN7WebCore17ViewportArguments19deprecatedTargetDPIE
__ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE
__ZN7WebCore17openTemporaryFileERKN3WTF6StringERi
__ZN7WebCore17userVisibleStringEP5NSURL
Modified: trunk/Source/WebKit2/ChangeLog (121739 => 121740)
--- trunk/Source/WebKit2/ChangeLog 2012-07-03 08:20:09 UTC (rev 121739)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-03 08:22:34 UTC (rev 121740)
@@ -1,3 +1,15 @@
+2012-07-03 Balazs Kelemen <[email protected]>
+
+ [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 <[email protected]>
[EFL][WK2] Add API to deliver a Web Intent to a frame
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (121739 => 121740)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-07-03 08:20:09 UTC (rev 121739)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-07-03 08:22:34 UTC (rev 121740)
@@ -3122,7 +3122,8 @@
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);
