| 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 "public/web/WebFrame.h" | 6 #include "public/web/WebFrame.h" |
| 7 | 7 |
| 8 #include "core/frame/RemoteFrame.h" | 8 #include "core/frame/RemoteFrame.h" |
| 9 #include "core/html/HTMLFrameOwnerElement.h" | 9 #include "core/html/HTMLFrameOwnerElement.h" |
| 10 #include "platform/UserGestureIndicator.h" | 10 #include "platform/UserGestureIndicator.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 oldFrame->disconnectOwnerElement(); | 80 oldFrame->disconnectOwnerElement(); |
| 81 if (frame->isWebLocalFrame()) { | 81 if (frame->isWebLocalFrame()) { |
| 82 toWebLocalFrameImpl(frame)->initializeCoreFrame(oldFrame->host(), owner,
oldFrame->tree().name(), nullAtom); | 82 toWebLocalFrameImpl(frame)->initializeCoreFrame(oldFrame->host(), owner,
oldFrame->tree().name(), nullAtom); |
| 83 } else { | 83 } else { |
| 84 toWebRemoteFrameImpl(frame)->initializeCoreFrame(oldFrame->host(), owner
, oldFrame->tree().name()); | 84 toWebRemoteFrameImpl(frame)->initializeCoreFrame(oldFrame->host(), owner
, oldFrame->tree().name()); |
| 85 } | 85 } |
| 86 | 86 |
| 87 return true; | 87 return true; |
| 88 } | 88 } |
| 89 | 89 |
| 90 v8::Handle<v8::Value> WebFrame::executeScriptAndReturnValueForTests(const WebScr
iptSource& source) | |
| 91 { | |
| 92 // FIXME: This fake UserGestureIndicator is required for a bunch of browser | |
| 93 // tests to pass. We should update the tests to simulate input and get rid | |
| 94 // of this. | |
| 95 // http://code.google.com/p/chromium/issues/detail?id=86397 | |
| 96 UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture); | |
| 97 return executeScriptAndReturnValue(source); | |
| 98 } | |
| 99 | |
| 100 WebFrame* WebFrame::opener() const | 90 WebFrame* WebFrame::opener() const |
| 101 { | 91 { |
| 102 return m_opener; | 92 return m_opener; |
| 103 } | 93 } |
| 104 | 94 |
| 105 void WebFrame::setOpener(WebFrame* opener) | 95 void WebFrame::setOpener(WebFrame* opener) |
| 106 { | 96 { |
| 107 if (m_opener) | 97 if (m_opener) |
| 108 m_opener->m_openedFrameTracker->remove(this); | 98 m_opener->m_openedFrameTracker->remove(this); |
| 109 if (opener) | 99 if (opener) |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 visitor->trace(toWebLocalFrameImpl(child)); | 231 visitor->trace(toWebLocalFrameImpl(child)); |
| 242 else | 232 else |
| 243 visitor->trace(toWebRemoteFrameImpl(child)); | 233 visitor->trace(toWebRemoteFrameImpl(child)); |
| 244 | 234 |
| 245 child = child->nextSibling(); | 235 child = child->nextSibling(); |
| 246 } | 236 } |
| 247 #endif | 237 #endif |
| 248 } | 238 } |
| 249 | 239 |
| 250 } // namespace blink | 240 } // namespace blink |
| OLD | NEW |