Changeset 111504 in webkit
- Timestamp:
- Mar 20, 2012 10:50:30 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 39 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r110024 r111504 28 28 ENDIF () 29 29 30 SET(WTF_DIR "${CMAKE_SOURCE_DIR}/Source/WTF") 30 31 SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore") 31 32 SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore") -
trunk/ChangeLog
r111473 r111504 1 2012-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 1 10 2012-03-20 Ryosuke Niwa <rniwa@webkit.org> 2 11 -
trunk/Source/JavaScriptCore/CMakeLists.txt
r110518 r111504 1 1 SET(JavaScriptCore_INCLUDE_DIRECTORIES 2 2 "${CMAKE_BINARY_DIR}" 3 "${WTF_DIR}" 3 4 "${JAVASCRIPTCORE_DIR}" 4 5 "${JAVASCRIPTCORE_DIR}/API" -
trunk/Source/JavaScriptCore/ChangeLog
r111481 r111504 1 2012-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 1 17 2012-03-20 Filip Pizlo <fpizlo@apple.com> 2 18 -
trunk/Source/JavaScriptCore/JavaScriptCore.pri
r108444 r111504 13 13 $$SOURCE_DIR \ 14 14 $$SOURCE_DIR/.. \ 15 $$SOURCE_DIR/../WTF \ 15 16 $$SOURCE_DIR/assembler \ 16 17 $$SOURCE_DIR/bytecode \ -
trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops
r108813 r111504 7 7 <Tool 8 8 Name="VCCLCompilerTool" 9 AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../parser/;../../bytecompiler/;../../dfg/;../../jit/;../../llint/;../../runtime/;../../tools/;../../bytecode/;../../interpreter/;../../wtf/;../../profiler;../../assembler/;../../debugger/;../../heap/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\private";"$(ConfigurationBuildDir)\include";"$(ConfigurationBuildDir)\include\JavaScriptCore";"$(ConfigurationBuildDir)\include\private ";"$(WebKitLibrariesDir)\include\pthreads""9 AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../parser/;../../bytecompiler/;../../dfg/;../../jit/;../../llint/;../../runtime/;../../tools/;../../bytecode/;../../interpreter/;../../wtf/;../../profiler;../../assembler/;../../debugger/;../../heap/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\private";"$(ConfigurationBuildDir)\include";"$(ConfigurationBuildDir)\include\JavaScriptCore";"$(ConfigurationBuildDir)\include\private\JavaScriptCore";"$(ConfigurationBuildDir)\include\private";"$(WebKitLibrariesDir)\include\pthreads"" 10 10 PreprocessorDefinitions="__STD_C" 11 11 ForcedIncludeFiles="ICUVersion.h" -
trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
r111254 r111504 1094 1094 65C7A1710A8EAACB00FA37EA /* JSWrapperObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSWrapperObject.cpp; sourceTree = "<group>"; }; 1095 1095 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>"; };1097 1096 65DFC92A08EA173A00F7300B /* HashFunctions.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HashFunctions.h; sourceTree = "<group>"; tabWidth = 8; }; 1098 1097 65DFC92B08EA173A00F7300B /* HashMap.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HashMap.h; sourceTree = "<group>"; tabWidth = 8; }; … … 2142 2141 6580F795094070560082C219 /* PassRefPtr.h */, 2143 2142 651DCA02136A6FAB00F74194 /* PassTraits.h */, 2144 65D6D87E09B5A32E0002E4D7 /* Platform.h */,2145 2143 A7D649A91015224E009B2E1B /* PossiblyNull.h */, 2146 2144 088FA5B90EF76D4300578E6F /* RandomNumber.cpp */, -
trunk/Source/JavaScriptCore/wtf/CMakeLists.txt
r109197 r111504 70 70 ParallelJobsLibdispatch.h 71 71 ParallelJobsOpenMP.h 72 Platform.h72 ${WTF_DIR}/wtf/Platform.h 73 73 PossiblyNull.h 74 74 RandomNumber.h -
trunk/Source/WTF/ChangeLog
r111438 r111504 1 2012-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 1 21 2012-03-20 Steve Falkenburg <sfalken@apple.com> 2 22 -
trunk/Source/WTF/GNUmakefile.list.am
r104289 r111504 1 1 wtf_sources += \ 2 2 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 4 4 'wtf_privateheader_files': [ 5 5 'Stub.h', 6 'wtf/Platform.h', 6 7 ], 7 8 'wtf_files': [ -
trunk/Source/WTF/WTF.pro
r107499 r111504 103 103 PassRefPtr.h \ 104 104 PassTraits.h \ 105 Platform.h \105 ../../WTF/wtf/Platform.h \ 106 106 PossiblyNull.h \ 107 107 qt/UtilsQt.h \ -
trunk/Source/WTF/WTF.vcproj/WTF.vcproj
r111438 r111504 998 998 </File> 999 999 <File 1000 RelativePath=" ..\..\JavaScriptCore\wtf\Platform.h"1000 RelativePath="wtf\Platform.h" 1001 1001 > 1002 1002 </File> -
trunk/Source/WTF/WTF.vcproj/work-around-vs-dependency-tracking-bugs.py
r111438 r111504 32 32 # Touch wtf/Platform.h so all files will be recompiled. This is necessary 33 33 # 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') 35 35 touch_if_older_than(wtf_platform_h, newest_vsprops_time) 36 36 -
trunk/Source/WTF/WTF.xcodeproj/project.pbxproj
r110969 r111504 10 10 5D247B7914689D8900E78B76 /* Stub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D247B7714689D8900E78B76 /* Stub.cpp */; }; 11 11 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 */; }; 12 13 /* End PBXBuildFile section */ 13 14 … … 21 22 5D247B7814689D8900E78B76 /* Stub.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Stub.h; sourceTree = "<group>"; }; 22 23 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>"; }; 23 25 /* End PBXFileReference section */ 24 26 … … 68 70 5D247B7714689D8900E78B76 /* Stub.cpp */, 69 71 5D247B7814689D8900E78B76 /* Stub.h */, 72 A876DBD6151816E500DADB95 /* wtf */, 70 73 ); 71 74 name = Source; 75 sourceTree = "<group>"; 76 }; 77 A876DBD6151816E500DADB95 /* wtf */ = { 78 isa = PBXGroup; 79 children = ( 80 A876DBD7151816E500DADB95 /* Platform.h */, 81 ); 82 path = wtf; 72 83 sourceTree = "<group>"; 73 84 }; … … 79 90 buildActionMask = 2147483647; 80 91 files = ( 81 5D247EB21468B01500E78B76 /* HeaderDetection.h in Headers */,82 92 5D247B7A14689D8900E78B76 /* Stub.h in Headers */, 93 A876DBD8151816E500DADB95 /* Platform.h in Headers */, 83 94 ); 84 95 runOnlyForDeploymentPostprocessing = 0; … … 144 155 runOnlyForDeploymentPostprocessing = 0; 145 156 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"; 147 158 }; 148 159 5D247E9D1468AEE200E78B76 /* Detect Available Headers */ = { -
trunk/Source/WTF/config.h
r104825 r111504 32 32 // WTF cannot depend on JSC even if USE(JSC). 33 33 #if USE(JSC) && !defined(BUILDING_WTF) 34 #include " JSExportMacros.h"34 #include "runtime/JSExportMacros.h" 35 35 #endif 36 36 -
trunk/Source/WebCore/CMakeLists.txt
r111474 r111504 1 1 SET(WebCore_INCLUDE_DIRECTORIES 2 2 "${WEBCORE_DIR}" 3 "${WTF_DIR}" 3 4 "${WEBCORE_DIR}/Modules/filesystem" 4 5 "${WEBCORE_DIR}/Modules/geolocation" -
trunk/Source/WebCore/ChangeLog
r111502 r111504 1 2012-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 1 11 2012-03-20 Dana Jansens <danakj@chromium.org> 2 12 -
trunk/Source/WebKit/CMakeLists.txt
r110024 r111504 1 1 SET(WebKit_INCLUDE_DIRECTORIES 2 "${WTF_DIR}" 2 3 "${WEBKIT_DIR}" 3 4 "${WEBCORE_DIR}" -
trunk/Source/WebKit/ChangeLog
r111396 r111504 1 2012-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 1 10 2012-03-20 Charles Wei <charles.wei@torchmobile.com.cn> 2 11 -
trunk/Source/WebKit/qt/Api/qwebdatabase_p.h
r95901 r111504 25 25 #include "PlatformString.h" 26 26 #include "SecurityOrigin.h" 27 #include "RefPtr.h"27 #include <wtf/RefPtr.h> 28 28 29 29 -
trunk/Source/WebKit/qt/Api/qwebscriptworld_p.h
r95901 r111504 21 21 #define _QWEBSCRIPTWORLD_P_H_ 22 22 23 #include "RefPtr.h"23 #include <wtf/RefPtr.h> 24 24 25 25 namespace WebCore { -
trunk/Source/WebKit/qt/Api/qwebsecurityorigin_p.h
r95901 r111504 22 22 23 23 #include "SecurityOrigin.h" 24 #include "RefPtr.h"24 #include <wtf/RefPtr.h> 25 25 26 26 class QWebSecurityOriginPrivate : public QSharedData { -
trunk/Source/WebKit/qt/ChangeLog
r111361 r111504 1 2012-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 1 22 2012-03-19 Adam Barth <abarth@webkit.org> 2 23 -
trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.h
r101201 r111504 33 33 #include "InspectorClient.h" 34 34 #include "InspectorFrontendClientLocal.h" 35 #include "OwnPtr.h"36 #include "PassOwnPtr.h"37 35 #include <QtCore/QString> 38 36 #include <wtf/Forward.h> 37 #include <wtf/OwnPtr.h> 38 #include <wtf/PassOwnPtr.h> 39 39 40 40 class QWebPage; -
trunk/Source/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h
r94321 r111504 21 21 #define QtFallbackWebPopup_h 22 22 23 #include "Platform.h"24 23 #include "qwebkitplatformplugin.h" 24 #include <wtf/Platform.h> 25 25 26 26 #include <QComboBox> -
trunk/Source/WebKit/qt/WebCoreSupport/QtWebComboBox.h
r96345 r111504 22 22 #define QtWebComboBox_h 23 23 24 #include "Platform.h"24 #include <wtf/Platform.h> 25 25 26 26 #include <QComboBox> -
trunk/Source/WebKit/qt/declarative/experimental/experimental.pri
r110272 r111504 44 44 ../../../../JavaScriptCore/runtime \ 45 45 ../../../../WebKit2/Platform \ 46 ../../../../WebKit2/Platform/CoreIPC 46 ../../../../WebKit2/Platform/CoreIPC \ 47 ../../../../WTF 47 48 48 49 target.path = $$[QT_INSTALL_IMPORTS]/$${TARGET.module_name} -
trunk/Source/WebKit/qt/declarative/public.pri
r110291 r111504 45 45 ../../../JavaScriptCore \ 46 46 ../../../JavaScriptCore/runtime \ 47 ../../../JavaScriptCore/wtf 47 ../../../JavaScriptCore/wtf \ 48 ../../../WTF 48 49 49 50 SOURCES += plugin.cpp -
trunk/Source/WebKit/qt/tests/MIMESniffing/MIMESniffing.pro
r109549 r111504 11 11 ../../../../WebCore/platform/network \ 12 12 ../../../../JavaScriptCore \ 13 ../../../../JavaScriptCore/runtime 13 ../../../../JavaScriptCore/runtime \ 14 ../../../../WTF 14 15 15 16 RESOURCES += resources.qrc -
trunk/Source/WebKit2/ChangeLog
r111493 r111504 1 2012-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 1 14 2012-03-20 Anders Carlsson <andersca@apple.com> 2 15 -
trunk/Source/WebKit2/Shared/qt/QtNetworkReplyData.h
r105991 r111504 27 27 #define QtNetworkReplyData_h 28 28 29 #include "Noncopyable.h"30 #include "RefCounted.h"31 29 #include "SharedMemory.h" 32 30 #include <QNetworkAccessManager> 31 #include <wtf/Noncopyable.h> 32 #include <wtf/RefCounted.h> 33 33 #include <wtf/text/WTFString.h> 34 34 -
trunk/Source/WebKit2/Shared/qt/QtNetworkRequestData.cpp
r105711 r111504 28 28 29 29 #include "ArgumentCodersQt.h" 30 #include "Platform.h"31 30 #include "WebCoreArgumentCoders.h" 32 31 #include <QNetworkReply> 33 32 #include <QNetworkRequest> 34 33 #include <QUuid> 34 #include <wtf/Platform.h> 35 35 #include <wtf/text/WTFString.h> 36 36 -
trunk/Source/WebKit2/Shared/qt/QtNetworkRequestData.h
r105711 r111504 27 27 #define QtNetworkRequestData_h 28 28 29 #include "RefCounted.h"29 #include <wtf/RefCounted.h> 30 30 #include <wtf/text/WTFString.h> 31 31 -
trunk/Tools/ChangeLog
r111503 r111504 1 2012-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 1 15 2012-03-20 Adam Barth <abarth@webkit.org> 2 16 -
trunk/Tools/DumpRenderTree/efl/CMakeLists.txt
r110619 r111504 42 42 43 43 SET(DumpRenderTree_INCLUDE_DIRECTORIES 44 ${WTF_DIR} 44 45 "${WEBKIT_DIR}/efl/ewk" 45 46 ${WEBKIT_DIR}/efl -
trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro
r110272 r111504 16 16 INCLUDEPATH += \ 17 17 $$PWD/.. \ 18 $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport 18 $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport \ 19 $${ROOT_WEBKIT_DIR}/Source/WTF 19 20 20 21 QT = core gui network testlib webkit -
trunk/Tools/QtTestBrowser/QtTestBrowser.pro
r110272 r111504 10 10 $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport \ 11 11 $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/ \ 12 $${ROOT_WEBKIT_DIR}/Source/WTF 12 13 13 14 load(features) -
trunk/Tools/Scripts/build-webkit
r111121 r111504 497 497 498 498 # Build WTF as a separate static library on ports which support it. 499 splice @projects, 0, 0, "Source/WTF" if isAppleMacWebKit() ;499 splice @projects, 0, 0, "Source/WTF" if isAppleMacWebKit() or isAppleWinWebKit(); 500 500 501 501 for my $dir (@projects) {
Note: See TracChangeset
for help on using the changeset viewer.