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

Side by Side Diff: cc/scrollbar_layer_impl.cc

Issue 11550035: Implement pinch-zoom scaling for main-frame scrollbars and pinch-zoom overlay scrollbars. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix impl-side painting issues. Created 7 years, 10 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "cc/scrollbar_layer_impl.h" 5 #include "cc/scrollbar_layer_impl.h"
6 6
7 #include "cc/layer_tree_impl.h" 7 #include "cc/layer_tree_impl.h"
8 #include "cc/layer_tree_settings.h" 8 #include "cc/layer_tree_settings.h"
9 #include "cc/quad_sink.h" 9 #include "cc/quad_sink.h"
10 #include "cc/scrollbar_animation_controller.h" 10 #include "cc/scrollbar_animation_controller.h"
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 scrollbarLayer->setScrollbarData(&m_scrollbar); 131 scrollbarLayer->setScrollbarData(&m_scrollbar);
132 scrollbarLayer->setThumbSize(m_thumbSize); 132 scrollbarLayer->setThumbSize(m_thumbSize);
133 133
134 scrollbarLayer->setBackTrackResourceId(m_backTrackResourceId); 134 scrollbarLayer->setBackTrackResourceId(m_backTrackResourceId);
135 scrollbarLayer->setForeTrackResourceId(m_foreTrackResourceId); 135 scrollbarLayer->setForeTrackResourceId(m_foreTrackResourceId);
136 scrollbarLayer->setThumbResourceId(m_thumbResourceId); 136 scrollbarLayer->setThumbResourceId(m_thumbResourceId);
137 } 137 }
138 138
139 void ScrollbarLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& append QuadsData) 139 void ScrollbarLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& append QuadsData)
140 { 140 {
141 // TODO(wjmaclean) Make quads respect layer opacity for fading scrollbars in /out
142 // via opacity animations.
143 if (!opacity())
144 return;
145
141 bool premultipledAlpha = true; 146 bool premultipledAlpha = true;
142 bool flipped = false; 147 bool flipped = false;
143 gfx::PointF uvTopLeft(0.f, 0.f); 148 gfx::PointF uvTopLeft(0.f, 0.f);
144 gfx::PointF uvBottomRight(1.f, 1.f); 149 gfx::PointF uvBottomRight(1.f, 1.f);
145 gfx::Rect boundsRect(gfx::Point(), bounds()); 150 gfx::Rect boundsRect(gfx::Point(), bounds());
146 gfx::Rect contentBoundsRect(gfx::Point(), contentBounds()); 151 gfx::Rect contentBoundsRect(gfx::Point(), contentBounds());
147 152
148 SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQ uadState()); 153 SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQ uadState());
149 appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData); 154 appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData);
150 155
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 { 294 {
290 return m_owner->m_isCustomScrollbar; 295 return m_owner->m_isCustomScrollbar;
291 } 296 }
292 297
293 const char* ScrollbarLayerImpl::layerTypeAsString() const 298 const char* ScrollbarLayerImpl::layerTypeAsString() const
294 { 299 {
295 return "ScrollbarLayer"; 300 return "ScrollbarLayer";
296 } 301 }
297 302
298 } // namespace cc 303 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698