diff options
| -rw-r--r-- | DEPS | 8 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/JavaScriptCore/WTF.vcproj | 10 | ||||
| -rw-r--r-- | webkit/webkit.xcodeproj/project.pbxproj | 6 |
5 files changed, 21 insertions, 6 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@7261", + "/trunk/deps/third_party/WebKit@7278", "src/third_party/icu38": "/trunk/deps/third_party/icu38@6780", @@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@968", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39335", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39369", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@39335", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@39369", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39335", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39369", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index b845959..f412d02 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@39335
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@39369
\ No newline at end of file diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 9a3f119..2ca8ec8 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -151,6 +151,7 @@ wtf_inputs = [ '$WTF_DIR/FastMalloc.cpp', '$WTF_DIR/HashTable.cpp', '$WTF_DIR/MainThread.cpp', + '$WTF_DIR/RandomNumber.cpp', '$WTF_DIR/RefCountedLeakCounter.cpp', '$WTF_DIR/TCSystemAlloc.cpp', '$WTF_DIR/unicode/UTF8.cpp', diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj index c4636de..5a5d7c3 100644 --- a/webkit/build/JavaScriptCore/WTF.vcproj +++ b/webkit/build/JavaScriptCore/WTF.vcproj @@ -262,6 +262,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\RandomNumber.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\RandomNumber.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\RefCounted.h" > </File> @@ -277,7 +285,7 @@ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\RefPtrHashMap.h" > </File> - <File + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\StdLibExtras.h" > </File> diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 914f59f..e244528 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -41,6 +41,7 @@ 04C3AFC30EF1E43D0046D578 /* NavigatorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04C3AFC20EF1E43D0046D578 /* NavigatorBase.cpp */; }; 04C3AFC60EF1E45F0046D578 /* WorkerNavigator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04C3AFC50EF1E45F0046D578 /* WorkerNavigator.cpp */; }; 4103039F0EFB0F7C008832CA /* CachedPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4103039E0EFB0F7C008832CA /* CachedPage.cpp */; }; + 4112E7060EFB0A26001E0E7A /* RandomNumber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4112E7050EFB0A26001E0E7A /* RandomNumber.cpp */; }; 416F45220ED7697D008215B6 /* FrameLoaderClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 416F45210ED7697D008215B6 /* FrameLoaderClient.cpp */; }; 419107560EF319C300BFDCC5 /* ScriptCallFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 419107550EF319C300BFDCC5 /* ScriptCallFrame.cpp */; }; 4191075F0EF319FC00BFDCC5 /* ScriptCallStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4191075E0EF319FC00BFDCC5 /* ScriptCallStack.cpp */; }; @@ -1449,6 +1450,8 @@ 410303530EFB0C7C008832CA /* ScriptCachedPageData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCachedPageData.h; sourceTree = "<group>"; }; 4103039E0EFB0F7C008832CA /* CachedPage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedPage.cpp; sourceTree = "<group>"; }; 410303A10EFB0F8D008832CA /* CachedPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedPage.h; sourceTree = "<group>"; }; + 4112E7040EFB0A26001E0E7A /* RandomNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RandomNumber.h; sourceTree = "<group>"; }; + 4112E7050EFB0A26001E0E7A /* RandomNumber.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RandomNumber.cpp; sourceTree = "<group>"; }; 416F45210ED7697D008215B6 /* FrameLoaderClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLoaderClient.cpp; sourceTree = "<group>"; }; 419106470EF2D6D500BFDCC5 /* ScriptState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptState.h; sourceTree = "<group>"; }; 419107540EF319C300BFDCC5 /* ScriptCallFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCallFrame.h; sourceTree = "<group>"; }; @@ -4673,6 +4676,8 @@ 7B5E85CC0D7F28F5001ECF42 /* OwnPtr.h */, 7B5E85CE0D7F28F5001ECF42 /* PassRefPtr.h */, 7B5E85CF0D7F28F5001ECF42 /* Platform.h */, + 4112E7050EFB0A26001E0E7A /* RandomNumber.cpp */, + 4112E7040EFB0A26001E0E7A /* RandomNumber.h */, 7B5E85D00D7F28F5001ECF42 /* RefCounted.h */, E40054A60E9BC4C20055B38E /* RefCountedLeakCounter.cpp */, 4DB7F5250E9BD3FB00C66CE0 /* RefCountedLeakCounter.h */, @@ -8160,6 +8165,7 @@ 7B5E85F40D7F28F5001ECF42 /* HashTable.cpp in Sources */, 4DB7F5290E9BD3FB00C66CE0 /* MainThread.cpp in Sources */, 4DB7F5420E9BD50600C66CE0 /* MainThreadMac.mm in Sources */, + 4112E7060EFB0A26001E0E7A /* RandomNumber.cpp in Sources */, E40054A70E9BC4C20055B38E /* RefCountedLeakCounter.cpp in Sources */, 7B5E86090D7F28F5001ECF42 /* TCSystemAlloc.cpp in Sources */, 4DB7F52A0E9BD3FB00C66CE0 /* ThreadingPthreads.cpp in Sources */, |