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

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

Issue 10702135: Merge 120858 - [chromium] Separate LayerRenderer initialization from updateLayers (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 5 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
« no previous file with comments | « no previous file | Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 RecreateFailedButTryAgain, 161 RecreateFailedButTryAgain,
162 RecreateFailedAndGaveUp, 162 RecreateFailedAndGaveUp,
163 }; 163 };
164 RecreateResult recreateContext(); 164 RecreateResult recreateContext();
165 void willCommit() { m_client->willCommit(); } 165 void willCommit() { m_client->willCommit(); }
166 void didCommitAndDrawFrame() { m_client->didCommitAndDrawFrame(); } 166 void didCommitAndDrawFrame() { m_client->didCommitAndDrawFrame(); }
167 void didCompleteSwapBuffers() { m_client->didCompleteSwapBuffers(); } 167 void didCompleteSwapBuffers() { m_client->didCompleteSwapBuffers(); }
168 void deleteContentsTexturesOnImplThread(TextureAllocator*); 168 void deleteContentsTexturesOnImplThread(TextureAllocator*);
169 virtual void acquireLayerTextures(); 169 virtual void acquireLayerTextures();
170 // Returns false if we should abort this frame due to initialization failure . 170 // Returns false if we should abort this frame due to initialization failure .
171 bool updateLayers(CCTextureUpdater&); 171 bool initializeLayerRendererIfNeeded();
172 void updateLayers(CCTextureUpdater&);
172 173
173 CCLayerTreeHostClient* client() { return m_client; } 174 CCLayerTreeHostClient* client() { return m_client; }
174 175
175 int compositorIdentifier() const { return m_compositorIdentifier; } 176 int compositorIdentifier() const { return m_compositorIdentifier; }
176 177
177 // Only used when compositing on the main thread. 178 // Only used when compositing on the main thread.
178 void composite(); 179 void composite();
179 void scheduleComposite(); 180 void scheduleComposite();
180 181
181 // NOTE: The returned value can only be used to make GL calls or make the 182 // NOTE: The returned value can only be used to make GL calls or make the
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 bool m_hasTransparentBackground; 311 bool m_hasTransparentBackground;
311 312
312 TextureList m_deleteTextureAfterCommitList; 313 TextureList m_deleteTextureAfterCommitList;
313 size_t m_partialTextureUpdateRequests; 314 size_t m_partialTextureUpdateRequests;
314 static bool s_needsFilterContext; 315 static bool s_needsFilterContext;
315 }; 316 };
316 317
317 } 318 }
318 319
319 #endif 320 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698