webkit_unit_tests crashing on chromium lion in ScrollbarLayerChromiumTest.resolveScro...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Mar 2012 01:56:30 +0000 (01:56 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Mar 2012 01:56:30 +0000 (01:56 +0000)
https://bugs.webkit.org/show_bug.cgi?id=82381

Patch by James Robinson <jamesr@chromium.org> on 2012-03-27
Reviewed by Adrienne Walker.

Use the mock scrollbar theme for this unit test. The real ScrollbarThemeMac isn't compatible with the mocks this
test uses and the test isn't designed to cover the theming code, only code inside the compositor.

* tests/ScrollbarLayerChromiumTest.cpp:
(WebCore::TEST):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@112351 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/tests/ScrollbarLayerChromiumTest.cpp

index fff36c7e1bad2e615633e8a20155cb50059d7d09..739d475ed7c31f96dbbeb633f3adb7969933d1fe 100644 (file)
@@ -1,3 +1,16 @@
+2012-03-27  James Robinson  <jamesr@chromium.org>
+
+        webkit_unit_tests crashing on chromium lion in ScrollbarLayerChromiumTest.resolveScrollLayerPointer
+        https://bugs.webkit.org/show_bug.cgi?id=82381
+
+        Reviewed by Adrienne Walker.
+
+        Use the mock scrollbar theme for this unit test. The real ScrollbarThemeMac isn't compatible with the mocks this
+        test uses and the test isn't designed to cover the theming code, only code inside the compositor.
+
+        * tests/ScrollbarLayerChromiumTest.cpp:
+        (WebCore::TEST):
+
 2012-03-27  Dirk Pranke  <dpranke@chromium.org>
 
         Unreviewed, rolling out r112339.
index 78b96b495fc01c50b2d3a9099e9d0dbfe02aed4e..5bf990cdee925c807d6451f5bbb43feb44512bb5 100644 (file)
@@ -27,6 +27,7 @@
 #include "ScrollbarLayerChromium.h"
 
 #include "Scrollbar.h"
+#include "Settings.h"
 #include "TreeSynchronizer.h"
 #include "cc/CCScrollbarLayerImpl.h"
 #include "cc/CCSingleThreadProxy.h"
@@ -90,6 +91,7 @@ TEST(ScrollbarLayerChromiumTest, resolveScrollLayerPointer)
 {
     DebugScopedSetImplThread impl;
 
+    Settings::setMockScrollbarsEnabled(true);
     {
         RefPtr<MockScrollbar> scrollbar = adoptRef(new MockScrollbar);
         RefPtr<LayerChromium> layerTreeRoot = LayerChromium::create();