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/WebProcess/WebPage/ChunkedUpdateDrawingArea.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/WebProcess/WebPage/ChunkedUpdateDrawingArea.h')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h b/Source/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h index d32ed4c..5798ef6 100644 --- a/Source/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h +++ b/Source/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h @@ -36,7 +36,7 @@ class UpdateChunk; class ChunkedUpdateDrawingArea : public DrawingArea { public: - ChunkedUpdateDrawingArea(DrawingAreaInfo::Identifier identifier, WebPage*); + explicit ChunkedUpdateDrawingArea(WebPage*); virtual ~ChunkedUpdateDrawingArea(); virtual void setNeedsDisplay(const WebCore::IntRect&); @@ -45,8 +45,6 @@ public: virtual void forceRepaint(); #if USE(ACCELERATED_COMPOSITING) - virtual void attachCompositingContext() { } - virtual void detachCompositingContext() { } virtual void setRootCompositingLayer(WebCore::GraphicsLayer*) { } virtual void scheduleCompositingLayerSync() { } virtual void syncCompositingLayers() { } @@ -60,7 +58,7 @@ private: // CoreIPC message handlers. void setSize(const WebCore::IntSize& viewSize); void suspendPainting(); - void resumePainting(bool forceRepaint); + void deprecatedResumePainting(bool forceRepaint); void didUpdate(); // Platform overrides |