Title: [111875] trunk/Source
- Revision
- 111875
- Author
- [email protected]
- Date
- 2012-03-23 10:13:09 -0700 (Fri, 23 Mar 2012)
Log Message
[chromium] Fix scrollbarLayerLostContext flaky test crash on 10.6
https://bugs.webkit.org/show_bug.cgi?id=82062
Reviewed by James Robinson.
Source/WebCore:
* platform/graphics/chromium/cc/CCScrollbarLayerImpl.h:
(CCScrollbarLayerImpl):
Source/WebKit/chromium:
Override the paint function so that it becomes a no-op. Painting
scrollbars on the impl thread is not yet supported on platforms other
than Linux or ChromeOS.
* tests/CCLayerTreeHostImplTest.cpp:
(ScrollbarLayerFakePaint):
(WebKitTests::ScrollbarLayerFakePaint::create):
(WebKitTests::ScrollbarLayerFakePaint::paint):
(WebKitTests::ScrollbarLayerFakePaint::ScrollbarLayerFakePaint):
(WebKitTests):
(WebKitTests::TEST_F):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (111874 => 111875)
--- trunk/Source/WebCore/ChangeLog 2012-03-23 17:10:15 UTC (rev 111874)
+++ trunk/Source/WebCore/ChangeLog 2012-03-23 17:13:09 UTC (rev 111875)
@@ -1,3 +1,13 @@
+2012-03-23 Adrienne Walker <[email protected]>
+
+ [chromium] Fix scrollbarLayerLostContext flaky test crash on 10.6
+ https://bugs.webkit.org/show_bug.cgi?id=82062
+
+ Reviewed by James Robinson.
+
+ * platform/graphics/chromium/cc/CCScrollbarLayerImpl.h:
+ (CCScrollbarLayerImpl):
+
2012-03-23 Tommy Widenflycht <[email protected]>
[chromium] MediaStream API (JSEP): Extending WebMediaStreamCenter
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.h (111874 => 111875)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.h 2012-03-23 17:10:15 UTC (rev 111874)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.h 2012-03-23 17:13:09 UTC (rev 111875)
@@ -66,9 +66,9 @@
protected:
explicit CCScrollbarLayerImpl(int id);
+ virtual void paint(GraphicsContext*);
+
private:
- void paint(GraphicsContext*);
-
CCLayerImpl* m_scrollLayer;
OwnPtr<ManagedTexture> m_texture;
Modified: trunk/Source/WebKit/chromium/ChangeLog (111874 => 111875)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-23 17:10:15 UTC (rev 111874)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-23 17:13:09 UTC (rev 111875)
@@ -1,3 +1,22 @@
+2012-03-23 Adrienne Walker <[email protected]>
+
+ [chromium] Fix scrollbarLayerLostContext flaky test crash on 10.6
+ https://bugs.webkit.org/show_bug.cgi?id=82062
+
+ Reviewed by James Robinson.
+
+ Override the paint function so that it becomes a no-op. Painting
+ scrollbars on the impl thread is not yet supported on platforms other
+ than Linux or ChromeOS.
+
+ * tests/CCLayerTreeHostImplTest.cpp:
+ (ScrollbarLayerFakePaint):
+ (WebKitTests::ScrollbarLayerFakePaint::create):
+ (WebKitTests::ScrollbarLayerFakePaint::paint):
+ (WebKitTests::ScrollbarLayerFakePaint::ScrollbarLayerFakePaint):
+ (WebKitTests):
+ (WebKitTests::TEST_F):
+
2012-03-23 Tommy Widenflycht <[email protected]>
[chromium] MediaStream API (JSEP): Extending WebMediaStreamCenter
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp (111874 => 111875)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2012-03-23 17:10:15 UTC (rev 111874)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2012-03-23 17:13:09 UTC (rev 111875)
@@ -1035,13 +1035,23 @@
m_hostImpl->finishAllRendering();
}
+class ScrollbarLayerFakePaint : public CCScrollbarLayerImpl {
+public:
+ static PassOwnPtr<ScrollbarLayerFakePaint> create(int id) { return adoptPtr(new ScrollbarLayerFakePaint(id)); }
+
+ virtual void paint(GraphicsContext*) { }
+
+private:
+ ScrollbarLayerFakePaint(int id) : CCScrollbarLayerImpl(id) { }
+};
+
TEST_F(CCLayerTreeHostImplTest, scrollbarLayerLostContext)
{
m_hostImpl->initializeLayerRenderer(createContext());
m_hostImpl->setViewportSize(IntSize(10, 10));
- m_hostImpl->setRootLayer(CCScrollbarLayerImpl::create(0));
- CCScrollbarLayerImpl* scrollbar = static_cast<CCScrollbarLayerImpl*>(m_hostImpl->rootLayer());
+ m_hostImpl->setRootLayer(ScrollbarLayerFakePaint::create(0));
+ ScrollbarLayerFakePaint* scrollbar = static_cast<ScrollbarLayerFakePaint*>(m_hostImpl->rootLayer());
scrollbar->setBounds(IntSize(1, 1));
scrollbar->setContentBounds(IntSize(1, 1));
scrollbar->setDrawsContent(true);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
