| 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 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 m_testWebViewClient->clearAnimationScheduled(); | 305 m_testWebViewClient->clearAnimationScheduled(); |
| 306 webViewImpl()->resize(size); | 306 webViewImpl()->resize(size); |
| 307 EXPECT_FALSE(m_testWebViewClient->animationScheduled()); | 307 EXPECT_FALSE(m_testWebViewClient->animationScheduled()); |
| 308 m_testWebViewClient->clearAnimationScheduled(); | 308 m_testWebViewClient->clearAnimationScheduled(); |
| 309 } | 309 } |
| 310 | 310 |
| 311 TestWebFrameClient::TestWebFrameClient() : m_loadsInProgress(0) | 311 TestWebFrameClient::TestWebFrameClient() : m_loadsInProgress(0) |
| 312 { | 312 { |
| 313 } | 313 } |
| 314 | 314 |
| 315 WebFrame* TestWebFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeSco
peType scope, const WebString& frameName, WebSandboxFlags sandboxFlags, const We
bFrameOwnerProperties& frameOwnerProperties) | 315 WebFrame* TestWebFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeSco
peType scope, const WebString& frameName, const WebString& frameUniqueName, WebS
andboxFlags sandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties) |
| 316 { | 316 { |
| 317 WebFrame* frame = WebLocalFrame::create(scope, this); | 317 WebFrame* frame = WebLocalFrame::create(scope, this); |
| 318 parent->appendChild(frame); | 318 parent->appendChild(frame); |
| 319 return frame; | 319 return frame; |
| 320 } | 320 } |
| 321 | 321 |
| 322 void TestWebFrameClient::frameDetached(WebFrame* frame, DetachType type) | 322 void TestWebFrameClient::frameDetached(WebFrame* frame, DetachType type) |
| 323 { | 323 { |
| 324 if (type == DetachType::Remove && frame->parent()) | 324 if (type == DetachType::Remove && frame->parent()) |
| 325 frame->parent()->removeChild(frame); | 325 frame->parent()->removeChild(frame); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 365 } | 365 } |
| 366 | 366 |
| 367 void TestWebViewClient::initializeLayerTreeView() | 367 void TestWebViewClient::initializeLayerTreeView() |
| 368 { | 368 { |
| 369 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay
erTreeViewForTesting()); | 369 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay
erTreeViewForTesting()); |
| 370 ASSERT(m_layerTreeView); | 370 ASSERT(m_layerTreeView); |
| 371 } | 371 } |
| 372 | 372 |
| 373 } // namespace FrameTestHelpers | 373 } // namespace FrameTestHelpers |
| 374 } // namespace blink | 374 } // namespace blink |
| OLD | NEW |