diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h')
| -rw-r--r-- | Source/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h b/Source/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h index 7d7a5f4..94e441f 100644 --- a/Source/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h +++ b/Source/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h @@ -30,6 +30,8 @@ #include "DrawingAreaProxy.h" #include <WebCore/IntSize.h> +#include <wtf/PassOwnPtr.h> +#include <wtf/OwnPtr.h> #if PLATFORM(MAC) #include <wtf/RetainPtr.h> @@ -80,15 +82,10 @@ private: bool platformPaint(const WebCore::IntRect&, PlatformDrawingContext); void drawUpdateChunkIntoBackingStore(UpdateChunk*); void didSetSize(UpdateChunk*); - void update(UpdateChunk*); + void deprecatedUpdate(UpdateChunk*); void sendSetSize(); -#if USE(ACCELERATED_COMPOSITING) - virtual void attachCompositingContext(uint32_t) { } - virtual void detachCompositingContext() { } -#endif - bool m_isWaitingForDidSetFrameNotification; bool m_isVisible; bool m_forceRepaintWhenResumingPainting; |