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

Side by Side Diff: third_party/WebKit/Source/web/WebTestingSupport.cpp

Issue 2719893002: //third_party/WebKit/Source/web: include v8 as a user, not system, header (Closed)
Patch Set: Revert things that use inspector headers. Created 3 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 11 matching lines...) Expand all
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "public/web/WebTestingSupport.h" 26 #include "public/web/WebTestingSupport.h"
27 27
28 #include "bindings/modules/v8/V8InternalsPartial.h" 28 #include "bindings/modules/v8/V8InternalsPartial.h"
29 #include "bindings/modules/v8/V8WorkerInternalsPartial.h" 29 #include "bindings/modules/v8/V8WorkerInternalsPartial.h"
30 #include "core/testing/v8/WebCoreTestSupport.h" 30 #include "core/testing/v8/WebCoreTestSupport.h"
31 #include "public/web/WebLocalFrame.h" 31 #include "public/web/WebLocalFrame.h"
32 #include <v8/include/v8.h> 32 #include "v8/include/v8.h"
33 33
34 namespace blink { 34 namespace blink {
35 35
36 void WebTestingSupport::injectInternalsObject(WebLocalFrame* frame) { 36 void WebTestingSupport::injectInternalsObject(WebLocalFrame* frame) {
37 V8InternalsPartial::initialize(); 37 V8InternalsPartial::initialize();
38 v8::HandleScope handleScope(v8::Isolate::GetCurrent()); 38 v8::HandleScope handleScope(v8::Isolate::GetCurrent());
39 WebCoreTestSupport::injectInternalsObject(frame->mainWorldScriptContext()); 39 WebCoreTestSupport::injectInternalsObject(frame->mainWorldScriptContext());
40 } 40 }
41 41
42 void WebTestingSupport::resetInternalsObject(WebLocalFrame* frame) { 42 void WebTestingSupport::resetInternalsObject(WebLocalFrame* frame) {
43 v8::HandleScope handleScope(v8::Isolate::GetCurrent()); 43 v8::HandleScope handleScope(v8::Isolate::GetCurrent());
44 WebCoreTestSupport::resetInternalsObject(frame->mainWorldScriptContext()); 44 WebCoreTestSupport::resetInternalsObject(frame->mainWorldScriptContext());
45 } 45 }
46 46
47 void WebTestingSupport::injectInternalsObject(v8::Local<v8::Context> context) { 47 void WebTestingSupport::injectInternalsObject(v8::Local<v8::Context> context) {
48 V8InternalsPartial::initialize(); 48 V8InternalsPartial::initialize();
49 V8WorkerInternalsPartial::initialize(); 49 V8WorkerInternalsPartial::initialize();
50 v8::HandleScope handleScope(v8::Isolate::GetCurrent()); 50 v8::HandleScope handleScope(v8::Isolate::GetCurrent());
51 WebCoreTestSupport::injectInternalsObject(context); 51 WebCoreTestSupport::injectInternalsObject(context);
52 } 52 }
53 53
54 } // namespace blink 54 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebKit.cpp ('k') | third_party/WebKit/Source/web/tests/ActivityLoggerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698