diff options
24 files changed, 72 insertions, 73 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@6697", + "/trunk/deps/third_party/WebKit@6803", "src/third_party/icu38": "/trunk/deps/third_party/icu38@6780", @@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@968", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39050", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39100", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@39050", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@39100", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39050", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39100", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 57a24ea..24b3c22 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@39050
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@39100
\ No newline at end of file diff --git a/webkit/build/KJSBindings/KJSBindings.vcproj b/webkit/build/KJSBindings/KJSBindings.vcproj index 15c4936..be8ba3a9 100644 --- a/webkit/build/KJSBindings/KJSBindings.vcproj +++ b/webkit/build/KJSBindings/KJSBindings.vcproj @@ -3286,14 +3286,6 @@ >
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\PausedTimeouts.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\PausedTimeouts.h"
- >
- </File>
- <File
RelativePath="..\precompiled_webkit.cc"
>
<FileConfiguration
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript index 45ea1bf..af3b92a 100644 --- a/webkit/build/V8Bindings/SConscript +++ b/webkit/build/V8Bindings/SConscript @@ -37,8 +37,6 @@ else: ) inputs = [ - '$SHARED_DIR/PausedTimeouts.cpp', - '$DERIVED_DIR/CSSGrammar.cpp', '$DERIVED_DIR/HTMLNames.cpp', '$DERIVED_DIR/SVGElementFactory.cpp', diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj index c3231cc..4ef3c7b 100644 --- a/webkit/build/V8Bindings/V8Bindings.vcproj +++ b/webkit/build/V8Bindings/V8Bindings.vcproj @@ -2379,14 +2379,6 @@ <Filter
Name="SharedSources"
>
- <File
- RelativePath="$(IntDir)\SharedSources\PausedTimeouts.cpp"
- >
- </File>
- <File
- RelativePath="$(IntDir)\SharedSources\PausedTimeouts.h"
- >
- </File>
</Filter>
<Filter
Name="c_binding"
diff --git a/webkit/build/V8Bindings/copy_files.bat b/webkit/build/V8Bindings/copy_files.bat index c0e0172..effcfbb 100644 --- a/webkit/build/V8Bindings/copy_files.bat +++ b/webkit/build/V8Bindings/copy_files.bat @@ -11,8 +11,6 @@ set KJS_BINDINGS_DIR="..\..\..\third_party\WebKit\WebCore\bindings\js" setlocal mkdir 2>NUL %DIR% -xcopy /y /d "%KJS_BINDINGS_DIR%\PausedTimeouts.h" %DIR% -xcopy /y /d "%KJS_BINDINGS_DIR%\PausedTimeouts.cpp" %DIR% endlocal diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript index ae87fb5..b5a106e 100644 --- a/webkit/build/port/SConscript +++ b/webkit/build/port/SConscript @@ -479,9 +479,8 @@ for name in idl_files: # copy over some files -i = env.Install('$SHARED_DIR', - ['$PORT_DIR/bindings/js/PausedTimeouts.h', - '$PORT_DIR/bindings/js/PausedTimeouts.cpp']) +# TODO(eroman): can probably get rid of this. +i = env.Install('$SHARED_DIR', []) env.Alias('webkit', i) # HTML tag and attribute names diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/uncaught-exception-line-number-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/uncaught-exception-line-number-expected.txt new file mode 100644 index 0000000..14aef95b --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/uncaught-exception-line-number-expected.txt @@ -0,0 +1,3 @@ +CONSOLE MESSAGE: line 11: Uncaught uh oh, an exception! +This tests that uncaught exceptions have the right line numbers, for example for display in the JavaScript error console. To run the test manually, look in the JS console for an uncaught exception on line 11. + diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/selection-rect-transform-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/selection-rect-transform-expected.checksum new file mode 100644 index 0000000..7fbe6b1 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/selection-rect-transform-expected.checksum @@ -0,0 +1 @@ +013329435f712d4c0708ca3ce0ca4060
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/selection-rect-transform-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/selection-rect-transform-expected.png Binary files differnew file mode 100644 index 0000000..eb46dc1 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/selection-rect-transform-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/selection-rect-transform-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/selection-rect-transform-expected.txt new file mode 100644 index 0000000..5d670ff --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/selection-rect-transform-expected.txt @@ -0,0 +1,22 @@ +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 {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 354x19 + text run at (0,0) width 354: "Tests selection painting on a transformed, replaced element" + RenderBR {BR} at (354,15) size 0x0 + RenderInline {A} at (0,0) size 291x19 [color=#0000EE] + RenderText {#text} at (0,20) size 291x19 + text run at (0,20) width 291: "https://bugs.webkit.org/show_bug.cgi?id=15739" + RenderText {#text} at (0,0) size 0x0 + RenderBlock {P} at (0,56) size 784x20 + RenderText {#text} at (0,0) size 497x19 + text run at (0,0) width 497: "You should see a dark green square rotated 45\x{B0}. If you see any red, the test failed." + RenderBlock {DIV} at (0,92) size 784x150 + RenderText {#text} at (0,0) size 0x0 +layer at (58,150) size 100x100 + RenderImage {IMG} at (50,50) size 100x100 [bgcolor=#FF0000] +selection start: position 0 of child 1 {IMG} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document +selection end: position 1 of child 1 {IMG} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-caret-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-caret-expected.checksum new file mode 100644 index 0000000..0591b804 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-caret-expected.checksum @@ -0,0 +1 @@ +969f05ef2a8cd369f3f9417a00eca947
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-caret-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-caret-expected.png Binary files differnew file mode 100644 index 0000000..b1c56d7 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-caret-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-caret-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-caret-expected.txt new file mode 100644 index 0000000..50a2f86 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-caret-expected.txt @@ -0,0 +1,17 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x418 + RenderBlock {HTML} at (0,0) size 800x418 + RenderBody {BODY} at (8,16) size 784x322 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 346x19 + text run at (0,0) width 346: "The caret should render correctly in transformed elements" + RenderBR {BR} at (346,15) size 0x0 + RenderInline {A} at (0,0) size 291x19 [color=#0000EE] + RenderText {#text} at (0,20) size 291x19 + text run at (0,20) width 291: "https://bugs.webkit.org/show_bug.cgi?id=15671" +layer at (88,136) size 302x202 + RenderBlock {DIV} at (80,120) size 302x202 [border: (1px solid #000000)] + RenderText {#text} at (1,2) size 174x90 + text run at (1,2) width 174: "Caret" +caret: position 6 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 1 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-focused-text-input-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-focused-text-input-expected.checksum index 991a142b..b7e81d3 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-focused-text-input-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-focused-text-input-expected.checksum @@ -1 +1 @@ -fffadbfba33288fd4bcf7b22325650ce
\ No newline at end of file +bcd054ac45b7f292e04f1d7a1a51af56
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-focused-text-input-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-focused-text-input-expected.png Binary files differindex 76a2b5a..aacce54 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-focused-text-input-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transformed-focused-text-input-expected.png diff --git a/webkit/glue/chromium_bridge_impl.cc b/webkit/glue/chromium_bridge_impl.cc index 38b5f96..c02d472 100644 --- a/webkit/glue/chromium_bridge_impl.cc +++ b/webkit/glue/chromium_bridge_impl.cc @@ -535,4 +535,12 @@ void ChromiumBridge::widgetSetFocus(Widget* widget) { chrome_client->focus(); } +// Link history --------------------------------------------------------------- + +bool ChromiumBridge::isLinkVisited(LinkHash) { + // NOT IMPLEMENTED + // http://code.google.com/p/chromium/issues/detail?id=5401 + return false; +} + } // namespace WebCore diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index c07825c..6f099c9 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -1127,7 +1127,7 @@ bool WebViewImpl::ImeUpdateStatus(bool* enable_ime, const FrameView* view = node->document()->view(); if (!view) return false; - const IntRect rect(view->contentsToWindow(controller->caretRect())); + const IntRect rect(view->contentsToWindow(controller->localCaretRect())); caret_rect->SetRect(rect.x(), rect.y(), rect.width(), rect.height()); return true; } diff --git a/webkit/port/bindings/v8/ScriptController.cpp b/webkit/port/bindings/v8/ScriptController.cpp index 90ca327..3127e4b 100644 --- a/webkit/port/bindings/v8/ScriptController.cpp +++ b/webkit/port/bindings/v8/ScriptController.cpp @@ -42,7 +42,6 @@ #include "NotImplemented.h" #include "npruntime_priv.h" #include "np_v8object.h" -#include "PausedTimeouts.h" #include "ScriptSourceCode.h" #include "Widget.h" @@ -139,26 +138,6 @@ void ScriptController::unentangleMessagePort(MessagePort *port) } } -void ScriptController::pauseTimeouts(OwnPtr<PausedTimeouts>& result) -{ - DOMWindow* window = m_frame->domWindow(); - if (!window) { - result.clear(); - return; - } - window->pauseTimeouts(result); -} - -void ScriptController::resumeTimeouts(OwnPtr<PausedTimeouts>& timeouts) -{ - DOMWindow* window = m_frame->domWindow(); - if (!window) { - timeouts.clear(); - return; - } - window->resumeTimeouts(timeouts); -} - ScriptController::ScriptController(Frame* frame) : m_frame(frame) , m_sourceURL(0) diff --git a/webkit/port/bindings/v8/ScriptController.h b/webkit/port/bindings/v8/ScriptController.h index 00c6e0c..5269a6a 100644 --- a/webkit/port/bindings/v8/ScriptController.h +++ b/webkit/port/bindings/v8/ScriptController.h @@ -127,7 +127,6 @@ class Event; class Frame; class HTMLPlugInElement; class Node; -class PausedTimeouts; class ScriptSourceCode; class String; class Widget; @@ -248,9 +247,6 @@ public: void clearWindowShell(); void updateDocument(); - void pauseTimeouts(OwnPtr<PausedTimeouts>&); - void resumeTimeouts(OwnPtr<PausedTimeouts>&); - void clearScriptObjects(); void cleanupScriptObjectsForPlugin(void*); diff --git a/webkit/port/platform/chromium/ChromiumBridge.h b/webkit/port/platform/chromium/ChromiumBridge.h index 3513293..eaf0ccd 100644 --- a/webkit/port/platform/chromium/ChromiumBridge.h +++ b/webkit/port/platform/chromium/ChromiumBridge.h @@ -32,6 +32,7 @@ #include "config.h" +#include "LinkHash.h" #include "PasteboardPrivate.h" #include "PassRefPtr.h" #include "PlatformString.h" @@ -147,6 +148,9 @@ namespace WebCore { // Widget ------------------------------------------------------------- static void widgetSetCursor(Widget*, const Cursor&); static void widgetSetFocus(Widget*); + + // Link history ------------------------------------------------------- + static bool isLinkVisited(LinkHash); }; } diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index d80635c..77ee1e2 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1994,6 +1994,13 @@ MAC WIN : LayoutTests/svg/custom/stroke-fallback.svg = FAIL LayoutTests/wml/variable-reference-invalid-character.html = FAIL LayoutTests/wml/variable-reference-valid.html = FAIL +// WebKit Merge 39050:39100 failures: +LayoutTests/editing/pasteboard/5780697-2.html = FAIL +LayoutTests/fast/dom/Window/get-set-properties.html = FAIL +LayoutTests/fast/dom/java-applet-calls.html = FAIL +LayoutTests/fast/repaint/transform-repaint-descendants.html = FAIL +LayoutTests/http/tests/loading/simple-subframe.html = FAIL + // Linux pixeltest failure: font metrics for Ahem(?). // evanm sent a reduction of this problem to agl. LINUX : LayoutTests/fast/block/margin-collapse/055.html = FAIL diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 556c4f9..d9cee4d 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -559,7 +559,6 @@ E40064540EA90AA10055B38E /* Console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8E3D0D7F3C48001ECF42 /* Console.cpp */; }; E4006ABA0EC235870055B38E /* AXObjectCacheChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4006AB90EC235870055B38E /* AXObjectCacheChromium.cpp */; }; E40FB28F0EAFF0BC006F380A /* PlatformScreenMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E40FB28E0EAFF0BC006F380A /* PlatformScreenMac.mm */; }; - E43CE13C0E68621500D8C5B9 /* PausedTimeouts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E43CE13A0E68621500D8C5B9 /* PausedTimeouts.cpp */; }; E45062E10E40B5420025A81A /* SkiaUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45062DF0E40B5420025A81A /* SkiaUtils.cpp */; }; E45063BA0E4104700025A81A /* localized_strings.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8254051A0D92E3DA0006B936 /* localized_strings.cc */; }; E4506C0C0EF039DE003BE099 /* dom_serializer.cc in Sources */ = {isa = PBXBuildFile; fileRef = E4506C0A0EF039DE003BE099 /* dom_serializer.cc */; }; @@ -4217,8 +4216,6 @@ E40063760EA908220055B38E /* ScriptCallContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScriptCallContext.cpp; path = ../third_party/WebKit/WebCore/bindings/js/ScriptCallContext.cpp; sourceTree = SOURCE_ROOT; }; E4006AB90EC235870055B38E /* AXObjectCacheChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AXObjectCacheChromium.cpp; sourceTree = "<group>"; }; E40FB28E0EAFF0BC006F380A /* PlatformScreenMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PlatformScreenMac.mm; path = mac/PlatformScreenMac.mm; sourceTree = "<group>"; }; - E43CE1390E68621500D8C5B9 /* PausedTimeouts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PausedTimeouts.h; path = WebCore/bindings/js/PausedTimeouts.h; sourceTree = "<group>"; }; - E43CE13A0E68621500D8C5B9 /* PausedTimeouts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PausedTimeouts.cpp; path = WebCore/bindings/js/PausedTimeouts.cpp; sourceTree = "<group>"; }; E45062DF0E40B5420025A81A /* SkiaUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkiaUtils.cpp; sourceTree = "<group>"; }; E45062E00E40B5420025A81A /* SkiaUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkiaUtils.h; sourceTree = "<group>"; }; E4506C0A0EF039DE003BE099 /* dom_serializer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dom_serializer.cc; sourceTree = "<group>"; }; @@ -4495,8 +4492,6 @@ 7B00912A0DAFEF2000F72082 /* bindings */ = { isa = PBXGroup; children = ( - E43CE13A0E68621500D8C5B9 /* PausedTimeouts.cpp */, - E43CE1390E68621500D8C5B9 /* PausedTimeouts.h */, E40063760EA908220055B38E /* ScriptCallContext.cpp */, ); name = bindings; @@ -8870,7 +8865,6 @@ E45624E50E268E87005E4685 /* PathTraversalState.cpp in Sources */, 4DB7F00B0E9BA3A100C66CE0 /* Pattern.cpp in Sources */, B5442A7B0E9BDCF30098766D /* PatternCG.cpp in Sources */, - E43CE13C0E68621500D8C5B9 /* PausedTimeouts.cpp in Sources */, E456268D0E268E87005E4685 /* PDFDocumentImage.cpp in Sources */, E45624E60E268E87005E4685 /* Pen.cpp in Sources */, 4DDC62B80EAD142D00FB5EBE /* Plugin.cpp in Sources */, diff --git a/webkit/webkit.xcodeproj/webcore_prebuild.sh b/webkit/webkit.xcodeproj/webcore_prebuild.sh index 339c4f3..0a58d07 100755 --- a/webkit/webkit.xcodeproj/webcore_prebuild.sh +++ b/webkit/webkit.xcodeproj/webcore_prebuild.sh @@ -27,18 +27,6 @@ fi rmdir "${GENERATED_DIR}/include/v8/new" -# WebCore/bindings/js/PausedTimeouts.cpp depends on PausedTimeouts.h, which -# depends on ScheduledAction.h, all in the same directory. PausedTimeouts is -# not JSC-specific and should be built here, but ScheduledAction.h is -# JSC-specific. Our own V8-compatible ScheduledAction.h is in webkit/port/dom -# and would normally not be the one chosen by the preprocessor, which finds -# the JSC one first instead. Copy PausedTimeouts.cpp out to another location -# so that the proper ScheduledAction.h can be included. -mkdir -p "${GENERATED_DIR}/bindings/v8/WebCore/bindings/js" -cp -p "../third_party/WebKit/WebCore/bindings/js/PausedTimeouts.cpp" \ - "../third_party/WebKit/WebCore/bindings/js/PausedTimeouts.h" \ - "${GENERATED_DIR}/bindings/v8/WebCore/bindings/js" - # TODO(mmentovai): If I'm still needed, can I move to jsbindings_prebuild.sh? cd "${GENERATED_DIR}/DerivedSources/v8" mkdir -p ForwardingHeaders/loader |
