OLD | NEW |
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 "base/macros.h" | 5 #include "base/macros.h" |
6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
7 #include "content/renderer/pepper/host_globals.h" | 7 #include "content/renderer/pepper/host_globals.h" |
8 #include "content/renderer/pepper/host_var_tracker.h" | 8 #include "content/renderer/pepper/host_var_tracker.h" |
9 #include "content/renderer/pepper/mock_resource.h" | 9 #include "content/renderer/pepper/mock_resource.h" |
10 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" | 10 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" |
11 #include "content/renderer/pepper/pepper_try_catch.h" | 11 #include "content/renderer/pepper/pepper_try_catch.h" |
12 #include "content/renderer/pepper/v8_var_converter.h" | 12 #include "content/renderer/pepper/v8_var_converter.h" |
13 #include "content/renderer/pepper/v8object_var.h" | 13 #include "content/renderer/pepper/v8object_var.h" |
14 #include "content/test/ppapi_unittest.h" | 14 #include "content/test/ppapi_unittest.h" |
15 #include "gin/handle.h" | 15 #include "gin/handle.h" |
16 #include "gin/wrappable.h" | 16 #include "gin/wrappable.h" |
17 #include "ppapi/c/pp_var.h" | 17 #include "ppapi/c/pp_var.h" |
18 #include "ppapi/c/ppp_instance.h" | 18 #include "ppapi/c/ppp_instance.h" |
19 #include "third_party/WebKit/public/web/WebBindings.h" | |
20 | 19 |
21 using ppapi::V8ObjectVar; | 20 using ppapi::V8ObjectVar; |
22 | 21 |
23 namespace content { | 22 namespace content { |
24 | 23 |
25 namespace { | 24 namespace { |
26 | 25 |
27 int g_v8objects_alive = 0; | 26 int g_v8objects_alive = 0; |
28 | 27 |
29 class MyObject : public gin::Wrappable<MyObject> { | 28 class MyObject : public gin::Wrappable<MyObject> { |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 pp_object1 = ppapi::ScopedPPVar(); | 131 pp_object1 = ppapi::ScopedPPVar(); |
133 pp_object2 = ppapi::ScopedPPVar(); | 132 pp_object2 = ppapi::ScopedPPVar(); |
134 | 133 |
135 // Releasing the resource should free the internal ref, and so making a new | 134 // Releasing the resource should free the internal ref, and so making a new |
136 // one now should generate a new ID. | 135 // one now should generate a new ID. |
137 ppapi::ScopedPPVar pp_object3 = try_catch.FromV8(v8_object); | 136 ppapi::ScopedPPVar pp_object3 = try_catch.FromV8(v8_object); |
138 EXPECT_NE(pp_object1.get().value.as_id, pp_object3.get().value.as_id); | 137 EXPECT_NE(pp_object1.get().value.as_id, pp_object3.get().value.as_id); |
139 } | 138 } |
140 | 139 |
141 } // namespace content | 140 } // namespace content |
OLD | NEW |