From ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Mon, 16 May 2011 16:25:10 +0100 Subject: Merge WebKit at r76408: Initial merge by git. Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53 --- Source/WebKit2/UIProcess/BackingStore.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'Source/WebKit2/UIProcess/BackingStore.h') diff --git a/Source/WebKit2/UIProcess/BackingStore.h b/Source/WebKit2/UIProcess/BackingStore.h index e196a55..a3ea065 100644 --- a/Source/WebKit2/UIProcess/BackingStore.h +++ b/Source/WebKit2/UIProcess/BackingStore.h @@ -40,6 +40,7 @@ namespace WebCore { namespace WebKit { +class ShareableBitmap; class UpdateInfo; class WebPageProxy; @@ -47,9 +48,11 @@ class BackingStore { WTF_MAKE_NONCOPYABLE(BackingStore); public: - static PassOwnPtr create(const WebCore::IntSize&); + static PassOwnPtr create(const WebCore::IntSize&, WebPageProxy*); ~BackingStore(); + const WebCore::IntSize& size() const { return m_size; } + #if PLATFORM(MAC) typedef CGContextRef PlatformGraphicsContext; #endif @@ -58,13 +61,19 @@ public: void incorporateUpdate(const UpdateInfo&); private: - explicit BackingStore(const WebCore::IntSize&); + BackingStore(const WebCore::IntSize&, WebPageProxy*); - void scroll(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollDelta); + void incorporateUpdate(ShareableBitmap*, const UpdateInfo&); + void scroll(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset); WebCore::IntSize m_size; + WebPageProxy* m_webPageProxy; + double m_latestUpdateTimestamp; #if PLATFORM(MAC) + CGContextRef backingStoreContext(); + + RetainPtr m_cgLayer; RetainPtr m_bitmapContext; #endif }; -- cgit v1.1