diff options
49 files changed, 536 insertions, 13 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "41447", + "webkit_revision": "41498", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@11154", + "/trunk/deps/third_party/WebKit@11209", "src/third_party/icu38": "/trunk/deps/third_party/icu38@10692", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 748e0c9..d6e046e 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@41447
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@41498
\ No newline at end of file diff --git a/chrome/renderer/webmediaplayer_delegate_impl.cc b/chrome/renderer/webmediaplayer_delegate_impl.cc index 81d0abc..cb054e5 100644 --- a/chrome/renderer/webmediaplayer_delegate_impl.cc +++ b/chrome/renderer/webmediaplayer_delegate_impl.cc @@ -255,11 +255,12 @@ int64 WebMediaPlayerDelegateImpl::GetTotalBytes() const { return pipeline_.GetTotalBytes(); } -void WebMediaPlayerDelegateImpl::SetRect(const gfx::Rect& rect) { +void WebMediaPlayerDelegateImpl::SetSize(const gfx::Size& size) { DCHECK(main_loop_ && MessageLoop::current() == main_loop_); if (video_renderer_) { - video_renderer_->SetRect(rect); + // TODO(scherkus): Change API to use SetSize(). + video_renderer_->SetRect(gfx::Rect(0, 0, size.width(), size.height())); } } diff --git a/chrome/renderer/webmediaplayer_delegate_impl.h b/chrome/renderer/webmediaplayer_delegate_impl.h index 95423c7..3a75b2f 100644 --- a/chrome/renderer/webmediaplayer_delegate_impl.h +++ b/chrome/renderer/webmediaplayer_delegate_impl.h @@ -84,7 +84,7 @@ class WebMediaPlayerDelegateImpl : public webkit_glue::WebMediaPlayerDelegate, virtual bool IsTotalBytesKnown(); // Methods for painting. - virtual void SetRect(const gfx::Rect& rect); + virtual void SetSize(const gfx::Size& size); virtual void Paint(skia::PlatformCanvas *canvas, const gfx::Rect& rect); diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.txt index fb7f551..770388d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.txt @@ -5,10 +5,13 @@ EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > DIV > BODY EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 35 of #text > DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-at-start-or-end-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-at-start-or-end-expected.txt index adc418f..11b52ef 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-at-start-or-end-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-at-start-or-end-expected.txt @@ -1,10 +1,6 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 layer at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-002-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-002-expected.txt index 0ee5411..0a8631a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-002-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-002-expected.txt @@ -24,6 +24,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 2 of SPAN > DIV > BODY > HTML > #document to 3 of SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-004-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-004-expected.txt index ab8902c..b6e5f51 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-004-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-004-expected.txt @@ -25,6 +25,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 3 of SPAN > DIV > BODY > HTML > #document to 4 of SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-005-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-005-expected.txt index 0f83152..53a6bf0 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-005-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-005-expected.txt @@ -25,8 +25,10 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 3 of SPAN > DIV > BODY > HTML > #document to 4 of SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 2 of SPAN > DIV > BODY > HTML > #document to 3 of SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-006-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-006-expected.txt index 30aba26..4a3b805 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-006-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-006-expected.txt @@ -25,8 +25,10 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 3 of SPAN > DIV > BODY > HTML > #document to 4 of SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 2 of SPAN > DIV > BODY > HTML > #document to 3 of SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 1 of SPAN > DIV > BODY > HTML > #document to 2 of SPAN > DIV > BODY > HTML > #document EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 23 of #text > SPAN > DIV > BODY > HTML > #document to 23 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 23 of #text > SPAN > DIV > BODY > HTML > #document to 23 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-009-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-009-expected.txt index 6d0cbe9..da87e39 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-009-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-009-expected.txt @@ -7,6 +7,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 2 of BODY > HTML > #document to 0 of DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-010-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-010-expected.txt index b89700b..ff267fe 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-010-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-010-expected.txt @@ -7,6 +7,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 2 of BODY > HTML > #document to 0 of DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 3 of #text > DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-hr-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-hr-expected.txt index c2f2608..06cab5e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-hr-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-hr-expected.txt @@ -8,6 +8,7 @@ EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > SPAN > DI EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 4 of DIV > BODY > HTML > #document to 0 of SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-tab-004-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-tab-004-expected.txt index 609d56f..b8f75c0 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-tab-004-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-tab-004-expected.txt @@ -1,6 +1,7 @@ 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: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > SPAN > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > SPAN > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/forward-delete-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/forward-delete-expected.txt index 5841c8e..48b97b6 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/forward-delete-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/forward-delete-expected.txt @@ -2,12 +2,16 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #do EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-into-empty-block-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-into-empty-block-1-expected.txt index 3a40d81..6217781 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-into-empty-block-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-into-empty-block-1-expected.txt @@ -2,6 +2,7 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of BLOCKQUOTE > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-into-empty-block-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-into-empty-block-2-expected.txt index 0008c82..58e7452 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-into-empty-block-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/merge-into-empty-block-2-expected.txt @@ -2,6 +2,7 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of LI > UL > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editing-empty-divs-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editing-empty-divs-expected.txt index 3952b79..cbe8b4d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editing-empty-divs-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/editing-empty-divs-expected.txt @@ -1,6 +1,7 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldEndEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-3800346-fix-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-3800346-fix-expected.txt index 460f98c..1f32720 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-3800346-fix-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-3800346-fix-expected.txt @@ -11,8 +11,11 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-004-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-004-expected.txt index d7f5441..8dff3b2 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-004-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-004-expected.txt @@ -7,6 +7,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 3 of #text > SPAN > DIV > BODY > HTML > #document to 3 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 2 of SPAN > DIV > BODY > HTML > #document to 2 of SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-005-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-005-expected.txt index c17cdb6..98baf1f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-005-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-005-expected.txt @@ -7,6 +7,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 3 of #text > SPAN > DIV > BODY > HTML > #document to 3 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 2 of SPAN > DIV > BODY > HTML > #document to 2 of SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of #text > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-006-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-006-expected.txt index d89dfd6..b558e0b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-006-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-006-expected.txt @@ -1,6 +1,7 @@ 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: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of SPAN > DIV > BODY > HTML > #document to 1 of SPAN > DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-008-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-008-expected.txt index e706c9f..56cbf61 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-008-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-br-008-expected.txt @@ -1,6 +1,7 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-006-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-006-expected.txt index b472423..edeeb5b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-006-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-006-expected.txt @@ -1,6 +1,7 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 4 of BODY > HTML > #document EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-008-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-008-expected.txt index 256a262..03804e3 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-008-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-008-expected.txt @@ -1,6 +1,7 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 4 of BODY > HTML > #document EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-010-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-010-expected.txt index ac226f8..30fe475 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-010-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-010-expected.txt @@ -6,6 +6,7 @@ EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-011-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-011-expected.txt index 5b56658..eea1a4a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-011-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-011-expected.txt @@ -1,6 +1,7 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 10 of BODY > HTML > #document EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-013-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-013-expected.txt index a36223f..95a584bd 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-013-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-013-expected.txt @@ -5,6 +5,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-015-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-015-expected.txt index 597dc28..ea7e576 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-015-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-015-expected.txt @@ -9,6 +9,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-019-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-019-expected.txt index db30b38..9dfbf56 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-019-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-019-expected.txt @@ -5,6 +5,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-021-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-021-expected.txt index 62a4bb3..25874bc 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-021-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-div-021-expected.txt @@ -12,6 +12,7 @@ EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 3 of #text > SPAN > BODY > HTML > #document to 3 of #text > SPAN > BODY > HTML > #document toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-paragraph-01-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-paragraph-01-expected.txt index f41ed9a..810a8e98 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-paragraph-01-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-paragraph-01-expected.txt @@ -1,6 +1,7 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-paragraph-03-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-paragraph-03-expected.txt index b59c3ed..fc8d1c4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-paragraph-03-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-paragraph-03-expected.txt @@ -3,6 +3,7 @@ EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-paragraph-05-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-paragraph-05-expected.txt index 0fc4697..8971b075 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-paragraph-05-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-paragraph-05-expected.txt @@ -1,6 +1,7 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-tab-004-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-tab-004-expected.txt index 3aab3d0..acba8f9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-tab-004-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-tab-004-expected.txt @@ -1,6 +1,7 @@ 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: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > SPAN > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > SPAN > SPAN > DIV > BODY > HTML > #document to 1 of #text > SPAN > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-text-with-newlines-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-text-with-newlines-expected.txt index 1a834f5..909e493 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-text-with-newlines-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/insert-text-with-newlines-expected.txt @@ -33,6 +33,7 @@ EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 3 of #text > SPAN > DIV > BODY > HTML > #document to 3 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 5 of SPAN > DIV > BODY > HTML > #document to 5 of SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/line-break-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/line-break-expected.txt index 08f65de..4190e90 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/line-break-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/line-break-expected.txt @@ -1,6 +1,7 @@ EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/3976872-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/3976872-expected.txt index 428562a..0327659 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/3976872-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/3976872-expected.txt @@ -7,6 +7,7 @@ EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldInsertText:this text should end up bold replacingDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-010-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-010-expected.txt index 5f563f6..ff2cedb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-010-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-010-expected.txt @@ -43,6 +43,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 38 of #text > DIV > BODY > HTML > #document to 38 of #text > DIV > BODY > HTML > #document toDOMRange:range from 2 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 3 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-006-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-006-expected.txt index 0cdfa97..6df058f1 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-006-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-style-006-expected.txt @@ -21,6 +21,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-combined-delete-boundary-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-combined-delete-boundary-expected.txt index 0bccdfc..527bffe 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-combined-delete-boundary-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-combined-delete-boundary-expected.txt @@ -14,8 +14,10 @@ EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > SPAN > DI EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > B > SPAN > DIV > BODY > HTML > #document to 1 of #text > B > SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > B > SPAN > DIV > BODY > HTML > #document to 1 of #text > B > SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 5 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 2 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-combined-delete-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-combined-delete-expected.txt index 3e9c7bd..bd65e2b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-combined-delete-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-combined-delete-expected.txt @@ -14,8 +14,10 @@ EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > SPAN > DI EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 6 of #text > SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 6 of #text > SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 5 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 9 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-forward-delete-boundary-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-forward-delete-boundary-expected.txt index 57339ff..039496d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-forward-delete-boundary-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-forward-delete-boundary-expected.txt @@ -4,12 +4,16 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 6 of #text > SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 6 of #text > SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > B > SPAN > DIV > BODY > HTML > #document to 1 of #text > B > SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > B > SPAN > DIV > BODY > HTML > #document to 1 of #text > B > SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 5 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 2 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-forward-delete-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-forward-delete-expected.txt index 1315ba5..223ec1f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-forward-delete-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/undo/undo-forward-delete-expected.txt @@ -4,12 +4,16 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 6 of #text > SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 6 of #text > SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 6 of #text > SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldDeleteDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 6 of #text > SPAN > DIV > BODY > HTML > #document +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 5 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 5 of #text > SPAN > DIV > BODY > HTML > #document to 9 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt new file mode 100644 index 0000000..10e06f1 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt @@ -0,0 +1,207 @@ +Attributes that are exposed in the CSS computed style object: + +background-attachment: scroll; +background-color: rgba(0, 0, 0, 0); +background-image: none; +background-position: 0% 0%; +background-repeat: repeat; +border-bottom-color: rgb(0, 0, 0); +border-bottom-style: none; +border-bottom-width: 0px; +border-collapse: separate; +border-left-color: rgb(0, 0, 0); +border-left-style: none; +border-left-width: 0px; +border-right-color: rgb(0, 0, 0); +border-right-style: none; +border-right-width: 0px; +border-top-color: rgb(0, 0, 0); +border-top-style: none; +border-top-width: 0px; +bottom: auto; +caption-side: top; +clear: none; +color: rgb(0, 0, 0); +cursor: auto; +direction: ltr; +display: block; +empty-cells: show; +float: none; +font-family: 'times new roman'; +font-size: 16px; +font-style: normal; +font-variant: normal; +font-weight: normal; +height: 576px; +left: auto; +letter-spacing: normal; +line-height: normal; +list-style-image: none; +list-style-position: outside; +list-style-type: disc; +margin-bottom: 8px; +margin-left: 8px; +margin-right: 8px; +margin-top: 8px; +max-height: none; +max-width: none; +min-height: 0px; +min-width: 0px; +opacity: 1; +orphans: 2; +outline-color: rgb(0, 0, 0); +outline-style: none; +outline-width: 0px; +overflow-x: visible; +overflow-y: visible; +padding-bottom: 0px; +padding-left: 0px; +padding-right: 0px; +padding-top: 0px; +page-break-after: auto; +page-break-before: auto; +page-break-inside: auto; +pointer-events: auto; +position: static; +resize: none; +right: auto; +table-layout: auto; +text-align: auto; +text-decoration: none; +text-indent: 0px; +text-shadow: none; +text-transform: none; +top: auto; +unicode-bidi: normal; +vertical-align: baseline; +visibility: visible; +white-space: normal; +widows: 2; +width: 784px; +word-spacing: 0px; +word-wrap: normal; +z-index: auto; +zoom: 1; +-webkit-animation-delay: 0s; +-webkit-animation-direction: normal; +-webkit-animation-duration: 0s; +-webkit-animation-iteration-count: 1; +-webkit-animation-name: none; +-webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1); +-webkit-appearance: none; +-webkit-backface-visibility: visible; +-webkit-background-clip: border; +-webkit-background-composite: source-over; +-webkit-background-origin: padding; +-webkit-background-size: auto auto; +-webkit-border-fit: border; +-webkit-border-image: none; +-webkit-border-horizontal-spacing: 0px; +-webkit-border-vertical-spacing: 0px; +-webkit-box-align: stretch; +-webkit-box-direction: normal; +-webkit-box-flex: 0; +-webkit-box-flex-group: 1; +-webkit-box-lines: single; +-webkit-box-ordinal-group: 1; +-webkit-box-orient: horizontal; +-webkit-box-pack: start; +-webkit-box-reflect: none; +-webkit-box-shadow: none; +-webkit-box-sizing: content-box; +-webkit-column-break-after: auto; +-webkit-column-break-before: auto; +-webkit-column-break-inside: auto; +-webkit-column-count: auto; +-webkit-column-gap: normal; +-webkit-column-rule-color: rgb(0, 0, 0); +-webkit-column-rule-style: none; +-webkit-column-rule-width: 0px; +-webkit-column-width: auto; +-webkit-highlight: none; +-webkit-line-break: normal; +-webkit-line-clamp: none; +-webkit-margin-bottom-collapse: collapse; +-webkit-margin-top-collapse: collapse; +-webkit-marquee-direction: auto; +-webkit-marquee-increment: 6px; +-webkit-marquee-repetition: infinite; +-webkit-marquee-style: scroll; +-webkit-mask-attachment: scroll; +-webkit-mask-box-image: none; +-webkit-mask-image: none; +-webkit-mask-position: 0% 0%; +-webkit-mask-repeat: repeat; +-webkit-mask-clip: border; +-webkit-mask-composite: source-over; +-webkit-mask-origin: border; +-webkit-mask-size: auto auto; +-webkit-nbsp-mode: normal; +-webkit-perspective: none; +-webkit-perspective-origin: 392px 288px; +-webkit-rtl-ordering: logical; +-webkit-text-decorations-in-effect: none; +-webkit-text-fill-color: rgb(0, 0, 0); +-webkit-text-security: none; +-webkit-text-stroke-color: rgb(0, 0, 0); +-webkit-text-stroke-width: 0px; +-webkit-transform: none; +-webkit-transform-origin: 392px 288px; +-webkit-transform-style: flat; +-webkit-transition-delay: 0s; +-webkit-transition-duration: 0s; +-webkit-transition-property: all; +-webkit-transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1); +-webkit-user-drag: auto; +-webkit-user-modify: read-only; +-webkit-user-select: text; +-webkit-border-bottom-left-radius: 0px; +-webkit-border-bottom-right-radius: 0px; +-webkit-border-top-left-radius: 0px; +-webkit-border-top-right-radius: 0px; +clip-path: none; +clip-rule: nonzero; +mask: none; +filter: none; +flood-color: rgb(0, 0, 0); +flood-opacity: 1; +lighting-color: rgb(255, 255, 255); +stop-color: rgb(0, 0, 0); +stop-opacity: 1; +color-interpolation: srgb; +color-interpolation-filters: linearrgb; +color-rendering: auto; +fill: #000000; +fill-opacity: 1; +fill-rule: nonzero; +image-rendering: auto; +marker-end: none; +marker-mid: none; +marker-start: none; +shape-rendering: auto; +stroke: none; +stroke-dasharray: ; +stroke-dashoffset: ; +stroke-linecap: butt; +stroke-linejoin: miter; +stroke-miterlimit: 4; +stroke-opacity: 1; +stroke-width: ; +text-rendering: auto; +alignment-baseline: auto; +baseline-shift: baseline; +dominant-baseline: auto; +kerning: ; +text-anchor: start; +writing-mode: lr-tb; +glyph-orientation-horizontal: 0deg; +glyph-orientation-vertical: auto; + +Other attributes that the computed style class supports: + +background-position: 0% 0%; +border-spacing: 0px 0px; +overflow: visible; +-webkit-match-nearest-mail-blockquote-color: normal; +-webkit-text-size-adjust: auto; + diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt new file mode 100644 index 0000000..72f5311 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt @@ -0,0 +1,218 @@ +Computed style of an element whose parent's 'display' value is 'none': + background-attachment: scroll + background-color: rgb(0, 128, 0) + background-image: none + background-position: 0% 0% + background-repeat: repeat + border-bottom-color: rgb(0, 0, 0) + border-bottom-style: none + border-bottom-width: 0px + border-collapse: separate + border-left-color: rgb(0, 0, 0) + border-left-style: none + border-left-width: 0px + border-right-color: rgb(0, 0, 0) + border-right-style: none + border-right-width: 0px + border-top-color: rgb(0, 0, 0) + border-top-style: solid + border-top-width: 16px + bottom: auto + caption-side: top + clear: none + color: rgb(0, 0, 0) + cursor: auto + direction: ltr + display: block + empty-cells: show + float: none + font-family: 'times new roman' + font-size: 16px + font-style: normal + font-variant: normal + font-weight: normal + height: 100px + left: auto + letter-spacing: normal + line-height: normal + list-style-image: none + list-style-position: outside + list-style-type: disc + margin-bottom: 0px + margin-left: auto + margin-right: 0px + margin-top: 0px + max-height: none + max-width: none + min-height: 0px + min-width: 0px + opacity: 1 + orphans: 2 + outline-color: rgb(0, 0, 0) + outline-style: none + outline-width: 0px + overflow-x: visible + overflow-y: visible + padding-bottom: 0px + padding-left: 0px + padding-right: 0px + padding-top: 0px + page-break-after: auto + page-break-before: auto + page-break-inside: auto + pointer-events: auto + position: static + resize: none + right: auto + table-layout: auto + text-align: auto + text-decoration: none + text-indent: 0px + text-shadow: none + text-transform: none + top: auto + unicode-bidi: normal + vertical-align: baseline + visibility: visible + white-space: normal + widows: 2 + width: 50% + word-spacing: 0px + word-wrap: normal + z-index: auto + zoom: 1 + -webkit-animation-delay: 0s + -webkit-animation-direction: normal + -webkit-animation-duration: 0s + -webkit-animation-iteration-count: 1 + -webkit-animation-name: none + -webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1) + -webkit-appearance: none + -webkit-backface-visibility: visible + -webkit-background-clip: border + -webkit-background-composite: source-over + -webkit-background-origin: padding + -webkit-background-size: auto auto + -webkit-border-fit: border + -webkit-border-image: none + -webkit-border-horizontal-spacing: 0px + -webkit-border-vertical-spacing: 0px + -webkit-box-align: stretch + -webkit-box-direction: normal + -webkit-box-flex: 0 + -webkit-box-flex-group: 1 + -webkit-box-lines: single + -webkit-box-ordinal-group: 1 + -webkit-box-orient: horizontal + -webkit-box-pack: start + -webkit-box-reflect: none + -webkit-box-shadow: none + -webkit-box-sizing: content-box + -webkit-column-break-after: auto + -webkit-column-break-before: auto + -webkit-column-break-inside: auto + -webkit-column-count: auto + -webkit-column-gap: normal + -webkit-column-rule-color: rgb(0, 0, 0) + -webkit-column-rule-style: none + -webkit-column-rule-width: 0px + -webkit-column-width: auto + -webkit-highlight: none + -webkit-line-break: normal + -webkit-line-clamp: none + -webkit-margin-bottom-collapse: collapse + -webkit-margin-top-collapse: collapse + -webkit-marquee-direction: auto + -webkit-marquee-increment: 6px + -webkit-marquee-repetition: infinite + -webkit-marquee-style: scroll + -webkit-mask-attachment: scroll + -webkit-mask-box-image: none + -webkit-mask-image: none + -webkit-mask-position: 0% 0% + -webkit-mask-repeat: repeat + -webkit-mask-clip: border + -webkit-mask-composite: source-over + -webkit-mask-origin: border + -webkit-mask-size: auto auto + -webkit-nbsp-mode: normal + -webkit-perspective: none + -webkit-perspective-origin: 50% 50% + -webkit-rtl-ordering: logical + -webkit-text-decorations-in-effect: none + -webkit-text-fill-color: rgb(0, 0, 0) + -webkit-text-security: none + -webkit-text-stroke-color: rgb(0, 0, 0) + -webkit-text-stroke-width: 0px + -webkit-transform: none + -webkit-transform-origin: 50% 50% + -webkit-transform-style: flat + -webkit-transition-delay: 0s + -webkit-transition-duration: 0s + -webkit-transition-property: all + -webkit-transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1) + -webkit-user-drag: auto + -webkit-user-modify: read-only + -webkit-user-select: text + -webkit-border-bottom-left-radius: 0px + -webkit-border-bottom-right-radius: 0px + -webkit-border-top-left-radius: 0px + -webkit-border-top-right-radius: 0px + clip-path: none + clip-rule: nonzero + mask: none + filter: none + flood-color: rgb(0, 0, 0) + flood-opacity: 1 + lighting-color: rgb(255, 255, 255) + stop-color: rgb(0, 0, 0) + stop-opacity: 1 + color-interpolation: srgb + color-interpolation-filters: linearrgb + color-rendering: auto + fill: #000000 + fill-opacity: 1 + fill-rule: nonzero + image-rendering: auto + marker-end: none + marker-mid: none + marker-start: none + shape-rendering: auto + stroke: none + stroke-dasharray: + stroke-dashoffset: + stroke-linecap: butt + stroke-linejoin: miter + stroke-miterlimit: 4 + stroke-opacity: 1 + stroke-width: + text-rendering: auto + alignment-baseline: auto + baseline-shift: baseline + dominant-baseline: auto + kerning: + text-anchor: start + writing-mode: lr-tb + glyph-orientation-horizontal: 0deg + glyph-orientation-vertical: auto + background-position: 0% 0% + border-spacing: 0px 0px + overflow: visible + -webkit-match-nearest-mail-blockquote-color: normal + -webkit-text-size-adjust: auto + +After changing grandparent's 'color' and the parent's 'font-size' inherited properties: + border-top-width: 18px + color: rgb(0, 0, 255) + +After changing the parent's 'display' property to 'block', so that the child gets a renderer: + height: 100px + margin-left: 385px + width: 384px + +After changing the parent's 'display' property back to 'none': + height: 100px + margin-left: auto + width: 50% + + diff --git a/webkit/glue/media_player_private_impl.cc b/webkit/glue/media_player_private_impl.cc index 19dc2da..78c723f 100644 --- a/webkit/glue/media_player_private_impl.cc +++ b/webkit/glue/media_player_private_impl.cc @@ -277,9 +277,9 @@ void MediaPlayerPrivate::setVisible(bool visible) { } } -void MediaPlayerPrivate::setRect(const IntRect& r) { +void MediaPlayerPrivate::setSize(const IntSize& size) { if (m_data) { - AsDelegate(m_data)->SetRect(gfx::Rect(r.x(), r.y(), r.width(), r.height())); + AsDelegate(m_data)->SetSize(gfx::Size(size.width(), size.height())); } } diff --git a/webkit/glue/webmediaplayer_delegate.h b/webkit/glue/webmediaplayer_delegate.h index 69df7e7..7f60851 100644 --- a/webkit/glue/webmediaplayer_delegate.h +++ b/webkit/glue/webmediaplayer_delegate.h @@ -43,7 +43,7 @@ class WebMediaPlayerDelegate { virtual float GetMaxTimeSeekable() const = 0; // Methods for painting. - virtual void SetRect(const gfx::Rect& rect) = 0; + virtual void SetSize(const gfx::Size& size) = 0; // TODO(hclam): Using paint at the moment, maybe we just need to return a // SkiaBitmap? diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index ef947c2..1b59db3 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1759,6 +1759,51 @@ SKIP : LayoutTests/transforms/3d/point-mapping/3d-point-mapping-2.html = FAIL DEFER : LayoutTests/fast/block/float/nested-clearance.html = FAIL DEFER : LayoutTests/fast/css-generated-content/hit-test-generated-content.html = FAIL +// These may need to be rebaselined on linux, due to merge 41447:41498 +// See: http://trac.webkit.org/changeset/41465 +// The difference from our existing baselines should be only in +// "EDITING DELEGATE:" lines. +LINUX : LayoutTests/editing/deleting/delete-4038408-fix.html = PASS FAIL +LINUX : LayoutTests/editing/deleting/delete-at-start-or-end.html = PASS FAIL +LINUX : LayoutTests/editing/deleting/delete-br-002.html = PASS FAIL +LINUX : LayoutTests/editing/deleting/delete-br-004.html = PASS FAIL +LINUX : LayoutTests/editing/deleting/delete-br-005.html = PASS FAIL +LINUX : LayoutTests/editing/deleting/delete-br-006.html = PASS FAIL +LINUX : LayoutTests/editing/deleting/delete-br-009.html = PASS FAIL +LINUX : LayoutTests/editing/deleting/delete-br-010.html = PASS FAIL +LINUX : LayoutTests/editing/deleting/delete-hr.html = PASS FAIL +LINUX : LayoutTests/editing/deleting/delete-tab-004.html = PASS FAIL +LINUX : LayoutTests/editing/deleting/forward-delete.html = PASS FAIL +LINUX : LayoutTests/editing/deleting/merge-into-empty-block-1.html = PASS FAIL +LINUX : LayoutTests/editing/deleting/merge-into-empty-block-2.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/editing-empty-divs.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-3800346-fix.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-br-004.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-br-005.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-br-006.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-br-008.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-div-006.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-div-008.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-div-010.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-div-011.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-div-013.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-div-015.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-div-019.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-div-021.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-paragraph-01.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-paragraph-03.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-paragraph-05.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-tab-004.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/insert-text-with-newlines.html = PASS FAIL +LINUX : LayoutTests/editing/inserting/line-break.html = PASS FAIL +LINUX : LayoutTests/editing/pasteboard/3976872.html = PASS FAIL +LINUX : LayoutTests/editing/pasteboard/paste-text-010.html = PASS FAIL +LINUX : LayoutTests/editing/style/block-style-006.html = PASS FAIL +LINUX : LayoutTests/editing/undo/undo-combined-delete-boundary.html = PASS FAIL +LINUX : LayoutTests/editing/undo/undo-combined-delete.html = PASS FAIL +LINUX : LayoutTests/editing/undo/undo-forward-delete-boundary.html = PASS FAIL +LINUX : LayoutTests/editing/undo/undo-forward-delete.html = PASS FAIL + // Crashes sometimes. Race? Memory corruption? // Might be related to https://bugs.webkit.org/show_bug.cgi?id=22834 LINUX : LayoutTests/fast/canvas/set-colors.html = PASS CRASH |