| OLD | NEW |
| 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 24 matching lines...) Expand all Loading... |
| 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 v8::Context::Scope contextScope(context); | 44 v8::Context::Scope contextScope(context); |
| 45 v8::HandleScope scope; | 45 v8::HandleScope scope(context->GetIsolate()); |
| 46 | |
| 47 ScriptExecutionContext* scriptContext = getScriptExecutionContext(); | 46 ScriptExecutionContext* scriptContext = getScriptExecutionContext(); |
| 48 if (scriptContext->isDocument()) | 47 if (scriptContext->isDocument()) |
| 49 context->Global()->Set(v8::String::New(Internals::internalsId), toV8(Int
ernals::create(toDocument(scriptContext)), v8::Handle<v8::Object>(), context->Ge
tIsolate())); | 48 context->Global()->Set(v8::String::New(Internals::internalsId), toV8(Int
ernals::create(toDocument(scriptContext)), v8::Handle<v8::Object>(), context->Ge
tIsolate())); |
| 50 } | 49 } |
| 51 | 50 |
| 52 void resetInternalsObject(v8::Local<v8::Context> context) | 51 void resetInternalsObject(v8::Local<v8::Context> context) |
| 53 { | 52 { |
| 54 // This can happen if JavaScript is disabled in the main frame. | 53 // This can happen if JavaScript is disabled in the main frame. |
| 55 if (context.IsEmpty()) | 54 if (context.IsEmpty()) |
| 56 return; | 55 return; |
| 57 | 56 |
| 58 v8::Context::Scope contextScope(context); | 57 v8::Context::Scope contextScope(context); |
| 59 v8::HandleScope scope; | 58 v8::HandleScope scope(context->GetIsolate()); |
| 60 | 59 |
| 61 ScriptExecutionContext* scriptContext = getScriptExecutionContext(); | 60 ScriptExecutionContext* scriptContext = getScriptExecutionContext(); |
| 62 Page* page = toDocument(scriptContext)->frame()->page(); | 61 Page* page = toDocument(scriptContext)->frame()->page(); |
| 63 Internals::resetToConsistentState(page); | 62 Internals::resetToConsistentState(page); |
| 64 InternalSettings::from(page)->resetToConsistentState(); | 63 InternalSettings::from(page)->resetToConsistentState(); |
| 65 } | 64 } |
| 66 | 65 |
| 67 } | 66 } |
| OLD | NEW |