Title: [121651] trunk
Revision
121651
Author
[email protected]
Date
2012-07-01 19:55:42 -0700 (Sun, 01 Jul 2012)

Log Message

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:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (121650 => 121651)


--- trunk/LayoutTests/ChangeLog	2012-07-02 02:21:19 UTC (rev 121650)
+++ trunk/LayoutTests/ChangeLog	2012-07-02 02:55:42 UTC (rev 121651)
@@ -1,3 +1,17 @@
+2012-07-01  James Robinson  <[email protected]>
+
+        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  <[email protected]>
 
         <rdar://problem/11785743> [mac] Non-BMP characters in vertical text appear as missing glyphs

Modified: trunk/LayoutTests/platform/efl/TestExpectations (121650 => 121651)


--- trunk/LayoutTests/platform/efl/TestExpectations	2012-07-02 02:21:19 UTC (rev 121650)
+++ trunk/LayoutTests/platform/efl/TestExpectations	2012-07-02 02:55:42 UTC (rev 121651)
@@ -715,4 +715,7 @@
 
 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

Modified: trunk/LayoutTests/platform/gtk/TestExpectations (121650 => 121651)


--- trunk/LayoutTests/platform/gtk/TestExpectations	2012-07-02 02:21:19 UTC (rev 121650)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2012-07-02 02:55:42 UTC (rev 121651)
@@ -1239,6 +1239,9 @@
 
 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
 
 //////////////////////////////////////////////////////////////////////////////////////////

Modified: trunk/LayoutTests/platform/qt/TestExpectations (121650 => 121651)


--- trunk/LayoutTests/platform/qt/TestExpectations	2012-07-02 02:21:19 UTC (rev 121650)
+++ trunk/LayoutTests/platform/qt/TestExpectations	2012-07-02 02:55:42 UTC (rev 121651)
@@ -101,3 +101,6 @@
 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

Modified: trunk/Source/WebCore/ChangeLog (121650 => 121651)


--- trunk/Source/WebCore/ChangeLog	2012-07-02 02:21:19 UTC (rev 121650)
+++ trunk/Source/WebCore/ChangeLog	2012-07-02 02:55:42 UTC (rev 121651)
@@ -1,3 +1,16 @@
+2012-07-01  James Robinson  <[email protected]>
+
+        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  <[email protected]>
 
         Make the "Inspect Element" context menu item appear in nightly builds again.

Modified: trunk/Source/WebCore/dom/ViewportArguments.h (121650 => 121651)


--- trunk/Source/WebCore/dom/ViewportArguments.h	2012-07-02 02:21:19 UTC (rev 121650)
+++ trunk/Source/WebCore/dom/ViewportArguments.h	2012-07-02 02:55:42 UTC (rev 121651)
@@ -110,7 +110,7 @@
     }
     // 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);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to