OLD | NEW |
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 Loading... |
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 Loading... |
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 |
OLD | NEW |