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

Side by Side Diff: Source/web/tests/ScrollingCoordinatorChromiumTest.cpp

Issue 272143002: Revert of Fix webkit_unit_tests to use the threaded parser and enable everywhere. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 months 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/tests/PrerenderingTest.cpp ('k') | Source/web/tests/ViewportTest.cpp » ('j') | 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 } 58 }
59 59
60 virtual ~ScrollingCoordinatorChromiumTest() 60 virtual ~ScrollingCoordinatorChromiumTest()
61 { 61 {
62 Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); 62 Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
63 } 63 }
64 64
65 void navigateTo(const std::string& url) 65 void navigateTo(const std::string& url)
66 { 66 {
67 FrameTestHelpers::loadFrame(webViewImpl()->mainFrame(), url); 67 FrameTestHelpers::loadFrame(webViewImpl()->mainFrame(), url);
68 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests( );
68 } 69 }
69 70
70 void forceFullCompositingUpdate() 71 void forceFullCompositingUpdate()
71 { 72 {
72 webViewImpl()->layout(); 73 webViewImpl()->layout();
73 } 74 }
74 75
75 void registerMockedHttpURLLoad(const std::string& fileName) 76 void registerMockedHttpURLLoad(const std::string& fileName)
76 { 77 {
77 URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseU RL.c_str()), WebString::fromUTF8(fileName.c_str())); 78 URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseU RL.c_str()), WebString::fromUTF8(fileName.c_str()));
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 TEST_F(ScrollingCoordinatorChromiumTest, setupScrollbarLayerShouldNotCrash) 442 TEST_F(ScrollingCoordinatorChromiumTest, setupScrollbarLayerShouldNotCrash)
442 { 443 {
443 registerMockedHttpURLLoad("setup_scrollbar_layer_crash.html"); 444 registerMockedHttpURLLoad("setup_scrollbar_layer_crash.html");
444 navigateTo(m_baseURL + "setup_scrollbar_layer_crash.html"); 445 navigateTo(m_baseURL + "setup_scrollbar_layer_crash.html");
445 forceFullCompositingUpdate(); 446 forceFullCompositingUpdate();
446 // This test document setup an iframe with scrollbars, then switch to 447 // This test document setup an iframe with scrollbars, then switch to
447 // an empty document by javascript. 448 // an empty document by javascript.
448 } 449 }
449 450
450 } // namespace 451 } // namespace
OLDNEW
« no previous file with comments | « Source/web/tests/PrerenderingTest.cpp ('k') | Source/web/tests/ViewportTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698