| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 } | 128 } |
| 129 | 129 |
| 130 void loadHistoryItem(WebFrame* frame, const WebHistoryItem& item, WebHistoryLoad
Type loadType, WebURLRequest::CachePolicy cachePolicy) | 130 void loadHistoryItem(WebFrame* frame, const WebHistoryItem& item, WebHistoryLoad
Type loadType, WebURLRequest::CachePolicy cachePolicy) |
| 131 { | 131 { |
| 132 frame->loadHistoryItem(item, loadType, cachePolicy); | 132 frame->loadHistoryItem(item, loadType, cachePolicy); |
| 133 pumpPendingRequestsForFrameToLoad(frame); | 133 pumpPendingRequestsForFrameToLoad(frame); |
| 134 } | 134 } |
| 135 | 135 |
| 136 void reloadFrame(WebFrame* frame) | 136 void reloadFrame(WebFrame* frame) |
| 137 { | 137 { |
| 138 frame->reload(false); | 138 frame->reload(WebFrameLoadType::Reload); |
| 139 pumpPendingRequestsForFrameToLoad(frame); | 139 pumpPendingRequestsForFrameToLoad(frame); |
| 140 } | 140 } |
| 141 | 141 |
| 142 void reloadFrameIgnoringCache(WebFrame* frame) | 142 void reloadFrameIgnoringCache(WebFrame* frame) |
| 143 { | 143 { |
| 144 frame->reload(true); | 144 frame->reload(WebFrameLoadType::ReloadBypassingCache); |
| 145 pumpPendingRequestsForFrameToLoad(frame); | 145 pumpPendingRequestsForFrameToLoad(frame); |
| 146 } | 146 } |
| 147 | 147 |
| 148 void pumpPendingRequestsForFrameToLoad(WebFrame* frame) | 148 void pumpPendingRequestsForFrameToLoad(WebFrame* frame) |
| 149 { | 149 { |
| 150 Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FRO
M_HERE, bind(&runServeAsyncRequestsTask, testClientForFrame(frame))); | 150 Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FRO
M_HERE, bind(&runServeAsyncRequestsTask, testClientForFrame(frame))); |
| 151 testing::enterRunLoop(); | 151 testing::enterRunLoop(); |
| 152 } | 152 } |
| 153 | 153 |
| 154 WebMouseEvent createMouseEvent(WebInputEvent::Type type, WebMouseEvent::Button b
utton, const IntPoint& point, int modifiers) | 154 WebMouseEvent createMouseEvent(WebInputEvent::Type type, WebMouseEvent::Button b
utton, const IntPoint& point, int modifiers) |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 m_frame->close(); | 301 m_frame->close(); |
| 302 } | 302 } |
| 303 | 303 |
| 304 void TestWebViewClient::initializeLayerTreeView() | 304 void TestWebViewClient::initializeLayerTreeView() |
| 305 { | 305 { |
| 306 m_layerTreeView = adoptPtr(new WebLayerTreeViewImplForTesting); | 306 m_layerTreeView = adoptPtr(new WebLayerTreeViewImplForTesting); |
| 307 } | 307 } |
| 308 | 308 |
| 309 } // namespace FrameTestHelpers | 309 } // namespace FrameTestHelpers |
| 310 } // namespace blink | 310 } // namespace blink |
| OLD | NEW |