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

Side by Side Diff: third_party/WebKit/Source/core/frame/RemoteFrame.h

Issue 1489253002: Plumb document's strict mixed content checking for RemoteFrames (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix 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
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 #ifndef RemoteFrame_h 5 #ifndef RemoteFrame_h
6 #define RemoteFrame_h 6 #define RemoteFrame_h
7 7
8 #include "core/CoreExport.h" 8 #include "core/CoreExport.h"
9 #include "core/dom/RemoteSecurityContext.h" 9 #include "core/dom/RemoteSecurityContext.h"
10 #include "core/frame/Frame.h" 10 #include "core/frame/Frame.h"
(...skipping 22 matching lines...) Expand all
33 WindowProxy* windowProxy(DOMWrapperWorld&) override; 33 WindowProxy* windowProxy(DOMWrapperWorld&) override;
34 void navigate(Document& originDocument, const KURL&, bool replaceCurrentItem , UserGestureStatus) override; 34 void navigate(Document& originDocument, const KURL&, bool replaceCurrentItem , UserGestureStatus) override;
35 void navigate(const FrameLoadRequest& passedRequest) override; 35 void navigate(const FrameLoadRequest& passedRequest) override;
36 void reload(FrameLoadType, ClientRedirectPolicy) override; 36 void reload(FrameLoadType, ClientRedirectPolicy) override;
37 void detach(FrameDetachType) override; 37 void detach(FrameDetachType) override;
38 RemoteSecurityContext* securityContext() const override; 38 RemoteSecurityContext* securityContext() const override;
39 void printNavigationErrorMessage(const Frame&, const char* reason) override { } 39 void printNavigationErrorMessage(const Frame&, const char* reason) override { }
40 void disconnectOwnerElement() override; 40 void disconnectOwnerElement() override;
41 bool prepareForCommit() override; 41 bool prepareForCommit() override;
42 bool shouldClose() override; 42 bool shouldClose() override;
43 bool shouldEnforceStrictMixedContentChecking() const override;
43 44
44 // FIXME: Remove this method once we have input routing in the browser 45 // FIXME: Remove this method once we have input routing in the browser
45 // process. See http://crbug.com/339659. 46 // process. See http://crbug.com/339659.
46 void forwardInputEvent(Event*); 47 void forwardInputEvent(Event*);
47 48
48 void frameRectsChanged(const IntRect& frameRect); 49 void frameRectsChanged(const IntRect& frameRect);
49 50
50 void setRemotePlatformLayer(WebLayer*); 51 void setRemotePlatformLayer(WebLayer*);
51 WebLayer* remotePlatformLayer() const { return m_remotePlatformLayer; } 52 WebLayer* remotePlatformLayer() const { return m_remotePlatformLayer; }
52 53
53 void setView(PassRefPtrWillBeRawPtr<RemoteFrameView>); 54 void setView(PassRefPtrWillBeRawPtr<RemoteFrameView>);
54 void createView(); 55 void createView();
55 56
56 RemoteFrameView* view() const; 57 RemoteFrameView* view() const;
57 58
59 void setShouldEnforceStrictMixedContentChecking(bool);
60
58 private: 61 private:
59 RemoteFrame(RemoteFrameClient*, FrameHost*, FrameOwner*); 62 RemoteFrame(RemoteFrameClient*, FrameHost*, FrameOwner*);
60 63
61 // Internal Frame helper overrides: 64 // Internal Frame helper overrides:
62 WindowProxyManager* windowProxyManager() const override { return m_windowPro xyManager.get(); } 65 WindowProxyManager* windowProxyManager() const override { return m_windowPro xyManager.get(); }
63 66
64 RemoteFrameClient* remoteFrameClient() const; 67 RemoteFrameClient* remoteFrameClient() const;
65 68
66 RefPtrWillBeMember<RemoteFrameView> m_view; 69 RefPtrWillBeMember<RemoteFrameView> m_view;
67 RefPtrWillBeMember<RemoteSecurityContext> m_securityContext; 70 RefPtrWillBeMember<RemoteSecurityContext> m_securityContext;
68 RefPtrWillBeMember<RemoteDOMWindow> m_domWindow; 71 RefPtrWillBeMember<RemoteDOMWindow> m_domWindow;
69 OwnPtrWillBeMember<WindowProxyManager> m_windowProxyManager; 72 OwnPtrWillBeMember<WindowProxyManager> m_windowProxyManager;
70 WebLayer* m_remotePlatformLayer; 73 WebLayer* m_remotePlatformLayer;
74 bool m_shouldEnforceStrictMixedContentChecking;
71 }; 75 };
72 76
73 inline RemoteFrameView* RemoteFrame::view() const 77 inline RemoteFrameView* RemoteFrame::view() const
74 { 78 {
75 return m_view.get(); 79 return m_view.get();
76 } 80 }
77 81
78 DEFINE_TYPE_CASTS(RemoteFrame, Frame, remoteFrame, remoteFrame->isRemoteFrame(), remoteFrame.isRemoteFrame()); 82 DEFINE_TYPE_CASTS(RemoteFrame, Frame, remoteFrame, remoteFrame->isRemoteFrame(), remoteFrame.isRemoteFrame());
79 83
80 } // namespace blink 84 } // namespace blink
81 85
82 #endif // RemoteFrame_h 86 #endif // RemoteFrame_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698