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

Side by Side Diff: cc/CCLayerTreeHostImpl.cpp

Issue 11031060: Revert 160267 - Merge 158192 - cc: Remove TextureUploaderOption. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1271/src/
Patch Set: Created 8 years, 2 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 | « cc/CCLayerTreeHostImpl.h ('k') | 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 660 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 didVisibilityChange(this, m_visible); 671 didVisibilityChange(this, m_visible);
672 672
673 if (!m_renderer) 673 if (!m_renderer)
674 return; 674 return;
675 675
676 m_renderer->setVisible(visible); 676 m_renderer->setVisible(visible);
677 677
678 setBackgroundTickingEnabled(!m_visible && m_needsAnimateLayers); 678 setBackgroundTickingEnabled(!m_visible && m_needsAnimateLayers);
679 } 679 }
680 680
681 bool CCLayerTreeHostImpl::initializeRenderer(PassOwnPtr<CCGraphicsContext> conte xt) 681 bool CCLayerTreeHostImpl::initializeRenderer(PassOwnPtr<CCGraphicsContext> conte xt, TextureUploaderOption textureUploader)
682 { 682 {
683 if (!context->bindToClient(this)) 683 if (!context->bindToClient(this))
684 return false; 684 return false;
685 685
686 WebKit::WebGraphicsContext3D* context3d = context->context3D(); 686 WebKit::WebGraphicsContext3D* context3d = context->context3D();
687 687
688 if (!context3d) { 688 if (!context3d) {
689 // FIXME: Implement this path for software compositing. 689 // FIXME: Implement this path for software compositing.
690 return false; 690 return false;
691 } 691 }
692 692
693 OwnPtr<CCGraphicsContext> contextRef(context); 693 OwnPtr<CCGraphicsContext> contextRef(context);
694 OwnPtr<CCResourceProvider> resourceProvider = CCResourceProvider::create(con textRef.get()); 694 OwnPtr<CCResourceProvider> resourceProvider = CCResourceProvider::create(con textRef.get(), textureUploader);
695 OwnPtr<CCRendererGL> renderer; 695 OwnPtr<CCRendererGL> renderer;
696 if (resourceProvider.get()) 696 if (resourceProvider.get())
697 renderer = CCRendererGL::create(this, resourceProvider.get()); 697 renderer = CCRendererGL::create(this, resourceProvider.get());
698 698
699 // Since we now have a new context/renderer, we cannot continue to use the o ld 699 // Since we now have a new context/renderer, we cannot continue to use the o ld
700 // resources (i.e. renderSurfaces and texture IDs). 700 // resources (i.e. renderSurfaces and texture IDs).
701 if (m_rootLayerImpl) { 701 if (m_rootLayerImpl) {
702 clearRenderSurfaces(); 702 clearRenderSurfaces();
703 sendDidLoseContextRecursive(m_rootLayerImpl.get()); 703 sendDidLoseContextRecursive(m_rootLayerImpl.get());
704 } 704 }
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
1267 1267
1268 CCScrollbarAnimationController* scrollbarController = layer->scrollbarAnimat ionController(); 1268 CCScrollbarAnimationController* scrollbarController = layer->scrollbarAnimat ionController();
1269 if (scrollbarController && scrollbarController->animate(monotonicTime)) 1269 if (scrollbarController && scrollbarController->animate(monotonicTime))
1270 m_client->setNeedsRedrawOnImplThread(); 1270 m_client->setNeedsRedrawOnImplThread();
1271 1271
1272 for (size_t i = 0; i < layer->children().size(); ++i) 1272 for (size_t i = 0; i < layer->children().size(); ++i)
1273 animateScrollbarsRecursive(layer->children()[i].get(), monotonicTime); 1273 animateScrollbarsRecursive(layer->children()[i].get(), monotonicTime);
1274 } 1274 }
1275 1275
1276 } // namespace cc 1276 } // namespace cc
OLDNEW
« no previous file with comments | « cc/CCLayerTreeHostImpl.h ('k') | cc/CCLayerTreeHostImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698