| 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 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 testing::runPendingTasks(); | 337 testing::runPendingTasks(); |
| 338 if (!isLoading()) | 338 if (!isLoading()) |
| 339 break; | 339 break; |
| 340 | 340 |
| 341 Platform::current()->yieldCurrentThread(); | 341 Platform::current()->yieldCurrentThread(); |
| 342 } | 342 } |
| 343 } | 343 } |
| 344 | 344 |
| 345 TestWebRemoteFrameClient::TestWebRemoteFrameClient() | 345 TestWebRemoteFrameClient::TestWebRemoteFrameClient() |
| 346 : m_frame(WebRemoteFrameImpl::create(WebTreeScopeType::Document, this)) | 346 : m_frame(WebRemoteFrameImpl::create(WebTreeScopeType::Document, this)) |
| 347 , m_visible(true) |
| 347 { | 348 { |
| 348 } | 349 } |
| 349 | 350 |
| 350 void TestWebRemoteFrameClient::frameDetached(DetachType type) | 351 void TestWebRemoteFrameClient::frameDetached(DetachType type) |
| 351 { | 352 { |
| 352 if (type == DetachType::Remove && m_frame->parent()) | 353 if (type == DetachType::Remove && m_frame->parent()) |
| 353 m_frame->parent()->removeChild(m_frame); | 354 m_frame->parent()->removeChild(m_frame); |
| 354 m_frame->close(); | 355 m_frame->close(); |
| 355 } | 356 } |
| 356 | 357 |
| 357 void TestWebViewClient::initializeLayerTreeView() | 358 void TestWebViewClient::initializeLayerTreeView() |
| 358 { | 359 { |
| 359 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay
erTreeViewForTesting()); | 360 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay
erTreeViewForTesting()); |
| 360 ASSERT(m_layerTreeView); | 361 ASSERT(m_layerTreeView); |
| 361 } | 362 } |
| 362 | 363 |
| 363 } // namespace FrameTestHelpers | 364 } // namespace FrameTestHelpers |
| 364 } // namespace blink | 365 } // namespace blink |
| OLD | NEW |