Title: [130998] trunk/Source/Platform
- Revision
- 130998
- Author
- [email protected]
- Date
- 2012-10-10 19:33:49 -0700 (Wed, 10 Oct 2012)
Log Message
[chromium] Add entrypoints to set frame contents and recycle resources in WebDelegatedRendererLayer
https://bugs.webkit.org/show_bug.cgi?id=98833
Reviewed by James Robinson.
This is needed for https://codereview.chromium.org/10915298
* chromium/public/WebDelegatedRendererLayer.h:
(cc):
(WebKit):
(WebDelegatedRendererLayer):
Modified Paths
Added Paths
Diff
Modified: trunk/Source/Platform/ChangeLog (130997 => 130998)
--- trunk/Source/Platform/ChangeLog 2012-10-11 02:26:43 UTC (rev 130997)
+++ trunk/Source/Platform/ChangeLog 2012-10-11 02:33:49 UTC (rev 130998)
@@ -1,5 +1,19 @@
2012-10-10 Antoine Labour <[email protected]>
+ [chromium] Add entrypoints to set frame contents and recycle resources in WebDelegatedRendererLayer
+ https://bugs.webkit.org/show_bug.cgi?id=98833
+
+ Reviewed by James Robinson.
+
+ This is needed for https://codereview.chromium.org/10915298
+
+ * chromium/public/WebDelegatedRendererLayer.h:
+ (cc):
+ (WebKit):
+ (WebDelegatedRendererLayer):
+
+2012-10-10 Antoine Labour <[email protected]>
+
[chromium] Add empty WebCompositorFrame/WebCompositorFrameAck
https://bugs.webkit.org/show_bug.cgi?id=98841
Copied: trunk/Source/Platform/chromium/public/WebCompositorTransferableResourceList.h (from rev 130997, trunk/Source/Platform/chromium/public/WebDelegatedRendererLayer.h) (0 => 130998)
--- trunk/Source/Platform/chromium/public/WebCompositorTransferableResourceList.h (rev 0)
+++ trunk/Source/Platform/chromium/public/WebCompositorTransferableResourceList.h 2012-10-11 02:33:49 UTC (rev 130998)
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebCompositorTransferableResourceList_h
+#define WebCompositorTransferableResourceList_h
+
+namespace WebKit {
+
+// This class represents data, opaque to WebKit, representing resources that can
+// be transfered between compositors. See WebDelegatedRendererLayer.
+struct WebCompositorTransferableResourceList {
+};
+
+} // namespace WebKit
+
+#endif // WebCompositorTransferableResourceList_h
Modified: trunk/Source/Platform/chromium/public/WebDelegatedRendererLayer.h (130997 => 130998)
--- trunk/Source/Platform/chromium/public/WebDelegatedRendererLayer.h 2012-10-11 02:26:43 UTC (rev 130997)
+++ trunk/Source/Platform/chromium/public/WebDelegatedRendererLayer.h 2012-10-11 02:33:49 UTC (rev 130998)
@@ -30,6 +30,9 @@
namespace WebKit {
+struct WebCompositorFrame;
+struct WebCompositorTransferableResourceList;
+
// This class represents a layer that renders the output of another
// delegating compositor. It is created and owned by the embedder, who
// provides the layer with a set of RenderPasses generated by the
@@ -40,6 +43,8 @@
virtual ~WebDelegatedRendererLayer() { }
virtual WebLayer* layer() = 0;
+ virtual void setFrameData(const WebCompositorFrame&) { }
+ virtual void getRecycledResources(WebCompositorTransferableResourceList*) { }
};
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
