webkit/plugins/ppapi/npobject_var.cc - Issue 16155009: Update webkit/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: webkit/plugins/ppapi/npobject_var.cc

Issue 16155009: Update webkit/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 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/plugins/ppapi/npapi_glue.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | no next file with comments »

OLD	NEW
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 "webkit/plugins/ppapi/npobject_var.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "ppapi/c/pp_var.h"	8 #include "ppapi/c/pp_var.h"

9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"	9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"

10 #include "webkit/plugins/ppapi/host_globals.h"	10 #include "webkit/plugins/ppapi/host_globals.h"

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 HostGlobals::Get()->host_var_tracker()->RemoveNPObjectVar(this);	44 HostGlobals::Get()->host_var_tracker()->RemoveNPObjectVar(this);

45 pp_instance_ = 0;	45 pp_instance_ = 0;

46 }	46 }

47	47

48 // static	48 // static

49 scoped_refptr<NPObjectVar> NPObjectVar::FromPPVar(PP_Var var) {	49 scoped_refptr<NPObjectVar> NPObjectVar::FromPPVar(PP_Var var) {

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)	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

OLD	NEW