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

Side by Side Diff: Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp

Issue 10146014: Merge 113677 - [chromium] Viewport is not filled when out of texture memory on mac (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 8 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 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 pass->appendQuadsForLayer(*it, &occlusionTracker, usedCheckerboard); 308 pass->appendQuadsForLayer(*it, &occlusionTracker, usedCheckerboard);
309 if (usedCheckerboard) { 309 if (usedCheckerboard) {
310 bool layerHasAnimatingTransform = it->screenSpaceTransformIsAnimatin g() || it->drawTransformIsAnimating(); 310 bool layerHasAnimatingTransform = it->screenSpaceTransformIsAnimatin g() || it->drawTransformIsAnimating();
311 if (layerHasAnimatingTransform) 311 if (layerHasAnimatingTransform)
312 drawFrame = false; 312 drawFrame = false;
313 } 313 }
314 314
315 occlusionTracker.markOccludedBehindLayer(*it); 315 occlusionTracker.markOccludedBehindLayer(*it);
316 } 316 }
317 317
318 passes.last()->appendQuadsToFillScreen(rootLayer(), m_backgroundColor, occlu sionTracker);
319
318 if (drawFrame) 320 if (drawFrame)
319 occlusionTracker.overdrawMetrics().recordMetrics(this); 321 occlusionTracker.overdrawMetrics().recordMetrics(this);
320 return drawFrame; 322 return drawFrame;
321 } 323 }
322 324
323 void CCLayerTreeHostImpl::animateLayersRecursive(CCLayerImpl* current, double mo notonicTime, double wallClockTime, CCAnimationEventsVector* events, bool& didAni mate, bool& needsAnimateLayers) 325 void CCLayerTreeHostImpl::animateLayersRecursive(CCLayerImpl* current, double mo notonicTime, double wallClockTime, CCAnimationEventsVector* events, bool& didAni mate, bool& needsAnimateLayers)
324 { 326 {
325 bool subtreeNeedsAnimateLayers = false; 327 bool subtreeNeedsAnimateLayers = false;
326 328
327 CCLayerAnimationController* currentController = current->layerAnimationContr oller(); 329 CCLayerAnimationController* currentController = current->layerAnimationContr oller();
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 return; 828 return;
827 829
828 bool isContinuing = m_activeGestureAnimation->animate(monotonicTime); 830 bool isContinuing = m_activeGestureAnimation->animate(monotonicTime);
829 if (isContinuing) 831 if (isContinuing)
830 m_client->setNeedsRedrawOnImplThread(); 832 m_client->setNeedsRedrawOnImplThread();
831 else 833 else
832 m_activeGestureAnimation.clear(); 834 m_activeGestureAnimation.clear();
833 } 835 }
834 836
835 } // namespace WebCore 837 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698