diff options
| -rw-r--r-- | DEPS | 8 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 12 | ||||
| -rw-r--r-- | webkit/webkit.xcodeproj/project.pbxproj | 2 |
5 files changed, 20 insertions, 5 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@6479", + "/trunk/deps/third_party/WebKit@6544", "src/third_party/icu38": "/trunk/deps/third_party/icu38@5827", @@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@911", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38950", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39000", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@38950", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@39000", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@38950", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39000", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index b0aaa61..1ef5307 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@38950
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@39000
\ No newline at end of file diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index dbab0a7..12c1889 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -67,6 +67,7 @@ input_files = [ '$WEBCORE_DIR/css/CSSRuleList.cpp', '$WEBCORE_DIR/css/CSSSegmentedFontFace.cpp', '$WEBCORE_DIR/css/CSSSelector.cpp', + '$WEBCORE_DIR/css/CSSSelectorList.cpp', '$WEBCORE_DIR/css/CSSStyleDeclaration.cpp', '$WEBCORE_DIR/css/CSSStyleRule.cpp', '$WEBCORE_DIR/css/CSSStyleSelector.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index cfeea32..cfbfc8c 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -2042,6 +2042,14 @@ >
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\css\CSSSelectorList.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\css\CSSSelectorList.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\css\CSSStyleDeclaration.cpp"
>
</File>
@@ -3706,6 +3714,10 @@ >
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\DOMTimer.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\dom\DynamicNodeList.cpp"
>
</File>
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 4497b4b..d5459343 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -3984,6 +3984,7 @@ 93BF8E650EA6AED30030F05C /* ResourceRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResourceRequest.h; path = chromium/ResourceRequest.h; sourceTree = "<group>"; }; 93BF8E660EA6AED30030F05C /* ResourceResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResourceResponse.h; path = chromium/ResourceResponse.h; sourceTree = "<group>"; }; 93BF8F510EA6BD870030F05C /* AccessibilityObjectChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityObjectChromium.cpp; sourceTree = "<group>"; }; + A7218BEB0EEDF5BD000FC021 /* CSSSelectorList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CSSSelectorList.cpp; path = ../third_party/WebKit/WebCore/css/CSSSelectorList.cpp; sourceTree = SOURCE_ROOT; }; A80DD9160EE4A85900728DDE /* PurgeableBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurgeableBuffer.h; sourceTree = "<group>"; }; A80DD9180EE4A87900728DDE /* PurgeableBufferMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PurgeableBufferMac.cpp; sourceTree = "<group>"; }; AB332F4B0E95497E0020F882 /* AnimationController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AnimationController.cpp; path = animation/AnimationController.cpp; sourceTree = "<group>"; }; @@ -4607,6 +4608,7 @@ 7B5E77540D7F22D8001ECF42 = { isa = PBXGroup; children = ( + A7218BEB0EEDF5BD000FC021 /* CSSSelectorList.cpp */, 7BF8842B0E71C100000BAF8A /* Configuration */, 7BF889C10E71CEA6000BAF8A /* generated */, 825404E50D92E3BB0006B936 /* glue */, |