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

Side by Side Diff: webkit/compositor_bindings/WebLayerTreeViewImpl.cpp

Issue 10914268: Change cc files from namespace WebCore to cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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 | Annotate | Revision Log
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 #include "WebLayerTreeViewImpl.h" 6 #include "WebLayerTreeViewImpl.h"
7 7
8 #include "CCFontAtlas.h" 8 #include "CCFontAtlas.h"
9 #include "CCInputHandler.h" 9 #include "CCInputHandler.h"
10 #include "CCLayerTreeHost.h" 10 #include "CCLayerTreeHost.h"
11 #include "LayerChromium.h" 11 #include "LayerChromium.h"
12 #include "WebLayerImpl.h" 12 #include "WebLayerImpl.h"
13 #include "WebToCCInputHandlerAdapter.h" 13 #include "WebToCCInputHandlerAdapter.h"
14 #include "webcore_convert.h" 14 #include "webcore_convert.h"
15 #include <public/WebGraphicsContext3D.h> 15 #include <public/WebGraphicsContext3D.h>
16 #include <public/WebInputHandler.h> 16 #include <public/WebInputHandler.h>
17 #include <public/WebLayer.h> 17 #include <public/WebLayer.h>
18 #include <public/WebLayerTreeView.h> 18 #include <public/WebLayerTreeView.h>
19 #include <public/WebLayerTreeViewClient.h> 19 #include <public/WebLayerTreeViewClient.h>
20 #include <public/WebRenderingStats.h> 20 #include <public/WebRenderingStats.h>
21 #include <public/WebSize.h> 21 #include <public/WebSize.h>
22 22
23 using namespace WebCore; 23 using namespace cc;
24 24
25 namespace WebKit { 25 namespace WebKit {
26 26
27 WebLayerTreeView* WebLayerTreeView::create(WebLayerTreeViewClient* client, const WebLayer& root, const WebLayerTreeView::Settings& settings) 27 WebLayerTreeView* WebLayerTreeView::create(WebLayerTreeViewClient* client, const WebLayer& root, const WebLayerTreeView::Settings& settings)
28 { 28 {
29 OwnPtr<WebLayerTreeViewImpl> layerTreeViewImpl = adoptPtr(new WebLayerTreeVi ewImpl(client)); 29 OwnPtr<WebLayerTreeViewImpl> layerTreeViewImpl = adoptPtr(new WebLayerTreeVi ewImpl(client));
30 if (!layerTreeViewImpl->initialize(settings)) 30 if (!layerTreeViewImpl->initialize(settings))
31 return 0; 31 return 0;
32 layerTreeViewImpl->setRootLayer(root); 32 layerTreeViewImpl->setRootLayer(root);
33 return layerTreeViewImpl.leakPtr(); 33 return layerTreeViewImpl.leakPtr();
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 void WebLayerTreeViewImpl::animate(double monotonicFrameBeginTime) 204 void WebLayerTreeViewImpl::animate(double monotonicFrameBeginTime)
205 { 205 {
206 m_client->updateAnimations(monotonicFrameBeginTime); 206 m_client->updateAnimations(monotonicFrameBeginTime);
207 } 207 }
208 208
209 void WebLayerTreeViewImpl::layout() 209 void WebLayerTreeViewImpl::layout()
210 { 210 {
211 m_client->layout(); 211 m_client->layout();
212 } 212 }
213 213
214 void WebLayerTreeViewImpl::applyScrollAndScale(const WebCore::IntSize& scrollDel ta, float pageScale) 214 void WebLayerTreeViewImpl::applyScrollAndScale(const cc::IntSize& scrollDelta, f loat pageScale)
215 { 215 {
216 m_client->applyScrollAndScale(convert(scrollDelta), pageScale); 216 m_client->applyScrollAndScale(convert(scrollDelta), pageScale);
217 } 217 }
218 218
219 PassOwnPtr<WebCompositorOutputSurface> WebLayerTreeViewImpl::createOutputSurface () 219 PassOwnPtr<WebCompositorOutputSurface> WebLayerTreeViewImpl::createOutputSurface ()
220 { 220 {
221 return adoptPtr(m_client->createOutputSurface()); 221 return adoptPtr(m_client->createOutputSurface());
222 } 222 }
223 223
224 void WebLayerTreeViewImpl::didRecreateOutputSurface(bool success) 224 void WebLayerTreeViewImpl::didRecreateOutputSurface(bool success)
(...skipping 28 matching lines...) Expand all
253 { 253 {
254 m_client->didCompleteSwapBuffers(); 254 m_client->didCompleteSwapBuffers();
255 } 255 }
256 256
257 void WebLayerTreeViewImpl::scheduleComposite() 257 void WebLayerTreeViewImpl::scheduleComposite()
258 { 258 {
259 m_client->scheduleComposite(); 259 m_client->scheduleComposite();
260 } 260 }
261 261
262 } // namespace WebKit 262 } // namespace WebKit
OLDNEW
« no previous file with comments | « webkit/compositor_bindings/WebLayerTreeViewImpl.h ('k') | webkit/compositor_bindings/WebScrollbarLayerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698