Changeset 111504 in webkit


Ignore:
Timestamp:
Mar 20, 2012 10:50:30 PM (12 years ago)
Author:
eric@webkit.org
Message:

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

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).

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.
Location:
trunk
Files:
1 added
39 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r110024 r111504  
    2828ENDIF ()
    2929
     30SET(WTF_DIR "${CMAKE_SOURCE_DIR}/Source/WTF")
    3031SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
    3132SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
  • trunk/ChangeLog

    r111473 r111504  
     12012-03-20  Eric Seidel  <eric@webkit.org>
     2
     3        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
     4        https://bugs.webkit.org/show_bug.cgi?id=80911
     5
     6        Reviewed by Adam Barth.
     7
     8        * CMakeLists.txt: Define WTF_DIR
     9
    1102012-03-20  Ryosuke Niwa  <rniwa@webkit.org>
    211
  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r110518 r111504  
    11SET(JavaScriptCore_INCLUDE_DIRECTORIES
    22    "${CMAKE_BINARY_DIR}"
     3    "${WTF_DIR}"
    34    "${JAVASCRIPTCORE_DIR}"
    45    "${JAVASCRIPTCORE_DIR}/API"
  • trunk/Source/JavaScriptCore/ChangeLog

    r111481 r111504  
     12012-03-20  Eric Seidel  <eric@webkit.org>
     2
     3        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
     4        https://bugs.webkit.org/show_bug.cgi?id=80911
     5
     6        Reviewed by Adam Barth.
     7
     8        Update the various build systems to depend on Source/WTF headers
     9        as well as remove references to Platform.h (since it's now moved).
     10
     11        * CMakeLists.txt:
     12        * JavaScriptCore.pri:
     13        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops:
     14        * JavaScriptCore.xcodeproj/project.pbxproj:
     15        * wtf/CMakeLists.txt:
     16
    1172012-03-20  Filip Pizlo  <fpizlo@apple.com>
    218
  • trunk/Source/JavaScriptCore/JavaScriptCore.pri

    r108444 r111504  
    1313    $$SOURCE_DIR \
    1414    $$SOURCE_DIR/.. \
     15    $$SOURCE_DIR/../WTF \
    1516    $$SOURCE_DIR/assembler \
    1617    $$SOURCE_DIR/bytecode \
  • trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops

    r108813 r111504  
    77        <Tool
    88                Name="VCCLCompilerTool"
    9                 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;"
     9                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;"
    1010                PreprocessorDefinitions="__STD_C"
    1111                ForcedIncludeFiles="ICUVersion.h"
  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r111254 r111504  
    10941094                65C7A1710A8EAACB00FA37EA /* JSWrapperObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSWrapperObject.cpp; sourceTree = "<group>"; };
    10951095                65C7A1720A8EAACB00FA37EA /* JSWrapperObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSWrapperObject.h; sourceTree = "<group>"; };
    1096                 65D6D87E09B5A32E0002E4D7 /* Platform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Platform.h; sourceTree = "<group>"; };
    10971096                65DFC92A08EA173A00F7300B /* HashFunctions.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HashFunctions.h; sourceTree = "<group>"; tabWidth = 8; };
    10981097                65DFC92B08EA173A00F7300B /* HashMap.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HashMap.h; sourceTree = "<group>"; tabWidth = 8; };
     
    21422141                                6580F795094070560082C219 /* PassRefPtr.h */,
    21432142                                651DCA02136A6FAB00F74194 /* PassTraits.h */,
    2144                                 65D6D87E09B5A32E0002E4D7 /* Platform.h */,
    21452143                                A7D649A91015224E009B2E1B /* PossiblyNull.h */,
    21462144                                088FA5B90EF76D4300578E6F /* RandomNumber.cpp */,
  • trunk/Source/JavaScriptCore/wtf/CMakeLists.txt

    r109197 r111504  
    7070    ParallelJobsLibdispatch.h
    7171    ParallelJobsOpenMP.h
    72     Platform.h
     72    ${WTF_DIR}/wtf/Platform.h
    7373    PossiblyNull.h
    7474    RandomNumber.h
  • trunk/Source/WTF/ChangeLog

    r111438 r111504  
     12012-03-20  Eric Seidel  <eric@webkit.org>
     2
     3        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
     4        https://bugs.webkit.org/show_bug.cgi?id=80911
     5
     6        Reviewed by Adam Barth.
     7
     8        Update build systems to account for the new location of Platform.h
     9
     10        * GNUmakefile.list.am:
     11        * WTF.gypi:
     12        * WTF.pro:
     13        * WTF.vcproj/WTF.vcproj:
     14        * WTF.vcproj/work-around-vs-dependency-tracking-bugs.py:
     15        (react_to_vsprops_changes):
     16        * WTF.xcodeproj/project.pbxproj:
     17        * config.h: I don't think this change is 100% correct (but seemed to be needed to make qt-wk2 build)
     18         - This dependency on JSC should be removed regardless (in a later patch).
     19        * wtf/Platform.h: Renamed from Source/JavaScriptCore/wtf/Platform.h.
     20
    1212012-03-20  Steve Falkenburg  <sfalken@apple.com>
    222
  • trunk/Source/WTF/GNUmakefile.list.am

    r104289 r111504  
    11wtf_sources += \
    22        Source/WTF/Stub.cpp \
    3         Source/WTF/Stub.h
     3        Source/WTF/Stub.h \
     4        Source/WTF/wtf/Platform.h
  • trunk/Source/WTF/WTF.gypi

    r99251 r111504  
    44        'wtf_privateheader_files': [
    55            'Stub.h',
     6            'wtf/Platform.h',
    67        ],
    78        'wtf_files': [
  • trunk/Source/WTF/WTF.pro

    r107499 r111504  
    103103    PassRefPtr.h \
    104104    PassTraits.h \
    105     Platform.h \
     105    ../../WTF/wtf/Platform.h \
    106106    PossiblyNull.h \
    107107    qt/UtilsQt.h \
  • trunk/Source/WTF/WTF.vcproj/WTF.vcproj

    r111438 r111504  
    998998                </File>
    999999                <File
    1000                         RelativePath="..\..\JavaScriptCore\wtf\Platform.h"
     1000                        RelativePath="wtf\Platform.h"
    10011001                        >
    10021002                </File>
  • trunk/Source/WTF/WTF.vcproj/work-around-vs-dependency-tracking-bugs.py

    r111438 r111504  
    3232    # Touch wtf/Platform.h so all files will be recompiled. This is necessary
    3333    # to pick up changes to preprocessor macros (e.g., ENABLE_*).
    34     wtf_platform_h = os.path.join(TOP_LEVEL_DIRECTORY, 'Source', 'JavaScriptCore', 'wtf', 'Platform.h')
     34    wtf_platform_h = os.path.join(TOP_LEVEL_DIRECTORY, 'Source', 'WTF', 'wtf', 'Platform.h')
    3535    touch_if_older_than(wtf_platform_h, newest_vsprops_time)
    3636
  • trunk/Source/WTF/WTF.xcodeproj/project.pbxproj

    r110969 r111504  
    1010                5D247B7914689D8900E78B76 /* Stub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D247B7714689D8900E78B76 /* Stub.cpp */; };
    1111                5D247B7A14689D8900E78B76 /* Stub.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D247B7814689D8900E78B76 /* Stub.h */; settings = {ATTRIBUTES = (); }; };
     12                A876DBD8151816E500DADB95 /* Platform.h in Headers */ = {isa = PBXBuildFile; fileRef = A876DBD7151816E500DADB95 /* Platform.h */; };
    1213/* End PBXBuildFile section */
    1314
     
    2122                5D247B7814689D8900E78B76 /* Stub.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Stub.h; sourceTree = "<group>"; };
    2223                5D247EB11468B01500E78B76 /* HeaderDetection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HeaderDetection.h; path = DerivedSources/WTF/HeaderDetection.h; sourceTree = BUILT_PRODUCTS_DIR; };
     24                A876DBD7151816E500DADB95 /* Platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Platform.h; sourceTree = "<group>"; };
    2325/* End PBXFileReference section */
    2426
     
    6870                                5D247B7714689D8900E78B76 /* Stub.cpp */,
    6971                                5D247B7814689D8900E78B76 /* Stub.h */,
     72                                A876DBD6151816E500DADB95 /* wtf */,
    7073                        );
    7174                        name = Source;
     75                        sourceTree = "<group>";
     76                };
     77                A876DBD6151816E500DADB95 /* wtf */ = {
     78                        isa = PBXGroup;
     79                        children = (
     80                                A876DBD7151816E500DADB95 /* Platform.h */,
     81                        );
     82                        path = wtf;
    7283                        sourceTree = "<group>";
    7384                };
     
    7990                        buildActionMask = 2147483647;
    8091                        files = (
    81                                 5D247EB21468B01500E78B76 /* HeaderDetection.h in Headers */,
    8292                                5D247B7A14689D8900E78B76 /* Stub.h in Headers */,
     93                                A876DBD8151816E500DADB95 /* Platform.h in Headers */,
    8394                        );
    8495                        runOnlyForDeploymentPostprocessing = 0;
     
    144155                        runOnlyForDeploymentPostprocessing = 0;
    145156                        shellPath = /bin/sh;
    146                         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";
     157                        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";
    147158                };
    148159                5D247E9D1468AEE200E78B76 /* Detect Available Headers */ = {
  • trunk/Source/WTF/config.h

    r104825 r111504  
    3232// WTF cannot depend on JSC even if USE(JSC).
    3333#if USE(JSC) && !defined(BUILDING_WTF)
    34 #include "JSExportMacros.h"
     34#include "runtime/JSExportMacros.h"
    3535#endif
    3636
  • trunk/Source/WebCore/CMakeLists.txt

    r111474 r111504  
    11SET(WebCore_INCLUDE_DIRECTORIES
    22    "${WEBCORE_DIR}"
     3    "${WTF_DIR}"
    34    "${WEBCORE_DIR}/Modules/filesystem"
    45    "${WEBCORE_DIR}/Modules/geolocation"
  • trunk/Source/WebCore/ChangeLog

    r111502 r111504  
     12012-03-20  Eric Seidel  <eric@webkit.org>
     2
     3        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
     4        https://bugs.webkit.org/show_bug.cgi?id=80911
     5
     6        Reviewed by Adam Barth.
     7
     8        * CMakeLists.txt:
     9         - Look for headers in Source/WTF as well.
     10
    1112012-03-20  Dana Jansens  <danakj@chromium.org>
    212
  • trunk/Source/WebKit/CMakeLists.txt

    r110024 r111504  
    11SET(WebKit_INCLUDE_DIRECTORIES
     2    "${WTF_DIR}"
    23    "${WEBKIT_DIR}"
    34    "${WEBCORE_DIR}"
  • trunk/Source/WebKit/ChangeLog

    r111396 r111504  
     12012-03-20  Eric Seidel  <eric@webkit.org>
     2
     3        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
     4        https://bugs.webkit.org/show_bug.cgi?id=80911
     5
     6        Reviewed by Adam Barth.
     7
     8        * CMakeLists.txt: Look for headers in Source/WTF.
     9
    1102012-03-20  Charles Wei  <charles.wei@torchmobile.com.cn>
    211
  • trunk/Source/WebKit/qt/Api/qwebdatabase_p.h

    r95901 r111504  
    2525#include "PlatformString.h"
    2626#include "SecurityOrigin.h"
    27 #include "RefPtr.h"
     27#include <wtf/RefPtr.h>
    2828
    2929
  • trunk/Source/WebKit/qt/Api/qwebscriptworld_p.h

    r95901 r111504  
    2121#define _QWEBSCRIPTWORLD_P_H_
    2222
    23 #include "RefPtr.h"
     23#include <wtf/RefPtr.h>
    2424
    2525namespace WebCore {
  • trunk/Source/WebKit/qt/Api/qwebsecurityorigin_p.h

    r95901 r111504  
    2222
    2323#include "SecurityOrigin.h"
    24 #include "RefPtr.h"
     24#include <wtf/RefPtr.h>
    2525
    2626class QWebSecurityOriginPrivate : public QSharedData {
  • trunk/Source/WebKit/qt/ChangeLog

    r111361 r111504  
     12012-03-20  Eric Seidel  <eric@webkit.org>
     2
     3        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
     4        https://bugs.webkit.org/show_bug.cgi?id=80911
     5
     6        Reviewed by Adam Barth.
     7
     8        Fix WTF header include paths since although
     9        Source/WTF is included, no longer are all the
     10        subdirectories (thus "RefPtr.h" can't work).
     11
     12        * Api/qwebdatabase_p.h:
     13        * Api/qwebscriptworld_p.h:
     14        * Api/qwebsecurityorigin_p.h:
     15        * WebCoreSupport/InspectorClientQt.h:
     16        * WebCoreSupport/QtFallbackWebPopup.h:
     17        * WebCoreSupport/QtWebComboBox.h:
     18        * declarative/experimental/experimental.pri:
     19        * declarative/public.pri:
     20        * tests/MIMESniffing/MIMESniffing.pro:
     21
    1222012-03-19  Adam Barth  <abarth@webkit.org>
    223
  • trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.h

    r101201 r111504  
    3333#include "InspectorClient.h"
    3434#include "InspectorFrontendClientLocal.h"
    35 #include "OwnPtr.h"
    36 #include "PassOwnPtr.h"
    3735#include <QtCore/QString>
    3836#include <wtf/Forward.h>
     37#include <wtf/OwnPtr.h>
     38#include <wtf/PassOwnPtr.h>
    3939
    4040class QWebPage;
  • trunk/Source/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h

    r94321 r111504  
    2121#define QtFallbackWebPopup_h
    2222
    23 #include "Platform.h"
    2423#include "qwebkitplatformplugin.h"
     24#include <wtf/Platform.h>
    2525
    2626#include <QComboBox>
  • trunk/Source/WebKit/qt/WebCoreSupport/QtWebComboBox.h

    r96345 r111504  
    2222#define QtWebComboBox_h
    2323
    24 #include "Platform.h"
     24#include <wtf/Platform.h>
    2525
    2626#include <QComboBox>
  • trunk/Source/WebKit/qt/declarative/experimental/experimental.pri

    r110272 r111504  
    4444    ../../../../JavaScriptCore/runtime \
    4545    ../../../../WebKit2/Platform \
    46     ../../../../WebKit2/Platform/CoreIPC
     46    ../../../../WebKit2/Platform/CoreIPC \
     47    ../../../../WTF
    4748
    4849target.path = $$[QT_INSTALL_IMPORTS]/$${TARGET.module_name}
  • trunk/Source/WebKit/qt/declarative/public.pri

    r110291 r111504  
    4545    ../../../JavaScriptCore \
    4646    ../../../JavaScriptCore/runtime \
    47     ../../../JavaScriptCore/wtf
     47    ../../../JavaScriptCore/wtf \
     48    ../../../WTF
    4849
    4950SOURCES += plugin.cpp
  • trunk/Source/WebKit/qt/tests/MIMESniffing/MIMESniffing.pro

    r109549 r111504  
    1111    ../../../../WebCore/platform/network \
    1212    ../../../../JavaScriptCore \
    13     ../../../../JavaScriptCore/runtime
     13    ../../../../JavaScriptCore/runtime \
     14    ../../../../WTF
    1415
    1516RESOURCES += resources.qrc
  • trunk/Source/WebKit2/ChangeLog

    r111493 r111504  
     12012-03-20  Eric Seidel  <eric@webkit.org>
     2
     3        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
     4        https://bugs.webkit.org/show_bug.cgi?id=80911
     5
     6        Reviewed by Adam Barth.
     7
     8        Update to not depend on "Foo.h" includes for WTF headers.
     9
     10        * Shared/qt/QtNetworkReplyData.h:
     11        * Shared/qt/QtNetworkRequestData.cpp:
     12        * Shared/qt/QtNetworkRequestData.h:
     13
    1142012-03-20  Anders Carlsson  <andersca@apple.com>
    215
  • trunk/Source/WebKit2/Shared/qt/QtNetworkReplyData.h

    r105991 r111504  
    2727#define QtNetworkReplyData_h
    2828
    29 #include "Noncopyable.h"
    30 #include "RefCounted.h"
    3129#include "SharedMemory.h"
    3230#include <QNetworkAccessManager>
     31#include <wtf/Noncopyable.h>
     32#include <wtf/RefCounted.h>
    3333#include <wtf/text/WTFString.h>
    3434
  • trunk/Source/WebKit2/Shared/qt/QtNetworkRequestData.cpp

    r105711 r111504  
    2828
    2929#include "ArgumentCodersQt.h"
    30 #include "Platform.h"
    3130#include "WebCoreArgumentCoders.h"
    3231#include <QNetworkReply>
    3332#include <QNetworkRequest>
    3433#include <QUuid>
     34#include <wtf/Platform.h>
    3535#include <wtf/text/WTFString.h>
    3636
  • trunk/Source/WebKit2/Shared/qt/QtNetworkRequestData.h

    r105711 r111504  
    2727#define QtNetworkRequestData_h
    2828
    29 #include "RefCounted.h"
     29#include <wtf/RefCounted.h>
    3030#include <wtf/text/WTFString.h>
    3131
  • trunk/Tools/ChangeLog

    r111503 r111504  
     12012-03-20  Eric Seidel  <eric@webkit.org>
     2
     3        Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
     4        https://bugs.webkit.org/show_bug.cgi?id=80911
     5
     6        Reviewed by Adam Barth.
     7
     8        Update include paths for Source/WTF.
     9
     10        * DumpRenderTree/efl/CMakeLists.txt:
     11        * DumpRenderTree/qt/DumpRenderTree.pro:
     12        * QtTestBrowser/QtTestBrowser.pro:
     13        * Scripts/build-webkit: Build Source/WTF on AppleWin as well.
     14
    1152012-03-20  Adam Barth  <abarth@webkit.org>
    216
  • trunk/Tools/DumpRenderTree/efl/CMakeLists.txt

    r110619 r111504  
    4242
    4343SET(DumpRenderTree_INCLUDE_DIRECTORIES
     44    ${WTF_DIR}
    4445    "${WEBKIT_DIR}/efl/ewk"
    4546    ${WEBKIT_DIR}/efl
  • trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro

    r110272 r111504  
    1616INCLUDEPATH += \
    1717    $$PWD/.. \
    18     $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport
     18    $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport \
     19    $${ROOT_WEBKIT_DIR}/Source/WTF
    1920
    2021QT = core gui network testlib webkit
  • trunk/Tools/QtTestBrowser/QtTestBrowser.pro

    r110272 r111504  
    1010    $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport \
    1111    $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/ \
     12    $${ROOT_WEBKIT_DIR}/Source/WTF
    1213
    1314load(features)
  • trunk/Tools/Scripts/build-webkit

    r111121 r111504  
    497497
    498498# Build WTF as a separate static library on ports which support it.
    499 splice @projects, 0, 0, "Source/WTF" if isAppleMacWebKit();
     499splice @projects, 0, 0, "Source/WTF" if isAppleMacWebKit() or isAppleWinWebKit();
    500500
    501501for my $dir (@projects) {
Note: See TracChangeset for help on using the changeset viewer.