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

Side by Side Diff: cc/CCLayerTreeHostImpl.cpp

Issue 10917251: Move TextureCopier and TextureUploader from CCRenderer to CCResourceProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix rebase merge issues Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | cc/CCLayerTreeHostImplTest.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 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "CCLayerTreeHostImpl.h" 7 #include "CCLayerTreeHostImpl.h"
8 8
9 #include "CCAppendQuadsData.h" 9 #include "CCAppendQuadsData.h"
10 #include "CCDamageTracker.h" 10 #include "CCDamageTracker.h"
(...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 return false; 680 return false;
681 681
682 WebKit::WebGraphicsContext3D* context3d = context->context3D(); 682 WebKit::WebGraphicsContext3D* context3d = context->context3D();
683 683
684 if (!context3d) { 684 if (!context3d) {
685 // FIXME: Implement this path for software compositing. 685 // FIXME: Implement this path for software compositing.
686 return false; 686 return false;
687 } 687 }
688 688
689 OwnPtr<CCGraphicsContext> contextRef(context); 689 OwnPtr<CCGraphicsContext> contextRef(context);
690 OwnPtr<CCResourceProvider> resourceProvider = CCResourceProvider::create(con textRef.get()); 690 OwnPtr<CCResourceProvider> resourceProvider = CCResourceProvider::create(con textRef.get(), textureUploader);
691 OwnPtr<CCRendererGL> renderer; 691 OwnPtr<CCRendererGL> renderer;
692 if (resourceProvider.get()) 692 if (resourceProvider.get())
693 renderer = CCRendererGL::create(this, resourceProvider.get(), textureUpl oader); 693 renderer = CCRendererGL::create(this, resourceProvider.get());
694 694
695 // Since we now have a new context/renderer, we cannot continue to use the o ld 695 // Since we now have a new context/renderer, we cannot continue to use the o ld
696 // resources (i.e. renderSurfaces and texture IDs). 696 // resources (i.e. renderSurfaces and texture IDs).
697 if (m_rootLayerImpl) { 697 if (m_rootLayerImpl) {
698 clearRenderSurfaces(); 698 clearRenderSurfaces();
699 sendDidLoseContextRecursive(m_rootLayerImpl.get()); 699 sendDidLoseContextRecursive(m_rootLayerImpl.get());
700 } 700 }
701 701
702 m_renderer = renderer.release(); 702 m_renderer = renderer.release();
703 m_resourceProvider = resourceProvider.release(); 703 m_resourceProvider = resourceProvider.release();
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
1263 1263
1264 CCScrollbarAnimationController* scrollbarController = layer->scrollbarAnimat ionController(); 1264 CCScrollbarAnimationController* scrollbarController = layer->scrollbarAnimat ionController();
1265 if (scrollbarController && scrollbarController->animate(monotonicTime)) 1265 if (scrollbarController && scrollbarController->animate(monotonicTime))
1266 m_client->setNeedsRedrawOnImplThread(); 1266 m_client->setNeedsRedrawOnImplThread();
1267 1267
1268 for (size_t i = 0; i < layer->children().size(); ++i) 1268 for (size_t i = 0; i < layer->children().size(); ++i)
1269 animateScrollbarsRecursive(layer->children()[i].get(), monotonicTime); 1269 animateScrollbarsRecursive(layer->children()[i].get(), monotonicTime);
1270 } 1270 }
1271 1271
1272 } // namespace cc 1272 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/CCLayerTreeHostImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698