Title: [119662] trunk/Tools
- Revision
- 119662
- Author
- [email protected]
- Date
- 2012-06-06 18:46:38 -0700 (Wed, 06 Jun 2012)
Log Message
[Chromium] Remove header dependency of ImageDiff to WTF
https://bugs.webkit.org/show_bug.cgi?id=88422
Reviewed by Adam Barth.
* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
* DumpRenderTree/chromium/ImageDiff.cpp:
(untestedCompareImages):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (119661 => 119662)
--- trunk/Tools/ChangeLog 2012-06-07 01:36:12 UTC (rev 119661)
+++ trunk/Tools/ChangeLog 2012-06-07 01:46:38 UTC (rev 119662)
@@ -1,3 +1,14 @@
+2012-06-06 Xianzhu Wang <[email protected]>
+
+ [Chromium] Remove header dependency of ImageDiff to WTF
+ https://bugs.webkit.org/show_bug.cgi?id=88422
+
+ Reviewed by Adam Barth.
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+ * DumpRenderTree/chromium/ImageDiff.cpp:
+ (untestedCompareImages):
+
2012-06-06 Amy Ousterhout <[email protected]>
[WebKit] DeviceOrientation cleanup
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (119661 => 119662)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-06-07 01:36:12 UTC (rev 119661)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-06-07 01:46:38 UTC (rev 119662)
@@ -58,7 +58,6 @@
'<(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 (119661 => 119662)
--- trunk/Tools/DumpRenderTree/chromium/ImageDiff.cpp 2012-06-07 01:36:12 UTC (rev 119661)
+++ trunk/Tools/DumpRenderTree/chromium/ImageDiff.cpp 2012-06-07 01:46:38 UTC (rev 119662)
@@ -34,8 +34,6 @@
// 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>
@@ -44,7 +42,7 @@
#include <string.h>
#include <vector>
-#if OS(WINDOWS)
+#if defined(OS_WINDOWS)
#include <windows.h>
#define PATH_MAX MAX_PATH
#endif
@@ -342,7 +340,7 @@
while (fgets(buffer, sizeof(buffer), stdin)) {
if (!strncmp("Content-length: ", buffer, 16)) {
char* context;
-#if OS(WINDOWS)
+#if defined(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
