| 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 uniqueName.append(" "); | 116 uniqueName.append(" "); |
| 117 uniqueName.appendNumber(uniqueNameCounter++); | 117 uniqueName.appendNumber(uniqueNameCounter++); |
| 118 return uniqueName.toString(); | 118 return uniqueName.toString(); |
| 119 } | 119 } |
| 120 | 120 |
| 121 } // namespace | 121 } // namespace |
| 122 | 122 |
| 123 void loadFrame(WebFrame* frame, const std::string& url) | 123 void loadFrame(WebFrame* frame, const std::string& url) |
| 124 { | 124 { |
| 125 WebURLRequest urlRequest; | 125 WebURLRequest urlRequest; |
| 126 urlRequest.initialize(); | |
| 127 urlRequest.setURL(URLTestHelpers::toKURL(url)); | 126 urlRequest.setURL(URLTestHelpers::toKURL(url)); |
| 128 urlRequest.setRequestorOrigin(WebSecurityOrigin::createUnique()); | 127 urlRequest.setRequestorOrigin(WebSecurityOrigin::createUnique()); |
| 129 frame->loadRequest(urlRequest); | 128 frame->loadRequest(urlRequest); |
| 130 pumpPendingRequestsForFrameToLoad(frame); | 129 pumpPendingRequestsForFrameToLoad(frame); |
| 131 } | 130 } |
| 132 | 131 |
| 133 void loadHTMLString(WebFrame* frame, const std::string& html, const WebURL& base
URL) | 132 void loadHTMLString(WebFrame* frame, const std::string& html, const WebURL& base
URL) |
| 134 { | 133 { |
| 135 frame->loadHTMLString(WebData(html.data(), html.size()), baseURL); | 134 frame->loadHTMLString(WebData(html.data(), html.size()), baseURL); |
| 136 pumpPendingRequestsForFrameToLoad(frame); | 135 pumpPendingRequestsForFrameToLoad(frame); |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 return m_testWebViewClient->layerTreeView(); | 332 return m_testWebViewClient->layerTreeView(); |
| 334 } | 333 } |
| 335 | 334 |
| 336 void TestWebViewWidgetClient::scheduleAnimation() | 335 void TestWebViewWidgetClient::scheduleAnimation() |
| 337 { | 336 { |
| 338 m_testWebViewClient->scheduleAnimation(); | 337 m_testWebViewClient->scheduleAnimation(); |
| 339 } | 338 } |
| 340 | 339 |
| 341 } // namespace FrameTestHelpers | 340 } // namespace FrameTestHelpers |
| 342 } // namespace blink | 341 } // namespace blink |
| OLD | NEW |