diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-30 11:37:48 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-30 11:38:52 +0200 |
commit | 89e2486a48b739f8d771d69ede5a6a1b244a10fc (patch) | |
tree | 503b1a7812cf97d93704c32437eb5f62dc1a1ff9 /Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h | |
parent | 625f028249cb37c55bbbd153f3902afd0b0756d9 (diff) | |
download | qtwebkit-89e2486a48b739f8d771d69ede5a6a1b244a10fc.tar.gz |
Imported WebKit commit 0282df8ca7c11d8c8a66ea18543695c69f545a27 (http://svn.webkit.org/repository/webkit/trunk@124002)
New snapshot with prospective Mountain Lion build fix
Diffstat (limited to 'Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h')
-rw-r--r-- | Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h b/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h index 0f8a35404..860a20173 100644 --- a/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h +++ b/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h @@ -71,7 +71,6 @@ public: virtual void stop() OVERRIDE; virtual size_t maxPartialTextureUpdates() const OVERRIDE; virtual void acquireLayerTextures() OVERRIDE; - virtual void setFontAtlas(PassOwnPtr<CCFontAtlas>) OVERRIDE; virtual void forceSerializeOnSwapBuffers() OVERRIDE; // CCLayerTreeHostImplClient implementation @@ -144,7 +143,6 @@ private: void recreateContextOnImplThread(CCCompletionEvent*, CCGraphicsContext*, bool* recreateSucceeded, LayerRendererCapabilities*); void implSideRenderingStatsOnImplThread(CCCompletionEvent*, CCRenderingStats*); CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapInternal(bool forcedDraw); - void setFontAtlasOnImplThread(PassOwnPtr<CCFontAtlas>); void forceSerializeOnSwapBuffersOnImplThread(CCCompletionEvent*); void setNeedsForcedCommitOnImplThread(); |