| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 WebURLRequest urlRequest; | 84 WebURLRequest urlRequest; |
| 85 urlRequest.initialize(); | 85 urlRequest.initialize(); |
| 86 urlRequest.setURL(URLTestHelpers::toKURL(url)); | 86 urlRequest.setURL(URLTestHelpers::toKURL(url)); |
| 87 frame->loadRequest(urlRequest); | 87 frame->loadRequest(urlRequest); |
| 88 } | 88 } |
| 89 | 89 |
| 90 void runPendingTasks() | 90 void runPendingTasks() |
| 91 { | 91 { |
| 92 // Pending tasks include Timers that have been scheduled. | 92 // Pending tasks include Timers that have been scheduled. |
| 93 WebCore::Timer<QuitTask> quitOnTimeout(new QuitTask, &QuitTask::PostThis); | 93 WebCore::Timer<QuitTask> quitOnTimeout(new QuitTask, &QuitTask::PostThis); |
| 94 quitOnTimeout.startOneShot(0); | 94 quitOnTimeout.startOneShot(0, FROM_HERE); |
| 95 Platform::current()->currentThread()->enterRunLoop(); | 95 Platform::current()->currentThread()->enterRunLoop(); |
| 96 } | 96 } |
| 97 | 97 |
| 98 WebViewHelper::WebViewHelper() | 98 WebViewHelper::WebViewHelper() |
| 99 : m_webView(0) | 99 : m_webView(0) |
| 100 { | 100 { |
| 101 } | 101 } |
| 102 | 102 |
| 103 WebViewHelper::~WebViewHelper() | 103 WebViewHelper::~WebViewHelper() |
| 104 { | 104 { |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 void TestWebFrameClient::frameDetached(WebFrame* frame) | 155 void TestWebFrameClient::frameDetached(WebFrame* frame) |
| 156 { | 156 { |
| 157 if (frame->parent()) | 157 if (frame->parent()) |
| 158 frame->parent()->removeChild(frame); | 158 frame->parent()->removeChild(frame); |
| 159 frame->close(); | 159 frame->close(); |
| 160 } | 160 } |
| 161 | 161 |
| 162 | 162 |
| 163 } // namespace FrameTestHelpers | 163 } // namespace FrameTestHelpers |
| 164 } // namespace blink | 164 } // namespace blink |
| OLD | NEW |