| 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 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 | 363 |
| 364 v8::Local<v8::Context> context = m_scriptState->context(); | 364 v8::Local<v8::Context> context = m_scriptState->context(); |
| 365 // The global proxy object. Note this is not the global object. | 365 // The global proxy object. Note this is not the global object. |
| 366 v8::Local<v8::Object> globalProxy = context->Global(); | 366 v8::Local<v8::Object> globalProxy = context->Global(); |
| 367 // The global object, aka window wrapper object. | 367 // The global object, aka window wrapper object. |
| 368 v8::Local<v8::Object> windowWrapper = globalProxy->GetPrototype().As<v8::Obj
ect>(); | 368 v8::Local<v8::Object> windowWrapper = globalProxy->GetPrototype().As<v8::Obj
ect>(); |
| 369 windowWrapper = V8DOMWrapper::associateObjectWithWrapper(m_isolate, window,
wrapperTypeInfo, windowWrapper); | 369 windowWrapper = V8DOMWrapper::associateObjectWithWrapper(m_isolate, window,
wrapperTypeInfo, windowWrapper); |
| 370 // The prototype object of Window interface. | 370 // The prototype object of Window interface. |
| 371 v8::Local<v8::Object> windowPrototype = windowWrapper->GetPrototype().As<v8:
:Object>(); | 371 v8::Local<v8::Object> windowPrototype = windowWrapper->GetPrototype().As<v8:
:Object>(); |
| 372 RELEASE_ASSERT(!windowPrototype.IsEmpty()); | 372 RELEASE_ASSERT(!windowPrototype.IsEmpty()); |
| 373 V8DOMWrapper::setNativeInfo(windowPrototype, wrapperTypeInfo, window); | 373 V8DOMWrapper::setNativeInfo(m_isolate, windowPrototype, wrapperTypeInfo, win
dow); |
| 374 // The named properties object of Window interface. | 374 // The named properties object of Window interface. |
| 375 v8::Local<v8::Object> windowProperties = windowPrototype->GetPrototype().As<
v8::Object>(); | 375 v8::Local<v8::Object> windowProperties = windowPrototype->GetPrototype().As<
v8::Object>(); |
| 376 RELEASE_ASSERT(!windowProperties.IsEmpty()); | 376 RELEASE_ASSERT(!windowProperties.IsEmpty()); |
| 377 V8DOMWrapper::setNativeInfo(windowProperties, wrapperTypeInfo, window); | 377 V8DOMWrapper::setNativeInfo(m_isolate, windowProperties, wrapperTypeInfo, wi
ndow); |
| 378 | 378 |
| 379 // TODO(keishi): Remove installPagePopupController and implement | 379 // TODO(keishi): Remove installPagePopupController and implement |
| 380 // PagePopupController in another way. | 380 // PagePopupController in another way. |
| 381 V8PagePopupControllerBinding::installPagePopupController(context, windowWrap
per); | 381 V8PagePopupControllerBinding::installPagePopupController(context, windowWrap
per); |
| 382 return true; | 382 return true; |
| 383 } | 383 } |
| 384 | 384 |
| 385 void WindowProxy::updateDocumentWrapper(v8::Local<v8::Object> wrapper) | 385 void WindowProxy::updateDocumentWrapper(v8::Local<v8::Object> wrapper) |
| 386 { | 386 { |
| 387 ASSERT(m_world->isMainWorld()); | 387 ASSERT(m_world->isMainWorld()); |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 } | 562 } |
| 563 | 563 |
| 564 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) | 564 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) |
| 565 { | 565 { |
| 566 if (!isContextInitialized()) | 566 if (!isContextInitialized()) |
| 567 return; | 567 return; |
| 568 setSecurityToken(origin); | 568 setSecurityToken(origin); |
| 569 } | 569 } |
| 570 | 570 |
| 571 } // namespace blink | 571 } // namespace blink |
| OLD | NEW |