From a8dd5245ccd8cc0aab3db367ee621467598d0f59 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Thu, 15 Jan 2009 23:14:44 +0000 Subject: Chrome-side of WebKit merge 39913:39933 Review URL: http://codereview.chromium.org/18283 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8131 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 8 ++++---- WEBKIT_MERGE_REVISION | 2 +- webkit/build/WebCore/SConscript | 1 + webkit/build/WebCore/WebCore.vcproj | 8 ++++++++ webkit/tools/layout_tests/test_lists/tests_fixable.txt | 7 ++++++- webkit/webkit.xcodeproj/project.pbxproj | 6 ++++++ 6 files changed, 26 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index 810769b..3d985e7 100644 --- a/DEPS +++ b/DEPS @@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@8077", + "/trunk/deps/third_party/WebKit@8120", "src/third_party/icu38": "/trunk/deps/third_party/icu38@7525", @@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@1040", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39913", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39933", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@39913", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@39933", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39913", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39933", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 73cc2d1..389cf63 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@39913 \ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@39933 \ No newline at end of file diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 43cace8..25071e4 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -95,6 +95,7 @@ input_files = [ '$WEBCORE_DIR/css/SVGCSSStyleSelector.cpp', '$WEBCORE_DIR/css/WebKitCSSKeyframeRule.cpp', '$WEBCORE_DIR/css/WebKitCSSKeyframesRule.cpp', + '$WEBCORE_DIR/css/WebKitCSSMatrix.cpp', '$WEBCORE_DIR/css/WebKitCSSTransformValue.cpp', '$WEBCORE_DIR/dom/ActiveDOMObject.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index cfe2651..1519990 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -2898,6 +2898,14 @@ > + + + + diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index 41cdc21..6fe416c 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1908,7 +1908,6 @@ LayoutTests/fast/js/numeric-conversion.html = FAIL // Merge 39894:39913 - regressions LayoutTests/plugins/netscape-throw-exception.html = FAIL - // Merge 39744:39913? - regressions WIN : LayoutTests/fast/dom/Window/setting-properties-on-closed-window.html = PASS TIMEOUT WIN : LayoutTests/fast/dom/Window/timeout-callback-scope.html = PASS TIMEOUT @@ -1922,3 +1921,9 @@ LINUX : LayoutTests/http/tests/local/stylesheet-and-script-load-order-http.html LINUX : LayoutTests/svg/custom/animate-path-morphing.svg = PASS FAIL LINUX : LayoutTests/svg/custom/circular-marker-reference-1.svg = PASS FAIL LINUX : LayoutTests/transitions/change-values-during-transition.html = PASS FAIL + +// Merge 39913:39933 - new tests +// This is bug 6475, css/WebKitCSSMatrix.idl needs to be added to the build. +LayoutTests/transforms/3d/cssmatrix-interface.xhtml = FAIL + + diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 2458b7f..c792e87 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -1270,6 +1270,7 @@ 93AF52490F001CAB0073C62D /* media_player_private_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 93AF52480F001CAB0073C62D /* media_player_private_impl.cc */; }; 93AF57990F0198CD0073C62D /* webkit_glue_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93AF57980F0198CD0073C62D /* webkit_glue_mac.mm */; }; A7FBE6100F1EC18A00BB13F2 /* EditorChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7FBE60F0F1EC15D00BB13F2 /* EditorChromium.cpp */; }; + A7FBE6600F1FDFF900BB13F2 /* WebKitCSSMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7FBE65A0F1FDFDB00BB13F2 /* WebKitCSSMatrix.cpp */; }; B5B0D6890EC91D3D00EA3314 /* autofill_form.cc in Sources */ = {isa = PBXBuildFile; fileRef = B5B0D6880EC91D3D00EA3314 /* autofill_form.cc */; }; E40054A70E9BC4C20055B38E /* RefCountedLeakCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E40054A60E9BC4C20055B38E /* RefCountedLeakCounter.cpp */; }; E40054B10E9BCC5C0055B38E /* CollatorICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E40054B00E9BCC5C0055B38E /* CollatorICU.cpp */; }; @@ -4087,6 +4088,8 @@ 9DEAFAB44D279360C80A1BA9 /* PtrAndFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PtrAndFlags.h; sourceTree = ""; }; A7218BEB0EEDF5BD000FC021 /* CSSSelectorList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSSelectorList.cpp; sourceTree = ""; }; A7FBE60F0F1EC15D00BB13F2 /* EditorChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EditorChromium.cpp; path = chromium/EditorChromium.cpp; sourceTree = ""; }; + A7FBE65A0F1FDFDB00BB13F2 /* WebKitCSSMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitCSSMatrix.cpp; sourceTree = ""; }; + A7FBE65B0F1FDFDB00BB13F2 /* WebKitCSSMatrix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitCSSMatrix.h; sourceTree = ""; }; A80DD9160EE4A85900728DDE /* PurgeableBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurgeableBuffer.h; sourceTree = ""; }; A80DD9180EE4A87900728DDE /* PurgeableBufferMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PurgeableBufferMac.cpp; sourceTree = ""; }; AB332F4B0E95497E0020F882 /* AnimationController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AnimationController.cpp; path = animation/AnimationController.cpp; sourceTree = ""; }; @@ -4955,6 +4958,8 @@ 4DB7EFB80E9BA0F300C66CE0 /* WebKitCSSKeyframeRule.h */, 4DB7EFB90E9BA0F300C66CE0 /* WebKitCSSKeyframesRule.cpp */, 4DB7EFBA0E9BA0F300C66CE0 /* WebKitCSSKeyframesRule.h */, + A7FBE65A0F1FDFDB00BB13F2 /* WebKitCSSMatrix.cpp */, + A7FBE65B0F1FDFDB00BB13F2 /* WebKitCSSMatrix.h */, 4DB7EFBB0E9BA0F300C66CE0 /* WebKitCSSTransformValue.cpp */, 4DB7EFBC0E9BA0F300C66CE0 /* WebKitCSSTransformValue.h */, ); @@ -9379,6 +9384,7 @@ 9384474C0F16B0570075F4C5 /* WebKitAnimationEvent.cpp in Sources */, 9384474D0F16B0570075F4C5 /* WebKitCSSKeyframeRule.cpp in Sources */, 9384474E0F16B0570075F4C5 /* WebKitCSSKeyframesRule.cpp in Sources */, + A7FBE6600F1FDFF900BB13F2 /* WebKitCSSMatrix.cpp in Sources */, 9384474F0F16B0570075F4C5 /* WebKitCSSTransformValue.cpp in Sources */, 938447500F16B0570075F4C5 /* WebKitTransitionEvent.cpp in Sources */, 938447510F16B0570075F4C5 /* WheelEvent.cpp in Sources */, -- cgit v1.1