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

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

Issue 9933003: Merge 112360 - [chromium] Route monotonic clock up from compositor (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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 return RecreateFailedAndGaveUp; 174 return RecreateFailedAndGaveUp;
175 } 175 }
176 176
177 void CCLayerTreeHost::deleteContentsTexturesOnImplThread(TextureAllocator* alloc ator) 177 void CCLayerTreeHost::deleteContentsTexturesOnImplThread(TextureAllocator* alloc ator)
178 { 178 {
179 ASSERT(CCProxy::isImplThread()); 179 ASSERT(CCProxy::isImplThread());
180 if (m_contentsTextureManager) 180 if (m_contentsTextureManager)
181 m_contentsTextureManager->evictAndDeleteAllTextures(allocator); 181 m_contentsTextureManager->evictAndDeleteAllTextures(allocator);
182 } 182 }
183 183
184 void CCLayerTreeHost::updateAnimations(double wallClockTime) 184 void CCLayerTreeHost::updateAnimations(double monotonicFrameBeginTime)
185 { 185 {
186 m_animating = true; 186 m_animating = true;
187 m_client->updateAnimations(wallClockTime); 187 m_client->updateAnimations(monotonicFrameBeginTime);
188 animateLayers(monotonicallyIncreasingTime()); 188 animateLayers(monotonicFrameBeginTime);
189 m_animating = false; 189 m_animating = false;
190 } 190 }
191 191
192 void CCLayerTreeHost::layout() 192 void CCLayerTreeHost::layout()
193 { 193 {
194 m_client->layout(); 194 m_client->layout();
195 } 195 }
196 196
197 void CCLayerTreeHost::beginCommitOnImplThread(CCLayerTreeHostImpl* hostImpl) 197 void CCLayerTreeHost::beginCommitOnImplThread(CCLayerTreeHostImpl* hostImpl)
198 { 198 {
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 for (size_t eventIndex = 0; eventIndex < events.size(); ++eventIndex) { 692 for (size_t eventIndex = 0; eventIndex < events.size(); ++eventIndex) {
693 if (layer->id() == events[eventIndex].layerId) 693 if (layer->id() == events[eventIndex].layerId)
694 layer->notifyAnimationStarted(events[eventIndex], wallClockTime); 694 layer->notifyAnimationStarted(events[eventIndex], wallClockTime);
695 } 695 }
696 696
697 for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIn dex) 697 for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIn dex)
698 setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime); 698 setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
699 } 699 }
700 700
701 } // namespace WebCore 701 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698