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

Side by Side Diff: content/renderer/pepper/message_channel.cc

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more more clang fun Created 7 years, 5 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 (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/plugins/ppapi/message_channel.h" 5 #include "content/renderer/pepper/message_channel.h"
6 6
7 #include <cstdlib> 7 #include <cstdlib>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "content/renderer/pepper/host_array_buffer_var.h"
14 #include "content/renderer/pepper/npapi_glue.h"
15 #include "content/renderer/pepper/plugin_module.h"
16 #include "content/renderer/pepper/ppapi_plugin_instance_impl.h"
17 #include "content/renderer/pepper/v8_var_converter.h"
13 #include "ppapi/shared_impl/ppapi_globals.h" 18 #include "ppapi/shared_impl/ppapi_globals.h"
14 #include "ppapi/shared_impl/var.h" 19 #include "ppapi/shared_impl/var.h"
15 #include "ppapi/shared_impl/var_tracker.h" 20 #include "ppapi/shared_impl/var_tracker.h"
16 #include "third_party/WebKit/public/web/WebBindings.h" 21 #include "third_party/WebKit/public/web/WebBindings.h"
17 #include "third_party/WebKit/public/web/WebDocument.h" 22 #include "third_party/WebKit/public/web/WebDocument.h"
18 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h" 23 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h"
19 #include "third_party/WebKit/public/web/WebElement.h" 24 #include "third_party/WebKit/public/web/WebElement.h"
20 #include "third_party/WebKit/public/web/WebFrame.h" 25 #include "third_party/WebKit/public/web/WebFrame.h"
21 #include "third_party/WebKit/public/web/WebNode.h" 26 #include "third_party/WebKit/public/web/WebNode.h"
22 #include "third_party/WebKit/public/web/WebPluginContainer.h" 27 #include "third_party/WebKit/public/web/WebPluginContainer.h"
23 #include "third_party/WebKit/public/web/WebSerializedScriptValue.h" 28 #include "third_party/WebKit/public/web/WebSerializedScriptValue.h"
24 #include "v8/include/v8.h" 29 #include "v8/include/v8.h"
25 #include "webkit/plugins/ppapi/host_array_buffer_var.h"
26 #include "webkit/plugins/ppapi/npapi_glue.h"
27 #include "webkit/plugins/ppapi/plugin_module.h"
28 #include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h"
29 #include "webkit/plugins/ppapi/v8_var_converter.h"
30 30
31 using ppapi::ArrayBufferVar; 31 using ppapi::ArrayBufferVar;
32 using ppapi::PpapiGlobals; 32 using ppapi::PpapiGlobals;
33 using ppapi::StringVar; 33 using ppapi::StringVar;
34 using WebKit::WebBindings; 34 using WebKit::WebBindings;
35 using WebKit::WebElement; 35 using WebKit::WebElement;
36 using WebKit::WebDOMEvent; 36 using WebKit::WebDOMEvent;
37 using WebKit::WebDOMMessageEvent; 37 using WebKit::WebDOMMessageEvent;
38 using WebKit::WebPluginContainer; 38 using WebKit::WebPluginContainer;
39 using WebKit::WebSerializedScriptValue; 39 using WebKit::WebSerializedScriptValue;
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 // invokes: 511 // invokes:
512 // SetPassthroughObject(passthrough_object()); 512 // SetPassthroughObject(passthrough_object());
513 if (passthrough_object_) 513 if (passthrough_object_)
514 WebBindings::releaseObject(passthrough_object_); 514 WebBindings::releaseObject(passthrough_object_);
515 515
516 passthrough_object_ = passthrough; 516 passthrough_object_ = passthrough;
517 } 517 }
518 518
519 } // namespace ppapi 519 } // namespace ppapi
520 } // namespace webkit 520 } // namespace webkit
OLDNEW
« no previous file with comments | « content/renderer/pepper/message_channel.h ('k') | content/renderer/pepper/mock_platform_image_2d.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698