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

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

Issue 10199014: Merge 114800 - [chromium] Plumb a compositor surface ready notification through to the threaded com… (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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 { 111 {
112 ASSERT(CCProxy::isMainThread()); 112 ASSERT(CCProxy::isMainThread());
113 TRACE_EVENT("CCLayerTreeHost::~CCLayerTreeHost", this, 0); 113 TRACE_EVENT("CCLayerTreeHost::~CCLayerTreeHost", this, 0);
114 ASSERT(m_proxy); 114 ASSERT(m_proxy);
115 m_proxy->stop(); 115 m_proxy->stop();
116 m_proxy.clear(); 116 m_proxy.clear();
117 clearPendingUpdate(); 117 clearPendingUpdate();
118 numLayerTreeInstances--; 118 numLayerTreeInstances--;
119 } 119 }
120 120
121 void CCLayerTreeHost::setSurfaceReady()
122 {
123 m_proxy->setSurfaceReady();
124 }
125
121 void CCLayerTreeHost::initializeLayerRenderer() 126 void CCLayerTreeHost::initializeLayerRenderer()
122 { 127 {
123 TRACE_EVENT("CCLayerTreeHost::initializeLayerRenderer", this, 0); 128 TRACE_EVENT("CCLayerTreeHost::initializeLayerRenderer", this, 0);
124 if (!m_proxy->initializeLayerRenderer()) { 129 if (!m_proxy->initializeLayerRenderer()) {
125 // Uh oh, better tell the client that we can't do anything with this con text. 130 // Uh oh, better tell the client that we can't do anything with this con text.
126 m_client->didRecreateContext(false); 131 m_client->didRecreateContext(false);
127 return; 132 return;
128 } 133 }
129 134
130 // Update m_settings based on capabilities that we got back from the rendere r. 135 // Update m_settings based on capabilities that we got back from the rendere r.
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 for (size_t eventIndex = 0; eventIndex < events.size(); ++eventIndex) { 707 for (size_t eventIndex = 0; eventIndex < events.size(); ++eventIndex) {
703 if (layer->id() == events[eventIndex].layerId) 708 if (layer->id() == events[eventIndex].layerId)
704 layer->notifyAnimationStarted(events[eventIndex], wallClockTime); 709 layer->notifyAnimationStarted(events[eventIndex], wallClockTime);
705 } 710 }
706 711
707 for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIn dex) 712 for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIn dex)
708 setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime); 713 setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
709 } 714 }
710 715
711 } // namespace WebCore 716 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h ('k') | Source/WebCore/platform/graphics/chromium/cc/CCProxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698