| 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 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 ASSERT(m_webView->mainFrame()->isWebRemoteFrame() || !testClientForFrame
(m_webView->mainFrame())->isLoading()); | 285 ASSERT(m_webView->mainFrame()->isWebRemoteFrame() || !testClientForFrame
(m_webView->mainFrame())->isLoading()); |
| 286 m_webView->close(); | 286 m_webView->close(); |
| 287 m_webView = 0; | 287 m_webView = 0; |
| 288 } | 288 } |
| 289 } | 289 } |
| 290 | 290 |
| 291 TestWebFrameClient::TestWebFrameClient() : m_loadsInProgress(0) | 291 TestWebFrameClient::TestWebFrameClient() : m_loadsInProgress(0) |
| 292 { | 292 { |
| 293 } | 293 } |
| 294 | 294 |
| 295 WebFrame* TestWebFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeSco
peType scope, const WebString& frameName, WebSandboxFlags sandboxFlags) | 295 WebFrame* TestWebFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeSco
peType scope, const WebString& frameName, WebSandboxFlags sandboxFlags, const We
bFrameOwnerProperties& frameOwnerProperties) |
| 296 { | 296 { |
| 297 WebFrame* frame = WebLocalFrame::create(scope, this); | 297 WebFrame* frame = WebLocalFrame::create(scope, this); |
| 298 parent->appendChild(frame); | 298 parent->appendChild(frame); |
| 299 return frame; | 299 return frame; |
| 300 } | 300 } |
| 301 | 301 |
| 302 void TestWebFrameClient::frameDetached(WebFrame* frame, DetachType type) | 302 void TestWebFrameClient::frameDetached(WebFrame* frame, DetachType type) |
| 303 { | 303 { |
| 304 if (type == DetachType::Remove && frame->parent()) | 304 if (type == DetachType::Remove && frame->parent()) |
| 305 frame->parent()->removeChild(frame); | 305 frame->parent()->removeChild(frame); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 } | 345 } |
| 346 | 346 |
| 347 void TestWebViewClient::initializeLayerTreeView() | 347 void TestWebViewClient::initializeLayerTreeView() |
| 348 { | 348 { |
| 349 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay
erTreeViewForTesting()); | 349 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay
erTreeViewForTesting()); |
| 350 ASSERT(m_layerTreeView); | 350 ASSERT(m_layerTreeView); |
| 351 } | 351 } |
| 352 | 352 |
| 353 } // namespace FrameTestHelpers | 353 } // namespace FrameTestHelpers |
| 354 } // namespace blink | 354 } // namespace blink |
| OLD | NEW |