Title: [119781] trunk/Tools
- Revision
- 119781
- Author
- [email protected]
- Date
- 2012-06-07 18:35:51 -0700 (Thu, 07 Jun 2012)
Log Message
[Chromium] Remove header dependency of ImageDiff to WTF
https://bugs.webkit.org/show_bug.cgi?id=88422
Reviewed by Ryosuke Niwa.
* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
* DumpRenderTree/chromium/ImageDiff.cpp:
(untestedCompareImages):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (119780 => 119781)
--- trunk/Tools/ChangeLog 2012-06-08 01:33:25 UTC (rev 119780)
+++ trunk/Tools/ChangeLog 2012-06-08 01:35:51 UTC (rev 119781)
@@ -1,3 +1,14 @@
+2012-06-07 Xianzhu Wang <[email protected]>
+
+ [Chromium] Remove header dependency of ImageDiff to WTF
+ https://bugs.webkit.org/show_bug.cgi?id=88422
+
+ Reviewed by Ryosuke Niwa.
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+ * DumpRenderTree/chromium/ImageDiff.cpp:
+ (untestedCompareImages):
+
2012-06-07 Dongwoo Im <[email protected]>
[EFL] [DRT] DRT enables WebAudio when WebAudio feature is enabled.
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (119780 => 119781)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-06-08 01:33:25 UTC (rev 119780)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-06-08 01:35:51 UTC (rev 119781)
@@ -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 (119780 => 119781)
--- trunk/Tools/DumpRenderTree/chromium/ImageDiff.cpp 2012-06-08 01:33:25 UTC (rev 119780)
+++ trunk/Tools/DumpRenderTree/chromium/ImageDiff.cpp 2012-06-08 01:35:51 UTC (rev 119781)
@@ -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,12 +42,13 @@
#include <string.h>
#include <vector>
-#if OS(WINDOWS)
+#if defined(_WIN32)
#include <windows.h>
#define PATH_MAX MAX_PATH
+#define strtok_r strtok_s
#endif
-// Define macro here to make ImageDiff independent of _javascript_Core.
+// Define macro here to make ImageDiff independent of WTF.
#ifdef NDEBUG
#define ASSERT(assertion) do { } while (0)
#else
@@ -342,13 +341,8 @@
while (fgets(buffer, sizeof(buffer), stdin)) {
if (!strncmp("Content-length: ", buffer, 16)) {
char* context;
-#if OS(WINDOWS)
- strtok_s(buffer, " ", &context);
- int imageSize = strtol(strtok_s(0, " ", &context), 0, 10);
-#else
strtok_r(buffer, " ", &context);
int imageSize = strtol(strtok_r(0, " ", &context), 0, 10);
-#endif
bool success = false;
if (imageSize > 0 && !actualImage.hasImage()) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
