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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 } | 96 } |
97 | 97 |
98 } // namespace | 98 } // namespace |
99 | 99 |
100 void LoadFrame(WebFrame* frame, const std::string& url) { | 100 void LoadFrame(WebFrame* frame, const std::string& url) { |
101 WebURLRequest url_request(URLTestHelpers::ToKURL(url)); | 101 WebURLRequest url_request(URLTestHelpers::ToKURL(url)); |
102 frame->LoadRequest(url_request); | 102 frame->LoadRequest(url_request); |
103 PumpPendingRequestsForFrameToLoad(frame); | 103 PumpPendingRequestsForFrameToLoad(frame); |
104 } | 104 } |
105 | 105 |
106 void LoadHTMLString(WebFrame* frame, | 106 void LoadHTMLString(WebLocalFrame* frame, |
107 const std::string& html, | 107 const std::string& html, |
108 const WebURL& base_url) { | 108 const WebURL& base_url) { |
109 frame->LoadHTMLString(WebData(html.data(), html.size()), base_url); | 109 frame->LoadHTMLString(WebData(html.data(), html.size()), base_url); |
110 PumpPendingRequestsForFrameToLoad(frame); | 110 PumpPendingRequestsForFrameToLoad(frame); |
111 } | 111 } |
112 | 112 |
113 void LoadHistoryItem(WebFrame* frame, | 113 void LoadHistoryItem(WebFrame* frame, |
114 const WebHistoryItem& item, | 114 const WebHistoryItem& item, |
115 WebHistoryLoadType load_type, | 115 WebHistoryLoadType load_type, |
116 WebCachePolicy cache_policy) { | 116 WebCachePolicy cache_policy) { |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 test_web_view_client_->ScheduleAnimation(); | 334 test_web_view_client_->ScheduleAnimation(); |
335 } | 335 } |
336 | 336 |
337 void TestWebViewWidgetClient::DidMeaningfulLayout( | 337 void TestWebViewWidgetClient::DidMeaningfulLayout( |
338 WebMeaningfulLayout layout_type) { | 338 WebMeaningfulLayout layout_type) { |
339 test_web_view_client_->DidMeaningfulLayout(layout_type); | 339 test_web_view_client_->DidMeaningfulLayout(layout_type); |
340 } | 340 } |
341 | 341 |
342 } // namespace FrameTestHelpers | 342 } // namespace FrameTestHelpers |
343 } // namespace blink | 343 } // namespace blink |
OLD | NEW |