Changeset 65860 in webkit

Timestamp:

Aug 23, 2010 8:43:08 PM (14 years ago)

Author:

jcivelli@chromium.org

Message:

2010-08-23 Jay Civelli <​jcivelli@chromium.org>

Reviewed by Darin Fisher.

Made WebFrame not report the text from hidden frames.
(some pages contain hidden frames with garbage text that
should not be indexed or used to detect the page's language).
​https://bugs.webkit.org/show_bug.cgi?id=39456

• WebKit.gyp:
• public/WebCString.h: (WebKit::operator<):
• public/WebURL.h: (WebKit::operator<):
• src/WebCString.cpp: (WebKit::WebCString::compare):
• src/WebFrameImpl.cpp: (WebKit::frameContentAsPlainText):
• tests/RunAllTests.cpp: (main):
• tests/WebFrameTest.cpp: Added.

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (2 diffs)
• src/WebFrameImpl.cpp (modified) (1 diff)
• tests/RunAllTests.cpp (modified) (1 diff)
• tests/WebFrameTest.cpp (added)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-08-23  Jay Civelli  <jcivelli@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Made WebFrame not report the text from hidden frames.
+        (some pages contain hidden frames with garbage text that
+        should not be indexed or used to detect the page's language).
+        https://bugs.webkit.org/show_bug.cgi?id=39456
+
+        * WebKit.gyp:
+        * public/WebCString.h:
+        (WebKit::operator<):
+        * public/WebURL.h:
+        (WebKit::operator<):
+        * src/WebCString.cpp:
+        (WebKit::WebCString::compare):
+        * src/WebFrameImpl.cpp:
+        (WebKit::frameContentAsPlainText):
+        * tests/RunAllTests.cpp:
+        (main):
+        * tests/WebFrameTest.cpp: Added.
+
 2010-08-23  Kent Tamura  <tkent@chromium.org>
 

trunk/WebKit/chromium/WebKit.gyp

@@ -735 +735 @@
                         '<(chromium_src_dir)/base/base.gyp:test_support_base',
                         '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
+                        '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
                     ],
                     'include_dirs': [
@@ -752 +753 @@
                         ['OS=="win"', {
                             'sources': [
-                                # FIXME: Port PopupMenuTest to Linux and Mac.
+                                # FIXME: Port PopupMenuTest and WebFrameTest to Linux and Mac.
                                 'tests/PopupMenuTest.cpp',
                                 'tests/TransparencyWinTest.cpp',
                                 'tests/UniscribeHelperTest.cpp',
+                                'tests/WebFrameTest.cpp',
                             ],
                         }],

trunk/WebKit/chromium/src/WebFrameImpl.cpp

@@ -235 +235 @@
     FrameTree* frameTree = frame->tree();
     for (Frame* curChild = frameTree->firstChild(); curChild; curChild = curChild->tree()->nextSibling()) {
+        // Ignore the text of non-visible frames.
+        RenderView* contentRenderer = curChild->contentRenderer();
+        RenderPart* ownerRenderer = curChild->ownerRenderer();        
+        if (!contentRenderer || !contentRenderer->width() || !contentRenderer->height()
+            || (contentRenderer->x() + contentRenderer->width() <= 0) || (contentRenderer->y() + contentRenderer->height() <= 0)
+            || (ownerRenderer && ownerRenderer->style() && ownerRenderer->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

trunk/WebKit/chromium/tests/RunAllTests.cpp

@@ -34 +34 @@
 #include "WebKit.h"
 #include "WebKitClient.h"
-
-// WebKitClient has a protected destructor, so we need to subclass.
-class DummyWebKitClient : public WebKit::WebKitClient {
-};
+#include <webkit/support/webkit_support.h>
 
 int main(int argc, char** argv)
 {
-    DummyWebKitClient dummyClient;
-    WebKit::initialize(&dummyClient);
-
-    int result = TestSuite(argc, argv).Run();
-
-    WebKit::shutdown();
+    TestSuite testSuite(argc, argv);
+    // TestSuite must be created before SetUpTestEnvironment so it performs
+    // initializations needed by WebKit support.
+    webkit_support::SetUpTestEnvironmentForUnitTests();
+    int result = testSuite.Run();
+    webkit_support::TearDownTestEnvironment();
     return result;
 }