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

Side by Side Diff: cc/TreeSynchronizer.cpp

Issue 11048044: cc: Switch to Chromium DCHECKs and LOGs (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
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
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 "TreeSynchronizer.h" 7 #include "TreeSynchronizer.h"
8 8
9 #include "CCLayerImpl.h" 9 #include "CCLayerImpl.h"
10 #include "CCScrollbarAnimationController.h" 10 #include "CCScrollbarAnimationController.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 const std::vector<scoped_refptr<LayerChromium> >& children = layer->children (); 92 const std::vector<scoped_refptr<LayerChromium> >& children = layer->children ();
93 for (size_t i = 0; i < children.size(); ++i) 93 for (size_t i = 0; i < children.size(); ++i)
94 updateScrollbarLayerPointersRecursive(newLayers, children[i].get()); 94 updateScrollbarLayerPointersRecursive(newLayers, children[i].get());
95 95
96 ScrollbarLayerChromium* scrollbarLayer = layer->toScrollbarLayerChromium(); 96 ScrollbarLayerChromium* scrollbarLayer = layer->toScrollbarLayerChromium();
97 if (!scrollbarLayer) 97 if (!scrollbarLayer)
98 return; 98 return;
99 99
100 CCScrollbarLayerImpl* ccScrollbarLayerImpl = static_cast<CCScrollbarLayerImp l*>(newLayers.get(scrollbarLayer->id())); 100 CCScrollbarLayerImpl* ccScrollbarLayerImpl = static_cast<CCScrollbarLayerImp l*>(newLayers.get(scrollbarLayer->id()));
101 ASSERT(ccScrollbarLayerImpl); 101 DCHECK(ccScrollbarLayerImpl);
102 CCLayerImpl* ccScrollLayerImpl = newLayers.get(scrollbarLayer->scrollLayerId ()); 102 CCLayerImpl* ccScrollLayerImpl = newLayers.get(scrollbarLayer->scrollLayerId ());
103 ASSERT(ccScrollLayerImpl); 103 DCHECK(ccScrollLayerImpl);
104 104
105 if (ccScrollbarLayerImpl->orientation() == WebKit::WebScrollbar::Horizontal) 105 if (ccScrollbarLayerImpl->orientation() == WebKit::WebScrollbar::Horizontal)
106 ccScrollLayerImpl->setHorizontalScrollbarLayer(ccScrollbarLayerImpl); 106 ccScrollLayerImpl->setHorizontalScrollbarLayer(ccScrollbarLayerImpl);
107 else 107 else
108 ccScrollLayerImpl->setVerticalScrollbarLayer(ccScrollbarLayerImpl); 108 ccScrollLayerImpl->setVerticalScrollbarLayer(ccScrollbarLayerImpl);
109 } 109 }
110 110
111 } // namespace cc 111 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698