summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS8
-rw-r--r--WEBKIT_MERGE_REVISION2
-rw-r--r--webkit/build/JavaScriptCore/SConscript2
-rw-r--r--webkit/build/JavaScriptCore/WTF.vcproj4
-rw-r--r--webkit/build/V8Bindings/v8bindings.vsprops2
-rw-r--r--webkit/build/WebCore/SConscript1
-rw-r--r--webkit/build/WebCore/WebCore.vcproj8
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-selection-bidi-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-selection-bidi-expected.pngbin0 -> 4781 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-selection-bidi-expected.txt42
-rw-r--r--webkit/glue/webframeloaderclient_impl.cc3
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt3
-rw-r--r--webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj10
-rw-r--r--webkit/webkit.xcodeproj/project.pbxproj41
14 files changed, 89 insertions, 38 deletions
diff --git a/DEPS b/DEPS
index d8b2778..de62c89 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@8326",
+ "/trunk/deps/third_party/WebKit@8367",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@7525",
@@ -21,13 +21,13 @@ deps = {
"http://v8.googlecode.com/svn/trunk@1103",
"src/webkit/data/layout_tests/LayoutTests":
- "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39972",
+ "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@40058",
"src/third_party/WebKit/WebKit":
- "http://svn.webkit.org/repository/webkit/trunk/WebKit@39972",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKit@40058",
"src/third_party/WebKit/WebKitLibraries":
- "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39972",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@40058",
}
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 2a6c2df..3657514 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@39972 \ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@40058 \ No newline at end of file
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index e691d31..16b228d 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -146,7 +146,7 @@ if env.Bit('windows'):
)
wtf_inputs = [
- '$JAVASCRIPTCORE_DIR/runtime/ByteArray.cpp',
+ '$WTF_DIR/ByteArray.cpp',
'$WTF_DIR/Assertions.cpp',
'$WTF_DIR/CurrentTime.cpp',
'$WTF_DIR/dtoa.cpp',
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index baf5d8c..7515ad7 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -138,11 +138,11 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ByteArray.cpp"
+ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\ByteArray.cpp"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ByteArray.h"
+ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\ByteArray.h"
>
</File>
<File
diff --git a/webkit/build/V8Bindings/v8bindings.vsprops b/webkit/build/V8Bindings/v8bindings.vsprops
index 702f21b..8943495 100644
--- a/webkit/build/V8Bindings/v8bindings.vsprops
+++ b/webkit/build/V8Bindings/v8bindings.vsprops
@@ -7,7 +7,7 @@
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="NOGDI;WIN32_LEAN_AND_MEAN"
+ PreprocessorDefinitions="WIN32_LEAN_AND_MEAN"
DisableSpecificWarnings="4291,4099,4996,4521,4244"
/>
</VisualStudioPropertySheet>
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index a9d1b96..6b04f6a 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -62,6 +62,7 @@ input_files = [
'$WEBCORE_DIR/css/CSSParserValues.cpp',
'$WEBCORE_DIR/css/CSSPrimitiveValue.cpp',
'$WEBCORE_DIR/css/CSSProperty.cpp',
+ '$WEBCORE_DIR/css/CSSPropertyLonghand.cpp',
'$WEBCORE_DIR/css/CSSReflectValue.cpp',
'$WEBCORE_DIR/css/CSSRule.cpp',
'$WEBCORE_DIR/css/CSSRuleList.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 5f8c1a5..39f11fd 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -2655,6 +2655,14 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\css\CSSPropertyLonghand.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\css\CSSPropertyLonghand.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\css\CSSPropertyNames.in"
>
</File>
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-selection-bidi-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-selection-bidi-expected.checksum
new file mode 100644
index 0000000..eb2b04e
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-selection-bidi-expected.checksum
@@ -0,0 +1 @@
+7ccc80a12c7d0a9cbf1580454df9eca0 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-selection-bidi-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-selection-bidi-expected.png
new file mode 100644
index 0000000..585531a
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-selection-bidi-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-selection-bidi-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-selection-bidi-expected.txt
new file mode 100644
index 0000000..231ac94
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-selection-bidi-expected.txt
@@ -0,0 +1,42 @@
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock (anonymous) at (0,0) size 784x40
+ RenderText {#text} at (0,0) size 341x19
+ text run at (0,0) width 341: "The selection range in the red box should look like this: "
+ RenderInline {SPAN} at (0,0) size 97x19 [bgcolor=#AFDAFF]
+ RenderText {#text} at (341,0) size 97x19
+ text run at (341,0) width 26: "abc "
+ text run at (390,0) width 8: "1"
+ text run at (414,0) width 24 RTL: "\x{5D0}\x{5D1}\x{5D2} "
+ RenderText {#text} at (367,0) size 98x19
+ text run at (367,0) width 23 RTL: " \x{5D3}\x{5D4}\x{5D5}"
+ text run at (398,0) width 16: "23"
+ text run at (438,0) width 27: " def "
+ RenderBR {BR} at (465,15) size 0x0
+ RenderBR {BR} at (0,20) size 0x19
+ RenderBlock {DIV} at (0,40) size 784x56 [border: (2px solid #FF0000)]
+ RenderInline {SPAN} at (0,0) size 184x27
+ RenderText {#text} at (14,14) size 184x27
+ text run at (14,14) width 40: "abc "
+ text run at (54,14) width 34 RTL: " \x{5D3}\x{5D4}\x{5D5}"
+ text run at (88,14) width 36: "123"
+ text run at (124,14) width 37 RTL: "\x{5D0}\x{5D1}\x{5D2} "
+ text run at (161,14) width 37: " def"
+ RenderText {#text} at (0,0) size 0x0
+selection start: position 0 of child 0 {#text} of child 1 {SPAN} of child 6 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end: position 9 of child 0 {#text} of child 1 {SPAN} of child 6 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index 3bd996b..cf14096 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -1286,7 +1286,8 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() {
}
bool WebFrameLoaderClient::canCachePage() const {
- NOTREACHED() << "Page cache should be disabled";
+ // Since we manage the cache, always report this page as non-cacheable to
+ // FrameLoader.
return false;
}
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 5ce0bdf..b3edec3 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1884,3 +1884,6 @@ LayoutTests/fast/dom/css-selectorText.html = FAIL
// Passes locally but Text diff fails on the buildbots
LINUX : LayoutTests/svg/custom/path-getTotalLength.svg = FAIL PASS
+
+// Merge 39972:40057 -- new tests (V8?)
+LayoutTests/fast/regex/malformed-escapes.html = FAIL
diff --git a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj
index be61313..75df568 100644
--- a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj
+++ b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj
@@ -2177,14 +2177,16 @@
../../../../third_party/WebKit/WebCore/html,
../../../../third_party/WebKit/WebCore/loader,
../../../../third_party/WebKit/WebCore/page,
+ ../../../../third_party/WebKit/WebCore/page/animation,
../../../../third_party/WebKit/WebCore/platform,
../../../../third_party/WebKit/WebCore/platform/animation,
../../../../third_party/WebKit/WebCore/platform/chromium,
../../../../third_party/WebKit/WebCore/platform/graphics,
+ ../../../../third_party/WebKit/WebCore/platform/graphics/mac,
../../../../third_party/WebKit/WebCore/platform/graphics/chromium,
../../../../third_party/WebKit/WebCore/platform/graphics/transforms,
../../../../third_party/WebKit/WebCore/platform/graphics/skia,
- ../../../../third_party/WebKit/WebCore/platform/image-decoders/skia,
+ "../../../../third_party/WebKit/WebCore/platform/image-decoders/skia",
../../../../third_party/WebKit/WebCore/platform/network,
../../../../third_party/WebKit/WebCore/platform/network/chromium,
../../../../third_party/WebKit/WebCore/platform/text,
@@ -2192,6 +2194,7 @@
../../../../third_party/WebKit/WebCore/rendering/style,
../../../../third_party/WebKit/WebCore/svg,
../../../../third_party/WebKit/WebKit/mac/WebCoreSupport,
+ ../../../../v8/include,
../../../../webkit/port/platform,
../../../../webkit/port/platform/graphics,
../../../../webkit/port/bindings/v8,
@@ -2240,14 +2243,16 @@
../../../../third_party/WebKit/WebCore/html,
../../../../third_party/WebKit/WebCore/loader,
../../../../third_party/WebKit/WebCore/page,
+ ../../../../third_party/WebKit/WebCore/page/animation,
../../../../third_party/WebKit/WebCore/platform,
../../../../third_party/WebKit/WebCore/platform/animation,
../../../../third_party/WebKit/WebCore/platform/chromium,
../../../../third_party/WebKit/WebCore/platform/graphics,
+ ../../../../third_party/WebKit/WebCore/platform/graphics/mac,
../../../../third_party/WebKit/WebCore/platform/graphics/chromium,
../../../../third_party/WebKit/WebCore/platform/graphics/transforms,
../../../../third_party/WebKit/WebCore/platform/graphics/skia,
- ../../../../third_party/WebKit/WebCore/platform/image-decoders/skia,
+ "../../../../third_party/WebKit/WebCore/platform/image-decoders/skia",
../../../../third_party/WebKit/WebCore/platform/network,
../../../../third_party/WebKit/WebCore/platform/network/chromium,
../../../../third_party/WebKit/WebCore/platform/text,
@@ -2255,6 +2260,7 @@
../../../../third_party/WebKit/WebCore/rendering/style,
../../../../third_party/WebKit/WebCore/svg,
../../../../third_party/WebKit/WebKit/mac/WebCoreSupport,
+ ../../../../v8/include,
../../../../webkit/port/platform,
../../../../webkit/port/platform/graphics,
../../../../webkit/port/bindings/v8,
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 521a93c..a24f2d2 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -38,12 +38,14 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
+ 25B9F25199984DFE5E4A59AE /* V8WebKitCSSMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 688FFA9B9CEFE9B1B66F8671 /* V8WebKitCSSMatrix.cpp */; };
3CF1E7470F09B352009BC1A7 /* Threading.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CF1E7460F09B352009BC1A7 /* Threading.cpp */; };
4112E7060EFB0A26001E0E7A /* RandomNumber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4112E7050EFB0A26001E0E7A /* RandomNumber.cpp */; };
+ 41807C570F268375007BB4CC /* ByteArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41807C550F268375007BB4CC /* ByteArray.cpp */; };
+ 419E80750F264BBC006564E0 /* CSSPropertyLonghand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 419E80730F264BBC006564E0 /* CSSPropertyLonghand.cpp */; };
4D114BB60F17F0D5009F37AA /* SkewTransformOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CBAF5FA0EFC893600E752CB /* SkewTransformOperation.cpp */; };
4D35557D0ED4ACF600FB28B1 /* dtoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D35557B0ED4ACF600FB28B1 /* dtoa.cpp */; };
4D7B071F0E9DAE56009A6919 /* GraphicsContextStub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D7B071E0E9DAE56009A6919 /* GraphicsContextStub.cpp */; };
- 4D7FAB940F156764004F1B19 /* ByteArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D7FAB870F156634004F1B19 /* ByteArray.cpp */; };
4DB043A40EB1577900A5633C /* webcursor.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825405300D92E3DA0006B936 /* webcursor.cc */; };
4DB7F5290E9BD3FB00C66CE0 /* MainThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7F5210E9BD3FB00C66CE0 /* MainThread.cpp */; };
4DB7F52A0E9BD3FB00C66CE0 /* ThreadingPthreads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7F5270E9BD3FB00C66CE0 /* ThreadingPthreads.cpp */; };
@@ -1247,7 +1249,6 @@
9384489D0F16B06E0075F4C5 /* V8WebKitAnimationEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB299BD0EA4DD1E007EA4CF /* V8WebKitAnimationEvent.cpp */; };
9384489E0F16B06E0075F4C5 /* V8WebKitCSSKeyframeRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7F9A40E9BEB9B00C66CE0 /* V8WebKitCSSKeyframeRule.cpp */; };
9384489F0F16B06E0075F4C5 /* V8WebKitCSSKeyframesRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7F9A60E9BEB9B00C66CE0 /* V8WebKitCSSKeyframesRule.cpp */; };
- 25B9F25199984DFE5E4A59AE /* V8WebKitCSSMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 688FFA9B9CEFE9B1B66F8671 /* V8WebKitCSSMatrix.cpp */; };
938448A00F16B06E0075F4C5 /* V8WebKitCSSTransformValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB299BF0EA4DD1E007EA4CF /* V8WebKitCSSTransformValue.cpp */; };
938448A10F16B06E0075F4C5 /* V8WebKitTransitionEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB299C10EA4DD1E007EA4CF /* V8WebKitTransitionEvent.cpp */; };
938448A20F16B06E0075F4C5 /* V8WheelEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B00936B0DAFEFE500F72082 /* V8WheelEvent.cpp */; };
@@ -1501,12 +1502,16 @@
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>"; };
+ 41807C550F268375007BB4CC /* ByteArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ByteArray.cpp; sourceTree = "<group>"; };
+ 41807C560F268375007BB4CC /* ByteArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ByteArray.h; sourceTree = "<group>"; };
418E48770F166D9A00CF92F9 /* ColorChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ColorChromium.cpp; path = chromium/ColorChromium.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>"; };
419107550EF319C300BFDCC5 /* ScriptCallFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptCallFrame.cpp; sourceTree = "<group>"; };
4191075D0EF319FC00BFDCC5 /* ScriptCallStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCallStack.h; sourceTree = "<group>"; };
4191075E0EF319FC00BFDCC5 /* ScriptCallStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptCallStack.cpp; sourceTree = "<group>"; };
+ 419E80730F264BBC006564E0 /* CSSPropertyLonghand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSPropertyLonghand.cpp; sourceTree = "<group>"; };
+ 419E80740F264BBC006564E0 /* CSSPropertyLonghand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSPropertyLonghand.h; sourceTree = "<group>"; };
41A361D80F001E3800778012 /* PluginDataChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PluginDataChromium.cpp; path = ../third_party/WebKit/WebCore/plugins/chromium/PluginDataChromium.cpp; sourceTree = SOURCE_ROOT; };
41A362370F0032B100778012 /* RenderThemeChromiumMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderThemeChromiumMac.h; sourceTree = "<group>"; };
41A362380F0032B100778012 /* RenderThemeChromiumMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RenderThemeChromiumMac.mm; sourceTree = "<group>"; };
@@ -1635,8 +1640,6 @@
4D35557B0ED4ACF600FB28B1 /* dtoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dtoa.cpp; sourceTree = "<group>"; };
4D35557C0ED4ACF600FB28B1 /* dtoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dtoa.h; sourceTree = "<group>"; };
4D7B071E0E9DAE56009A6919 /* GraphicsContextStub.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsContextStub.cpp; sourceTree = "<group>"; };
- 4D7FAB870F156634004F1B19 /* ByteArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ByteArray.cpp; sourceTree = "<group>"; };
- 4D7FAB880F156634004F1B19 /* ByteArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ByteArray.h; sourceTree = "<group>"; };
4DB299BD0EA4DD1E007EA4CF /* V8WebKitAnimationEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8WebKitAnimationEvent.cpp; sourceTree = "<group>"; };
4DB299BE0EA4DD1E007EA4CF /* V8WebKitAnimationEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8WebKitAnimationEvent.h; sourceTree = "<group>"; };
4DB299BF0EA4DD1E007EA4CF /* V8WebKitCSSTransformValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8WebKitCSSTransformValue.cpp; sourceTree = "<group>"; };
@@ -1790,8 +1793,6 @@
4DB7F9A50E9BEB9B00C66CE0 /* V8WebKitCSSKeyframeRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8WebKitCSSKeyframeRule.h; sourceTree = "<group>"; };
4DB7F9A60E9BEB9B00C66CE0 /* V8WebKitCSSKeyframesRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8WebKitCSSKeyframesRule.cpp; sourceTree = "<group>"; };
4DB7F9A70E9BEB9B00C66CE0 /* V8WebKitCSSKeyframesRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8WebKitCSSKeyframesRule.h; sourceTree = "<group>"; };
- 688FFA9B9CEFE9B1B66F8671 /* V8WebKitCSSMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = V8WebKitCSSMatrix.cpp; path = V8WebKitCSSMatrix.cpp; sourceTree = "<group>"; };
- B4B7717F57DD81751BCEF85E /* V8WebKitCSSMatrix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = V8WebKitCSSMatrix.h; path = V8WebKitCSSMatrix.h; sourceTree = "<group>"; };
4DB7F9D70E9BEC9500C66CE0 /* AuthenticationChallengeBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationChallengeBase.cpp; sourceTree = "<group>"; };
4DB7F9D80E9BEC9500C66CE0 /* AuthenticationChallengeBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeBase.h; sourceTree = "<group>"; };
4DB7F9D90E9BEC9500C66CE0 /* NetworkStateNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkStateNotifier.cpp; sourceTree = "<group>"; };
@@ -1823,6 +1824,7 @@
538D81990EC371EA00278C31 /* password_autocomplete_listener.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = password_autocomplete_listener.cc; sourceTree = "<group>"; };
538D819A0EC371EA00278C31 /* password_autocomplete_listener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = password_autocomplete_listener.h; sourceTree = "<group>"; };
53E8BE8D0EC36F4B00B3F8B0 /* autocomplete_input_listener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = autocomplete_input_listener.h; sourceTree = "<group>"; };
+ 688FFA9B9CEFE9B1B66F8671 /* V8WebKitCSSMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8WebKitCSSMatrix.cpp; sourceTree = "<group>"; };
7B00912B0DAFEFBE00F72082 /* CSSGrammar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSGrammar.cpp; sourceTree = "<group>"; };
7B00912C0DAFEFBE00F72082 /* CSSGrammar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSGrammar.h; sourceTree = "<group>"; };
7B00912D0DAFEFBE00F72082 /* HTMLNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLNames.cpp; sourceTree = "<group>"; };
@@ -4240,6 +4242,7 @@
ABBD24D80EB7C29F00BEC658 /* FontMacCoreText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontMacCoreText.cpp; sourceTree = "<group>"; };
ABBD24EC0EB7C3C800BEC658 /* AccessibilityList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityList.cpp; sourceTree = "<group>"; };
ABBD24ED0EB7C3C800BEC658 /* AccessibilityList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityList.h; sourceTree = "<group>"; };
+ B4B7717F57DD81751BCEF85E /* V8WebKitCSSMatrix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8WebKitCSSMatrix.h; sourceTree = "<group>"; };
B507F54D0E9BECC300D16D77 /* HTMLPlugInImageElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLPlugInImageElement.cpp; sourceTree = "<group>"; };
B50F5BDF0E96D3F800AD71A6 /* WebCoreObjCExtras.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreObjCExtras.mm; sourceTree = "<group>"; };
B51C76BF0E9BC7A400D9DFC4 /* GradientCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GradientCG.cpp; sourceTree = "<group>"; };
@@ -4503,24 +4506,6 @@
path = storage;
sourceTree = "<group>";
};
- 4D7FAB850F1565F6004F1B19 /* javascriptcore */ = {
- isa = PBXGroup;
- children = (
- 4D7FAB890F156638004F1B19 /* runtime */,
- );
- name = javascriptcore;
- path = ../third_party/WebKit/JavaScriptCore;
- sourceTree = "<group>";
- };
- 4D7FAB890F156638004F1B19 /* runtime */ = {
- isa = PBXGroup;
- children = (
- 4D7FAB870F156634004F1B19 /* ByteArray.cpp */,
- 4D7FAB880F156634004F1B19 /* ByteArray.h */,
- );
- path = runtime;
- sourceTree = "<group>";
- };
4DB044090EB161B600A5633C /* mac */ = {
isa = PBXGroup;
children = (
@@ -4669,7 +4654,6 @@
7BF8842B0E71C100000BAF8A /* Configuration */,
7BF889C10E71CEA6000BAF8A /* generated */,
825404E50D92E3BB0006B936 /* glue */,
- 4D7FAB850F1565F6004F1B19 /* javascriptcore */,
7B0091290DAFEF0E00F72082 /* jsbindings */,
7BF891DD0E73118C000BAF8A /* pcre */,
7B9375960D919010008B9587 /* port */,
@@ -4705,6 +4689,8 @@
7B5E85B60D7F28F5001ECF42 /* Assertions.cpp */,
7B5E85B70D7F28F5001ECF42 /* Assertions.h */,
4DB7F51F0E9BD3FB00C66CE0 /* AVLTree.h */,
+ 41807C550F268375007BB4CC /* ByteArray.cpp */,
+ 41807C560F268375007BB4CC /* ByteArray.h */,
CCBDDEF91A55ACE86471036E /* CurrentTime.cpp */,
20EF92D9CD4E55999674A63E /* CurrentTime.h */,
7B5E85B80D7F28F5001ECF42 /* Deque.h */,
@@ -4872,6 +4858,8 @@
7B5E88FE0D7F3A08001ECF42 /* CSSPrimitiveValueMappings.h */,
7B5E88FF0D7F3A08001ECF42 /* CSSProperty.cpp */,
7B5E89000D7F3A08001ECF42 /* CSSProperty.h */,
+ 419E80730F264BBC006564E0 /* CSSPropertyLonghand.cpp */,
+ 419E80740F264BBC006564E0 /* CSSPropertyLonghand.h */,
7B5E89020D7F3A08001ECF42 /* CSSQuirkPrimitiveValue.h */,
4DB7EFAE0E9BA0F300C66CE0 /* CSSReflectionDirection.h */,
4DB7EFAF0E9BA0F300C66CE0 /* CSSReflectValue.cpp */,
@@ -8183,7 +8171,6 @@
buildActionMask = 2147483647;
files = (
7B5E85E70D7F28F5001ECF42 /* Assertions.cpp in Sources */,
- 4D7FAB940F156764004F1B19 /* ByteArray.cpp in Sources */,
E40054B10E9BCC5C0055B38E /* CollatorICU.cpp in Sources */,
FBBBF2E4099C8EA9BDAF80F9 /* CurrentTime.cpp in Sources */,
4D35557D0ED4ACF600FB28B1 /* dtoa.cpp in Sources */,
@@ -8197,6 +8184,7 @@
3CF1E7470F09B352009BC1A7 /* Threading.cpp in Sources */,
4DB7F52A0E9BD3FB00C66CE0 /* ThreadingPthreads.cpp in Sources */,
7B5E860E0D7F28F5001ECF42 /* UTF8.cpp in Sources */,
+ 41807C570F268375007BB4CC /* ByteArray.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -8636,6 +8624,7 @@
9384447B0F16B0570075F4C5 /* CSSParserValues.cpp in Sources */,
9384447C0F16B0570075F4C5 /* CSSPrimitiveValue.cpp in Sources */,
9384447D0F16B0570075F4C5 /* CSSProperty.cpp in Sources */,
+ 419E80750F264BBC006564E0 /* CSSPropertyLonghand.cpp in Sources */,
9384447E0F16B0570075F4C5 /* CSSReflectValue.cpp in Sources */,
9384447F0F16B0570075F4C5 /* CSSRule.cpp in Sources */,
938444800F16B0570075F4C5 /* CSSRuleList.cpp in Sources */,
generated by cgit v1.1 at 2025-01-22 15:54:35 +0000