Title: [136531] trunk
- Revision
- 136531
- Author
- [email protected]
- Date
- 2012-12-04 10:52:10 -0800 (Tue, 04 Dec 2012)
Log Message
Unreviewed, rolling out r136509.
http://trac.webkit.org/changeset/136509
https://bugs.webkit.org/show_bug.cgi?id=104015
broke layout tests (Requested by eae on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-12-04
Source/WebCore:
* platform/graphics/IntSize.h:
(WebCore::IntSize::scale):
LayoutTests:
* platform/efl-wk2/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (136530 => 136531)
--- trunk/LayoutTests/ChangeLog 2012-12-04 18:49:51 UTC (rev 136530)
+++ trunk/LayoutTests/ChangeLog 2012-12-04 18:52:10 UTC (rev 136531)
@@ -1,3 +1,13 @@
+2012-12-04 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r136509.
+ http://trac.webkit.org/changeset/136509
+ https://bugs.webkit.org/show_bug.cgi?id=104015
+
+ broke layout tests (Requested by eae on #webkit).
+
+ * platform/efl-wk2/TestExpectations:
+
2012-12-04 Antoine Quint <[email protected]>
INVALID_STATE_ERR error upon calling .addCue() for an already-in-use cue
Modified: trunk/LayoutTests/platform/efl-wk2/TestExpectations (136530 => 136531)
--- trunk/LayoutTests/platform/efl-wk2/TestExpectations 2012-12-04 18:49:51 UTC (rev 136530)
+++ trunk/LayoutTests/platform/efl-wk2/TestExpectations 2012-12-04 18:52:10 UTC (rev 136531)
@@ -197,6 +197,9 @@
webkit.org/b/103400 [ Debug ] compositing/overflow/content-gains-scrollbars.html [ Crash Pass ]
webkit.org/b/103400 [ Debug ] compositing/overflow/content-loses-scrollbars.html [ Crash Pass ]
+# Easily reproducable flakiness on EFL WK2 only
+webkit.org/b/103882 css3/device-adapt/viewport-width-not-affecting-next-page.html [ Failure Pass ]
+
webkit.org/b/103883 css3/selectors3/html/css3-modsel-1.html [ Failure Pass ]
webkit.org/b/103883 css3/selectors3/xml/css3-modsel-1.xml [ Failure Pass ]
webkit.org/b/103883 css3/selectors3/xhtml/css3-modsel-1.xml [ Failure Pass ]
Modified: trunk/Source/WebCore/ChangeLog (136530 => 136531)
--- trunk/Source/WebCore/ChangeLog 2012-12-04 18:49:51 UTC (rev 136530)
+++ trunk/Source/WebCore/ChangeLog 2012-12-04 18:52:10 UTC (rev 136531)
@@ -1,3 +1,14 @@
+2012-12-04 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r136509.
+ http://trac.webkit.org/changeset/136509
+ https://bugs.webkit.org/show_bug.cgi?id=104015
+
+ broke layout tests (Requested by eae on #webkit).
+
+ * platform/graphics/IntSize.h:
+ (WebCore::IntSize::scale):
+
2012-12-04 Antoine Quint <[email protected]>
INVALID_STATE_ERR error upon calling .addCue() for an already-in-use cue
Modified: trunk/Source/WebCore/platform/graphics/IntSize.h (136530 => 136531)
--- trunk/Source/WebCore/platform/graphics/IntSize.h 2012-12-04 18:49:51 UTC (rev 136530)
+++ trunk/Source/WebCore/platform/graphics/IntSize.h 2012-12-04 18:52:10 UTC (rev 136531)
@@ -26,8 +26,6 @@
#ifndef IntSize_h
#define IntSize_h
-#include <wtf/MathExtras.h>
-
#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
typedef struct CGSize CGSize;
#endif
@@ -85,8 +83,8 @@
void scale(float widthScale, float heightScale)
{
- m_width = lroundf(static_cast<float>(m_width) * widthScale);
- m_height = lroundf(static_cast<float>(m_height) * heightScale);
+ m_width = static_cast<int>(static_cast<float>(m_width) * widthScale);
+ m_height = static_cast<int>(static_cast<float>(m_height) * heightScale);
}
void scale(float scale)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes