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

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

Issue 1330113002: Rename WebSourceBuffer::abort into WebSourceBuffer::resetParserState (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 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/modules/mediasource/SourceBuffer.cpp ('k') | public/platform/WebSourceBuffer.h » ('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 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 if (!frame.client()) 748 if (!frame.client())
749 return nullptr; 749 return nullptr;
750 return static_cast<RemoteFrameClientImpl*>(frame.client())->webFrame(); 750 return static_cast<RemoteFrameClientImpl*>(frame.client())->webFrame();
751 } 751 }
752 752
753 void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const 753 void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const
754 { 754 {
755 ASSERT(source); 755 ASSERT(source);
756 WebLocalFrameImpl* localFrameImpl = toWebLocalFrameImpl(source); 756 WebLocalFrameImpl* localFrameImpl = toWebLocalFrameImpl(source);
757 757
758 // TODO(bokan): The scale_factor argument here used to be the now-removed
759 // FrameView::visibleContentScaleFactor but the callee uses this parameter
760 // to set the device scale factor. crbug.com/493262
761 client()->initializeChildFrame( 758 client()->initializeChildFrame(
762 localFrameImpl->frame()->view()->frameRect(), 759 localFrameImpl->frame()->view()->frameRect(),
763 1); 760 localFrameImpl->frame()->page()->deviceScaleFactor());
764 } 761 }
765 762
766 void WebRemoteFrameImpl::setReplicatedOrigin(const WebSecurityOrigin& origin) co nst 763 void WebRemoteFrameImpl::setReplicatedOrigin(const WebSecurityOrigin& origin) co nst
767 { 764 {
768 ASSERT(frame()); 765 ASSERT(frame());
769 frame()->securityContext()->setReplicatedOrigin(origin); 766 frame()->securityContext()->setReplicatedOrigin(origin);
770 } 767 }
771 768
772 void WebRemoteFrameImpl::setReplicatedSandboxFlags(WebSandboxFlags flags) const 769 void WebRemoteFrameImpl::setReplicatedSandboxFlags(WebSandboxFlags flags) const
773 { 770 {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 : WebRemoteFrame(scope) 803 : WebRemoteFrame(scope)
807 , m_frameClient(RemoteFrameClientImpl::create(this)) 804 , m_frameClient(RemoteFrameClientImpl::create(this))
808 , m_client(client) 805 , m_client(client)
809 #if ENABLE(OILPAN) 806 #if ENABLE(OILPAN)
810 , m_selfKeepAlive(this) 807 , m_selfKeepAlive(this)
811 #endif 808 #endif
812 { 809 {
813 } 810 }
814 811
815 } // namespace blink 812 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/mediasource/SourceBuffer.cpp ('k') | public/platform/WebSourceBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698