| 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 { | 337 { |
| 338 } | 338 } |
| 339 | 339 |
| 340 void TestWebRemoteFrameClient::frameDetached(DetachType type) | 340 void TestWebRemoteFrameClient::frameDetached(DetachType type) |
| 341 { | 341 { |
| 342 if (type == DetachType::Remove && m_frame->parent()) | 342 if (type == DetachType::Remove && m_frame->parent()) |
| 343 m_frame->parent()->removeChild(m_frame); | 343 m_frame->parent()->removeChild(m_frame); |
| 344 m_frame->close(); | 344 m_frame->close(); |
| 345 } | 345 } |
| 346 | 346 |
| 347 TestWebViewClient::TestWebViewClient() |
| 348 : m_useCompositorAnimationTimelines(false) |
| 349 { |
| 350 } |
| 351 |
| 347 void TestWebViewClient::initializeLayerTreeView() | 352 void TestWebViewClient::initializeLayerTreeView() |
| 348 { | 353 { |
| 349 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay
erTreeViewForTesting()); | 354 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay
erTreeViewForTesting(m_useCompositorAnimationTimelines)); |
| 350 ASSERT(m_layerTreeView); | 355 ASSERT(m_layerTreeView); |
| 351 } | 356 } |
| 352 | 357 |
| 353 } // namespace FrameTestHelpers | 358 } // namespace FrameTestHelpers |
| 354 } // namespace blink | 359 } // namespace blink |
| OLD | NEW |