| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 1837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1848 if (result.IsEmpty() || !result->IsString()) | 1848 if (result.IsEmpty() || !result->IsString()) |
| 1849 return; | 1849 return; |
| 1850 String scriptResult = toCoreString(v8::Handle<v8::String>::Cast(result)); | 1850 String scriptResult = toCoreString(v8::Handle<v8::String>::Cast(result)); |
| 1851 if (!frame()->navigationScheduler().locationChangePending()) | 1851 if (!frame()->navigationScheduler().locationChangePending()) |
| 1852 frame()->loader().replaceDocumentWhileExecutingJavaScriptURL(scriptResul
t, ownerDocument.get()); | 1852 frame()->loader().replaceDocumentWhileExecutingJavaScriptURL(scriptResul
t, ownerDocument.get()); |
| 1853 } | 1853 } |
| 1854 | 1854 |
| 1855 void WebLocalFrameImpl::initializeToReplaceRemoteFrame(WebRemoteFrame* oldWebFra
me) | 1855 void WebLocalFrameImpl::initializeToReplaceRemoteFrame(WebRemoteFrame* oldWebFra
me) |
| 1856 { | 1856 { |
| 1857 Frame* oldFrame = toCoreFrame(oldWebFrame); | 1857 Frame* oldFrame = toCoreFrame(oldWebFrame); |
| 1858 OwnPtrWillBePersistent<FrameOwner> tempOwner = adoptPtrWillBeNoop(new Placeh
olderFrameOwner()); | 1858 OwnPtrWillBePersistent<FrameOwner> tempOwner = RemoteBridgeFrameOwner::creat
e(nullptr, SandboxNone); |
| 1859 m_frame = LocalFrame::create(&m_frameLoaderClientImpl, oldFrame->host(), tem
pOwner.get()); | 1859 m_frame = LocalFrame::create(&m_frameLoaderClientImpl, oldFrame->host(), tem
pOwner.get()); |
| 1860 m_frame->setOwner(oldFrame->owner()); | 1860 m_frame->setOwner(oldFrame->owner()); |
| 1861 m_frame->tree().setName(oldFrame->tree().name()); | 1861 m_frame->tree().setName(oldFrame->tree().name()); |
| 1862 setParent(oldWebFrame->parent()); | 1862 setParent(oldWebFrame->parent()); |
| 1863 // We must call init() after m_frame is assigned because it is referenced | 1863 // We must call init() after m_frame is assigned because it is referenced |
| 1864 // during init(). Note that this may dispatch JS events; the frame may be | 1864 // during init(). Note that this may dispatch JS events; the frame may be |
| 1865 // detached after init() returns. | 1865 // detached after init() returns. |
| 1866 m_frame->init(); | 1866 m_frame->init(); |
| 1867 m_frame->loader().stateMachine()->advanceTo(m_frameLoaderClientImpl.backForw
ardLength() > 1 ? FrameLoaderStateMachine::CommittedMultipleRealLoads : FrameLoa
derStateMachine::CommittedFirstRealLoad); | 1867 m_frame->loader().stateMachine()->advanceTo(m_frameLoaderClientImpl.backForw
ardLength() > 1 ? FrameLoaderStateMachine::CommittedMultipleRealLoads : FrameLoa
derStateMachine::CommittedFirstRealLoad); |
| 1868 } | 1868 } |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2001 { | 2001 { |
| 2002 m_frameWidget = frameWidget; | 2002 m_frameWidget = frameWidget; |
| 2003 } | 2003 } |
| 2004 | 2004 |
| 2005 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const | 2005 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const |
| 2006 { | 2006 { |
| 2007 return m_frameWidget; | 2007 return m_frameWidget; |
| 2008 } | 2008 } |
| 2009 | 2009 |
| 2010 } // namespace blink | 2010 } // namespace blink |
| OLD | NEW |