webkit/plugins/npapi/test/plugin_npobject_lifetime_test.cc - Issue 5961004: Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugin...

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/npapi/test/plugin_npobject_lifetime_test.cc

Issue 5961004: Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugin... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years 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

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2008 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/npapi/test/plugin_npobject_lifetime_test.h"	5 #include "webkit/glue/plugins/test/plugin_npobject_lifetime_test.h"

6	6

7 namespace NPAPIClient {	7 namespace NPAPIClient {

8	8

9 const int kNPObjectLifetimeTimer = 100;	9 const int kNPObjectLifetimeTimer = 100;

10 const int kNPObjectLifetimeTimerElapse = 2000;	10 const int kNPObjectLifetimeTimerElapse = 2000;

11	11

12 NPObject* NPObjectLifetimeTestInstance2::plugin_instance_object_ = NULL;	12 NPObject* NPObjectLifetimeTestInstance2::plugin_instance_object_ = NULL;

13	13

14 NPObjectDeletePluginInNPN_Evaluate*	14 NPObjectDeletePluginInNPN_Evaluate*

15 NPObjectDeletePluginInNPN_Evaluate::g_npn_evaluate_test_instance_ = NULL;	15 NPObjectDeletePluginInNPN_Evaluate::g_npn_evaluate_test_instance_ = NULL;

(...skipping 149 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
165 static_cast<unsigned int>(script.length());	165 static_cast<unsigned int>(script.length());

166	166

167 NPVariant result_var;	167 NPVariant result_var;

168 bool result = g_npn_evaluate_test_instance_->HostFunctions()->evaluate(	168 bool result = g_npn_evaluate_test_instance_->HostFunctions()->evaluate(

169 g_npn_evaluate_test_instance_->id(), window_obj,	169 g_npn_evaluate_test_instance_->id(), window_obj,

170 &script_string, &result_var);	170 &script_string, &result_var);

171 // If this test failed we would have crashed by now.	171 // If this test failed we would have crashed by now.

172 }	172 }

173	173

174 } // namespace NPAPIClient	174 } // namespace NPAPIClient

OLD	NEW