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

Side by Side Diff: cc/CCLayerTreeHostImpl.cpp

Issue 10909020: Enable webkit_compositor_unittests (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | 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 "CCActiveGestureAnimation.h" 9 #include "CCActiveGestureAnimation.h"
10 #include "CCAppendQuadsData.h" 10 #include "CCAppendQuadsData.h"
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 742
743 for (size_t i = 0; i < layerImpl->children().size(); ++i) 743 for (size_t i = 0; i < layerImpl->children().size(); ++i)
744 adjustScrollsForPageScaleChange(layerImpl->children()[i].get(), pageScal eChange); 744 adjustScrollsForPageScaleChange(layerImpl->children()[i].get(), pageScal eChange);
745 } 745 }
746 746
747 void CCLayerTreeHostImpl::setDeviceScaleFactor(float deviceScaleFactor) 747 void CCLayerTreeHostImpl::setDeviceScaleFactor(float deviceScaleFactor)
748 { 748 {
749 if (deviceScaleFactor == m_deviceScaleFactor) 749 if (deviceScaleFactor == m_deviceScaleFactor)
750 return; 750 return;
751 m_deviceScaleFactor = deviceScaleFactor; 751 m_deviceScaleFactor = deviceScaleFactor;
752
753 updateMaxScrollPosition();
752 } 754 }
753 755
754 756
755 void CCLayerTreeHostImpl::setPageScaleFactorAndLimits(float pageScale, float min PageScale, float maxPageScale) 757 void CCLayerTreeHostImpl::setPageScaleFactorAndLimits(float pageScale, float min PageScale, float maxPageScale)
756 { 758 {
757 if (!pageScale) 759 if (!pageScale)
758 return; 760 return;
759 761
760 if (m_sentPageScaleDelta == 1 && pageScale == m_pageScale && minPageScale == m_minPageScale && maxPageScale == m_maxPageScale) 762 if (m_sentPageScaleDelta == 1 && pageScale == m_pageScale && minPageScale == m_minPageScale && maxPageScale == m_maxPageScale)
761 return; 763 return;
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
1268 1270
1269 CCScrollbarAnimationController* scrollbarController = layer->scrollbarAnimat ionController(); 1271 CCScrollbarAnimationController* scrollbarController = layer->scrollbarAnimat ionController();
1270 if (scrollbarController && scrollbarController->animate(monotonicTime)) 1272 if (scrollbarController && scrollbarController->animate(monotonicTime))
1271 m_client->setNeedsRedrawOnImplThread(); 1273 m_client->setNeedsRedrawOnImplThread();
1272 1274
1273 for (size_t i = 0; i < layer->children().size(); ++i) 1275 for (size_t i = 0; i < layer->children().size(); ++i)
1274 animateScrollbarsRecursive(layer->children()[i].get(), monotonicTime); 1276 animateScrollbarsRecursive(layer->children()[i].get(), monotonicTime);
1275 } 1277 }
1276 1278
1277 } // namespace WebCore 1279 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | cc/CCLayerTreeHostImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698