Title: [112351] trunk/Source/WebKit/chromium
- Revision
- 112351
- Author
- [email protected]
- Date
- 2012-03-27 18:56:30 -0700 (Tue, 27 Mar 2012)
Log Message
webkit_unit_tests crashing on chromium lion in ScrollbarLayerChromiumTest.resolveScrollLayerPointer
https://bugs.webkit.org/show_bug.cgi?id=82381
Patch by James Robinson <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (112350 => 112351)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-28 01:16:21 UTC (rev 112350)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-28 01:56:30 UTC (rev 112351)
@@ -1,3 +1,16 @@
+2012-03-27 James Robinson <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r112339.
Modified: trunk/Source/WebKit/chromium/tests/ScrollbarLayerChromiumTest.cpp (112350 => 112351)
--- trunk/Source/WebKit/chromium/tests/ScrollbarLayerChromiumTest.cpp 2012-03-28 01:16:21 UTC (rev 112350)
+++ trunk/Source/WebKit/chromium/tests/ScrollbarLayerChromiumTest.cpp 2012-03-28 01:56:30 UTC (rev 112351)
@@ -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 @@
{
DebugScopedSetImplThread impl;
+ Settings::setMockScrollbarsEnabled(true);
{
RefPtr<MockScrollbar> scrollbar = adoptRef(new MockScrollbar);
RefPtr<LayerChromium> layerTreeRoot = LayerChromium::create();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
