| OLD | NEW |
| 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 WebViewImpl* m_webView; | 97 WebViewImpl* m_webView; |
| 98 SettingOverrider* m_settingOverrider; | 98 SettingOverrider* m_settingOverrider; |
| 99 }; | 99 }; |
| 100 | 100 |
| 101 // Minimal implementation of WebFrameClient needed for unit tests that load fram
es. Tests that load | 101 // Minimal implementation of WebFrameClient needed for unit tests that load fram
es. Tests that load |
| 102 // frames and need further specialization of WebFrameClient behavior should subc
lass this. | 102 // frames and need further specialization of WebFrameClient behavior should subc
lass this. |
| 103 class TestWebFrameClient : public WebFrameClient { | 103 class TestWebFrameClient : public WebFrameClient { |
| 104 public: | 104 public: |
| 105 TestWebFrameClient(); | 105 TestWebFrameClient(); |
| 106 | 106 |
| 107 WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType, const We
bString& frameName, WebSandboxFlags) override; | 107 WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType, const We
bString& frameName, WebSandboxFlags, const WebFrameOwnerProperties&) override; |
| 108 void frameDetached(WebFrame*, DetachType) override; | 108 void frameDetached(WebFrame*, DetachType) override; |
| 109 void didStartLoading(bool) override; | 109 void didStartLoading(bool) override; |
| 110 void didStopLoading() override; | 110 void didStopLoading() override; |
| 111 | 111 |
| 112 bool isLoading() { return m_loadsInProgress > 0; } | 112 bool isLoading() { return m_loadsInProgress > 0; } |
| 113 void waitForLoadToComplete(); | 113 void waitForLoadToComplete(); |
| 114 | 114 |
| 115 private: | 115 private: |
| 116 int m_loadsInProgress; | 116 int m_loadsInProgress; |
| 117 }; | 117 }; |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 { | 159 { |
| 160 Settings::setMockScrollbarsEnabled(false); | 160 Settings::setMockScrollbarsEnabled(false); |
| 161 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false); | 161 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false); |
| 162 } | 162 } |
| 163 }; | 163 }; |
| 164 | 164 |
| 165 } // namespace FrameTestHelpers | 165 } // namespace FrameTestHelpers |
| 166 } // namespace blink | 166 } // namespace blink |
| 167 | 167 |
| 168 #endif // FrameTestHelpers_h | 168 #endif // FrameTestHelpers_h |
| OLD | NEW |