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

Side by Side Diff: Source/web/tests/FrameTestHelpers.h

Issue 838903002: Replicate sandbox flags for OOPIF (Blink part 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@iframe-sandbox-flags-part1
Patch Set: Address Daniel's comments. Move sandbox flags inheritance to FrameLoader::effectiveSandboxFlags(). Created 5 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 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 private: 93 private:
94 WebViewImpl* m_webView; 94 WebViewImpl* m_webView;
95 }; 95 };
96 96
97 // Minimal implementation of WebFrameClient needed for unit tests that load fram es. Tests that load 97 // Minimal implementation of WebFrameClient needed for unit tests that load fram es. Tests that load
98 // frames and need further specialization of WebFrameClient behavior should subc lass this. 98 // frames and need further specialization of WebFrameClient behavior should subc lass this.
99 class TestWebFrameClient : public WebFrameClient { 99 class TestWebFrameClient : public WebFrameClient {
100 public: 100 public:
101 TestWebFrameClient(); 101 TestWebFrameClient();
102 102
103 virtual WebFrame* createChildFrame(WebLocalFrame* parent, const WebString& f rameName) override; 103 virtual WebFrame* createChildFrame(WebLocalFrame* parent, const WebString& f rameName, WebSandboxFlags) override;
104 virtual void frameDetached(WebFrame*) override; 104 virtual void frameDetached(WebFrame*) override;
105 virtual void didStartLoading(bool) override; 105 virtual void didStartLoading(bool) override;
106 virtual void didStopLoading() override; 106 virtual void didStopLoading() override;
107 107
108 bool isLoading() { return m_loadsInProgress > 0; } 108 bool isLoading() { return m_loadsInProgress > 0; }
109 void waitForLoadToComplete(); 109 void waitForLoadToComplete();
110 110
111 private: 111 private:
112 int m_loadsInProgress; 112 int m_loadsInProgress;
113 }; 113 };
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 { 147 {
148 Settings::setMockScrollbarsEnabled(false); 148 Settings::setMockScrollbarsEnabled(false);
149 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false); 149 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);
150 } 150 }
151 }; 151 };
152 152
153 } // namespace FrameTestHelpers 153 } // namespace FrameTestHelpers
154 } // namespace blink 154 } // namespace blink
155 155
156 #endif // FrameTestHelpers_h 156 #endif // FrameTestHelpers_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698