Skip to content

GitLab

T
tangled
Commit 0a7652c6 authored by tony@chromium.org's avatar tony@chromium.org
Browse files
Options

Rebaseline LayoutTests/editing/execCommand/indent-paragraphs.html, which was 

added by the merge.  There's no pixel checked in upstream, but we match
except for not showing image placeholders.  The test has the following
images:

<img src="http://">

With GURL, the URL is rejected and it doesn't try to load the image.
In KURL, the URL is "valid", but it fails to load an image so the place
holder image is shown instead.  Since that's not what the test is trying
to test, just rebaseline.

Review URL: http://codereview.chromium.org/342006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30283 0039d316-1c4b-4281-b951-d872f2087c98
parent c10cf583
Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 4 deletions
webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/execCommand/indent-paragraphs-expected.checksum
View file @ 0a7652c6
0000000000000000000000000000000 b21d0796f994da25205ac68fc50abd0e
\ No newline at end of file \ No newline at end of file
webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/execCommand/indent-paragraphs-expected.txt 0 → 100644
View file @ 0a7652c6
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: shouldChangeSelectedDOMRange:range from 0 of DIV > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > SPAN > DIV > DIV > DIV > BODY > HTML > #document to 6 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > SPAN > DIV > DIV > BLOCKQUOTE > DIV > BODY > HTML > #document to 6 of #text > DIV > BLOCKQUOTE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
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 784x576
RenderBlock (anonymous) at (0,0) size 784x18
RenderText {#text} at (0,0) size 395x18
text run at (0,0) width 395: "This tests indenting three paragraphs with different hierarchies."
RenderBlock {DIV} at (0,18) size 784x54
RenderBlock {BLOCKQUOTE} at (40,0) size 744x54
RenderBlock {DIV} at (0,0) size 744x18
RenderBlock {DIV} at (0,0) size 744x18
RenderInline {SPAN} at (0,0) size 80x18 [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 39x18
text run at (0,0) width 39: "Hello "
RenderImage {IMG} at (39,14) size 0x0
RenderText {#text} at (39,0) size 41x18
text run at (39,0) width 41: " world"
RenderBlock {DIV} at (0,18) size 744x18
RenderBlock {DIV} at (0,0) size 744x18
RenderText {#text} at (0,0) size 39x18
text run at (0,0) width 39: "Hello "
RenderImage {IMG} at (39,14) size 0x0
RenderText {#text} at (39,0) size 41x18
text run at (39,0) width 41: " world"
RenderBlock {DIV} at (0,36) size 744x18
RenderText {#text} at (0,0) size 39x18
text run at (0,0) width 39: "Hello "
RenderImage {IMG} at (39,14) size 0x0
RenderText {#text} at (39,0) size 41x18
text run at (39,0) width 41: " world"
RenderBlock (anonymous) at (0,72) size 784x18
RenderBR {BR} at (0,0) size 0x18
RenderBlock {UL} at (0,106) size 784x126
RenderListItem {LI} at (40,0) size 744x54
RenderListMarker at (-17,0) size 7x18: bullet
RenderText {#text} at (0,0) size 90x18
text run at (0,0) width 90: "Before indent:"
RenderInline {SPAN} at (0,0) size 692x54
RenderText {#text} at (90,0) size 692x54
text run at (90,0) width 106: " <div id=\"test\"> "
text run at (196,0) width 479: "<div><span class=\"Apple-style-span\" style=\"background-color: rgb(255, 0,"
text run at (0,18) width 333: "0);\">Hello <img src=\"http://\"> world</span></div> "
text run at (333,18) width 287: "<div>Hello <img src=\"http://\"> world</div> "
text run at (620,18) width 72: "Hello <img"
text run at (0,36) width 173: "src=\"http://\"> world </div>"
RenderListItem {LI} at (40,54) size 744x72
RenderListMarker at (-17,0) size 7x18: bullet
RenderText {#text} at (0,0) size 80x18
text run at (0,0) width 80: "After indent:"
RenderInline {SPAN} at (0,0) size 730x72
RenderText {#text} at (80,0) size 730x72
text run at (80,0) width 622: " <blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding:"
text run at (0,18) width 730: "0px;\"><div id=\"test\"><div><span class=\"Apple-style-span\" style=\"background-color: rgb(255, 0, 0);\">Hello <img"
text run at (0,36) width 714: "src=\"http://\"> world</span></div></div><div id=\"test\"><div>Hello <img src=\"http://\"> world</div></div><div"
text run at (0,54) width 69: "id=\"test\"> "
text run at (69,54) width 341: "Hello <img src=\"http://\"> world </div></blockquote>"
selection start: position 0 of child 0 {#text} of child 0 {SPAN} of child 0 {DIV} of child 0 {DIV} of child 1 {BLOCKQUOTE} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
selection end: position 6 of child 2 {#text} of child 2 {DIV} of child 1 {BLOCKQUOTE} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-paragraphs-expected.checksum
View file @ 0a7652c6
0000000000000000000000000000000 2815cfebf0f24c5b323c19a01416f0ff
\ No newline at end of file \ No newline at end of file
webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/indent-paragraphs-expected.txt 0 → 100644
View file @ 0a7652c6
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: shouldChangeSelectedDOMRange:range from 0 of DIV > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > SPAN > DIV > DIV > DIV > BODY > HTML > #document to 6 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > SPAN > DIV > DIV > BLOCKQUOTE > DIV > BODY > HTML > #document to 6 of #text > DIV > BLOCKQUOTE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
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 784x576
RenderBlock (anonymous) at (0,0) size 784x20
RenderText {#text} at (0,0) size 372x19
text run at (0,0) width 372: "This tests indenting three paragraphs with different hierarchies."
RenderBlock {DIV} at (0,20) size 784x60
RenderBlock {BLOCKQUOTE} at (40,0) size 744x60
RenderBlock {DIV} at (0,0) size 744x20
RenderBlock {DIV} at (0,0) size 744x20
RenderInline {SPAN} at (0,0) size 75x19 [bgcolor=#FF0000]
RenderText {#text} at (0,0) size 36x19
text run at (0,0) width 36: "Hello "
RenderImage {IMG} at (36,15) size 0x0
RenderText {#text} at (36,0) size 39x19
text run at (36,0) width 39: " world"
RenderBlock {DIV} at (0,20) size 744x20
RenderBlock {DIV} at (0,0) size 744x20
RenderText {#text} at (0,0) size 36x19
text run at (0,0) width 36: "Hello "
RenderImage {IMG} at (36,15) size 0x0
RenderText {#text} at (36,0) size 39x19
text run at (36,0) width 39: " world"
RenderBlock {DIV} at (0,40) size 744x20
RenderText {#text} at (0,0) size 36x19
text run at (0,0) width 36: "Hello "
RenderImage {IMG} at (36,15) size 0x0
RenderText {#text} at (36,0) size 39x19
text run at (36,0) width 39: " world"
RenderBlock (anonymous) at (0,80) size 784x20
RenderBR {BR} at (0,0) size 0x19
RenderBlock {UL} at (0,116) size 784x120
RenderListItem {LI} at (40,0) size 744x40
RenderListMarker at (-18,0) size 7x19: bullet
RenderText {#text} at (0,0) size 84x19
text run at (0,0) width 84: "Before indent:"
RenderInline {SPAN} at (0,0) size 743x39
RenderText {#text} at (84,0) size 743x39
text run at (84,0) width 99: " <div id=\"test\"> "
text run at (183,0) width 560: "<div><span class=\"Apple-style-span\" style=\"background-color: rgb(255, 0, 0);\">Hello <img"
text run at (0,20) width 213: "src=\"http://\"> world</span></div> "
text run at (213,20) width 269: "<div>Hello <img src=\"http://\"> world</div> "
text run at (482,20) width 233: "Hello <img src=\"http://\"> world </div>"
RenderListItem {LI} at (40,40) size 744x80
RenderListMarker at (-18,0) size 7x19: bullet
RenderText {#text} at (0,0) size 74x19
text run at (0,0) width 74: "After indent:"
RenderInline {SPAN} at (0,0) size 739x79
RenderText {#text} at (74,0) size 739x79
text run at (74,0) width 665: " <blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding: 0px;\"><div"
text run at (0,20) width 704: "id=\"test\"><div><span class=\"Apple-style-span\" style=\"background-color: rgb(255, 0, 0);\">Hello <img src=\"http://\">"
text run at (0,40) width 656: "world</span></div></div><div id=\"test\"><div>Hello <img src=\"http://\"> world</div></div><div id=\"test\"> "
text run at (656,40) width 66: "Hello <img"
text run at (0,60) width 253: "src=\"http://\"> world </div></blockquote>"
selection start: position 0 of child 0 {#text} of child 0 {SPAN} of child 0 {DIV} of child 0 {DIV} of child 1 {BLOCKQUOTE} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
selection end: position 6 of child 2 {#text} of child 2 {DIV} of child 1 {BLOCKQUOTE} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
webkit/tools/layout_tests/test_expectations.txt
View file @ 0a7652c6
...@@ -3202,8 +3202,6 @@ BUG_JOHNNYG LINUX DEBUG : LayoutTests/svg/custom/marker-overflow-clip.svg = PASS ...@@ -3202,8 +3202,6 @@ BUG_JOHNNYG LINUX DEBUG : LayoutTests/svg/custom/marker-overflow-clip.svg = PASS
// WebKit roll 49961:49992 // WebKit roll 49961:49992
// Added in http://trac.webkit.org/changeset/49990 // Added in http://trac.webkit.org/changeset/49990
BUG25884 WIN LINUX : LayoutTests/fast/dom/Document/CaretRangeFromPoint/caretRangeFromPoint-in-zoom-and-scroll.html = FAIL BUG25884 WIN LINUX : LayoutTests/fast/dom/Document/CaretRangeFromPoint/caretRangeFromPoint-in-zoom-and-scroll.html = FAIL
// Needs to show image placeholder for http://
BUG_TONY : LayoutTests/editing/execCommand/indent-paragraphs.html = FAIL
// Missing results. // Missing results.
BUG_TONY WIN LINUX SKIP : LayoutTests/fast/dom/defaultView.html = FAIL BUG_TONY WIN LINUX SKIP : LayoutTests/fast/dom/defaultView.html = FAIL
// Unknown // Unknown
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment