| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009, 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 void LocalWindowProxy::updateDocumentProperty() { | 248 void LocalWindowProxy::updateDocumentProperty() { |
| 249 DCHECK(m_world->isMainWorld()); | 249 DCHECK(m_world->isMainWorld()); |
| 250 | 250 |
| 251 ScriptState::Scope scope(m_scriptState.get()); | 251 ScriptState::Scope scope(m_scriptState.get()); |
| 252 v8::Local<v8::Context> context = m_scriptState->context(); | 252 v8::Local<v8::Context> context = m_scriptState->context(); |
| 253 v8::Local<v8::Value> documentWrapper = | 253 v8::Local<v8::Value> documentWrapper = |
| 254 ToV8(frame()->document(), context->Global(), isolate()); | 254 ToV8(frame()->document(), context->Global(), isolate()); |
| 255 DCHECK(documentWrapper->IsObject()); | 255 DCHECK(documentWrapper->IsObject()); |
| 256 // Update the cached accessor for window.document. | 256 // Update the cached accessor for window.document. |
| 257 CHECK(V8PrivateProperty::getWindowDocumentCachedAccessor(isolate()).set( | 257 CHECK(V8PrivateProperty::getWindowDocumentCachedAccessor(isolate()).set( |
| 258 context, context->Global(), documentWrapper)); | 258 context->Global(), documentWrapper)); |
| 259 } | 259 } |
| 260 | 260 |
| 261 void LocalWindowProxy::updateActivityLogger() { | 261 void LocalWindowProxy::updateActivityLogger() { |
| 262 m_scriptState->perContextData()->setActivityLogger( | 262 m_scriptState->perContextData()->setActivityLogger( |
| 263 V8DOMActivityLogger::activityLogger( | 263 V8DOMActivityLogger::activityLogger( |
| 264 m_world->worldId(), | 264 m_world->worldId(), |
| 265 frame()->document() ? frame()->document()->baseURI() : KURL())); | 265 frame()->document() ? frame()->document()->baseURI() : KURL())); |
| 266 } | 266 } |
| 267 | 267 |
| 268 void LocalWindowProxy::setSecurityToken(SecurityOrigin* origin) { | 268 void LocalWindowProxy::setSecurityToken(SecurityOrigin* origin) { |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 | 439 |
| 440 setSecurityToken(origin); | 440 setSecurityToken(origin); |
| 441 } | 441 } |
| 442 | 442 |
| 443 LocalWindowProxy::LocalWindowProxy(v8::Isolate* isolate, | 443 LocalWindowProxy::LocalWindowProxy(v8::Isolate* isolate, |
| 444 LocalFrame& frame, | 444 LocalFrame& frame, |
| 445 RefPtr<DOMWrapperWorld> world) | 445 RefPtr<DOMWrapperWorld> world) |
| 446 : WindowProxy(isolate, frame, std::move(world)) {} | 446 : WindowProxy(isolate, frame, std::move(world)) {} |
| 447 | 447 |
| 448 } // namespace blink | 448 } // namespace blink |
| OLD | NEW |