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

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

Issue 1162623007: Removed redundant rect methods on FrameView (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 months 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 | « Source/web/FindInPageCoordinates.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | 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 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 { 757 {
758 if (!frame.client()) 758 if (!frame.client())
759 return nullptr; 759 return nullptr;
760 return static_cast<RemoteFrameClientImpl*>(frame.client())->webFrame(); 760 return static_cast<RemoteFrameClientImpl*>(frame.client())->webFrame();
761 } 761 }
762 762
763 void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const 763 void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const
764 { 764 {
765 ASSERT(source); 765 ASSERT(source);
766 WebLocalFrameImpl* localFrameImpl = toWebLocalFrameImpl(source); 766 WebLocalFrameImpl* localFrameImpl = toWebLocalFrameImpl(source);
767
768 // TODO(bokan): The scale_factor argument here used to be the now-removed
769 // FrameView::visibleContentScaleFactor but the callee uses this parameter
770 // to set the device scale factor. crbug.com/493262
767 client()->initializeChildFrame( 771 client()->initializeChildFrame(
768 localFrameImpl->frame()->view()->frameRect(), 772 localFrameImpl->frame()->view()->frameRect(),
769 localFrameImpl->frame()->view()->visibleContentScaleFactor()); 773 1);
770 } 774 }
771 775
772 void WebRemoteFrameImpl::setReplicatedOrigin(const WebSecurityOrigin& origin) co nst 776 void WebRemoteFrameImpl::setReplicatedOrigin(const WebSecurityOrigin& origin) co nst
773 { 777 {
774 ASSERT(frame()); 778 ASSERT(frame());
775 frame()->securityContext()->setReplicatedOrigin(origin); 779 frame()->securityContext()->setReplicatedOrigin(origin);
776 } 780 }
777 781
778 void WebRemoteFrameImpl::setReplicatedSandboxFlags(WebSandboxFlags flags) const 782 void WebRemoteFrameImpl::setReplicatedSandboxFlags(WebSandboxFlags flags) const
779 { 783 {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 : WebRemoteFrame(scope) 816 : WebRemoteFrame(scope)
813 , m_frameClient(this) 817 , m_frameClient(this)
814 , m_client(client) 818 , m_client(client)
815 #if ENABLE(OILPAN) 819 #if ENABLE(OILPAN)
816 , m_selfKeepAlive(this) 820 , m_selfKeepAlive(this)
817 #endif 821 #endif
818 { 822 {
819 } 823 }
820 824
821 } // namespace blink 825 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/FindInPageCoordinates.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698