Diff
Modified: trunk/Source/Platform/ChangeLog (130944 => 130945)
--- trunk/Source/Platform/ChangeLog 2012-10-10 19:59:49 UTC (rev 130944)
+++ trunk/Source/Platform/ChangeLog 2012-10-10 20:18:55 UTC (rev 130945)
@@ -1,3 +1,17 @@
+2012-10-10 Antoine Labour <pi...@chromium.org>
+
+ [chromium] Add empty WebCompositorFrame/WebCompositorFrameAck
+ https://bugs.webkit.org/show_bug.cgi?id=98841
+
+ Reviewed by James Robinson.
+
+ These were used in the WebKit API but never defined.
+
+ * chromium/public/WebCompositorFrame.h: Added.
+ (WebKit):
+ * chromium/public/WebCompositorFrameAck.h: Added.
+ (WebKit):
+
2012-10-10 John Bauman <jbau...@chromium.org>
[chromium] Add attribute for disabling automatic flushes
Added: trunk/Source/Platform/chromium/public/WebCompositorFrame.h (0 => 130945)
--- trunk/Source/Platform/chromium/public/WebCompositorFrame.h (rev 0)
+++ trunk/Source/Platform/chromium/public/WebCompositorFrame.h 2012-10-10 20:18:55 UTC (rev 130945)
@@ -0,0 +1,44 @@
+/*
+ * 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:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * 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.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+ * OWNER OR 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 WebCompositorFrame_h
+#define WebCompositorFrame_h
+
+namespace WebKit {
+
+// This class represents data, opaque to WebKit, representing the data
+// comprising a compositor frame when transferring it to a parent compositor.
+// See WebCompositorOutputSurface and WebDelegatedRendererLayer.
+struct WebCompositorFrame {
+};
+
+} // namespace WebKit
+
+#endif
Added: trunk/Source/Platform/chromium/public/WebCompositorFrameAck.h (0 => 130945)
--- trunk/Source/Platform/chromium/public/WebCompositorFrameAck.h (rev 0)
+++ trunk/Source/Platform/chromium/public/WebCompositorFrameAck.h 2012-10-10 20:18:55 UTC (rev 130945)
@@ -0,0 +1,44 @@
+/*
+ * 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:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * 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.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+ * OWNER OR 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 WebCompositorFrameAck_h
+#define WebCompositorFrameAck_h
+
+namespace WebKit {
+
+// This class represents data, opaque to WebKit, representing the
+// acknowledgement that a compositor frame was transferred to a parent
+// compositor. See WebCompositorOutputSurfaceClient.
+struct WebCompositorFrameAck {
+};
+
+} // namespace WebKit
+
+#endif
