[EFL] [GTK] [QT] fast/viewport/viewport-91.html is failing after r121555

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

Patch by Konrad Piascik <kpiascik@rim.com> on 2012-07-02
Reviewed by Daniel Bates.

Source/WebCore:

Since the deprecatedTargetDPI was an int and the deviceDPI was also an int the result
was truncated.  Changed deprecatedTargetDPI to a float value. Viewport test 91 now passes.

* dom/ViewportArguments.h:
(ViewportArguments):

LayoutTests:

Unskip now passing tests.

* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:
* platform/qt/TestExpectations:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5dabeea..cf49e0f 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2012-07-02  Konrad Piascik  <kpiascik@rim.com>
+
+        [EFL] [GTK] [QT] fast/viewport/viewport-91.html is failing after r121555
+        https://bugs.webkit.org/show_bug.cgi?id=90286
+
+        Reviewed by Daniel Bates.
+
+        Unskip now passing tests.
+
+        * platform/efl/TestExpectations:
+        * platform/gtk/TestExpectations:
+        * platform/qt/TestExpectations:
+
 2012-07-02  Kristóf Kosztyó  <kkristof@inf.u-szeged.hu>
 
         [Qt] Unreviewed gardening, skip new failing test.

diff --git a/LayoutTests/platform/efl/TestExpectations b/LayoutTests/platform/efl/TestExpectations
index 6211fbb..7124a0d 100644 (file)
--- a/LayoutTests/platform/efl/TestExpectations
+++ b/LayoutTests/platform/efl/TestExpectations
@@ -718,7 +718,4 @@ BUGWK89845 : fast/forms/input-set-composition-scroll.html = TEXT
 
 BUGWK90007 : http/tests/security/mixedContent/insecure-audio-video-in-main-frame.html = TEXT
 
-// Failing after r121555
-BUGWK90286 : fast/viewport/viewport-91.html = TEXT
-
 BUGWK90334 : css3/flexbox/anonymous-block.html = IMAGE

diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
index 4299165..9c41157 100644 (file)
--- a/LayoutTests/platform/gtk/TestExpectations
+++ b/LayoutTests/platform/gtk/TestExpectations
@@ -1239,9 +1239,6 @@ BUGWK89845 : fast/forms/input-set-composition-scroll.html = TEXT
 
 BUGWK90007 : http/tests/security/mixedContent/insecure-audio-video-in-main-frame.html = TEXT
 
-// Failing after r121555
-BUGWK90286 : fast/viewport/viewport-91.html = TEXT
-
 BUGWK90334 : css3/flexbox/anonymous-block.html = IMAGE
 
 //////////////////////////////////////////////////////////////////////////////////////////

diff --git a/LayoutTests/platform/qt/TestExpectations b/LayoutTests/platform/qt/TestExpectations
index 4c56a58..d5b99ac 100644 (file)
--- a/LayoutTests/platform/qt/TestExpectations
+++ b/LayoutTests/platform/qt/TestExpectations
@@ -101,6 +101,3 @@ BUGWK85463 SKIP : editing/inserting/typing-space-to-trigger-smart-link.html = PA
 BUGWK88794 SKIP : webaudio/codec-tests = PASS
 
 BUGWK90007 : http/tests/security/mixedContent/insecure-audio-video-in-main-frame.html = TEXT
-
-// Failing after r121555
-BUGWK90286 : fast/viewport/viewport-91.html = TEXT

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 67835c6..8a96ff4 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2012-07-02  Konrad Piascik  <kpiascik@rim.com>
+
+        [EFL] [GTK] [QT] fast/viewport/viewport-91.html is failing after r121555
+        https://bugs.webkit.org/show_bug.cgi?id=90286
+
+        Reviewed by Daniel Bates.
+
+        Since the deprecatedTargetDPI was an int and the deviceDPI was also an int the result
+        was truncated.  Changed deprecatedTargetDPI to a float value. Viewport test 91 now passes.
+
+        * dom/ViewportArguments.h:
+        (ViewportArguments):
+
 2012-06-28  Yury Semikhatsky  <yurys@chromium.org>
 
         Web Inspector: add v8 bindings memory info to the native memory graph

diff --git a/Source/WebCore/dom/ViewportArguments.cpp b/Source/WebCore/dom/ViewportArguments.cpp
index 76c4aef..dc22e6e 100644 (file)
--- a/Source/WebCore/dom/ViewportArguments.cpp
+++ b/Source/WebCore/dom/ViewportArguments.cpp
@@ -41,6 +41,8 @@ using namespace std;
 
 namespace WebCore {
 
+const float ViewportArguments::deprecatedTargetDPI = 160;
+
 ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, float devicePixelRatio, IntSize visibleViewport)
 {
     ViewportAttributes result;

diff --git a/Source/WebCore/dom/ViewportArguments.h b/Source/WebCore/dom/ViewportArguments.h
index b6293ef..94fb1fa 100644 (file)
--- a/Source/WebCore/dom/ViewportArguments.h
+++ b/Source/WebCore/dom/ViewportArguments.h
@@ -108,9 +108,10 @@ struct ViewportArguments {
     {
         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;
+    static const float deprecatedTargetDPI;
 };
 
 ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, float devicePixelRatio, IntSize visibleViewport);