diff options
16 files changed, 111 insertions, 85 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "42671", + "webkit_revision": "42725", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@214", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@14193", + "/trunk/deps/third_party/WebKit@14289", "src/third_party/icu38": "/trunk/deps/third_party/icu38@13472", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index c2fb537..b53f7f9 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@42671
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@42725
\ No newline at end of file diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc index fe394c4..b991ebe 100644 --- a/chrome/browser/unload_uitest.cc +++ b/chrome/browser/unload_uitest.cc @@ -216,7 +216,7 @@ TEST_F(UnloadTest, BrowserCloseUnload) { // Tests closing the browser with a beforeunload handler and clicking // OK in the beforeunload confirm dialog. -TEST_F(UnloadTest, BrowserCloseBeforeUnloadOK) { +TEST_F(UnloadTest, DISABLED_BrowserCloseBeforeUnloadOK) { scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload"); @@ -228,7 +228,7 @@ TEST_F(UnloadTest, BrowserCloseBeforeUnloadOK) { // Tests closing the browser with a beforeunload handler and clicking // CANCEL in the beforeunload confirm dialog. -TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) { +TEST_F(UnloadTest, DISABLED_BrowserCloseBeforeUnloadCancel) { scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload"); diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-3907422-fix-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-3907422-fix-expected.txt index 45b373c..bdb6782 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-3907422-fix-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-3907422-fix-expected.txt @@ -10,11 +10,11 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > DIV > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > DIV > BODY > HTML > #document to 3 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 3 of #text > DIV > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 3 of #text > DIV > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > DIV > DIV > BODY > HTML > #document toDOMRange:range from 3 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 3 of #text > DIV > BODY > HTML > #document to 3 of #text > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 3 of #text > DIV > BODY > HTML > #document to 3 of #text > DIV > BODY > HTML > #document toDOMRange:range from 3 of #text > BODY > HTML > #document to 3 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 @@ -22,28 +22,28 @@ layer 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 {DIV} at (0,0) size 784x164 - RenderBlock {DIV} at (0,0) size 784x164 - RenderBlock {DIV} at (0,0) size 784x92 - RenderBlock (anonymous) at (0,0) size 784x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" - RenderBlock {BLOCKQUOTE} at (40,36) size 704x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "bar" - RenderBlock (anonymous) at (0,72) size 784x20 - RenderText {#text} at (0,0) size 21x19 - text run at (0,0) width 21: "baz" - RenderText {#text} at (21,0) size 20x19 - text run at (21,0) width 20: "foo" - RenderBlock {DIV} at (0,108) size 784x56 - RenderBlock {DIV} at (0,0) size 784x56 - RenderBlock (anonymous) at (0,0) size 784x0 - RenderBlock {BLOCKQUOTE} at (40,0) size 704x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "bar" - RenderBlock (anonymous) at (0,36) size 784x20 - RenderText {#text} at (0,0) size 21x19 - text run at (0,0) width 21: "baz" - RenderBlock (anonymous) at (0,164) size 784x0 -caret: position 3 of child 1 {#text} of child 0 {DIV} of child 1 {DIV} of child 0 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document + RenderBlock {DIV} at (0,0) size 784x92 + RenderBlock (anonymous) at (0,0) size 784x20 + RenderText {#text} at (0,0) size 20x19 + text run at (0,0) width 20: "foo" + RenderBlock {BLOCKQUOTE} at (40,36) size 704x20 + RenderText {#text} at (0,0) size 20x19 + text run at (0,0) width 20: "bar" + RenderBlock (anonymous) at (0,72) size 784x20 + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "baz" + RenderText {#text} at (21,0) size 20x19 + text run at (21,0) width 20: "foo" + RenderBlock (anonymous) at (0,92) size 784x0 + RenderBlock {BLOCKQUOTE} at (40,108) size 704x20 + RenderText {#text} at (0,0) size 20x19 + text run at (0,0) width 20: "bar" + RenderBlock (anonymous) at (0,144) size 784x20 + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "baz" + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 +caret: position 3 of child 3 {#text} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.checksum index 91488c4..9f14f60 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.checksum @@ -1 +1 @@ -3292545ab77b2a9860f1f56983be7faa
\ No newline at end of file +4b287270b8c0324bbedd80d998345a38
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.png Binary files differindex 6641aea..e4a3108 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.txt index c90e24a..f0d371d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-015-expected.txt @@ -16,15 +16,15 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of P > DIV > DIV > BODY > HTML > #document to 0 of P > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document to 3 of #text > P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > P > P > DIV > DIV > BODY > HTML > #document to 3 of #text > P > P > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 3 of #text > P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document to 3 of #text > P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document to 0 of P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 3 of #text > P > P > DIV > DIV > BODY > HTML > #document to 3 of #text > P > P > DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of P > P > DIV > DIV > BODY > HTML > #document to 0 of P > P > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document to 0 of P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted +EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of P > P > DIV > DIV > BODY > HTML > #document to 0 of P > P > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > P > DIV > DIV > SPAN > P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document to 3 of #text > P > DIV > DIV > SPAN > P > DIV > DIV > SPAN > P > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > P > P > P > DIV > DIV > BODY > HTML > #document to 3 of #text > P > P > P > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 @@ -32,34 +32,22 @@ layer 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 {DIV} at (0,0) size 784x196 - RenderBlock {DIV} at (0,0) size 784x196 [border: (2px solid #FF0000)] - RenderBlock {P} at (14,14) size 756x168 - RenderBlock (anonymous) at (0,0) size 756x0 - RenderInline {SPAN} at (0,0) size 0x0 - RenderBlock (anonymous) at (0,0) size 756x168 - RenderBlock {DIV} at (0,0) size 756x168 - RenderBlock {DIV} at (0,0) size 756x168 [border: (2px solid #FF0000)] - RenderBlock {P} at (14,14) size 728x28 - RenderText {#text} at (0,0) size 32x27 - text run at (0,0) width 32: "foo" - RenderBlock {P} at (14,42) size 728x28 - RenderText {#text} at (0,0) size 31x27 - text run at (0,0) width 31: "bar" - RenderBlock {P} at (14,70) size 728x84 - RenderBlock (anonymous) at (0,0) size 728x0 - RenderInline {SPAN} at (0,0) size 0x0 - RenderBlock (anonymous) at (0,0) size 728x84 - RenderBlock {DIV} at (0,0) size 728x84 - RenderBlock {DIV} at (0,0) size 728x84 [border: (2px solid #FF0000)] - RenderBlock {P} at (14,14) size 700x28 - RenderText {#text} at (0,0) size 32x27 - text run at (0,0) width 32: "foo" - RenderBlock {P} at (14,42) size 700x28 - RenderText {#text} at (0,0) size 31x27 - text run at (0,0) width 31: "bar" - RenderBlock (anonymous) at (0,84) size 728x0 - RenderInline {SPAN} at (0,0) size 0x0 - RenderBlock (anonymous) at (0,168) size 756x0 - RenderInline {SPAN} at (0,0) size 0x0 -caret: position 3 of child 0 {#text} of child 1 {P} of child 0 {DIV} of child 0 {DIV} of child 0 {SPAN} of child 2 {P} of child 0 {DIV} of child 0 {DIV} of child 0 {SPAN} of child 0 {P} of child 1 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document + RenderBlock {DIV} at (0,0) size 784x140 + RenderBlock {DIV} at (0,0) size 784x140 [border: (2px solid #FF0000)] + RenderBlock {P} at (14,14) size 756x112 + RenderBlock {P} at (0,0) size 756x28 + RenderText {#text} at (0,0) size 32x27 + text run at (0,0) width 32: "foo" + RenderBlock {P} at (0,28) size 756x28 + RenderText {#text} at (0,0) size 31x27 + text run at (0,0) width 31: "bar" + RenderBlock (anonymous) at (0,56) size 756x0 + RenderBlock {P} at (0,56) size 756x56 + RenderBlock {P} at (0,0) size 756x28 + RenderText {#text} at (0,0) size 32x27 + text run at (0,0) width 32: "foo" + RenderBlock {P} at (0,28) size 756x28 + RenderText {#text} at (0,0) size 31x27 + text run at (0,0) width 31: "bar" + RenderBlock (anonymous) at (0,56) size 756x0 +caret: position 3 of child 0 {#text} of child 1 {P} of child 2 {P} of child 0 {P} of child 1 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-all-iframe-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-all-iframe-expected.txt index 5ed2713..bb3723e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-all-iframe-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-all-iframe-expected.txt @@ -1,9 +1,9 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 4 of BODY > HTML > #document EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 11 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 11 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/font-family-with-space-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/font-family-with-space-expected.txt index 91e5ddb..57d9a2a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/font-family-with-space-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/font-family-with-space-expected.txt @@ -3,13 +3,13 @@ layer 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 - RenderInline {SPAN} at (0,0) size 234x15 + RenderInline {SPAN} at (0,0) size 468x15 RenderText {#text} at (0,0) size 234x15 text run at (0,0) width 234: "This text should be Times New Roman bold." - RenderInline {SPAN} at (0,0) size 234x15 RenderInline {SPAN} at (0,0) size 234x15 - RenderText {#text} at (234,0) size 234x15 - text run at (234,0) width 234: "This text should be Times New Roman bold." + RenderInline {SPAN} at (0,0) size 234x15 + RenderText {#text} at (234,0) size 234x15 + text run at (234,0) width 234: "This text should be Times New Roman bold." RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -caret: position 41 of child 0 {#text} of child 1 {SPAN} of child 0 {SPAN} of child 0 {BODY} of child 0 {HTML} of document +caret: position 41 of child 0 {#text} of child 0 {SPAN} of child 1 {SPAN} of child 0 {SPAN} of child 0 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/cell-coalescing-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/cell-coalescing-expected.checksum new file mode 100755 index 0000000..839c7c6 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/cell-coalescing-expected.checksum @@ -0,0 +1 @@ +ae2652b45f673ff0d994efdbdb1247ed
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/cell-coalescing-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/cell-coalescing-expected.png Binary files differnew file mode 100755 index 0000000..91d3599 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/cell-coalescing-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/cell-coalescing-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/cell-coalescing-expected.txt new file mode 100755 index 0000000..a87936e --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/table/cell-coalescing-expected.txt @@ -0,0 +1,15 @@ +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 {DIV} at (0,0) size 784x0
+ RenderTable at (0,0) size 54x20
+ RenderTableSection (anonymous) at (0,0) size 54x20
+ RenderTableRow (anonymous) at (0,0) size 54x20
+ RenderTableCell {DIV} at (0,0) size 26x20 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (0,0) size 26x19
+ text run at (0,0) width 26: "One"
+ RenderTableCell {DIV} at (26,0) size 28x20 [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (0,0) size 28x19
+ text run at (0,0) width 28: "Two"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/pointer-events-path-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/pointer-events-path-expected.txt index ccc2c77..01654705 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/pointer-events-path-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/pointer-events-path-expected.txt @@ -615,4 +615,3 @@ layer at (0,0) size 800x600 RenderSVGText {text} at (504,583) size 26x19 contains 1 chunk(s) RenderSVGInlineText {#text} at (0,-15) size 26x19 chunk 1 text run 1 at (504.00,583.00) startOffset 0 endOffset 4 width 26.00: "miss" -caret: position 0 of child 0 {#text} of child 9 {text} of child 0 {svg} of document diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 3a90612..6c55b48 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -1933,7 +1933,7 @@ void WebFrameImpl::EndPrint() { } int WebFrameImpl::PendingFrameUnloadEventCount() const { - return frame()->eventHandler()->pendingFrameUnloadEventCount(); + return frame()->domWindow()->pendingUnloadEventListeners(); } void WebFrameImpl::RegisterPasswordListener( diff --git a/webkit/port/bindings/v8/v8_custom.cpp b/webkit/port/bindings/v8/v8_custom.cpp index e887cb8..1faf33d 100644 --- a/webkit/port/bindings/v8/v8_custom.cpp +++ b/webkit/port/bindings/v8/v8_custom.cpp @@ -1072,7 +1072,7 @@ ACCESSOR_SETTER(DOMWindowEventHandler) { if (value->IsNull()) { // Clear the event listener - imp->clearInlineEventListener(event_type); + imp->clearAttributeEventListener(event_type); } else { V8Proxy* proxy = V8Proxy::retrieve(imp->frame()); if (!proxy) @@ -1081,7 +1081,7 @@ ACCESSOR_SETTER(DOMWindowEventHandler) { RefPtr<EventListener> listener = proxy->FindOrCreateV8EventListener(value, true); if (listener) { - imp->setInlineEventListener(event_type, listener); + imp->setAttributeEventListener(event_type, listener); } } } @@ -1105,7 +1105,7 @@ ACCESSOR_GETTER(DOMWindowEventHandler) { String key = ToWebCoreString(name); String event_type = EventNameFromAttributeName(key); - EventListener* listener = imp->getInlineEventListener(event_type); + EventListener* listener = imp->getAttributeEventListener(event_type); return V8Proxy::EventListenerToV8Object(listener); } @@ -1132,10 +1132,10 @@ ACCESSOR_SETTER(ElementEventHandler) { RefPtr<EventListener> listener = proxy->FindOrCreateV8EventListener(value, true); if (listener) { - node->setInlineEventListener(event_type, listener); + node->setAttributeEventListener(event_type, listener); } } else { - node->clearInlineEventListener(event_type); + node->clearAttributeEventListener(event_type); } } @@ -1148,7 +1148,7 @@ ACCESSOR_GETTER(ElementEventHandler) { ASSERT(key.startsWith("on")); String event_type = key.substring(2); - EventListener* listener = node->getInlineEventListener(event_type); + EventListener* listener = node->getAttributeEventListener(event_type); return V8Proxy::EventListenerToV8Object(listener); } diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 271e0d2..66b9db1 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2511,4 +2511,27 @@ BUG10760 LINUX : LayoutTests/svg/custom/focus-ring.svg = FAIL BUG10760 MAC LINUX : LayoutTests/svg/custom/marker-child-changes.svg = PASS FAIL BUG10760 MAC LINUX : LayoutTests/svg/custom/marker-viewBox-changes.svg = PASS FAIL BUG10760 MAC : LayoutTests/svg/custom/marker-changes.svg = PASS FAIL -BUG10760 MAC : LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f.svg = PASS FAIL
\ No newline at end of file +BUG10760 MAC : LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f.svg = PASS FAIL + +// Need rebaselining for Mac and Linux, from WebKit Merge 42671:42725 +BUG10859 LINUX MAC : LayoutTests/editing/inserting/insert-3907422-fix.html = FAIL +BUG10859 LINUX MAC : LayoutTests/editing/pasteboard/paste-text-015.html = FAIL +BUG10859 LINUX MAC : LayoutTests/editing/style/font-family-with-space.html = FAIL +BUG10859 LINUX MAC : LayoutTests/editing/selection/select-all-iframe.html = FAIL +BUG10859 LINUX MAC : LayoutTests/svg/custom/pointer-events-path.svg = FAIL +BUG10859 LINUX MAC : LayoutTests/fast/dom/HTMLSelectElement/named-options.html = FAIL + +// New tests from WebKit Merge 42671:42725 +BUG1 WIN LINUX MAC : LayoutTests/fast/dom/xmlhttprequest-constructor-in-detached-document.html = CRASH + +// New failures from WebKit Merge 42671:42725 +// Several of these failures are due to the onload firing twice. +BUG10861 : LayoutTests/fast/events/onload-fires-twice.html = FAIL +BUG10861 : LayoutTests/fast/events/onclick-list-marker.html = FAIL +BUG10861 : LayoutTests/fast/js/bitwise-and-on-undefined.html = FAIL +BUG10861 : LayoutTests/fast/table/form-in-table-before-misnested-text-crash-css.html = FAIL +BUG10861 : LayoutTests/fast/table/form-in-tbody-before-misnested-text-crash-css.html = FAIL +BUG10861 WIN : LayoutTests/security/block-test.html = FAIL +BUG10861 : chrome/fast/forms/lazy-event-listener-scope-chain.html = FAIL +BUG10861 : LayoutTests/fast/events/no-blur-on-page-leave.html = TIMEOUT +BUG10861 WIN MAC : LayoutTests/http/tests/plugins/post-url-file.html = TIMEOUT |
