Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Mar 2012 05:50:30 +0000 (05:50 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Mar 2012 05:50:30 +0000 (05:50 +0000)
https://bugs.webkit.org/show_bug.cgi?id=80911

Reviewed by Adam Barth.

.:

* CMakeLists.txt: Define WTF_DIR

Source/JavaScriptCore:

Update the various build systems to depend on Source/WTF headers
as well as remove references to Platform.h (since it's now moved).

* CMakeLists.txt:
* JavaScriptCore.pri:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops:
* JavaScriptCore.xcodeproj/project.pbxproj:
* wtf/CMakeLists.txt:

Source/WebCore:

* CMakeLists.txt:
 - Look for headers in Source/WTF as well.

Source/WebKit:

* CMakeLists.txt: Look for headers in Source/WTF.

Source/WebKit/qt:

Fix WTF header include paths since although
Source/WTF is included, no longer are all the
subdirectories (thus "RefPtr.h" can't work).

* Api/qwebdatabase_p.h:
* Api/qwebscriptworld_p.h:
* Api/qwebsecurityorigin_p.h:
* WebCoreSupport/InspectorClientQt.h:
* WebCoreSupport/QtFallbackWebPopup.h:
* WebCoreSupport/QtWebComboBox.h:
* declarative/experimental/experimental.pri:
* declarative/public.pri:
* tests/MIMESniffing/MIMESniffing.pro:

Source/WebKit2:

Update to not depend on "Foo.h" includes for WTF headers.

* Shared/qt/QtNetworkReplyData.h:
* Shared/qt/QtNetworkRequestData.cpp:
* Shared/qt/QtNetworkRequestData.h:

Source/WTF:

Update build systems to account for the new location of Platform.h

* GNUmakefile.list.am:
* WTF.gypi:
* WTF.pro:
* WTF.vcproj/WTF.vcproj:
* WTF.vcproj/work-around-vs-dependency-tracking-bugs.py:
(react_to_vsprops_changes):
* WTF.xcodeproj/project.pbxproj:
* config.h: I don't think this change is 100% correct (but seemed to be needed to make qt-wk2 build)
 - This dependency on JSC should be removed regardless (in a later patch).
* wtf/Platform.h: Renamed from Source/JavaScriptCore/wtf/Platform.h.

Tools:

Update include paths for Source/WTF.

* DumpRenderTree/efl/CMakeLists.txt:
* DumpRenderTree/qt/DumpRenderTree.pro:
* QtTestBrowser/QtTestBrowser.pro:
* Scripts/build-webkit: Build Source/WTF on AppleWin as well.

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

40 files changed:
CMakeLists.txt
ChangeLog
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.pri
Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
Source/JavaScriptCore/wtf/CMakeLists.txt
Source/WTF/ChangeLog
Source/WTF/GNUmakefile.list.am
Source/WTF/WTF.gypi
Source/WTF/WTF.pro
Source/WTF/WTF.vcproj/WTF.vcproj
Source/WTF/WTF.vcproj/work-around-vs-dependency-tracking-bugs.py
Source/WTF/WTF.xcodeproj/project.pbxproj
Source/WTF/config.h
Source/WTF/wtf/Platform.h [moved from Source/JavaScriptCore/wtf/Platform.h with 100% similarity]
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebKit/CMakeLists.txt
Source/WebKit/ChangeLog
Source/WebKit/qt/Api/qwebdatabase_p.h
Source/WebKit/qt/Api/qwebscriptworld_p.h
Source/WebKit/qt/Api/qwebsecurityorigin_p.h
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/WebCoreSupport/InspectorClientQt.h
Source/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h
Source/WebKit/qt/WebCoreSupport/QtWebComboBox.h
Source/WebKit/qt/declarative/experimental/experimental.pri
Source/WebKit/qt/declarative/public.pri
Source/WebKit/qt/tests/MIMESniffing/MIMESniffing.pro
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/qt/QtNetworkReplyData.h
Source/WebKit2/Shared/qt/QtNetworkRequestData.cpp
Source/WebKit2/Shared/qt/QtNetworkRequestData.h
Tools/ChangeLog
Tools/DumpRenderTree/efl/CMakeLists.txt
Tools/DumpRenderTree/qt/DumpRenderTree.pro
Tools/QtTestBrowser/QtTestBrowser.pro
Tools/Scripts/build-webkit

index 4f81a45..a9c1ba9 100644 (file)
@@ -27,6 +27,7 @@ IF (ONLY_BUILD_JAVASCRIPTCORE)
     SET(ENABLE_TOOLS OFF)
 ENDIF ()
 
+SET(WTF_DIR "${CMAKE_SOURCE_DIR}/Source/WTF")
 SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
 SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
 SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
index 900549c..a171ffb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-20  Eric Seidel  <eric@webkit.org>
+
+        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
+        https://bugs.webkit.org/show_bug.cgi?id=80911
+
+        Reviewed by Adam Barth.
+
+        * CMakeLists.txt: Define WTF_DIR
+
 2012-03-20  Ryosuke Niwa  <rniwa@webkit.org>
 
         Perf-o-matic: don't query datastore to generate chart API urls
index d208688..dbe42c8 100644 (file)
@@ -1,5 +1,6 @@
 SET(JavaScriptCore_INCLUDE_DIRECTORIES
     "${CMAKE_BINARY_DIR}"
+    "${WTF_DIR}"
     "${JAVASCRIPTCORE_DIR}"
     "${JAVASCRIPTCORE_DIR}/API"
     "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
index bdc5f04..53bf20c 100644 (file)
@@ -1,3 +1,19 @@
+2012-03-20  Eric Seidel  <eric@webkit.org>
+
+        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
+        https://bugs.webkit.org/show_bug.cgi?id=80911
+
+        Reviewed by Adam Barth.
+
+        Update the various build systems to depend on Source/WTF headers
+        as well as remove references to Platform.h (since it's now moved).
+
+        * CMakeLists.txt:
+        * JavaScriptCore.pri:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * wtf/CMakeLists.txt:
+
 2012-03-20  Filip Pizlo  <fpizlo@apple.com>
 
         op_mod fails on many interesting corner cases
index eeace17..4a8ecd4 100644 (file)
@@ -12,6 +12,7 @@ JAVASCRIPTCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/JavaScriptCore/
 INCLUDEPATH += \
     $$SOURCE_DIR \
     $$SOURCE_DIR/.. \
+    $$SOURCE_DIR/../WTF \
     $$SOURCE_DIR/assembler \
     $$SOURCE_DIR/bytecode \
     $$SOURCE_DIR/bytecompiler \
index b0b45d3..ed10d25 100644 (file)
@@ -6,7 +6,7 @@
        >
        <Tool
                Name="VCCLCompilerTool"
-               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\obj\JavaScriptCore\DerivedSources\&quot;;../../;../../API/;../../parser/;../../bytecompiler/;../../dfg/;../../jit/;../../llint/;../../runtime/;../../tools/;../../bytecode/;../../interpreter/;../../wtf/;../../profiler;../../assembler/;../../debugger/;../../heap/;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;;&quot;$(ConfigurationBuildDir)\include&quot;;&quot;$(ConfigurationBuildDir)\include\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;"
+               AdditionalIncludeDirectories="&quot;$(ConfigurationBuildDir)\obj\JavaScriptCore\DerivedSources\&quot;;../../;../../API/;../../parser/;../../bytecompiler/;../../dfg/;../../jit/;../../llint/;../../runtime/;../../tools/;../../bytecode/;../../interpreter/;../../wtf/;../../profiler;../../assembler/;../../debugger/;../../heap/;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;;&quot;$(ConfigurationBuildDir)\include&quot;;&quot;$(ConfigurationBuildDir)\include\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\include\private\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;"
                PreprocessorDefinitions="__STD_C"
                ForcedIncludeFiles="ICUVersion.h"
        />
index 3bf65ff..348d6cd 100644 (file)
                65C647B3093EF8D60022C380 /* RefPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RefPtr.h; sourceTree = "<group>"; tabWidth = 8; };
                65C7A1710A8EAACB00FA37EA /* JSWrapperObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSWrapperObject.cpp; sourceTree = "<group>"; };
                65C7A1720A8EAACB00FA37EA /* JSWrapperObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSWrapperObject.h; sourceTree = "<group>"; };
-               65D6D87E09B5A32E0002E4D7 /* Platform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Platform.h; sourceTree = "<group>"; };
                65DFC92A08EA173A00F7300B /* HashFunctions.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HashFunctions.h; sourceTree = "<group>"; tabWidth = 8; };
                65DFC92B08EA173A00F7300B /* HashMap.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HashMap.h; sourceTree = "<group>"; tabWidth = 8; };
                65DFC92C08EA173A00F7300B /* HashSet.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HashSet.h; sourceTree = "<group>"; tabWidth = 8; };
                                44DD48520FAEA85000D6B4EB /* PassOwnPtr.h */,
                                6580F795094070560082C219 /* PassRefPtr.h */,
                                651DCA02136A6FAB00F74194 /* PassTraits.h */,
-                               65D6D87E09B5A32E0002E4D7 /* Platform.h */,
                                A7D649A91015224E009B2E1B /* PossiblyNull.h */,
                                088FA5B90EF76D4300578E6F /* RandomNumber.cpp */,
                                088FA5BA0EF76D4300578E6F /* RandomNumber.h */,
index 7242012..adab728 100644 (file)
@@ -69,7 +69,7 @@ SET(WTF_HEADERS
     ParallelJobsGeneric.h
     ParallelJobsLibdispatch.h
     ParallelJobsOpenMP.h
-    Platform.h
+    ${WTF_DIR}/wtf/Platform.h
     PossiblyNull.h
     RandomNumber.h
     RandomNumberSeed.h
index faef801..5ca1695 100644 (file)
@@ -1,3 +1,23 @@
+2012-03-20  Eric Seidel  <eric@webkit.org>
+
+        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
+        https://bugs.webkit.org/show_bug.cgi?id=80911
+
+        Reviewed by Adam Barth.
+
+        Update build systems to account for the new location of Platform.h
+
+        * GNUmakefile.list.am:
+        * WTF.gypi:
+        * WTF.pro:
+        * WTF.vcproj/WTF.vcproj:
+        * WTF.vcproj/work-around-vs-dependency-tracking-bugs.py:
+        (react_to_vsprops_changes):
+        * WTF.xcodeproj/project.pbxproj:
+        * config.h: I don't think this change is 100% correct (but seemed to be needed to make qt-wk2 build)
+         - This dependency on JSC should be removed regardless (in a later patch).
+        * wtf/Platform.h: Renamed from Source/JavaScriptCore/wtf/Platform.h.
+
 2012-03-20  Steve Falkenburg  <sfalken@apple.com>
 
         Move WTF-related Windows project files out of JavaScriptCore
index a526f4a..b5e90b4 100644 (file)
@@ -1,3 +1,4 @@
 wtf_sources += \
        Source/WTF/Stub.cpp \
-       Source/WTF/Stub.h
+       Source/WTF/Stub.h \
+       Source/WTF/wtf/Platform.h
index aed1762..71c674c 100644 (file)
@@ -3,6 +3,7 @@
         'project_dir': ['.'],
         'wtf_privateheader_files': [
             'Stub.h',
+            'wtf/Platform.h',
         ],
         'wtf_files': [
             'Stub.cpp',
index b117b0d..010de38 100644 (file)
@@ -102,7 +102,7 @@ HEADERS += \
     PassOwnPtr.h \
     PassRefPtr.h \
     PassTraits.h \
-    Platform.h \
+    ../../WTF/wtf/Platform.h \
     PossiblyNull.h \
     qt/UtilsQt.h \
     RandomNumber.h \
index 77a1db8..fc747fe 100644 (file)
                        >
                </File>
                <File
-                       RelativePath="..\..\JavaScriptCore\wtf\Platform.h"
+                       RelativePath="wtf\Platform.h"
                        >
                </File>
                <File
index a23c280..5119118 100644 (file)
@@ -31,7 +31,7 @@ def react_to_vsprops_changes():
 
     # Touch wtf/Platform.h so all files will be recompiled. This is necessary
     # to pick up changes to preprocessor macros (e.g., ENABLE_*).
-    wtf_platform_h = os.path.join(TOP_LEVEL_DIRECTORY, 'Source', 'JavaScriptCore', 'wtf', 'Platform.h')
+    wtf_platform_h = os.path.join(TOP_LEVEL_DIRECTORY, 'Source', 'WTF', 'wtf', 'Platform.h')
     touch_if_older_than(wtf_platform_h, newest_vsprops_time)
 
 
index 6f8bdc6..8bde129 100644 (file)
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
                5D247B7914689D8900E78B76 /* Stub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D247B7714689D8900E78B76 /* Stub.cpp */; };
                5D247B7A14689D8900E78B76 /* Stub.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D247B7814689D8900E78B76 /* Stub.h */; settings = {ATTRIBUTES = (); }; };
+               A876DBD8151816E500DADB95 /* Platform.h in Headers */ = {isa = PBXBuildFile; fileRef = A876DBD7151816E500DADB95 /* Platform.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -20,6 +21,7 @@
                5D247B7714689D8900E78B76 /* Stub.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Stub.cpp; sourceTree = "<group>"; };
                5D247B7814689D8900E78B76 /* Stub.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Stub.h; sourceTree = "<group>"; };
                5D247EB11468B01500E78B76 /* HeaderDetection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HeaderDetection.h; path = DerivedSources/WTF/HeaderDetection.h; sourceTree = BUILT_PRODUCTS_DIR; };
+               A876DBD7151816E500DADB95 /* Platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Platform.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
                                5D247EB11468B01500E78B76 /* HeaderDetection.h */,
                                5D247B7714689D8900E78B76 /* Stub.cpp */,
                                5D247B7814689D8900E78B76 /* Stub.h */,
+                               A876DBD6151816E500DADB95 /* wtf */,
                        );
                        name = Source;
                        sourceTree = "<group>";
                };
+               A876DBD6151816E500DADB95 /* wtf */ = {
+                       isa = PBXGroup;
+                       children = (
+                               A876DBD7151816E500DADB95 /* Platform.h */,
+                       );
+                       path = wtf;
+                       sourceTree = "<group>";
+               };
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -78,8 +89,8 @@
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               5D247EB21468B01500E78B76 /* HeaderDetection.h in Headers */,
                                5D247B7A14689D8900E78B76 /* Stub.h in Headers */,
+                               A876DBD8151816E500DADB95 /* Platform.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "if [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\n    PRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%%/}${PRIVATE_HEADERS_FOLDER_PATH}\"\nelse\n    PRIVATE_HEADERS_PATH=\"${DSTROOT%%/}${PRIVATE_HEADERS_FOLDER_PATH}\"\nfi;\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/\" \"${PRIVATE_HEADERS_PATH}\"\n";
+                       shellScript = "if [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\n    PRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%%/}${PRIVATE_HEADERS_FOLDER_PATH}\"\nelse\n    PRIVATE_HEADERS_PATH=\"${DSTROOT%%/}${PRIVATE_HEADERS_FOLDER_PATH}\"\nfi;\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/wtf/\" \"${PRIVATE_HEADERS_PATH}\"\n";
                };
                5D247E9D1468AEE200E78B76 /* Detect Available Headers */ = {
                        isa = PBXShellScriptBuildPhase;
index 0ab3326..cd86252 100644 (file)
@@ -31,7 +31,7 @@
 #include <wtf/ExportMacros.h>
 // WTF cannot depend on JSC even if USE(JSC).
 #if USE(JSC) && !defined(BUILDING_WTF)
-#include "JSExportMacros.h"
+#include "runtime/JSExportMacros.h"
 #endif
 
 #if OS(WINDOWS)
index 8c7cd54..d43bea3 100644 (file)
@@ -1,5 +1,6 @@
 SET(WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}"
+    "${WTF_DIR}"
     "${WEBCORE_DIR}/Modules/filesystem"
     "${WEBCORE_DIR}/Modules/geolocation"
     "${WEBCORE_DIR}/Modules/indexeddb"
index fe2b698..fb081a5 100644 (file)
@@ -1,3 +1,13 @@
+2012-03-20  Eric Seidel  <eric@webkit.org>
+
+        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
+        https://bugs.webkit.org/show_bug.cgi?id=80911
+
+        Reviewed by Adam Barth.
+
+        * CMakeLists.txt:
+         - Look for headers in Source/WTF as well.
+
 2012-03-20  Dana Jansens  <danakj@chromium.org>
 
         [chromium] Use origin transform to transform occlusion from surface content space to its target content space
index 62f4b31..f13ec26 100644 (file)
@@ -1,4 +1,5 @@
 SET(WebKit_INCLUDE_DIRECTORIES
+    "${WTF_DIR}"
     "${WEBKIT_DIR}"
     "${WEBCORE_DIR}"
     "${WEBCORE_DIR}/Modules/webdatabase"
index 2738fa3..85b85e7 100644 (file)
@@ -1,3 +1,12 @@
+2012-03-20  Eric Seidel  <eric@webkit.org>
+
+        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
+        https://bugs.webkit.org/show_bug.cgi?id=80911
+
+        Reviewed by Adam Barth.
+
+        * CMakeLists.txt: Look for headers in Source/WTF.
+
 2012-03-20  Charles Wei  <charles.wei@torchmobile.com.cn>
 
         [BlackBerry] Remove OutOfMemoryHandler from the build system
index ec03ea5..2984704 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "PlatformString.h"
 #include "SecurityOrigin.h"
-#include "RefPtr.h"
+#include <wtf/RefPtr.h>
 
 
 class QWebDatabasePrivate : public QSharedData {
index 7115eb2..8c18e23 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef _QWEBSCRIPTWORLD_P_H_
 #define _QWEBSCRIPTWORLD_P_H_
 
-#include "RefPtr.h"
+#include <wtf/RefPtr.h>
 
 namespace WebCore {
     class DOMWrapperWorld;
index cdc93bd..1b64c49 100644 (file)
@@ -21,7 +21,7 @@
 #define _WEBSECURITYORIGIN_P_H_
 
 #include "SecurityOrigin.h"
-#include "RefPtr.h"
+#include <wtf/RefPtr.h>
 
 class QWebSecurityOriginPrivate : public QSharedData {
 public:
index 921e1e6..25a2b6a 100644 (file)
@@ -1,3 +1,24 @@
+2012-03-20  Eric Seidel  <eric@webkit.org>
+
+        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
+        https://bugs.webkit.org/show_bug.cgi?id=80911
+
+        Reviewed by Adam Barth.
+
+        Fix WTF header include paths since although
+        Source/WTF is included, no longer are all the
+        subdirectories (thus "RefPtr.h" can't work).
+
+        * Api/qwebdatabase_p.h:
+        * Api/qwebscriptworld_p.h:
+        * Api/qwebsecurityorigin_p.h:
+        * WebCoreSupport/InspectorClientQt.h:
+        * WebCoreSupport/QtFallbackWebPopup.h:
+        * WebCoreSupport/QtWebComboBox.h:
+        * declarative/experimental/experimental.pri:
+        * declarative/public.pri:
+        * tests/MIMESniffing/MIMESniffing.pro:
+
 2012-03-19  Adam Barth  <abarth@webkit.org>
 
         Remove support for "magic" iframe
index c94d61a..6c7d00f 100644 (file)
 
 #include "InspectorClient.h"
 #include "InspectorFrontendClientLocal.h"
-#include "OwnPtr.h"
-#include "PassOwnPtr.h"
 #include <QtCore/QString>
 #include <wtf/Forward.h>
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
 
 class QWebPage;
 class QWebView;
index ea111fa..2980d45 100644 (file)
@@ -20,8 +20,8 @@
 #ifndef QtFallbackWebPopup_h
 #define QtFallbackWebPopup_h
 
-#include "Platform.h"
 #include "qwebkitplatformplugin.h"
+#include <wtf/Platform.h>
 
 #include <QComboBox>
 
index bca2e5f..4264757 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef QtWebComboBox_h
 #define QtWebComboBox_h
 
-#include "Platform.h"
+#include <wtf/Platform.h>
 
 #include <QComboBox>
 
index 583726f..15386b8 100644 (file)
@@ -43,7 +43,8 @@ INCLUDEPATH += \
     ../../../../JavaScriptCore/wtf/unicode \
     ../../../../JavaScriptCore/runtime \
     ../../../../WebKit2/Platform \
-    ../../../../WebKit2/Platform/CoreIPC
+    ../../../../WebKit2/Platform/CoreIPC \
+    ../../../../WTF
 
 target.path = $$[QT_INSTALL_IMPORTS]/$${TARGET.module_name}
 
index e389e38..a2f77ee 100644 (file)
@@ -44,7 +44,8 @@ INCLUDEPATH += \
     ../../../WebKit2/Shared/qt \
     ../../../JavaScriptCore \
     ../../../JavaScriptCore/runtime \
-    ../../../JavaScriptCore/wtf
+    ../../../JavaScriptCore/wtf \
+    ../../../WTF
 
 SOURCES += plugin.cpp
 
index fe50f1b..c856a6e 100644 (file)
@@ -10,6 +10,7 @@ HEADERS += \
 INCLUDEPATH += \
     ../../../../WebCore/platform/network \
     ../../../../JavaScriptCore \
-    ../../../../JavaScriptCore/runtime
+    ../../../../JavaScriptCore/runtime \
+    ../../../../WTF
 
 RESOURCES += resources.qrc
index 63cf2cf..a43f6fa 100644 (file)
@@ -1,3 +1,16 @@
+2012-03-20  Eric Seidel  <eric@webkit.org>
+
+        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
+        https://bugs.webkit.org/show_bug.cgi?id=80911
+
+        Reviewed by Adam Barth.
+
+        Update to not depend on "Foo.h" includes for WTF headers.
+
+        * Shared/qt/QtNetworkReplyData.h:
+        * Shared/qt/QtNetworkRequestData.cpp:
+        * Shared/qt/QtNetworkRequestData.h:
+
 2012-03-20  Anders Carlsson  <andersca@apple.com>
 
         REGRESSION (r110780): Loading a PDF always makes the WKView layer backed
index d1565be..457d7be 100644 (file)
 #ifndef QtNetworkReplyData_h
 #define QtNetworkReplyData_h
 
-#include "Noncopyable.h"
-#include "RefCounted.h"
 #include "SharedMemory.h"
 #include <QNetworkAccessManager>
+#include <wtf/Noncopyable.h>
+#include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>
 
 namespace CoreIPC {
index f210660..8a80fb3 100644 (file)
 #include "QtNetworkRequestData.h"
 
 #include "ArgumentCodersQt.h"
-#include "Platform.h"
 #include "WebCoreArgumentCoders.h"
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QUuid>
+#include <wtf/Platform.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebKit {
index 082d499..940bf81 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef QtNetworkRequestData_h
 #define QtNetworkRequestData_h
 
-#include "RefCounted.h"
+#include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>
 
 namespace CoreIPC {
index a4a6f02..d637f93 100644 (file)
@@ -1,3 +1,17 @@
+2012-03-20  Eric Seidel  <eric@webkit.org>
+
+        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
+        https://bugs.webkit.org/show_bug.cgi?id=80911
+
+        Reviewed by Adam Barth.
+
+        Update include paths for Source/WTF.
+
+        * DumpRenderTree/efl/CMakeLists.txt:
+        * DumpRenderTree/qt/DumpRenderTree.pro:
+        * QtTestBrowser/QtTestBrowser.pro:
+        * Scripts/build-webkit: Build Source/WTF on AppleWin as well.
+
 2012-03-20  Adam Barth  <abarth@webkit.org>
 
         svn-apply should move inflight patches from WebCore/webaudio to WebCore/Modules/webaudio
index 3c1feab..cabe4cf 100644 (file)
@@ -41,6 +41,7 @@ SET(DumpRenderTree_LIBRARIES
 )
 
 SET(DumpRenderTree_INCLUDE_DIRECTORIES
+    ${WTF_DIR}
     "${WEBKIT_DIR}/efl/ewk"
     ${WEBKIT_DIR}/efl
     ${WEBCORE_DIR}
index 56604d5..54bcdbf 100644 (file)
@@ -15,7 +15,8 @@ WEBKIT += wtf webcore
 
 INCLUDEPATH += \
     $$PWD/.. \
-    $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport
+    $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport \
+    $${ROOT_WEBKIT_DIR}/Source/WTF
 
 QT = core gui network testlib webkit
 macx: QT += xml
index 628dc1f..6d8a41b 100644 (file)
@@ -9,6 +9,7 @@ TEMPLATE = app
 INCLUDEPATH += \
     $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport \
     $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/ \
+    $${ROOT_WEBKIT_DIR}/Source/WTF
 
 load(features)
 
index 8a749ad..dd145d3 100755 (executable)
@@ -496,7 +496,7 @@ sub unlinkZeroFiles()
 my @projects = ("Source/JavaScriptCore", "Source/WebCore", "Source/WebKit");
 
 # Build WTF as a separate static library on ports which support it.
-splice @projects, 0, 0, "Source/WTF" if isAppleMacWebKit();
+splice @projects, 0, 0, "Source/WTF" if isAppleMacWebKit() or isAppleWinWebKit();
 
 for my $dir (@projects) {
     if (! -d $dir) {