Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(350)

Side by Side Diff: third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp

Issue 1509013002: CC Animations: Fix ParameterizedWebFrameTests on Android N4 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 276
277 loadFrame(webView()->mainFrame(), url); 277 loadFrame(webView()->mainFrame(), url);
278 278
279 return webViewImpl(); 279 return webViewImpl();
280 } 280 }
281 281
282 void WebViewHelper::reset() 282 void WebViewHelper::reset()
283 { 283 {
284 if (m_webView) { 284 if (m_webView) {
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->willCloseLayerTreeView();
286 m_webView->close(); 287 m_webView->close();
287 m_webView = 0; 288 m_webView = 0;
288 } 289 }
289 } 290 }
290 291
291 TestWebFrameClient::TestWebFrameClient() : m_loadsInProgress(0) 292 TestWebFrameClient::TestWebFrameClient() : m_loadsInProgress(0)
292 { 293 {
293 } 294 }
294 295
295 WebFrame* TestWebFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeSco peType scope, const WebString& frameName, WebSandboxFlags sandboxFlags, const We bFrameOwnerProperties& frameOwnerProperties) 296 WebFrame* TestWebFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeSco peType scope, const WebString& frameName, WebSandboxFlags sandboxFlags, const We bFrameOwnerProperties& frameOwnerProperties)
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 } 346 }
346 347
347 void TestWebViewClient::initializeLayerTreeView() 348 void TestWebViewClient::initializeLayerTreeView()
348 { 349 {
349 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay erTreeViewForTesting()); 350 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay erTreeViewForTesting());
350 ASSERT(m_layerTreeView); 351 ASSERT(m_layerTreeView);
351 } 352 }
352 353
353 } // namespace FrameTestHelpers 354 } // namespace FrameTestHelpers
354 } // namespace blink 355 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698