Changeset 61957 in webkit

Timestamp:

Jun 26, 2010 10:23:42 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-06-26 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r61943.
​http://trac.webkit.org/changeset/61943
​https://bugs.webkit.org/show_bug.cgi?id=41251

Totally breaks webkit_unit_tests on Chromium linux and mac
(Requested by mnaganov on #webkit).

• WebKit.gyp:
• src/WebFrameImpl.cpp: (WebKit::frameContentAsPlainText):
• tests/RunAllTests.cpp: (main):
• tests/WebFrameTest.cpp: Removed.
• tests/data/iframes_test.html: Removed.
• tests/data/invisible_iframe.html: Removed.
• tests/data/visible_iframe.html: Removed.
• tests/data/zero_sized_iframe.html: Removed.

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 (deleted)
• tests/data/iframes_test.html (deleted)
• tests/data/invisible_iframe.html (deleted)
• tests/data/visible_iframe.html (deleted)
• tests/data/zero_sized_iframe.html (deleted)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-06-26  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r61943.
+        http://trac.webkit.org/changeset/61943
+        https://bugs.webkit.org/show_bug.cgi?id=41251
+
+        Totally breaks webkit_unit_tests on Chromium linux and mac
+        (Requested by mnaganov on #webkit).
+
+        * WebKit.gyp:
+        * src/WebFrameImpl.cpp:
+        (WebKit::frameContentAsPlainText):
+        * tests/RunAllTests.cpp:
+        (main):
+        * tests/WebFrameTest.cpp: Removed.
+        * tests/data/iframes_test.html: Removed.
+        * tests/data/invisible_iframe.html: Removed.
+        * tests/data/visible_iframe.html: Removed.
+        * tests/data/zero_sized_iframe.html: Removed.
+
 2010-06-26  Tony Gentilcore  <tonyg@chromium.org>
 

trunk/WebKit/chromium/WebKit.gyp

@@ -560 +560 @@
                 '<(chromium_src_dir)/base/base.gyp:base',
                 '<(chromium_src_dir)/base/base.gyp:base_i18n',
-                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
                 '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
             ],
@@ -572 +571 @@
                 'tests/KURLTest.cpp',
                 'tests/RunAllTests.cpp',
-                'tests/WebFrameTest.cpp',
             ],
             'conditions': [

trunk/WebKit/chromium/src/WebFrameImpl.cpp

@@ -234 +234 @@
     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"
-#include <webkit/support/webkit_support.h>
+
+// WebKitClient has a protected destructor, so we need to subclass.
+class DummyWebKitClient : public WebKit::WebKitClient {
+};
 
 int main(int argc, char** argv)
 {
-    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();
+    DummyWebKitClient dummyClient;
+    WebKit::initialize(&dummyClient);
+
+    int result = TestSuite(argc, argv).Run();
+
+    WebKit::shutdown();
     return result;
 }