2008-10-14 Alp Toker <alp@nuanti.com>
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Oct 2008 18:43:24 +0000 (18:43 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Oct 2008 18:43:24 +0000 (18:43 +0000)
        Reviewed by Sam Weinig.

        https://bugs.webkit.org/show_bug.cgi?id=16299
        Add a config.h file to DRT

        Add a config.h to DumpRenderTree and reduce use of DumpRenderTree.h as
        an ad-hoc config header.

        * DumpRenderTree/AccessibilityController.cpp:
        * DumpRenderTree/AccessibilityUIElement.cpp:
        * DumpRenderTree/AccessibilityUIElement.h:
        * DumpRenderTree/DumpRenderTree.h:
        * DumpRenderTree/GCController.cpp:
        * DumpRenderTree/LayoutTestController.cpp:
        * DumpRenderTree/WorkQueue.cpp:
        * DumpRenderTree/config.h: Added.
        * DumpRenderTree/gtk/DumpRenderTree.cpp:
        * DumpRenderTree/gtk/GCControllerGtk.cpp:
        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
        * DumpRenderTree/gtk/WorkQueueItemGtk.cpp:
        * DumpRenderTree/win/AccessibilityControllerWin.cpp:
        * DumpRenderTree/win/AccessibilityUIElementWin.cpp:
        * DumpRenderTree/win/DumpRenderTree.cpp:
        * DumpRenderTree/win/DumpRenderTreeWin.h:
        * DumpRenderTree/win/EditingDelegate.cpp:
        * DumpRenderTree/win/EventSender.cpp:
        * DumpRenderTree/win/FrameLoadDelegate.cpp:
        * DumpRenderTree/win/GCControllerWin.cpp:
        * DumpRenderTree/win/MD5.cpp:
        * DumpRenderTree/win/PixelDumpSupportWin.cpp:
        * DumpRenderTree/win/PolicyDelegate.cpp:
        * DumpRenderTree/win/ResourceLoadDelegate.cpp:
        * DumpRenderTree/win/WorkQueueItemWin.cpp:
        * GNUmakefile.am:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@37587 268f45cc-cd09-0410-ab3c-d52691b4dbfc

27 files changed:
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/AccessibilityController.cpp
WebKitTools/DumpRenderTree/AccessibilityUIElement.cpp
WebKitTools/DumpRenderTree/AccessibilityUIElement.h
WebKitTools/DumpRenderTree/DumpRenderTree.h
WebKitTools/DumpRenderTree/GCController.cpp
WebKitTools/DumpRenderTree/LayoutTestController.cpp
WebKitTools/DumpRenderTree/WorkQueue.cpp
WebKitTools/DumpRenderTree/config.h [new file with mode: 0644]
WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
WebKitTools/DumpRenderTree/gtk/GCControllerGtk.cpp
WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
WebKitTools/DumpRenderTree/win/AccessibilityControllerWin.cpp
WebKitTools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
WebKitTools/DumpRenderTree/win/DumpRenderTreeWin.h
WebKitTools/DumpRenderTree/win/EditingDelegate.cpp
WebKitTools/DumpRenderTree/win/EventSender.cpp
WebKitTools/DumpRenderTree/win/FrameLoadDelegate.cpp
WebKitTools/DumpRenderTree/win/GCControllerWin.cpp
WebKitTools/DumpRenderTree/win/MD5.cpp
WebKitTools/DumpRenderTree/win/PixelDumpSupportWin.cpp
WebKitTools/DumpRenderTree/win/PolicyDelegate.cpp
WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp
WebKitTools/DumpRenderTree/win/WorkQueueItemWin.cpp
WebKitTools/GNUmakefile.am

index 7bae38a..095f397 100644 (file)
@@ -1,3 +1,40 @@
+2008-10-14  Alp Toker  <alp@nuanti.com>
+
+        Reviewed by Sam Weinig.
+
+        https://bugs.webkit.org/show_bug.cgi?id=16299
+        Add a config.h file to DRT
+
+        Add a config.h to DumpRenderTree and reduce use of DumpRenderTree.h as
+        an ad-hoc config header.
+
+        * DumpRenderTree/AccessibilityController.cpp:
+        * DumpRenderTree/AccessibilityUIElement.cpp:
+        * DumpRenderTree/AccessibilityUIElement.h:
+        * DumpRenderTree/DumpRenderTree.h:
+        * DumpRenderTree/GCController.cpp:
+        * DumpRenderTree/LayoutTestController.cpp:
+        * DumpRenderTree/WorkQueue.cpp:
+        * DumpRenderTree/config.h: Added.
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        * DumpRenderTree/gtk/GCControllerGtk.cpp:
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        * DumpRenderTree/gtk/WorkQueueItemGtk.cpp:
+        * DumpRenderTree/win/AccessibilityControllerWin.cpp:
+        * DumpRenderTree/win/AccessibilityUIElementWin.cpp:
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        * DumpRenderTree/win/DumpRenderTreeWin.h:
+        * DumpRenderTree/win/EditingDelegate.cpp:
+        * DumpRenderTree/win/EventSender.cpp:
+        * DumpRenderTree/win/FrameLoadDelegate.cpp:
+        * DumpRenderTree/win/GCControllerWin.cpp:
+        * DumpRenderTree/win/MD5.cpp:
+        * DumpRenderTree/win/PixelDumpSupportWin.cpp:
+        * DumpRenderTree/win/PolicyDelegate.cpp:
+        * DumpRenderTree/win/ResourceLoadDelegate.cpp:
+        * DumpRenderTree/win/WorkQueueItemWin.cpp:
+        * GNUmakefile.am:
+
 2008-10-13  Chris Fleizach  <cfleizach@apple.com>
 
         Reviewed by Beth Dakin.
index 0705b68..d2ed2a6 100644 (file)
@@ -23,6 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include "config.h"
 #include "AccessibilityController.h"
 
 #include "AccessibilityUIElement.h"
index 1e2fa45..02d2dfa 100644 (file)
@@ -23,6 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include "config.h"
 #include "AccessibilityUIElement.h"
 
 #include <JavaScriptCore/JSRetainPtr.h>
index 9d9311e..064829f 100644 (file)
@@ -28,7 +28,6 @@
 
 #include <JavaScriptCore/JSObjectRef.h>
 #include <wtf/Vector.h>
-#include <wtf/Platform.h>
 
 #if PLATFORM(MAC)
 #ifdef __OBJC__
index dcc5f7b..9336a04 100644 (file)
 #ifndef DumpRenderTree_h
 #define DumpRenderTree_h
 
+// FIXME: Remove this when all platforms are using config.h
+#ifndef Config_H
 #include <wtf/Platform.h>
+#endif
 
 #if PLATFORM(MAC)
 #include "DumpRenderTreeMac.h"
index 38c45bf..e1a16f2 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DumpRenderTree.h"
+#include "config.h"
 #include "GCController.h"
 
 #include <JavaScriptCore/JSObjectRef.h>
index f0ae8d3..e1e3aee 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DumpRenderTree.h"
+#include "config.h"
 #include "LayoutTestController.h"
 
 #include <JavaScriptCore/JSObjectRef.h>
index 87c7af5..0891b9c 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DumpRenderTree.h"
+#include "config.h"
 #include "WorkQueue.h"
 
 #include "WorkQueueItem.h"
diff --git a/WebKitTools/DumpRenderTree/config.h b/WebKitTools/DumpRenderTree/config.h
new file mode 100644 (file)
index 0000000..366df55
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2008 Nuanti Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#define Config_H
+
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+#include "autotoolsconfig.h"
+#endif
+
+#include <wtf/Platform.h>
index 6200551..d75b701 100644 (file)
@@ -27,6 +27,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
+#include "DumpRenderTree.h"
+
 #include "LayoutTestController.h"
 #include "WorkQueue.h"
 #include "WorkQueueItem.h"
index b3e6ad3..35f1685 100644 (file)
@@ -26,6 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "GCController.h"
 
 void GCController::collect() const
index ed20f59..90a7f9b 100644 (file)
@@ -28,6 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "LayoutTestController.h"
 
 #include "DumpRenderTree.h"
index ecf9982..5526667 100644 (file)
@@ -17,7 +17,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "config.h"
 #include "WorkQueueItem.h"
+
 #include "DumpRenderTree.h"
 
 #include <JavaScriptCore/JSStringRef.h>
index d7d10a7..b6e45f2 100644 (file)
@@ -23,7 +23,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include "config.h"
 #include "AccessibilityController.h"
+
 #include "AccessibilityUIElement.h"
 #include "DumpRenderTree.h"
 #include <JavaScriptCore/Assertions.h>
index 893e04a..d835bb3 100644 (file)
@@ -23,7 +23,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include "config.h"
 #include "AccessibilityUIElement.h"
+
 #include <JavaScriptCore/JSStringRef.h>
 #include <tchar.h>
 #include <string>
index 4bb3536..1cbaa67 100644 (file)
@@ -26,6 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "DumpRenderTree.h"
 
 #include "EditingDelegate.h"
index 54dc697..1e19920 100644 (file)
@@ -45,9 +45,6 @@
 #undef _WINSOCKAPI_
 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
 
-// FIXME: we should add a config.h file for DumpRenderTree.
-#define WTF_PLATFORM_CF 1
-
 struct IWebFrame;
 struct IWebPolicyDelegate;
 struct IWebView;
index d814729..32c02bd 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DumpRenderTree.h"
+#include "config.h"
 #include "EditingDelegate.h"
 
+#include "DumpRenderTree.h"
 #include "LayoutTestController.h"
 #include <WebCore/COMPtr.h>
 #include <wtf/Platform.h>
index 15539cc..efecc03 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DumpRenderTree.h"
+#include "config.h"
 #include "EventSender.h"
 
 #include "DraggingInfo.h"
+#include "DumpRenderTree.h"
 
 #include <WebCore/COMPtr.h>
 #include <wtf/ASCIICType.h>
index 1fc9f91..b18b961 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DumpRenderTree.h"
+#include "config.h"
 #include "FrameLoadDelegate.h"
 
 #include "AccessibilityController.h"
+#include "DumpRenderTree.h"
 #include "EventSender.h"
 #include "GCController.h"
 #include "LayoutTestController.h"
index 24392af..547aabc 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DumpRenderTree.h"
+#include "config.h"
 #include "GCController.h"
 
+#include "DumpRenderTree.h"
 #include <WebCore/COMPtr.h>
 #include <WebKit/WebKit.h>
 
index 4d4c848..1bfc9c7 100644 (file)
@@ -26,6 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "MD5.h"
 
 #include <windows.h>
index f6dd82d..2f23158 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DumpRenderTree.h"
+#include "config.h"
 #include "PixelDumpSupportCG.h"
 
+#include "DumpRenderTree.h"
 #include <CoreGraphics/CGBitmapContext.h>
 #include <wtf/Assertions.h>
 #include <wtf/RetainPtr.h>
index c6a9fb0..99a1fd7 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DumpRenderTree.h"
+#include "config.h"
 #include "PolicyDelegate.h"
 
+#include "DumpRenderTree.h"
+
 #include <string>
 
 using std::wstring;
index c82e9ee..1e77eda 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DumpRenderTree.h"
+#include "config.h"
 #include "ResourceLoadDelegate.h"
 
+#include "DumpRenderTree.h"
 #include "LayoutTestController.h"
 #include <wtf/HashMap.h>
 #include <wtf/Vector.h>
index 4113c9e..a489498 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DumpRenderTree.h"
+#include "config.h"
 #include "WorkQueueItem.h"
 
+#include "DumpRenderTree.h"
 #include <WebCore/COMPtr.h>
 #include <WebKit/WebKit.h>
 #include <JavaScriptCore/JSStringRef.h>
index aaf0c4f..ee403a9 100644 (file)
@@ -45,6 +45,7 @@ Programs_DumpRenderTree_SOURCES = \
        WebKitTools/DumpRenderTree/WorkQueue.cpp \
        WebKitTools/DumpRenderTree/WorkQueue.h \
        WebKitTools/DumpRenderTree/WorkQueueItem.h \
+       WebKitTools/DumpRenderTree/config.h \
        WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp \
        WebKitTools/DumpRenderTree/gtk/DumpRenderTreeGtk.h \
        WebKitTools/DumpRenderTree/gtk/GCControllerGtk.cpp \