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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 const WebHistoryItem& item, | 119 const WebHistoryItem& item, |
120 WebHistoryLoadType loadType, | 120 WebHistoryLoadType loadType, |
121 WebCachePolicy cachePolicy) { | 121 WebCachePolicy cachePolicy) { |
122 WebURLRequest request = | 122 WebURLRequest request = |
123 frame->toWebLocalFrame()->requestFromHistoryItem(item, cachePolicy); | 123 frame->toWebLocalFrame()->requestFromHistoryItem(item, cachePolicy); |
124 frame->toWebLocalFrame()->load(request, WebFrameLoadType::BackForward, item); | 124 frame->toWebLocalFrame()->load(request, WebFrameLoadType::BackForward, item); |
125 pumpPendingRequestsForFrameToLoad(frame); | 125 pumpPendingRequestsForFrameToLoad(frame); |
126 } | 126 } |
127 | 127 |
128 void reloadFrame(WebFrame* frame) { | 128 void reloadFrame(WebFrame* frame) { |
129 frame->reload(WebFrameLoadType::ReloadMainResource); | 129 frame->reload(WebFrameLoadType::Reload); |
130 pumpPendingRequestsForFrameToLoad(frame); | 130 pumpPendingRequestsForFrameToLoad(frame); |
131 } | 131 } |
132 | 132 |
133 void reloadFrameBypassingCache(WebFrame* frame) { | 133 void reloadFrameBypassingCache(WebFrame* frame) { |
134 frame->reload(WebFrameLoadType::ReloadBypassingCache); | 134 frame->reload(WebFrameLoadType::ReloadBypassingCache); |
135 pumpPendingRequestsForFrameToLoad(frame); | 135 pumpPendingRequestsForFrameToLoad(frame); |
136 } | 136 } |
137 | 137 |
138 void pumpPendingRequestsForFrameToLoad(WebFrame* frame) { | 138 void pumpPendingRequestsForFrameToLoad(WebFrame* frame) { |
139 Platform::current()->currentThread()->getWebTaskRunner()->postTask( | 139 Platform::current()->currentThread()->getWebTaskRunner()->postTask( |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 m_testWebViewClient->scheduleAnimation(); | 350 m_testWebViewClient->scheduleAnimation(); |
351 } | 351 } |
352 | 352 |
353 void TestWebViewWidgetClient::didMeaningfulLayout( | 353 void TestWebViewWidgetClient::didMeaningfulLayout( |
354 WebMeaningfulLayout layoutType) { | 354 WebMeaningfulLayout layoutType) { |
355 m_testWebViewClient->didMeaningfulLayout(layoutType); | 355 m_testWebViewClient->didMeaningfulLayout(layoutType); |
356 } | 356 } |
357 | 357 |
358 } // namespace FrameTestHelpers | 358 } // namespace FrameTestHelpers |
359 } // namespace blink | 359 } // namespace blink |
OLD | NEW |