diff options
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 4 | ||||
| -rw-r--r-- | webkit/build/webkit_common_defines.vsprops | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/win/tests_fixable.txt | 6 | ||||
| -rw-r--r-- | webkit/webkit.xcodeproj/project.pbxproj | 4 |
7 files changed, 19 insertions, 4 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@5824", + "/trunk/deps/third_party/WebKit@5865", "src/third_party/icu38": "/trunk/deps/third_party/icu38@5749", @@ -21,7 +21,7 @@ deps = { "http://v8.googlecode.com/svn/trunk@768", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38550", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38575", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index f230eb5..242e2aa 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@38550
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@38575
\ No newline at end of file diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index ac4950b..1111c3b 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -327,6 +327,7 @@ input_files = [ '$WEBCORE_DIR/loader/DocumentLoader.cpp', '$WEBCORE_DIR/loader/FormState.cpp', '$WEBCORE_DIR/loader/FrameLoader.cpp', + '$WEBCORE_DIR/loader/FrameLoaderClient.cpp', '$WEBCORE_DIR/loader/FTPDirectoryDocument.cpp', '$WEBCORE_DIR/loader/FTPDirectoryParser.cpp', '$WEBCORE_DIR/loader/ImageDocument.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 0fc40e6..bab99ae 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -638,6 +638,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\loader\FrameLoaderClient.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\loader\FrameLoaderClient.h" > </File> diff --git a/webkit/build/webkit_common_defines.vsprops b/webkit/build/webkit_common_defines.vsprops index aa30250..0f750cc 100644 --- a/webkit/build/webkit_common_defines.vsprops +++ b/webkit/build/webkit_common_defines.vsprops @@ -6,6 +6,6 @@ > <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="ENABLE_DATABASE=1;ENABLE_DASHBOARD_SUPPORT=0;ENABLE_JAVASCRIPT_DEBUGGER=0;ENABLE_JSC_MULTIPLE_THREADS=0;ENABLE_ICONDATABASE=0;ENABLE_XSLT=1;ENABLE_XPATH=1;ENABLE_SVG=1;ENABLE_SVG_ANIMATION=1;ENABLE_SVG_AS_IMAGE=1;ENABLE_SVG_USE=1;ENABLE_SVG_FOREIGN_OBJECT=1;ENABLE_SVG_FONTS=1;ENABLE_VIDEO=0;WEBCORE_NAVIGATOR_PLATFORM="\"Win32\"";USE_GOOGLE_URL_LIBRARY;USE_SYSTEM_MALLOC=1;CRASH=__debugbreak;BUILDING_CHROMIUM__=1;" + PreprocessorDefinitions="ENABLE_DATABASE=1;ENABLE_DASHBOARD_SUPPORT=0;ENABLE_JAVASCRIPT_DEBUGGER=0;ENABLE_JSC_MULTIPLE_THREADS=0;ENABLE_ICONDATABASE=0;ENABLE_XSLT=1;ENABLE_XPATH=1;ENABLE_SVG=1;ENABLE_SVG_ANIMATION=1;ENABLE_SVG_AS_IMAGE=1;ENABLE_SVG_USE=1;ENABLE_SVG_FOREIGN_OBJECT=1;ENABLE_SVG_FONTS=1;ENABLE_VIDEO=0;ENABLE_WORKERS=0;WEBCORE_NAVIGATOR_PLATFORM="\"Win32\"";USE_GOOGLE_URL_LIBRARY;USE_SYSTEM_MALLOC=1;CRASH=__debugbreak;BUILDING_CHROMIUM__=1;" /> </VisualStudioPropertySheet> diff --git a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt index 4a0f80f..265659d 100644 --- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt @@ -1114,3 +1114,9 @@ LayoutTests/svg/W3C-SVG-1.1/text-path-01-b.svg = FAIL LayoutTests/transitions/transition-drt-api.html = TIMEOUT // Missing expected results SKIP : LayoutTests/animations/animation-drt-api.html = PASS + +// MERGE 38550:38575: New tests. Need ENABLE_WORKERS turned on. +LayoutTests/fast/workers/worker-constructor.html = FAIL +LayoutTests/fast/workers/worker-event-listener.html = TIMEOUT +LayoutTests/fast/workers/worker-gc.html = TIMEOUT +LayoutTests/fast/workers/worker-location.html = TIMEOUT
\ No newline at end of file diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 50094c7..dbee003 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -38,6 +38,7 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 416F45220ED7697D008215B6 /* FrameLoaderClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 416F45210ED7697D008215B6 /* FrameLoaderClient.cpp */; }; 4D11C5520E9AC23100EF7617 /* RenderThemeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E49E50DE0E65E33200AD47F7 /* RenderThemeMac.mm */; }; 4D1637CC0EBFA49E008F024E /* SQLiteAuthorizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D1637C30EBFA49E008F024E /* SQLiteAuthorizer.cpp */; }; 4D1637CD0EBFA49E008F024E /* SQLiteDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D1637C40EBFA49E008F024E /* SQLiteDatabase.cpp */; }; @@ -1429,6 +1430,7 @@ /* Begin PBXFileReference section */ 046192AA0EA5476500FB37B0 /* BitmapImageSingleFrameSkia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitmapImageSingleFrameSkia.h; sourceTree = "<group>"; }; + 416F45210ED7697D008215B6 /* FrameLoaderClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLoaderClient.cpp; sourceTree = "<group>"; }; 4D1637C30EBFA49E008F024E /* SQLiteAuthorizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLiteAuthorizer.cpp; sourceTree = "<group>"; }; 4D1637C40EBFA49E008F024E /* SQLiteDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLiteDatabase.cpp; sourceTree = "<group>"; }; 4D1637C50EBFA49E008F024E /* SQLiteDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLiteDatabase.h; sourceTree = "<group>"; }; @@ -5412,6 +5414,7 @@ 7B5E8DAB0D7F3C01001ECF42 /* FormState.h */, 7B5E8DAC0D7F3C01001ECF42 /* FrameLoader.cpp */, 7B5E8DAD0D7F3C01001ECF42 /* FrameLoader.h */, + 416F45210ED7697D008215B6 /* FrameLoaderClient.cpp */, 7B5E8DAF0D7F3C01001ECF42 /* FrameLoaderClient.h */, 7B5E8DB00D7F3C01001ECF42 /* FrameLoaderTypes.h */, 7B5E8DB10D7F3C01001ECF42 /* FTPDirectoryDocument.cpp */, @@ -8655,6 +8658,7 @@ E45624860E268E87005E4685 /* FormState.cpp in Sources */, E45624A40E268E87005E4685 /* Frame.cpp in Sources */, E45624870E268E87005E4685 /* FrameLoader.cpp in Sources */, + 416F45220ED7697D008215B6 /* FrameLoaderClient.cpp in Sources */, E45624A50E268E87005E4685 /* FrameTree.cpp in Sources */, E45624A60E268E87005E4685 /* FrameView.cpp in Sources */, E45624880E268E87005E4685 /* FTPDirectoryDocument.cpp in Sources */, |