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

Side by Side Diff: third_party/WebKit/Source/web/RemoteFrameOwner.h

Issue 2631233003: Avoid mutating frame owner when detaching a provisional frame. (Closed)
Patch Set: Fix test to actually test the changed behavior. Created 3 years, 11 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be found 2 // Use of this source code is governed by a BSD-style license that can be found
3 // in the LICENSE file. 3 // in the LICENSE file.
4 4
5 #ifndef RemoteFrameOwner_h 5 #ifndef RemoteFrameOwner_h
6 #define RemoteFrameOwner_h 6 #define RemoteFrameOwner_h
7 7
8 #include "core/frame/FrameOwner.h" 8 #include "core/frame/FrameOwner.h"
9 #include "platform/scroll/ScrollTypes.h" 9 #include "platform/scroll/ScrollTypes.h"
10 #include "public/web/WebFrameOwnerProperties.h" 10 #include "public/web/WebFrameOwnerProperties.h"
(...skipping 11 matching lines...) Expand all
22 USING_GARBAGE_COLLECTED_MIXIN(RemoteFrameOwner); 22 USING_GARBAGE_COLLECTED_MIXIN(RemoteFrameOwner);
23 23
24 public: 24 public:
25 static RemoteFrameOwner* create( 25 static RemoteFrameOwner* create(
26 SandboxFlags flags, 26 SandboxFlags flags,
27 const WebFrameOwnerProperties& frameOwnerProperties) { 27 const WebFrameOwnerProperties& frameOwnerProperties) {
28 return new RemoteFrameOwner(flags, frameOwnerProperties); 28 return new RemoteFrameOwner(flags, frameOwnerProperties);
29 } 29 }
30 30
31 // FrameOwner overrides: 31 // FrameOwner overrides:
32 Frame* contentFrame() const override { return m_frame.get(); }
32 void setContentFrame(Frame&) override; 33 void setContentFrame(Frame&) override;
33 void clearContentFrame() override; 34 void clearContentFrame() override;
34 SandboxFlags getSandboxFlags() const override { return m_sandboxFlags; } 35 SandboxFlags getSandboxFlags() const override { return m_sandboxFlags; }
35 void setSandboxFlags(SandboxFlags flags) { m_sandboxFlags = flags; } 36 void setSandboxFlags(SandboxFlags flags) { m_sandboxFlags = flags; }
36 void dispatchLoad() override; 37 void dispatchLoad() override;
37 // TODO(dcheng): Implement. 38 // TODO(dcheng): Implement.
38 bool canRenderFallbackContent() const override { return false; } 39 bool canRenderFallbackContent() const override { return false; }
39 void renderFallbackContent() override {} 40 void renderFallbackContent() override {}
40 ScrollbarMode scrollingMode() const override { return m_scrolling; } 41 ScrollbarMode scrollingMode() const override { return m_scrolling; }
41 int marginWidth() const override { return m_marginWidth; } 42 int marginWidth() const override { return m_marginWidth; }
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 86
86 DEFINE_TYPE_CASTS(RemoteFrameOwner, 87 DEFINE_TYPE_CASTS(RemoteFrameOwner,
87 FrameOwner, 88 FrameOwner,
88 owner, 89 owner,
89 owner->isRemote(), 90 owner->isRemote(),
90 owner.isRemote()); 91 owner.isRemote());
91 92
92 } // namespace blink 93 } // namespace blink
93 94
94 #endif // RemoteFrameOwner_h 95 #endif // RemoteFrameOwner_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698