Unreviewed, rolling out r121635.

http://trac.webkit.org/changeset/121635
https://bugs.webkit.org/show_bug.cgi?id=90286

Breaks compile on clang error: in-class initializer for static
data member of type 'const float' is a GNU extension
[-Werror,-Wgnu]

Source/WebCore:

* dom/ViewportArguments.h:
(ViewportArguments):

LayoutTests:

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

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 791a27e..be3aee8 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2012-07-01  James Robinson  <jamesr@chromium.org>
+
+        Unreviewed, rolling out r121635.
+        http://trac.webkit.org/changeset/121635
+        https://bugs.webkit.org/show_bug.cgi?id=90286
+
+        Breaks compile on clang error: in-class initializer for static
+        data member of type 'const float' is a GNU extension
+        [-Werror,-Wgnu]
+
+        * platform/efl/TestExpectations:
+        * platform/gtk/TestExpectations:
+        * platform/qt/TestExpectations:
+
 2012-07-01  Dan Bernstein  <mitz@apple.com>
 
         <rdar://problem/11785743> [mac] Non-BMP characters in vertical text appear as missing glyphs

diff --git a/LayoutTests/platform/efl/TestExpectations b/LayoutTests/platform/efl/TestExpectations
index de71f60..dcd66fc 100644 (file)
--- a/LayoutTests/platform/efl/TestExpectations
+++ b/LayoutTests/platform/efl/TestExpectations
@@ -715,4 +715,7 @@ 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 9c41157..4299165 100644 (file)
--- a/LayoutTests/platform/gtk/TestExpectations
+++ b/LayoutTests/platform/gtk/TestExpectations
@@ -1239,6 +1239,9 @@ 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 d5b99ac..4c56a58 100644 (file)
--- a/LayoutTests/platform/qt/TestExpectations
+++ b/LayoutTests/platform/qt/TestExpectations
@@ -101,3 +101,6 @@ 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 91c0d22..35f8ddc 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2012-07-01  James Robinson  <jamesr@chromium.org>
+
+        Unreviewed, rolling out r121635.
+        http://trac.webkit.org/changeset/121635
+        https://bugs.webkit.org/show_bug.cgi?id=90286
+
+        Breaks compile on clang error: in-class initializer for static
+        data member of type 'const float' is a GNU extension
+        [-Werror,-Wgnu]
+
+        * dom/ViewportArguments.h:
+        (ViewportArguments):
+
 2012-07-01  Timothy Hatcher  <timothy@apple.com>
 
         Make the "Inspect Element" context menu item appear in nightly builds again.

diff --git a/Source/WebCore/dom/ViewportArguments.h b/Source/WebCore/dom/ViewportArguments.h
index bb13e6a..b6293ef 100644 (file)
--- a/Source/WebCore/dom/ViewportArguments.h
+++ b/Source/WebCore/dom/ViewportArguments.h
@@ -110,7 +110,7 @@ struct ViewportArguments {
     }
     // FIXME: We're going to keep this constant around until all embedders
     // refactor their code to no longer need it.
-    static const float deprecatedTargetDPI = 160;
+    static const int deprecatedTargetDPI = 160;
 };
 
 ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, float devicePixelRatio, IntSize visibleViewport);