Title: [101613] trunk/Source/WebKit/chromium
- Revision
- 101613
- Author
- commit-qu...@webkit.org
- Date
- 2011-11-30 22:54:22 -0800 (Wed, 30 Nov 2011)
Log Message
[chromium] Expose WebLayerTreeView::setRootLayer as a call through
to same method on CCLayerTreeHost.
https://bugs.webkit.org/show_bug.cgi?id=73506
Patch by Scott Violet <s...@google.com> on 2011-11-30
Reviewed by James Robinson.
* public/WebLayerTreeView.h: Adds setRootLayer.
* src/WebLayerTreeView.cpp: Ditto.
(WebKit::WebLayerTreeView::setRootLayer):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (101612 => 101613)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-01 06:38:02 UTC (rev 101612)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-01 06:54:22 UTC (rev 101613)
@@ -1,3 +1,15 @@
+2011-11-30 Scott Violet <s...@google.com>
+
+ [chromium] Expose WebLayerTreeView::setRootLayer as a call through
+ to same method on CCLayerTreeHost.
+ https://bugs.webkit.org/show_bug.cgi?id=73506
+
+ Reviewed by James Robinson.
+
+ * public/WebLayerTreeView.h: Adds setRootLayer.
+ * src/WebLayerTreeView.cpp: Ditto.
+ (WebKit::WebLayerTreeView::setRootLayer):
+
2011-11-30 Alexey Proskuryakov <a...@apple.com>
Remove an unneeded argument from FrameLoaderClient::download
Modified: trunk/Source/WebKit/chromium/public/WebLayerTreeView.h (101612 => 101613)
--- trunk/Source/WebKit/chromium/public/WebLayerTreeView.h 2011-12-01 06:38:02 UTC (rev 101612)
+++ trunk/Source/WebKit/chromium/public/WebLayerTreeView.h 2011-12-01 06:54:22 UTC (rev 101613)
@@ -92,6 +92,11 @@
// The buffer is not modified if the false is returned.
WEBKIT_EXPORT bool compositeAndReadback(void *pixels, const WebRect&);
+ // Sets the root of the tree. The root is set by way of the constructor.
+ // This is typically used to explicitly set the root to null to break
+ // cycles.
+ WEBKIT_EXPORT void setRootLayer(WebLayer*);
+
#if WEBKIT_IMPLEMENTATION
WebLayerTreeView(const WTF::PassRefPtr<WebCore::CCLayerTreeHost>&);
WebLayerTreeView& operator=(const WTF::PassRefPtr<WebCore::CCLayerTreeHost>&);
Modified: trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp (101612 => 101613)
--- trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2011-12-01 06:38:02 UTC (rev 101612)
+++ trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp 2011-12-01 06:54:22 UTC (rev 101613)
@@ -26,6 +26,7 @@
#include "config.h"
#include "WebLayerTreeView.h"
+#include "WebLayer.h"
#include "WebLayerTreeViewImpl.h"
#include "WebRect.h"
#include "WebSize.h"
@@ -91,6 +92,14 @@
return m_private->compositeAndReadback(pixels, rect);
}
+void WebLayerTreeView::setRootLayer(WebLayer *root)
+{
+ if (root)
+ m_private->setRootLayer(*root);
+ else
+ m_private->setRootLayer(PassRefPtr<LayerChromium>());
+}
+
WebLayerTreeView::WebLayerTreeView(const PassRefPtr<CCLayerTreeHost>& node)
: m_private(node)
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
