Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1

1 files changed, 69 insertions, 0 deletions

diff --git a/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h
new file mode 100644
index 0000000..4ca1137
--- /dev/null
+++ b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2011 Apple 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 INC. 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 INC. 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 LayerTreeHost_h
+#define LayerTreeHost_h
+
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
+
+namespace WebCore {
+    class IntRect;
+    class IntSize;
+    class GraphicsLayer;
+}
+
+namespace WebKit {
+
+class LayerTreeContext;
+class WebPage;
+
+class LayerTreeHost : public RefCounted<LayerTreeHost> {
+public:
+    static PassRefPtr<LayerTreeHost> create(WebPage*);
+    virtual ~LayerTreeHost();
+
+    virtual const LayerTreeContext& layerTreeContext() = 0;
+    virtual void scheduleLayerFlush() = 0;
+    virtual void setRootCompositingLayer(WebCore::GraphicsLayer*) = 0;
+    virtual void invalidate() = 0;
+
+    virtual void setNonCompositedContentsNeedDisplay(const WebCore::IntRect&) = 0;
+    virtual void scrollNonCompositedContents(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset) = 0;
+    virtual void sizeDidChange(const WebCore::IntSize& newSize) = 0;
+
+    virtual void didInstallPageOverlay() = 0;
+    virtual void didUninstallPageOverlay() = 0;
+    virtual void setPageOverlayNeedsDisplay(const WebCore::IntRect&) = 0;
+
+protected:
+    explicit LayerTreeHost(WebPage*);
+
+    WebPage* m_webPage;
+};
+
+} // namespace WebKit
+
+#endif // LayerTreeHost_h