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

Side by Side Diff: Source/core/testing/v8/WebCoreTestSupport.cpp

Issue 318843003: Cleanup v8 usage in core (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix Skia compile Created 6 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 | « Source/core/testing/v8/WebCoreTestSupport.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 15 matching lines...) Expand all
26 #include "config.h" 26 #include "config.h"
27 #include "WebCoreTestSupport.h" 27 #include "WebCoreTestSupport.h"
28 28
29 #include "InternalSettings.h" 29 #include "InternalSettings.h"
30 #include "Internals.h" 30 #include "Internals.h"
31 #include "bindings/core/v8/V8Internals.h" 31 #include "bindings/core/v8/V8Internals.h"
32 #include "core/dom/Document.h" 32 #include "core/dom/Document.h"
33 #include "core/dom/ExecutionContext.h" 33 #include "core/dom/ExecutionContext.h"
34 #include "core/frame/LocalFrame.h" 34 #include "core/frame/LocalFrame.h"
35 35
36 #include <v8.h>
37
38 using namespace WebCore; 36 using namespace WebCore;
39 37
40 namespace WebCoreTestSupport { 38 namespace WebCoreTestSupport {
41 39
42 void injectInternalsObject(v8::Local<v8::Context> context) 40 void injectInternalsObject(v8::Local<v8::Context> context)
43 { 41 {
44 ScriptState* scriptState = ScriptState::from(context); 42 ScriptState* scriptState = ScriptState::from(context);
45 ScriptState::Scope scope(scriptState); 43 ScriptState::Scope scope(scriptState);
46 v8::Handle<v8::Object> global = scriptState->context()->Global(); 44 v8::Handle<v8::Object> global = scriptState->context()->Global();
47 ExecutionContext* executionContext = scriptState->executionContext(); 45 ExecutionContext* executionContext = scriptState->executionContext();
48 if (executionContext->isDocument()) 46 if (executionContext->isDocument())
49 global->Set(v8::String::NewFromUtf8(scriptState->isolate(), Internals::i nternalsId), toV8(Internals::create(toDocument(executionContext)), global, scrip tState->isolate())); 47 global->Set(v8::String::NewFromUtf8(scriptState->isolate(), Internals::i nternalsId), toV8(Internals::create(toDocument(executionContext)), global, scrip tState->isolate()));
50 } 48 }
51 49
52 void resetInternalsObject(v8::Local<v8::Context> context) 50 void resetInternalsObject(v8::Local<v8::Context> context)
53 { 51 {
54 // This can happen if JavaScript is disabled in the main frame. 52 // This can happen if JavaScript is disabled in the main frame.
55 if (context.IsEmpty()) 53 if (context.IsEmpty())
56 return; 54 return;
57 55
58 ScriptState* scriptState = ScriptState::from(context); 56 ScriptState* scriptState = ScriptState::from(context);
59 ScriptState::Scope scope(scriptState); 57 ScriptState::Scope scope(scriptState);
60 Page* page = toDocument(scriptState->executionContext())->frame()->page(); 58 Page* page = toDocument(scriptState->executionContext())->frame()->page();
61 ASSERT(page); 59 ASSERT(page);
62 Internals::resetToConsistentState(page); 60 Internals::resetToConsistentState(page);
63 InternalSettings::from(*page)->resetToConsistentState(); 61 InternalSettings::from(*page)->resetToConsistentState();
64 } 62 }
65 63
66 } 64 }
OLDNEW
« no previous file with comments | « Source/core/testing/v8/WebCoreTestSupport.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698