Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (123006 => 123007)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-07-18 20:09:57 UTC (rev 123006)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-07-18 20:21:34 UTC (rev 123007)
@@ -1,5 +1,12 @@
2012-07-18 Tony Chang <t...@chromium.org>
+ [chromium] Unreviewed, more compile fixes on Chromium Win.
+
+ * tests/WebTransformationMatrixTest.cpp:
+ (WebKit::TEST):
+
+2012-07-18 Tony Chang <t...@chromium.org>
+
[chromium] Fix compile on Windows.
148>tests\LayerChromiumTest.cpp(510): warning C4305: 'argument' : truncation from 'double' to 'float'
Modified: trunk/Source/WebKit/chromium/tests/WebTransformationMatrixTest.cpp (123006 => 123007)
--- trunk/Source/WebKit/chromium/tests/WebTransformationMatrixTest.cpp 2012-07-18 20:09:57 UTC (rev 123006)
+++ trunk/Source/WebKit/chromium/tests/WebTransformationMatrixTest.cpp 2012-07-18 20:21:34 UTC (rev 123007)
@@ -200,10 +200,10 @@
EXPECT_TRUE(scale.isInvertible());
WebTransformationMatrix inverseScale = scale.inverse();
- EXPECT_ROW1_EQ(0.25, 0, 0, 0, inverseScale);
- EXPECT_ROW2_EQ(0, 0.1, 0, 0, inverseScale);
- EXPECT_ROW3_EQ(0, 0, 0.01, 0, inverseScale);
- EXPECT_ROW4_EQ(0, 0, 0, 1, inverseScale);
+ EXPECT_ROW1_EQ(0.25, 0, 0, 0, inverseScale);
+ EXPECT_ROW2_EQ(0, .1f, 0, 0, inverseScale);
+ EXPECT_ROW3_EQ(0, 0, .01f, 0, inverseScale);
+ EXPECT_ROW4_EQ(0, 0, 0, 1, inverseScale);
// Try to invert a matrix that is not invertible.
// The inverse() function should simply return an identity matrix.
Modified: trunk/Tools/ChangeLog (123006 => 123007)
--- trunk/Tools/ChangeLog 2012-07-18 20:09:57 UTC (rev 123006)
+++ trunk/Tools/ChangeLog 2012-07-18 20:21:34 UTC (rev 123007)
@@ -1,3 +1,11 @@
+2012-07-18 Tony Chang <t...@chromium.org>
+
+ [chromium] Unreviewed, more compile fixes on Chromium Win.
+
+ * DumpRenderTree/chromium/TestShellWin.cpp:
+ (TestShell::waitTestFinished):
+ * DumpRenderTree/chromium/WebThemeControlDRTWin.cpp:
+
2012-07-18 Christophe Dumez <christophe.du...@intel.com>
[EFL] Add central error management to EFL port
Modified: trunk/Tools/DumpRenderTree/chromium/TestShellWin.cpp (123006 => 123007)
--- trunk/Tools/DumpRenderTree/chromium/TestShellWin.cpp 2012-07-18 20:09:57 UTC (rev 123006)
+++ trunk/Tools/DumpRenderTree/chromium/TestShellWin.cpp 2012-07-18 20:21:34 UTC (rev 123007)
@@ -78,7 +78,7 @@
void TestShell::waitTestFinished()
{
- DCHECK(!m_testIsPending) << "cannot be used recursively";
+ ASSERT(!m_testIsPending);
m_testIsPending = true;
@@ -89,7 +89,7 @@
// timeout, it can't do anything except terminate the test
// shell, which is unfortunate.
m_finishedEvent = CreateEvent(0, TRUE, FALSE, 0);
- DCHECK(m_finishedEvent);
+ ASSERT(m_finishedEvent);
HANDLE threadHandle = reinterpret_cast<HANDLE>(_beginthreadex(
0,
@@ -98,7 +98,7 @@
this,
0,
0));
- DCHECK(threadHandle);
+ ASSERT(threadHandle);
// TestFinished() will post a quit message to break this loop when the page
// finishes loading.
Modified: trunk/Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.cpp (123006 => 123007)
--- trunk/Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.cpp 2012-07-18 20:09:57 UTC (rev 123006)
+++ trunk/Tools/DumpRenderTree/chromium/WebThemeControlDRTWin.cpp 2012-07-18 20:21:34 UTC (rev 123007)
@@ -43,6 +43,7 @@
#include "third_party/skia/include/core/SkPath.h"
#include "third_party/skia/include/core/SkRect.h"
+#include <algorithm>
#include <wtf/Assertions.h>
using namespace std;
@@ -74,8 +75,8 @@
// The maximum width and height is 13.
// Center the square in the passed rectangle.
const int maxControlSize = 13;
- int controlSize = min(rect.width(), rect.height());
- controlSize = min(controlSize, maxControlSize);
+ int controlSize = std::min(rect.width(), rect.height());
+ controlSize = std::min(controlSize, maxControlSize);
retval.fLeft = rect.fLeft + (rect.width() / 2) - (controlSize / 2);
retval.fRight = retval.fLeft + controlSize - 1;
