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

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

Issue 306853002: Replace Context::Scope with ScriptState::Scope (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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/inspector/InspectorOverlay.cpp ('k') | Source/web/InspectorFrontendClientImpl.cpp » ('j') | 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 23 matching lines...) Expand all
34 #include "core/frame/LocalFrame.h" 34 #include "core/frame/LocalFrame.h"
35 35
36 #include <v8.h> 36 #include <v8.h>
37 37
38 using namespace WebCore; 38 using namespace WebCore;
39 39
40 namespace WebCoreTestSupport { 40 namespace WebCoreTestSupport {
41 41
42 void injectInternalsObject(v8::Local<v8::Context> context) 42 void injectInternalsObject(v8::Local<v8::Context> context)
43 { 43 {
44 // This can happen if no JavaScript was used in the main frame. 44 ScriptState* scriptState = ScriptState::from(context);
45 if (context.IsEmpty()) 45 ScriptState::Scope scope(scriptState);
46 return; 46 v8::Handle<v8::Object> global = scriptState->context()->Global();
47 47 ExecutionContext* executionContext = scriptState->executionContext();
48 v8::Context::Scope contextScope(context); 48 if (executionContext->isDocument())
49 v8::HandleScope scope(context->GetIsolate()); 49 global->Set(v8::String::NewFromUtf8(scriptState->isolate(), Internals::i nternalsId), toV8(Internals::create(toDocument(executionContext)), global, scrip tState->isolate()));
50 ExecutionContext* scriptContext = currentExecutionContext(context->GetIsolat e());
51 if (scriptContext->isDocument())
52 context->Global()->Set(v8::String::NewFromUtf8(context->GetIsolate(), In ternals::internalsId), toV8(Internals::create(toDocument(scriptContext)), v8::Ha ndle<v8::Object>(), context->GetIsolate()));
53 } 50 }
54 51
55 void resetInternalsObject(v8::Local<v8::Context> context) 52 void resetInternalsObject(v8::Local<v8::Context> context)
56 { 53 {
57 // This can happen if JavaScript is disabled in the main frame. 54 // This can happen if JavaScript is disabled in the main frame.
58 if (context.IsEmpty()) 55 if (context.IsEmpty())
59 return; 56 return;
60 57
61 v8::Context::Scope contextScope(context); 58 ScriptState* scriptState = ScriptState::from(context);
62 v8::HandleScope scope(context->GetIsolate()); 59 ScriptState::Scope scope(scriptState);
63 60 Page* page = toDocument(scriptState->executionContext())->frame()->page();
64 ExecutionContext* scriptContext = currentExecutionContext(context->GetIsolat e());
65 Page* page = toDocument(scriptContext)->frame()->page();
66 ASSERT(page); 61 ASSERT(page);
67 Internals::resetToConsistentState(page); 62 Internals::resetToConsistentState(page);
68 InternalSettings::from(*page)->resetToConsistentState(); 63 InternalSettings::from(*page)->resetToConsistentState();
69 } 64 }
70 65
71 } 66 }
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorOverlay.cpp ('k') | Source/web/InspectorFrontendClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698