Title: [119669] trunk/Tools
- Revision
- 119669
- Author
- [email protected]
- Date
- 2012-06-06 20:16:35 -0700 (Wed, 06 Jun 2012)
Log Message
Unreviewed, rolling out r119662.
http://trac.webkit.org/changeset/119662
https://bugs.webkit.org/show_bug.cgi?id=88487
Broke builds (Requested by rniwa on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-06-06
* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
* DumpRenderTree/chromium/ImageDiff.cpp:
(untestedCompareImages):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (119668 => 119669)
--- trunk/Tools/ChangeLog 2012-06-07 03:11:12 UTC (rev 119668)
+++ trunk/Tools/ChangeLog 2012-06-07 03:16:35 UTC (rev 119669)
@@ -1,3 +1,15 @@
+2012-06-06 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r119662.
+ http://trac.webkit.org/changeset/119662
+ https://bugs.webkit.org/show_bug.cgi?id=88487
+
+ Broke builds (Requested by rniwa on #webkit).
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+ * DumpRenderTree/chromium/ImageDiff.cpp:
+ (untestedCompareImages):
+
2012-06-06 Xianzhu Wang <[email protected]>
[Chromium] Remove header dependency of ImageDiff to WTF
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (119668 => 119669)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-06-07 03:11:12 UTC (rev 119668)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-06-07 03:16:35 UTC (rev 119669)
@@ -58,6 +58,7 @@
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support_gfx',
],
'include_dirs': [
+ '<(source_dir)/WTF',
'<(DEPTH)',
],
'sources': [
Modified: trunk/Tools/DumpRenderTree/chromium/ImageDiff.cpp (119668 => 119669)
--- trunk/Tools/DumpRenderTree/chromium/ImageDiff.cpp 2012-06-07 03:11:12 UTC (rev 119668)
+++ trunk/Tools/DumpRenderTree/chromium/ImageDiff.cpp 2012-06-07 03:16:35 UTC (rev 119669)
@@ -34,6 +34,8 @@
// The exact format of this tool's output to stdout is important, to match
// what the run-webkit-tests script expects.
+#include "config.h"
+
#include "webkit/support/webkit_support_gfx.h"
#include <algorithm>
#include <iterator>
@@ -42,7 +44,7 @@
#include <string.h>
#include <vector>
-#if defined(OS_WINDOWS)
+#if OS(WINDOWS)
#include <windows.h>
#define PATH_MAX MAX_PATH
#endif
@@ -340,7 +342,7 @@
while (fgets(buffer, sizeof(buffer), stdin)) {
if (!strncmp("Content-length: ", buffer, 16)) {
char* context;
-#if defined(OS_WINDOWS)
+#if OS(WINDOWS)
strtok_s(buffer, " ", &context);
int imageSize = strtol(strtok_s(0, " ", &context), 0, 10);
#else
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
