| 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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 m_testWebViewClient->clearAnimationScheduled(); | 268 m_testWebViewClient->clearAnimationScheduled(); |
| 269 webView()->resize(size); | 269 webView()->resize(size); |
| 270 EXPECT_FALSE(m_testWebViewClient->animationScheduled()); | 270 EXPECT_FALSE(m_testWebViewClient->animationScheduled()); |
| 271 m_testWebViewClient->clearAnimationScheduled(); | 271 m_testWebViewClient->clearAnimationScheduled(); |
| 272 } | 272 } |
| 273 | 273 |
| 274 TestWebFrameClient::TestWebFrameClient() | 274 TestWebFrameClient::TestWebFrameClient() |
| 275 { | 275 { |
| 276 } | 276 } |
| 277 | 277 |
| 278 WebFrame* TestWebFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeSco
peType scope, const WebString& name, const WebString& uniqueName, WebSandboxFlag
s sandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties) | 278 WebLocalFrame* TestWebFrameClient::createChildFrame(WebLocalFrame* parent, WebTr
eeScopeType scope, const WebString& name, const WebString& uniqueName, WebSandbo
xFlags sandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties) |
| 279 { | 279 { |
| 280 WebFrame* frame = WebLocalFrame::create(scope, this); | 280 WebLocalFrame* frame = WebLocalFrame::create(scope, this); |
| 281 parent->appendChild(frame); | 281 parent->appendChild(frame); |
| 282 return frame; | 282 return frame; |
| 283 } | 283 } |
| 284 | 284 |
| 285 void TestWebFrameClient::frameDetached(WebLocalFrame* frame, DetachType type) | |
| 286 { | |
| 287 if (type == DetachType::Remove && frame->parent()) | |
| 288 frame->parent()->removeChild(frame); | |
| 289 | |
| 290 if (frame->frameWidget()) | |
| 291 frame->frameWidget()->close(); | |
| 292 | |
| 293 frame->close(); | |
| 294 } | |
| 295 | |
| 296 void TestWebFrameClient::didStartLoading(bool) | 285 void TestWebFrameClient::didStartLoading(bool) |
| 297 { | 286 { |
| 298 ++m_loadsInProgress; | 287 ++m_loadsInProgress; |
| 299 } | 288 } |
| 300 | 289 |
| 301 void TestWebFrameClient::didStopLoading() | 290 void TestWebFrameClient::didStopLoading() |
| 302 { | 291 { |
| 303 DCHECK_GT(m_loadsInProgress, 0); | 292 DCHECK_GT(m_loadsInProgress, 0); |
| 304 --m_loadsInProgress; | 293 --m_loadsInProgress; |
| 305 } | 294 } |
| (...skipping 30 matching lines...) Expand all Loading... |
| 336 m_testWebViewClient->scheduleAnimation(); | 325 m_testWebViewClient->scheduleAnimation(); |
| 337 } | 326 } |
| 338 | 327 |
| 339 void TestWebViewWidgetClient::didMeaningfulLayout(WebMeaningfulLayout layoutType
) | 328 void TestWebViewWidgetClient::didMeaningfulLayout(WebMeaningfulLayout layoutType
) |
| 340 { | 329 { |
| 341 m_testWebViewClient->didMeaningfulLayout(layoutType); | 330 m_testWebViewClient->didMeaningfulLayout(layoutType); |
| 342 } | 331 } |
| 343 | 332 |
| 344 } // namespace FrameTestHelpers | 333 } // namespace FrameTestHelpers |
| 345 } // namespace blink | 334 } // namespace blink |
| OLD | NEW |