Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

Side by Side Diff: Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h

Issue 10384160: Merge 116722 - Sync with impl thread when removing references to external textures (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 void didLoseContext(); 155 void didLoseContext();
156 enum RecreateResult { 156 enum RecreateResult {
157 RecreateSucceeded, 157 RecreateSucceeded,
158 RecreateFailedButTryAgain, 158 RecreateFailedButTryAgain,
159 RecreateFailedAndGaveUp, 159 RecreateFailedAndGaveUp,
160 }; 160 };
161 RecreateResult recreateContext(); 161 RecreateResult recreateContext();
162 void didCommitAndDrawFrame() { m_client->didCommitAndDrawFrame(); } 162 void didCommitAndDrawFrame() { m_client->didCommitAndDrawFrame(); }
163 void didCompleteSwapBuffers() { m_client->didCompleteSwapBuffers(); } 163 void didCompleteSwapBuffers() { m_client->didCompleteSwapBuffers(); }
164 void deleteContentsTexturesOnImplThread(TextureAllocator*); 164 void deleteContentsTexturesOnImplThread(TextureAllocator*);
165 void acquireLayerTextures(); 165 virtual void acquireLayerTextures();
166 // Returns false if we should abort this frame due to initialization failure . 166 // Returns false if we should abort this frame due to initialization failure .
167 bool updateLayers(CCTextureUpdater&); 167 bool updateLayers(CCTextureUpdater&);
168 168
169 CCLayerTreeHostClient* client() { return m_client; } 169 CCLayerTreeHostClient* client() { return m_client; }
170 170
171 int compositorIdentifier() const { return m_compositorIdentifier; } 171 int compositorIdentifier() const { return m_compositorIdentifier; }
172 172
173 // Only used when compositing on the main thread. 173 // Only used when compositing on the main thread.
174 void composite(); 174 void composite();
175 175
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 Color m_backgroundColor; 286 Color m_backgroundColor;
287 287
288 TextureList m_deleteTextureAfterCommitList; 288 TextureList m_deleteTextureAfterCommitList;
289 size_t m_partialTextureUpdateRequests; 289 size_t m_partialTextureUpdateRequests;
290 static bool s_needsFilterContext; 290 static bool s_needsFilterContext;
291 }; 291 };
292 292
293 } 293 }
294 294
295 #endif 295 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/platform/graphics/chromium/TextureLayerChromium.cpp ('k') | Source/WebKit/chromium/WebKit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698