Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp

Issue 1461193003: Revert of [Oilpan] Prepare full definition of classes before using Member (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make patch applicable Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/web/WebRemoteFrameImpl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 appendChild(child); 732 appendChild(child);
733 child->initializeCoreFrame(frame()->host(), result.storedValue->value.get(), name); 733 child->initializeCoreFrame(frame()->host(), result.storedValue->value.get(), name);
734 return child; 734 return child;
735 } 735 }
736 736
737 void WebRemoteFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<RemoteFrame> frame) 737 void WebRemoteFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<RemoteFrame> frame)
738 { 738 {
739 m_frame = frame; 739 m_frame = frame;
740 } 740 }
741 741
742 RemoteFrame* WebRemoteFrameImpl::frame() const
743 {
744 return m_frame.get();
745 }
746
747 WebRemoteFrameImpl* WebRemoteFrameImpl::fromFrame(RemoteFrame& frame) 742 WebRemoteFrameImpl* WebRemoteFrameImpl::fromFrame(RemoteFrame& frame)
748 { 743 {
749 if (!frame.client()) 744 if (!frame.client())
750 return nullptr; 745 return nullptr;
751 return static_cast<RemoteFrameClientImpl*>(frame.client())->webFrame(); 746 return static_cast<RemoteFrameClientImpl*>(frame.client())->webFrame();
752 } 747 }
753 748
754 void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const 749 void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const
755 { 750 {
756 ASSERT(source); 751 ASSERT(source);
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 : WebRemoteFrame(scope) 799 : WebRemoteFrame(scope)
805 , m_frameClient(RemoteFrameClientImpl::create(this)) 800 , m_frameClient(RemoteFrameClientImpl::create(this))
806 , m_client(client) 801 , m_client(client)
807 #if ENABLE(OILPAN) 802 #if ENABLE(OILPAN)
808 , m_selfKeepAlive(this) 803 , m_selfKeepAlive(this)
809 #endif 804 #endif
810 { 805 {
811 } 806 }
812 807
813 } // namespace blink 808 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebRemoteFrameImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698