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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 pumpPendingRequestsForFrameToLoad(frame); | 142 pumpPendingRequestsForFrameToLoad(frame); |
143 } | 143 } |
144 | 144 |
145 void reloadFrameBypassingCache(WebFrame* frame) { | 145 void reloadFrameBypassingCache(WebFrame* frame) { |
146 frame->reload(WebFrameLoadType::ReloadBypassingCache); | 146 frame->reload(WebFrameLoadType::ReloadBypassingCache); |
147 pumpPendingRequestsForFrameToLoad(frame); | 147 pumpPendingRequestsForFrameToLoad(frame); |
148 } | 148 } |
149 | 149 |
150 void pumpPendingRequestsForFrameToLoad(WebFrame* frame) { | 150 void pumpPendingRequestsForFrameToLoad(WebFrame* frame) { |
151 Platform::current()->currentThread()->getWebTaskRunner()->postTask( | 151 Platform::current()->currentThread()->getWebTaskRunner()->postTask( |
152 BLINK_FROM_HERE, WTF::bind(&runServeAsyncRequestsTask, | 152 BLINK_FROM_HERE, |
153 WTF::unretained(testClientForFrame(frame)))); | 153 WTF::bind(&runServeAsyncRequestsTask, |
| 154 WTF::unretained(testClientForFrame(frame)))); |
154 testing::enterRunLoop(); | 155 testing::enterRunLoop(); |
155 } | 156 } |
156 | 157 |
157 WebMouseEvent createMouseEvent(WebInputEvent::Type type, | 158 WebMouseEvent createMouseEvent(WebInputEvent::Type type, |
158 WebMouseEvent::Button button, | 159 WebMouseEvent::Button button, |
159 const IntPoint& point, | 160 const IntPoint& point, |
160 int modifiers) { | 161 int modifiers) { |
161 WebMouseEvent result(type, modifiers, WebInputEvent::TimeStampForTesting); | 162 WebMouseEvent result(type, modifiers, WebInputEvent::TimeStampForTesting); |
162 result.x = result.windowX = result.globalX = point.x(); | 163 result.x = result.windowX = result.globalX = point.x(); |
163 result.y = result.windowX = result.globalX = point.y(); | 164 result.y = result.windowX = result.globalX = point.y(); |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
363 m_testWebViewClient->scheduleAnimation(); | 364 m_testWebViewClient->scheduleAnimation(); |
364 } | 365 } |
365 | 366 |
366 void TestWebViewWidgetClient::didMeaningfulLayout( | 367 void TestWebViewWidgetClient::didMeaningfulLayout( |
367 WebMeaningfulLayout layoutType) { | 368 WebMeaningfulLayout layoutType) { |
368 m_testWebViewClient->didMeaningfulLayout(layoutType); | 369 m_testWebViewClient->didMeaningfulLayout(layoutType); |
369 } | 370 } |
370 | 371 |
371 } // namespace FrameTestHelpers | 372 } // namespace FrameTestHelpers |
372 } // namespace blink | 373 } // namespace blink |
OLD | NEW |