summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS8
-rw-r--r--WEBKIT_MERGE_REVISION2
-rw-r--r--webkit/build/WebCore/SConscript3
-rw-r--r--webkit/build/WebCore/WebCore.vcproj8
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt2
-rw-r--r--webkit/webkit.xcodeproj/project.pbxproj16
6 files changed, 25 insertions, 14 deletions
diff --git a/DEPS b/DEPS
index 915bd51..1a38b86 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@8041",
+ "/trunk/deps/third_party/WebKit@8053",
"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@39894",
+ "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39913",
"src/third_party/WebKit/WebKit":
- "http://svn.webkit.org/repository/webkit/trunk/WebKit@39894",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKit@39913",
"src/third_party/WebKit/WebKitLibraries":
- "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39894",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39913",
}
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index cd79308..73cc2d1 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@39894 \ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@39913 \ No newline at end of file
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index d905cd4..43cace8 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -171,6 +171,8 @@ input_files = [
'$WEBCORE_DIR/dom/XMLTokenizer.cpp',
'$WEBCORE_DIR/dom/XMLTokenizerLibxml2.cpp',
+ '$WEBCORE_DIR/editing/chromium/EditorChromium.cpp',
+
'$WEBCORE_DIR/editing/AppendNodeCommand.cpp',
'$WEBCORE_DIR/editing/ApplyStyleCommand.cpp',
'$WEBCORE_DIR/editing/BreakBlockquoteCommand.cpp',
@@ -468,7 +470,6 @@ input_files = [
'$WEBCORE_DIR/platform/chromium/CursorChromium.cpp',
'$WEBCORE_DIR/platform/chromium/DragDataChromium.cpp',
'$WEBCORE_DIR/platform/chromium/DragImageChromium.cpp',
- '$WEBCORE_DIR/platform/chromium/EditorChromium.cpp',
'$WEBCORE_DIR/platform/chromium/FileChooserChromium.cpp',
'$WEBCORE_DIR/platform/chromium/FileSystemChromium.cpp',
'$WEBCORE_DIR/platform/chromium/FramelessScrollView.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 29e7cbf..cfe2651 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -2237,10 +2237,6 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\EditorChromium.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\FileChooserChromium.cpp"
>
</File>
@@ -4818,6 +4814,10 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\editing\chromium\EditorChromium.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\editing\EditorCommand.cpp"
>
</File>
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 80e34a0..bf472c1 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1910,3 +1910,5 @@ WIN : LayoutTests/fast/borders/border-image-omit-right-slice.html = FAIL | CRASH
LayoutTests/fast/js/numeric-conversion.html = FAIL
LayoutTests/http/tests/security/dataTransfer-set-data-file-url.html = FAIL
+// Merge 39894:39913 - regressions
+LayoutTests/plugins/netscape-throw-exception.html = FAIL
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 3095080..aed9785 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -237,7 +237,6 @@
938444AC0F16B0570075F4C5 /* EditCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8B0D0D7F3AFA001ECF42 /* EditCommand.cpp */; };
938444AD0F16B0570075F4C5 /* EditingText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E89EF0D7F3A7C001ECF42 /* EditingText.cpp */; };
938444AE0F16B0570075F4C5 /* Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8B0F0D7F3AFA001ECF42 /* Editor.cpp */; };
- 938444AF0F16B0570075F4C5 /* EditorChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF52700F002F680073C62D /* EditorChromium.cpp */; };
938444B00F16B0570075F4C5 /* EditorCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8B110D7F3AFA001ECF42 /* EditorCommand.cpp */; };
938444B10F16B0570075F4C5 /* Element.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E89F10D7F3A7C001ECF42 /* Element.cpp */; };
938444B20F16B0570075F4C5 /* EllipsisBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E951F0D7F3E94001ECF42 /* EllipsisBox.cpp */; };
@@ -1260,6 +1259,7 @@
938448B10F16B06E0075F4C5 /* XPathGrammar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B0095C70DAFF00100F72082 /* XPathGrammar.cpp */; };
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 */; };
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 */; };
@@ -4025,7 +4025,6 @@
93AF526D0F002F680073C62D /* DragDataRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DragDataRef.h; path = chromium/DragDataRef.h; sourceTree = "<group>"; };
93AF526E0F002F680073C62D /* DragImageChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DragImageChromium.cpp; path = chromium/DragImageChromium.cpp; sourceTree = "<group>"; };
93AF526F0F002F680073C62D /* DragImageRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DragImageRef.h; path = chromium/DragImageRef.h; sourceTree = "<group>"; };
- 93AF52700F002F680073C62D /* EditorChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EditorChromium.cpp; path = chromium/EditorChromium.cpp; sourceTree = "<group>"; };
93AF52710F002F680073C62D /* FileChooserChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileChooserChromium.cpp; path = chromium/FileChooserChromium.cpp; sourceTree = "<group>"; };
93AF52720F002F680073C62D /* FileSystemChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileSystemChromium.cpp; path = chromium/FileSystemChromium.cpp; sourceTree = "<group>"; };
93AF52730F002F680073C62D /* FileSystemChromiumMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = FileSystemChromiumMac.mm; path = chromium/FileSystemChromiumMac.mm; sourceTree = "<group>"; };
@@ -4074,6 +4073,7 @@
93AF57B70F0199880073C62D /* PlatformScreenChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PlatformScreenChromium.cpp; path = chromium/PlatformScreenChromium.cpp; sourceTree = "<group>"; };
9DEAFAB44D279360C80A1BA9 /* PtrAndFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PtrAndFlags.h; sourceTree = "<group>"; };
A7218BEB0EEDF5BD000FC021 /* CSSSelectorList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSSelectorList.cpp; sourceTree = "<group>"; };
+ A7FBE60F0F1EC15D00BB13F2 /* EditorChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EditorChromium.cpp; path = chromium/EditorChromium.cpp; sourceTree = "<group>"; };
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>"; };
@@ -5123,6 +5123,7 @@
7B5E8AF90D7F3AFA001ECF42 /* editing */ = {
isa = PBXGroup;
children = (
+ A7FBE60E0F1EC14F00BB13F2 /* chromium */,
7B5E8B2A0D7F3AFA001ECF42 /* mac */,
7B5E8AFA0D7F3AFA001ECF42 /* AppendNodeCommand.cpp */,
7B5E8AFB0D7F3AFA001ECF42 /* AppendNodeCommand.h */,
@@ -7721,7 +7722,6 @@
93AF526D0F002F680073C62D /* DragDataRef.h */,
93AF526E0F002F680073C62D /* DragImageChromium.cpp */,
93AF526F0F002F680073C62D /* DragImageRef.h */,
- 93AF52700F002F680073C62D /* EditorChromium.cpp */,
93AF52710F002F680073C62D /* FileChooserChromium.cpp */,
93AF52720F002F680073C62D /* FileSystemChromium.cpp */,
93AF52730F002F680073C62D /* FileSystemChromiumMac.mm */,
@@ -7792,6 +7792,14 @@
name = skia;
sourceTree = "<group>";
};
+ A7FBE60E0F1EC14F00BB13F2 /* chromium */ = {
+ isa = PBXGroup;
+ children = (
+ A7FBE60F0F1EC15D00BB13F2 /* EditorChromium.cpp */,
+ );
+ name = chromium;
+ sourceTree = "<group>";
+ };
AB332F440E9549650020F882 /* animation */ = {
isa = PBXGroup;
children = (
@@ -8685,7 +8693,7 @@
938444AC0F16B0570075F4C5 /* EditCommand.cpp in Sources */,
938444AD0F16B0570075F4C5 /* EditingText.cpp in Sources */,
938444AE0F16B0570075F4C5 /* Editor.cpp in Sources */,
- 938444AF0F16B0570075F4C5 /* EditorChromium.cpp in Sources */,
+ A7FBE6100F1EC18A00BB13F2 /* EditorChromium.cpp in Sources */,
938444B00F16B0570075F4C5 /* EditorCommand.cpp in Sources */,
938444B10F16B0570075F4C5 /* Element.cpp in Sources */,
938444B20F16B0570075F4C5 /* EllipsisBox.cpp in Sources */,
generated by cgit v1.1 at 2025-01-22 17:12:00 +0000