Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(603)

Unified Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 1650303002: Move DOM-inspecting language detection logic to Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/web/WebDocument.cpp ('k') | third_party/WebKit/public/blink_headers.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
index 761030a44632019f341991fa3a1bbe0373d56a4e..790e76389330a0524c44673e015150cf33c1726f 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
@@ -97,6 +97,7 @@
#include "bindings/core/v8/V8PerIsolateData.h"
#include "core/HTMLNames.h"
#include "core/dom/Document.h"
+#include "core/dom/DocumentStatisticsCollector.h"
#include "core/dom/IconURL.h"
#include "core/dom/MessagePort.h"
#include "core/dom/Node.h"
@@ -246,64 +247,6 @@ namespace blink {
static int frameCount = 0;
-static void frameContentAsPlainText(size_t maxChars, LocalFrame* frame, StringBuilder& output)
-{
- Document* document = frame->document();
- if (!document)
- return;
-
- if (!frame->view())
- return;
-
- // Select the document body.
- if (document->body()) {
- const EphemeralRange range = EphemeralRange::rangeOfContents(*document->body());
-
- // The text iterator will walk nodes giving us text. This is similar to
- // the plainText() function in core/editing/TextIterator.h, but we implement the maximum
- // size and also copy the results directly into a wstring, avoiding the
- // string conversion.
- for (TextIterator it(range.startPosition(), range.endPosition()); !it.atEnd(); it.advance()) {
- it.text().appendTextToStringBuilder(output, 0, maxChars - output.length());
- if (output.length() >= maxChars)
- return; // Filled up the buffer.
- }
- }
-
- // The separator between frames when the frames are converted to plain text.
- const LChar frameSeparator[] = { '\n', '\n' };
- const size_t frameSeparatorLength = WTF_ARRAY_LENGTH(frameSeparator);
-
- // Recursively walk the children.
- const FrameTree& frameTree = frame->tree();
- for (Frame* curChild = frameTree.firstChild(); curChild; curChild = curChild->tree().nextSibling()) {
- if (!curChild->isLocalFrame())
- continue;
- LocalFrame* curLocalChild = toLocalFrame(curChild);
- // Ignore the text of non-visible frames.
- LayoutView* contentLayoutObject = curLocalChild->contentLayoutObject();
- LayoutPart* ownerLayoutObject = curLocalChild->ownerLayoutObject();
- if (!contentLayoutObject || !contentLayoutObject->size().width() || !contentLayoutObject->size().height()
- || (contentLayoutObject->location().x() + contentLayoutObject->size().width() <= 0) || (contentLayoutObject->location().y() + contentLayoutObject->size().height() <= 0)
- || (ownerLayoutObject && ownerLayoutObject->style() && ownerLayoutObject->style()->visibility() != VISIBLE)) {
- continue;
- }
-
- // Make sure the frame separator won't fill up the buffer, and give up if
- // it will. The danger is if the separator will make the buffer longer than
- // maxChars. This will cause the computation above:
- // maxChars - output->size()
- // to be a negative number which will crash when the subframe is added.
- if (output.length() >= maxChars - frameSeparatorLength)
- return;
-
- output.append(frameSeparator, frameSeparatorLength);
- frameContentAsPlainText(maxChars, curLocalChild, output);
- if (output.length() >= maxChars)
- return; // Filled up the buffer.
- }
-}
-
static WillBeHeapVector<ScriptSourceCode> createSourcesVector(const WebScriptSource* sourcesIn, unsigned numSources)
{
WillBeHeapVector<ScriptSourceCode> sources;
@@ -1459,7 +1402,7 @@ WebString WebLocalFrameImpl::contentAsText(size_t maxChars) const
if (!frame())
return WebString();
StringBuilder text;
- frameContentAsPlainText(maxChars, frame(), text);
+ DocumentStatisticsCollector::frameTreeContentAsPlainText(maxChars, frame(), text);
return text.toString();
}
« no previous file with comments | « third_party/WebKit/Source/web/WebDocument.cpp ('k') | third_party/WebKit/public/blink_headers.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698