| 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 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 ASSERT(!testClientForFrame(m_webView->mainFrame())->isLoading()); | 298 ASSERT(!testClientForFrame(m_webView->mainFrame())->isLoading()); |
| 299 m_webView->close(); | 299 m_webView->close(); |
| 300 m_webView = 0; | 300 m_webView = 0; |
| 301 } | 301 } |
| 302 } | 302 } |
| 303 | 303 |
| 304 TestWebFrameClient::TestWebFrameClient() : m_loadsInProgress(0) | 304 TestWebFrameClient::TestWebFrameClient() : m_loadsInProgress(0) |
| 305 { | 305 { |
| 306 } | 306 } |
| 307 | 307 |
| 308 WebFrame* TestWebFrameClient::createChildFrame(WebLocalFrame* parent, const WebS
tring& frameName) | 308 WebFrame* TestWebFrameClient::createChildFrame(WebLocalFrame* parent, const WebS
tring& frameName, WebSandboxFlags sandboxFlags) |
| 309 { | 309 { |
| 310 WebFrame* frame = WebLocalFrame::create(this); | 310 WebFrame* frame = WebLocalFrame::create(this); |
| 311 parent->appendChild(frame); | 311 parent->appendChild(frame); |
| 312 return frame; | 312 return frame; |
| 313 } | 313 } |
| 314 | 314 |
| 315 void TestWebFrameClient::frameDetached(WebFrame* frame) | 315 void TestWebFrameClient::frameDetached(WebFrame* frame) |
| 316 { | 316 { |
| 317 if (frame->parent()) | 317 if (frame->parent()) |
| 318 frame->parent()->removeChild(frame); | 318 frame->parent()->removeChild(frame); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 346 } | 346 } |
| 347 | 347 |
| 348 void TestWebViewClient::initializeLayerTreeView() | 348 void TestWebViewClient::initializeLayerTreeView() |
| 349 { | 349 { |
| 350 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay
erTreeViewForTesting()); | 350 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay
erTreeViewForTesting()); |
| 351 ASSERT(m_layerTreeView); | 351 ASSERT(m_layerTreeView); |
| 352 } | 352 } |
| 353 | 353 |
| 354 } // namespace FrameTestHelpers | 354 } // namespace FrameTestHelpers |
| 355 } // namespace blink | 355 } // namespace blink |
| OLD | NEW |