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

Side by Side Diff: webkit/support/webkit_support.cc

Issue 12496013: Move compositor bindings implementations out of WebKit::, fix style (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 9 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
« no previous file with comments | « webkit/support/test_webkit_platform_support.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "webkit/support/webkit_support.h" 5 #include "webkit/support/webkit_support.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/base64.h" 8 #include "base/base64.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 WebKit::WebLayerTreeView* CreateLayerTreeView( 531 WebKit::WebLayerTreeView* CreateLayerTreeView(
532 LayerTreeViewType type, 532 LayerTreeViewType type,
533 DRTLayerTreeViewClient* client, 533 DRTLayerTreeViewClient* client,
534 WebKit::WebThread* thread) { 534 WebKit::WebThread* thread) {
535 scoped_ptr<cc::Thread> compositor_thread; 535 scoped_ptr<cc::Thread> compositor_thread;
536 if (thread) 536 if (thread)
537 compositor_thread = cc::ThreadImpl::CreateForDifferentThread( 537 compositor_thread = cc::ThreadImpl::CreateForDifferentThread(
538 static_cast<webkit_glue::WebThreadImpl*>(thread)-> 538 static_cast<webkit_glue::WebThreadImpl*>(thread)->
539 message_loop()->message_loop_proxy()); 539 message_loop()->message_loop_proxy());
540 540
541 scoped_ptr<WebKit::WebLayerTreeViewImplForTesting> view( 541 scoped_ptr<webkit::WebLayerTreeViewImplForTesting> view(
542 new WebKit::WebLayerTreeViewImplForTesting(type, client)); 542 new webkit::WebLayerTreeViewImplForTesting(type, client));
543 543
544 if (!view->initialize(compositor_thread.Pass())) 544 if (!view->initialize(compositor_thread.Pass()))
545 return NULL; 545 return NULL;
546 return view.release(); 546 return view.release();
547 } 547 }
548 548
549 void SetThreadedCompositorEnabled(bool enabled) { 549 void SetThreadedCompositorEnabled(bool enabled) {
550 test_environment->webkit_platform_support()-> 550 test_environment->webkit_platform_support()->
551 set_threaded_compositing_enabled(enabled); 551 set_threaded_compositing_enabled(enabled);
552 } 552 }
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 // Logging 916 // Logging
917 void EnableWebCoreLogChannels(const std::string& channels) { 917 void EnableWebCoreLogChannels(const std::string& channels) {
918 webkit_glue::EnableWebCoreLogChannels(channels); 918 webkit_glue::EnableWebCoreLogChannels(channels);
919 } 919 }
920 920
921 void SetGamepadData(const WebKit::WebGamepads& pads) { 921 void SetGamepadData(const WebKit::WebGamepads& pads) {
922 test_environment->webkit_platform_support()->setGamepadData(pads); 922 test_environment->webkit_platform_support()->setGamepadData(pads);
923 } 923 }
924 924
925 } // namespace webkit_support 925 } // namespace webkit_support
OLDNEW
« no previous file with comments | « webkit/support/test_webkit_platform_support.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698