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

Side by Side Diff: cc/layer_tree_host_impl.cc

Issue 10915313: cc: Apply the layer's initial CSS scale to the contentsScale to render text at the right resolution. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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/layer_tree_host_common_unittest.cc ('k') | cc/layer_tree_host_impl_unittest.cc » ('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 "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "CCAppendQuadsData.h" 10 #include "CCAppendQuadsData.h"
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 void CCLayerTreeHostImpl::calculateRenderSurfaceLayerList(CCLayerList& renderSur faceLayerList) 349 void CCLayerTreeHostImpl::calculateRenderSurfaceLayerList(CCLayerList& renderSur faceLayerList)
350 { 350 {
351 ASSERT(renderSurfaceLayerList.empty()); 351 ASSERT(renderSurfaceLayerList.empty());
352 ASSERT(m_rootLayerImpl); 352 ASSERT(m_rootLayerImpl);
353 ASSERT(m_renderer); // For maxTextureSize. 353 ASSERT(m_renderer); // For maxTextureSize.
354 354
355 { 355 {
356 updateRootScrollLayerImplTransform(); 356 updateRootScrollLayerImplTransform();
357 357
358 TRACE_EVENT0("cc", "CCLayerTreeHostImpl::calcDrawEtc"); 358 TRACE_EVENT0("cc", "CCLayerTreeHostImpl::calcDrawEtc");
359 CCLayerTreeHostCommon::calculateDrawTransforms(m_rootLayerImpl.get(), de viceViewportSize(), m_deviceScaleFactor, &m_layerSorter, rendererCapabilities(). maxTextureSize, renderSurfaceLayerList); 359 float pageScaleFactor = m_pinchZoomViewport.pageScaleFactor();
360 CCLayerTreeHostCommon::calculateDrawTransforms(m_rootLayerImpl.get(), de viceViewportSize(), m_deviceScaleFactor, pageScaleFactor, &m_layerSorter, render erCapabilities().maxTextureSize, renderSurfaceLayerList);
360 361
361 trackDamageForAllSurfaces(m_rootLayerImpl.get(), renderSurfaceLayerList) ; 362 trackDamageForAllSurfaces(m_rootLayerImpl.get(), renderSurfaceLayerList) ;
362 } 363 }
363 } 364 }
364 365
365 void CCLayerTreeHostImpl::FrameData::appendRenderPass(scoped_ptr<CCRenderPass> r enderPass) 366 void CCLayerTreeHostImpl::FrameData::appendRenderPass(scoped_ptr<CCRenderPass> r enderPass)
366 { 367 {
367 CCRenderPass* pass = renderPass.get(); 368 CCRenderPass* pass = renderPass.get();
368 renderPasses.push_back(pass); 369 renderPasses.push_back(pass);
369 renderPassesById.set(pass->id(), renderPass.Pass()); 370 renderPassesById.set(pass->id(), renderPass.Pass());
(...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after
1453 1454
1454 CCScrollbarAnimationController* scrollbarController = layer->scrollbarAnimat ionController(); 1455 CCScrollbarAnimationController* scrollbarController = layer->scrollbarAnimat ionController();
1455 if (scrollbarController && scrollbarController->animate(monotonicTime)) 1456 if (scrollbarController && scrollbarController->animate(monotonicTime))
1456 m_client->setNeedsRedrawOnImplThread(); 1457 m_client->setNeedsRedrawOnImplThread();
1457 1458
1458 for (size_t i = 0; i < layer->children().size(); ++i) 1459 for (size_t i = 0; i < layer->children().size(); ++i)
1459 animateScrollbarsRecursive(layer->children()[i], monotonicTime); 1460 animateScrollbarsRecursive(layer->children()[i], monotonicTime);
1460 } 1461 }
1461 1462
1462 } // namespace cc 1463 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layer_tree_host_common_unittest.cc ('k') | cc/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698