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

Side by Side Diff: content/renderer/pepper/npobject_var.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "webkit/plugins/ppapi/npobject_var.h" 5 #include "content/renderer/pepper/npobject_var.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/renderer/pepper/host_globals.h"
9 #include "content/renderer/pepper/host_var_tracker.h"
8 #include "ppapi/c/pp_var.h" 10 #include "ppapi/c/pp_var.h"
9 #include "third_party/WebKit/public/web/WebBindings.h" 11 #include "third_party/WebKit/public/web/WebBindings.h"
10 #include "webkit/plugins/ppapi/host_globals.h"
11 #include "webkit/plugins/ppapi/host_var_tracker.h"
12 12
13 using webkit::ppapi::HostGlobals; 13 using webkit::ppapi::HostGlobals;
14 using WebKit::WebBindings; 14 using WebKit::WebBindings;
15 15
16 namespace ppapi { 16 namespace ppapi {
17 17
18 // NPObjectVar ----------------------------------------------------------------- 18 // NPObjectVar -----------------------------------------------------------------
19 19
20 NPObjectVar::NPObjectVar(PP_Instance instance, 20 NPObjectVar::NPObjectVar(PP_Instance instance,
21 NPObject* np_object) 21 NPObject* np_object)
(...skipping 28 matching lines...) Expand all
50 if (var.type != PP_VARTYPE_OBJECT) 50 if (var.type != PP_VARTYPE_OBJECT)
51 return scoped_refptr<NPObjectVar>(NULL); 51 return scoped_refptr<NPObjectVar>(NULL);
52 scoped_refptr<Var> var_object( 52 scoped_refptr<Var> var_object(
53 PpapiGlobals::Get()->GetVarTracker()->GetVar(var)); 53 PpapiGlobals::Get()->GetVarTracker()->GetVar(var));
54 if (!var_object.get()) 54 if (!var_object.get())
55 return scoped_refptr<NPObjectVar>(); 55 return scoped_refptr<NPObjectVar>();
56 return scoped_refptr<NPObjectVar>(var_object->AsNPObjectVar()); 56 return scoped_refptr<NPObjectVar>(var_object->AsNPObjectVar());
57 } 57 }
58 58
59 } // namespace ppapi 59 } // namespace ppapi
OLDNEW
« no previous file with comments | « content/renderer/pepper/npobject_var.h ('k') | content/renderer/pepper/pepper_audio_input_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698