diff options
| author | dglazkov <dglazkov@chromium.org> | 2015-05-15 10:50:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-15 17:52:08 +0000 |
| commit | 3c1f64f9c822002263d9f0aa4e5e02cebb26671f (patch) | |
| tree | 2381b376bf5b27ad24dfce55f9bf2670fb362508 | |
| parent | 2e90051793d0fcc871c5df1a3f9b455544c9727d (diff) | |
| download | chromium_src-3c1f64f9c822002263d9f0aa4e5e02cebb26671f.zip chromium_src-3c1f64f9c822002263d9f0aa4e5e02cebb26671f.tar.gz chromium_src-3c1f64f9c822002263d9f0aa4e5e02cebb26671f.tar.bz2 | |
Remove the usage of WebElement::innerText in Chromium.
This is part 2 of removing WebElement::innerText.
BUG=488088
R=jochen@chromium.org
Review URL: https://codereview.chromium.org/1131993009
Cr-Commit-Position: refs/heads/master@{#330127}
| -rw-r--r-- | content/renderer/context_menu_params_builder.cc | 2 | ||||
| -rw-r--r-- | content/renderer/dom_serializer_browsertest.cc | 3 | ||||
| -rw-r--r-- | content/shell/renderer/test_runner/web_test_proxy.cc | 7 |
3 files changed, 4 insertions, 8 deletions
diff --git a/content/renderer/context_menu_params_builder.cc b/content/renderer/context_menu_params_builder.cc index 63dcd4d..d81fa13 100644 --- a/content/renderer/context_menu_params_builder.cc +++ b/content/renderer/context_menu_params_builder.cc @@ -59,7 +59,7 @@ ContextMenuParams ContextMenuParamsBuilder::Build( blink::WebNode selectedNode = DomUtils::ExtractParentAnchorNode(data.node); blink::WebElement selectedElement = selectedNode.to<blink::WebElement>(); if (!selectedElement.isNull() && selectedNode.isLink()) { - params.link_text = selectedElement.innerText(); + params.link_text = selectedElement.textContent(); } else { LOG(ERROR) << "Creating a ContextMenuParams for a node that has a link" << "url but is not an ElementNode or does not have an" diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc index b175942..2cb395c 100644 --- a/content/renderer/dom_serializer_browsertest.cc +++ b/content/renderer/dom_serializer_browsertest.cc @@ -582,8 +582,9 @@ class DomSerializerTests : public ContentBrowserTest, '%', 0x2285, 0x00b9, '\'', 0 }; WebString value = body_element.getAttribute("title"); + WebString content = doc.contentAsTextForTesting(); ASSERT_TRUE(base::UTF16ToWide(value) == parsed_value); - ASSERT_TRUE(base::UTF16ToWide(body_element.innerText()) == parsed_value); + ASSERT_TRUE(base::UTF16ToWide(content) == parsed_value); // Do serialization. SerializeDomForURL(file_url, false); diff --git a/content/shell/renderer/test_runner/web_test_proxy.cc b/content/shell/renderer/test_runner/web_test_proxy.cc index 8b3cfde..6b97d39d 100644 --- a/content/shell/renderer/test_runner/web_test_proxy.cc +++ b/content/shell/renderer/test_runner/web_test_proxy.cc @@ -311,12 +311,7 @@ std::string DumpFramesAsMarkup(blink::WebFrame* frame, bool recursive) { } std::string DumpDocumentText(blink::WebFrame* frame) { - // We use the document element's text instead of the body text here because - // not all documents have a body, such as XML documents. - blink::WebElement document_element = frame->document().documentElement(); - if (document_element.isNull()) - return std::string(); - return document_element.innerText().utf8(); + return frame->document().contentAsTextForTesting().utf8(); } std::string DumpFramesAsText(blink::WebFrame* frame, bool recursive) { |