Skip to content

GitLab

T
tangled
Commit abb6ca6d authored by playmobil@google.com's avatar playmobil@google.com
Browse files
Options

Chrome side of WebKit Merge 42994:43059 

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14960 0039d316-1c4b-4281-b951-d872f2087c98
parent 4240438b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 681 additions and 20 deletions
DEPS
View file @ abb6ca6d
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
"webkit_revision": "42995",
"webkit_revision": "43059",
}
......@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@243",
"src/third_party/WebKit":
"/trunk/deps/third_party/WebKit@14860",
"/trunk/deps/third_party/WebKit@14959",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@13472",
......
WEBKIT_MERGE_REVISION
View file @ abb6ca6d
http://svn.webkit.org/repository/webkit/trunk@42995
\ No newline at end of file
http://svn.webkit.org/repository/webkit/trunk@43059
\ No newline at end of file
webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-at-start-or-end-expected.txt
View file @ abb6ca6d
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
layer at (0,0) size 800x600
......
webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/home-end-expected.txt 0 → 100644
View file @ abb6ca6d
Test 1, LTR:
Moving forward: "\nabc ABC xyz DEF def\n"[1, 20]
Moving backward: "\nabc ABC xyz DEF def\n"[20, 1]
Test 1, RTL:
Moving forward: "\nabc ABC xyz DEF def\n"[1, 20]
Moving backward: "\nabc ABC xyz DEF def\n"[20, 1]
Test 2, LTR:
Moving forward: "\nABC xyz DEF def GHI\n"[1, 20]
Moving backward: "\nABC xyz DEF def GHI\n"[20, 1]
Test 2, RTL:
Moving forward: "\nABC xyz DEF def GHI\n"[1, 20]
Moving backward: "\nABC xyz DEF def GHI\n"[20, 1]
Test 3, LTR:
Moving forward: "\nABC DEF ABC\n"[1, 12]
Moving backward: "\nABC DEF ABC\n"[12, 1]
Test 3, RTL:
Moving forward: "\nABC DEF ABC\n"[1, 12]
Moving backward: "\nABC DEF ABC\n"[12, 1]
Test 4, LTR:
Moving forward: "\nabc efd dabeb\n"[1, 14]
Moving backward: "\nabc efd dabeb\n"[14, 1]
Test 4, RTL:
Moving forward: "\nabc efd dabeb\n"[1, 14]
Moving backward: "\nabc efd dabeb\n"[14, 1]
Test 5, LTR:
Moving forward: "Lorem "[0], " amet"[5]
Moving backward: " amet"[5], "Lorem "[0]
Test 5, RTL:
Moving forward: "Lorem "[0], " amet"[5]
Moving backward: " amet"[5], "Lorem "[0]
Test 6, LTR:
Moving forward: "Lorem "[0], "ipsum dolor"[11]
Moving backward: "ipsum dolor"[11], "Lorem "[0]
Test 6, RTL:
Moving forward: "Lorem "[0], "ipsum dolor"[11]
Moving backward: "ipsum dolor"[11], "Lorem "[0]
Test 7, LTR:
Moving forward: "Lorem "[0], " amet"[5]
Moving backward: " amet"[5], "Lorem "[0]
Test 7, RTL:
Moving forward: "Lorem "[0], " amet"[5]
Moving backward: " amet"[5], "Lorem "[0]
Test 8, LTR:
Moving forward: "Lorem "[0, 5]
Moving backward: "Lorem "[5, 0]
Test 8, RTL:
Moving forward: "Lorem "[0, 5]
Moving backward: "Lorem "[5, 0]
Test 9, LTR:
Moving forward: "Lorem "[0], " amet"[5]
Moving backward: " amet"[5], "Lorem "[0]
Test 9, RTL:
Moving forward: "Lorem "[0], " amet"[5]
Moving backward: " amet"[5], "Lorem "[0]
Test 10, LTR:
Moving forward: "Lorem "[0], "ipsum dolor"[11]
Moving backward: "ipsum dolor"[11], "Lorem "[0]
Test 10, RTL:
Moving forward: "Lorem "[0], "ipsum dolor"[11]
Moving backward: "ipsum dolor"[11], "Lorem "[0]
Test 11, LTR:
Moving forward: "Lorem "[0], " amet"[5]
Moving backward: " amet"[5], "Lorem "[0]
Test 11, RTL:
Moving forward: "Lorem "[0], " amet"[5]
Moving backward: " amet"[5], "Lorem "[0]
Test 12, LTR:
Moving forward: "Lorem "[0, 5]
Moving backward: "Lorem "[5, 0]
Test 12, RTL:
Moving forward: "Lorem "[0, 5]
Moving backward: "Lorem "[5, 0]
Test 13, LTR:
Moving forward: "\n Just\n "[2], "\n BFDX\n"[6]
Moving backward: "\n BFDX\n"[6], "\n Just\n "[2]
Test 13, RTL:
Moving forward: "\n Just\n "[2], "\n BFDX\n"[6]
Moving backward: "\n BFDX\n"[6], "\n Just\n "[2]
Test 14, LTR:
Moving forward: "\n Just\n "[2], "\n ever\n"[6]
Moving backward: "\n ever\n"[6], "\n Just\n "[2]
Test 14, RTL:
Moving forward: "\n Just\n "[2], "\n ever\n"[6]
Moving backward: "\n ever\n"[6], "\n Just\n "[2]
Test 15, LTR:
Moving forward: "car means ABC."[0, 14]
Moving backward: "car means ABC."[14, 0]
Test 15, RTL:
Moving forward: "car means ABC."[0, 14]
Moving backward: "car means ABC."[14, 0]
Test 16, LTR:
Moving forward: "᪜car DEF ABC.᪝"[1, 13]
Moving backward: "᪜car DEF ABC.᪝"[13, 1]
Test 16, RTL:
Moving forward: "᪜car DEF ABC.᪝"[1, 13]
Moving backward: "᪜car DEF ABC.᪝"[13, 1]
Test 17, LTR:
Moving forward: "he said "᪜car DEF ABC᪝.""[0, 24]
Moving backward: "he said "᪜car DEF ABC᪝.""[24, 0]
Test 17, RTL:
Moving forward: "he said "᪜car DEF ABC᪝.""[0, 24]
Moving backward: "he said "᪜car DEF ABC᪝.""[24, 0]
Test 18, LTR:
Moving forward: "GHI JKL MNO '᪛he said "᪜car DEF ABC᪝"᪝'?"[0, 40]
Moving backward: "GHI JKL MNO '᪛he said "᪜car DEF ABC᪝"᪝'?"[40, 0]
Test 18, RTL:
Moving forward: "GHI JKL MNO '᪛he said "᪜car DEF ABC᪝"᪝'?"[0, 40]
Moving backward: "GHI JKL MNO '᪛he said "᪜car DEF ABC᪝"᪝'?"[40, 0]
Test 19, LTR:
Moving forward: "ABC abc DEF"[0, 11]
Moving backward: "ABC abc DEF"[11, 0]
Test 19, RTL:
Moving forward: "ABC abc DEF"[0, 11]
Moving backward: "ABC abc DEF"[11, 0]
Test 20, LTR:
Moving forward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[0, 16]
Moving backward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[16, 0]
Test 20, RTL:
Moving forward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[0, 15]
Moving backward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[15, 0]
Test 21, LTR:
Moving forward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[0, 16]
Moving backward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[16, 0]
Test 21, RTL:
Moving forward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[0, 15]
Moving backward: "abcdefg abcdefg abcdefg a abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg "[15, 0]
webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/drag-out-of-textarea-expected.txt
View file @ abb6ca6d
......@@ -8,4 +8,4 @@ And the following input should have text in it:
Test failed! Input value was and text area value was drag this text into the text field above.
Test succeeded!
webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/image-clipped-hit-expected.txt
View file @ abb6ca6d
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (90,115) size 334.35x259.90
RenderSVGContainer {g} at (141.51,125) size 282.85x249.90 [transform={m=((0.87,0.50)(-0.50,0.87)) t=(0.00,0.00)}]
RenderSVGViewportContainer {svg} at (141.51,125) size 282.85x249.90
RenderSVGImage {image} at (141.51,125) size 282.85x249.90
RenderSVGText {text} at (90,130) size 43x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-15) size 43x19
chunk 1 text run 1 at (90.00,130.00) startOffset 0 endOffset 6 width 43.00: "Passed"
Hit test @ 219, 196 SUCCESS, got true; Hit test @ 236, 300 SUCCESS, got false;
webkit/glue/webtextinput_impl.cc
View file @ abb6ca6d
......@@ -112,8 +112,8 @@ void WebTextInputImpl::MarkedRange(std::string* range_str) {
// Range::toString() returns a string different from what test expects.
// So we need to construct the string ourselves.
SStringPrintf(range_str, "%d,%d", range->startPosition().m_offset,
range->endPosition().m_offset);
SStringPrintf(range_str, "%d,%d", range->startPosition().deprecatedEditingOffset(),
range->endPosition().deprecatedEditingOffset());
}
void WebTextInputImpl::SelectedRange(std::string* range_str) {
......@@ -122,8 +122,8 @@ void WebTextInputImpl::SelectedRange(std::string* range_str) {
// Range::toString() returns a string different from what test expects.
// So we need to construct the string ourselves.
SStringPrintf(range_str, "%d,%d", range.get()->startPosition().m_offset,
range.get()->endPosition().m_offset);
SStringPrintf(range_str, "%d,%d", range.get()->startPosition().deprecatedEditingOffset(),
range.get()->endPosition().deprecatedEditingOffset());
}
void WebTextInputImpl::FirstRectForCharacterRange(int32_t location,
......
webkit/tools/layout_tests/test_expectations.txt
View file @ abb6ca6d
......@@ -2361,7 +2361,7 @@ BUG9798 WIN : LayoutTests/http/tests/misc/url-in-utf7.html = TIMEOUT PASS
BUG9798 WIN : LayoutTests/http/tests/misc/xhtml.php = TIMEOUT PASS
BUG9798 WIN : LayoutTests/http/tests/navigation/back-send-referrer.html = TIMEOUT PASS
BUG9798 WIN : LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe.html = TIMEOUT PASS
BUG9798 WIN : LayoutTests/http/tests/ssl/verify-ssl-enabled.php = TIMEOUT PASS
BUG9798 WIN : LayoutTests/http/tests/ssl/verify-ssl-enabled.php = TIMEOUT PASS FAIL
BUG9798 WIN : LayoutTests/http/tests/uri/css-href.php = TIMEOUT PASS
BUG9798 WIN : LayoutTests/http/tests/uri/escaped-entity.html = TIMEOUT PASS
BUG9798 WIN : LayoutTests/http/tests/uri/utf8-path.html = TIMEOUT PASS
......@@ -2601,4 +2601,17 @@ BUG11179 DEFER : LayoutTests/http/tests/xmlhttprequest/detaching-frame-2.html =
// although we might eventually want to on Mac.
WONTFIX SKIP : LayoutTests/webarchive/adopt-attribute-styled-body-webarchive.html = FAIL
WONTFIX SKIP : LayoutTests/webarchive/adopt-attribute-styled-node-webarchive.html = FAIL
WONTFIX SKIP : LayoutTests/webarchive/adopt-inline-styled-node-webarchive.html = FAIL
\ No newline at end of file
WONTFIX SKIP : LayoutTests/webarchive/adopt-inline-styled-node-webarchive.html = FAIL
// Regressions from WebKit Merge 42932:42994
BUG11239 : LayoutTests/fast/dom/Window/setTimeout-string-argument.html = FAIL
BUG11239 WIN : LayoutTests/fast/forms/textarea-width.html = FAIL
BUG11239 : LayoutTests/fast/forms/text-control-intrinsic-widths.html = FAIL
BUG11239 : LayoutTests/fast/forms/textarea-metrics.html = FAIL
BUG11239 WIN LINUX : LayoutTests/http/tests/security/cross-frame-access-protocol-explicit-domain.html = FAIL
BUG11239 WIN LINUX : LayoutTests/http/tests/security/cross-frame-access-protocol.html = FAIL
BUG11239 : LayoutTests/platform/win/accessibility/document-role.html = FAIL
BUG11239 : LayoutTests/svg/custom/svg-fonts-in-text-controls.html = FAIL
BUG11239 WIN LINUX : chrome/fast/forms/textarea-metrics.html = FAIL
BUG11239 WIN LINUX : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = TIMEOUT
\ No newline at end of file
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