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

Side by Side Diff: cc/CCLayerTreeHostImpl.cpp

Issue 10961008: cc: Remove TextureUploaderOption. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Settle for removing TextureUploaderOption in this CL. I'll figure out what to do with the uploader … 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 | « 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 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 didVisibilityChange(this, m_visible); 702 didVisibilityChange(this, m_visible);
703 703
704 if (!m_renderer) 704 if (!m_renderer)
705 return; 705 return;
706 706
707 m_renderer->setVisible(visible); 707 m_renderer->setVisible(visible);
708 708
709 setBackgroundTickingEnabled(!m_visible && m_needsAnimateLayers); 709 setBackgroundTickingEnabled(!m_visible && m_needsAnimateLayers);
710 } 710 }
711 711
712 bool CCLayerTreeHostImpl::initializeRenderer(PassOwnPtr<CCGraphicsContext> conte xt, TextureUploaderOption textureUploader) 712 bool CCLayerTreeHostImpl::initializeRenderer(PassOwnPtr<CCGraphicsContext> conte xt)
713 { 713 {
714 if (!context->bindToClient(this)) 714 if (!context->bindToClient(this))
715 return false; 715 return false;
716 716
717 WebKit::WebGraphicsContext3D* context3d = context->context3D(); 717 WebKit::WebGraphicsContext3D* context3d = context->context3D();
718 718
719 if (!context3d) { 719 if (!context3d) {
720 // FIXME: Implement this path for software compositing. 720 // FIXME: Implement this path for software compositing.
721 return false; 721 return false;
722 } 722 }
723 723
724 OwnPtr<CCGraphicsContext> contextRef(context); 724 OwnPtr<CCGraphicsContext> contextRef(context);
725 OwnPtr<CCResourceProvider> resourceProvider = CCResourceProvider::create(con textRef.get(), textureUploader); 725 OwnPtr<CCResourceProvider> resourceProvider = CCResourceProvider::create(con textRef.get());
726 OwnPtr<CCRendererGL> renderer; 726 OwnPtr<CCRendererGL> renderer;
727 if (resourceProvider.get()) 727 if (resourceProvider.get())
728 renderer = CCRendererGL::create(this, resourceProvider.get()); 728 renderer = CCRendererGL::create(this, resourceProvider.get());
729 729
730 // Since we now have a new context/renderer, we cannot continue to use the o ld 730 // Since we now have a new context/renderer, we cannot continue to use the o ld
731 // resources (i.e. renderSurfaces and texture IDs). 731 // resources (i.e. renderSurfaces and texture IDs).
732 if (m_rootLayerImpl) { 732 if (m_rootLayerImpl) {
733 clearRenderSurfaces(); 733 clearRenderSurfaces();
734 sendDidLoseContextRecursive(m_rootLayerImpl.get()); 734 sendDidLoseContextRecursive(m_rootLayerImpl.get());
735 } 735 }
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
1304 1304
1305 CCScrollbarAnimationController* scrollbarController = layer->scrollbarAnimat ionController(); 1305 CCScrollbarAnimationController* scrollbarController = layer->scrollbarAnimat ionController();
1306 if (scrollbarController && scrollbarController->animate(monotonicTime)) 1306 if (scrollbarController && scrollbarController->animate(monotonicTime))
1307 m_client->setNeedsRedrawOnImplThread(); 1307 m_client->setNeedsRedrawOnImplThread();
1308 1308
1309 for (size_t i = 0; i < layer->children().size(); ++i) 1309 for (size_t i = 0; i < layer->children().size(); ++i)
1310 animateScrollbarsRecursive(layer->children()[i], monotonicTime); 1310 animateScrollbarsRecursive(layer->children()[i], monotonicTime);
1311 } 1311 }
1312 1312
1313 } // namespace cc 1313 } // 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