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

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

Issue 1157563004: Revert of Update Blink to use the tree scope info on WebFrame for scoping checks. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/tests/FrameLoaderClientImplTest.cpp ('k') | Source/web/tests/FrameTestHelpers.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 /* 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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 private: 91 private:
92 WebViewImpl* m_webView; 92 WebViewImpl* m_webView;
93 }; 93 };
94 94
95 // Minimal implementation of WebFrameClient needed for unit tests that load fram es. Tests that load 95 // Minimal implementation of WebFrameClient needed for unit tests that load fram es. Tests that load
96 // frames and need further specialization of WebFrameClient behavior should subc lass this. 96 // frames and need further specialization of WebFrameClient behavior should subc lass this.
97 class TestWebFrameClient : public WebFrameClient { 97 class TestWebFrameClient : public WebFrameClient {
98 public: 98 public:
99 TestWebFrameClient(); 99 TestWebFrameClient();
100 100
101 virtual WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType, const WebString& frameName, WebSandboxFlags) override; 101 virtual WebFrame* createChildFrame(WebLocalFrame* parent, const WebString& f rameName, WebSandboxFlags) override;
102 virtual void frameDetached(WebFrame*) override; 102 virtual void frameDetached(WebFrame*) override;
103 virtual void didStartLoading(bool) override; 103 virtual void didStartLoading(bool) override;
104 virtual void didStopLoading() override; 104 virtual void didStopLoading() override;
105 105
106 bool isLoading() { return m_loadsInProgress > 0; } 106 bool isLoading() { return m_loadsInProgress > 0; }
107 void waitForLoadToComplete(); 107 void waitForLoadToComplete();
108 108
109 private: 109 private:
110 int m_loadsInProgress; 110 int m_loadsInProgress;
111 }; 111 };
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 { 153 {
154 Settings::setMockScrollbarsEnabled(false); 154 Settings::setMockScrollbarsEnabled(false);
155 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false); 155 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);
156 } 156 }
157 }; 157 };
158 158
159 } // namespace FrameTestHelpers 159 } // namespace FrameTestHelpers
160 } // namespace blink 160 } // namespace blink
161 161
162 #endif // FrameTestHelpers_h 162 #endif // FrameTestHelpers_h
OLDNEW
« no previous file with comments | « Source/web/tests/FrameLoaderClientImplTest.cpp ('k') | Source/web/tests/FrameTestHelpers.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698