Title: [137681] trunk/Source/WebKit/chromium
- Revision
- 137681
- Author
- [email protected]
- Date
- 2012-12-13 16:22:36 -0800 (Thu, 13 Dec 2012)
Log Message
[chromium] Expose a WebLayerTreeView getter on WebWidget to make it easier for the embedder to interface with the compositor
https://bugs.webkit.org/show_bug.cgi?id=104968
Patch by James Robinson <[email protected]> on 2012-12-13
Reviewed by Adrienne Walker.
This is an intermediate step on the way to https://code.google.com/p/chromium/issues/detail?id=156175.
* public/WebWidget.h:
(WebKit):
(WebWidget):
(WebKit::WebWidget::layerTreeView):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::webLayerTreeView):
(WebKit):
* src/WebViewImpl.h:
(WebViewImpl):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (137680 => 137681)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-14 00:20:23 UTC (rev 137680)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-14 00:22:36 UTC (rev 137681)
@@ -1,3 +1,22 @@
+2012-12-13 James Robinson <[email protected]>
+
+ [chromium] Expose a WebLayerTreeView getter on WebWidget to make it easier for the embedder to interface with the compositor
+ https://bugs.webkit.org/show_bug.cgi?id=104968
+
+ Reviewed by Adrienne Walker.
+
+ This is an intermediate step on the way to https://code.google.com/p/chromium/issues/detail?id=156175.
+
+ * public/WebWidget.h:
+ (WebKit):
+ (WebWidget):
+ (WebKit::WebWidget::layerTreeView):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::webLayerTreeView):
+ (WebKit):
+ * src/WebViewImpl.h:
+ (WebViewImpl):
+
2012-12-13 Antoine Labour <[email protected]>
[chromium] Small fixes for WebPluginContainer::setWebLayer
Modified: trunk/Source/WebKit/chromium/public/WebWidget.h (137680 => 137681)
--- trunk/Source/WebKit/chromium/public/WebWidget.h 2012-12-14 00:20:23 UTC (rev 137680)
+++ trunk/Source/WebKit/chromium/public/WebWidget.h 2012-12-14 00:22:36 UTC (rev 137681)
@@ -46,6 +46,7 @@
namespace WebKit {
class WebInputEvent;
+class WebLayerTreeView;
class WebMouseEvent;
class WebString;
struct WebPoint;
@@ -134,6 +135,10 @@
// ready to use.
virtual void setCompositorSurfaceReady() = 0;
+ // Returns this widget's WebLayerTreeView if compositing is active, nil
+ // otherwise.
+ virtual WebLayerTreeView* layerTreeView() { return 0; }
+
// Temporary method for the embedder to notify the WebWidget that the widget
// has taken damage, e.g. due to a window expose. This method will be
// removed when the WebWidget inversion patch lands --- http://crbug.com/112837
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (137680 => 137681)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-12-14 00:20:23 UTC (rev 137680)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-12-14 00:22:36 UTC (rev 137681)
@@ -1724,6 +1724,11 @@
m_layerTreeView->setSurfaceReady();
}
+WebLayerTreeView* WebViewImpl::webLayerTreeView()
+{
+ return m_layerTreeView.get();
+}
+
void WebViewImpl::animate(double)
{
#if ENABLE(REQUEST_ANIMATION_FRAME)
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (137680 => 137681)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-12-14 00:20:23 UTC (rev 137680)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-12-14 00:22:36 UTC (rev 137681)
@@ -142,6 +142,7 @@
virtual void willExitFullScreen();
virtual void didExitFullScreen();
virtual void setCompositorSurfaceReady();
+ virtual WebLayerTreeView* webLayerTreeView();
virtual void animate(double);
virtual void layout(); // Also implements WebLayerTreeViewClient::layout()
virtual void enterForceCompositingMode(bool enable) OVERRIDE;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
