| 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 , m_world(world) | 86 , m_world(world) |
| 87 { | 87 { |
| 88 } | 88 } |
| 89 | 89 |
| 90 WindowProxy::~WindowProxy() | 90 WindowProxy::~WindowProxy() |
| 91 { | 91 { |
| 92 // clearForClose() or clearForNavigation() must be invoked before destructio
n starts. | 92 // clearForClose() or clearForNavigation() must be invoked before destructio
n starts. |
| 93 ASSERT(!isContextInitialized()); | 93 ASSERT(!isContextInitialized()); |
| 94 } | 94 } |
| 95 | 95 |
| 96 void WindowProxy::trace(Visitor* visitor) | 96 DEFINE_TRACE(WindowProxy) |
| 97 { | 97 { |
| 98 visitor->trace(m_frame); | 98 visitor->trace(m_frame); |
| 99 } | 99 } |
| 100 | 100 |
| 101 void WindowProxy::disposeContext(GlobalDetachmentBehavior behavior) | 101 void WindowProxy::disposeContext(GlobalDetachmentBehavior behavior) |
| 102 { | 102 { |
| 103 if (!isContextInitialized()) | 103 if (!isContextInitialized()) |
| 104 return; | 104 return; |
| 105 | 105 |
| 106 v8::HandleScope handleScope(m_isolate); | 106 v8::HandleScope handleScope(m_isolate); |
| (...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 487 | 487 |
| 488 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) | 488 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) |
| 489 { | 489 { |
| 490 ASSERT(m_world->isMainWorld()); | 490 ASSERT(m_world->isMainWorld()); |
| 491 if (!isContextInitialized()) | 491 if (!isContextInitialized()) |
| 492 return; | 492 return; |
| 493 setSecurityToken(origin); | 493 setSecurityToken(origin); |
| 494 } | 494 } |
| 495 | 495 |
| 496 } // namespace blink | 496 } // namespace blink |
| OLD | NEW |