| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "web/WebRemoteFrameImpl.h" | 6 #include "web/WebRemoteFrameImpl.h" |
| 7 | 7 |
| 8 #include "core/frame/FrameView.h" | 8 #include "core/frame/FrameView.h" |
| 9 #include "core/frame/RemoteFrame.h" | 9 #include "core/frame/RemoteFrame.h" |
| 10 #include "core/frame/Settings.h" | 10 #include "core/frame/Settings.h" |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 ASSERT_NOT_REACHED(); | 278 ASSERT_NOT_REACHED(); |
| 279 return v8::Local<v8::Value>(); | 279 return v8::Local<v8::Value>(); |
| 280 } | 280 } |
| 281 | 281 |
| 282 v8::Local<v8::Context> WebRemoteFrameImpl::mainWorldScriptContext() const | 282 v8::Local<v8::Context> WebRemoteFrameImpl::mainWorldScriptContext() const |
| 283 { | 283 { |
| 284 ASSERT_NOT_REACHED(); | 284 ASSERT_NOT_REACHED(); |
| 285 return v8::Local<v8::Context>(); | 285 return v8::Local<v8::Context>(); |
| 286 } | 286 } |
| 287 | 287 |
| 288 v8::Local<v8::Context> WebRemoteFrameImpl::deprecatedMainWorldScriptContext() co
nst |
| 289 { |
| 290 return toV8Context(frame(), DOMWrapperWorld::mainWorld()); |
| 291 } |
| 292 |
| 288 void WebRemoteFrameImpl::reload(bool ignoreCache) | 293 void WebRemoteFrameImpl::reload(bool ignoreCache) |
| 289 { | 294 { |
| 290 ASSERT_NOT_REACHED(); | 295 ASSERT_NOT_REACHED(); |
| 291 } | 296 } |
| 292 | 297 |
| 293 void WebRemoteFrameImpl::reloadWithOverrideURL(const WebURL& overrideUrl, bool i
gnoreCache) | 298 void WebRemoteFrameImpl::reloadWithOverrideURL(const WebURL& overrideUrl, bool i
gnoreCache) |
| 294 { | 299 { |
| 295 ASSERT_NOT_REACHED(); | 300 ASSERT_NOT_REACHED(); |
| 296 } | 301 } |
| 297 | 302 |
| (...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 803 : WebRemoteFrame(scope) | 808 : WebRemoteFrame(scope) |
| 804 , m_frameClient(RemoteFrameClientImpl::create(this)) | 809 , m_frameClient(RemoteFrameClientImpl::create(this)) |
| 805 , m_client(client) | 810 , m_client(client) |
| 806 #if ENABLE(OILPAN) | 811 #if ENABLE(OILPAN) |
| 807 , m_selfKeepAlive(this) | 812 , m_selfKeepAlive(this) |
| 808 #endif | 813 #endif |
| 809 { | 814 { |
| 810 } | 815 } |
| 811 | 816 |
| 812 } // namespace blink | 817 } // namespace blink |
| OLD | NEW |