| 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 mainFrameWidget->setRootGraphicsLayer(webViewImpl() | 75 mainFrameWidget->setRootGraphicsLayer(webViewImpl() |
| 76 ->mainFrameImpl() | 76 ->mainFrameImpl() |
| 77 ->frame() | 77 ->frame() |
| 78 ->view() | 78 ->view() |
| 79 ->layoutViewItem() | 79 ->layoutViewItem() |
| 80 .compositor() | 80 .compositor() |
| 81 ->rootGraphicsLayer()); | 81 ->rootGraphicsLayer()); |
| 82 } | 82 } |
| 83 | 83 |
| 84 ~ScrollingCoordinatorTest() override { | 84 ~ScrollingCoordinatorTest() override { |
| 85 Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs(); | 85 Platform::current() |
| 86 WebCache::clear(); | 86 ->getURLLoaderMockFactory() |
| 87 ->unregisterAllURLsAndClearMemoryCache(); |
| 87 } | 88 } |
| 88 | 89 |
| 89 void navigateTo(const std::string& url) { | 90 void navigateTo(const std::string& url) { |
| 90 FrameTestHelpers::loadFrame(webViewImpl()->mainFrame(), url); | 91 FrameTestHelpers::loadFrame(webViewImpl()->mainFrame(), url); |
| 91 } | 92 } |
| 92 | 93 |
| 93 void loadHTML(const std::string& html) { | 94 void loadHTML(const std::string& html) { |
| 94 FrameTestHelpers::loadHTMLString(webViewImpl()->mainFrame(), html, | 95 FrameTestHelpers::loadHTMLString(webViewImpl()->mainFrame(), html, |
| 95 URLTestHelpers::toKURL("about:blank")); | 96 URLTestHelpers::toKURL("about:blank")); |
| 96 } | 97 } |
| (...skipping 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1159 ASSERT_FALSE(frameView->mainThreadScrollingReasons() & reason); | 1160 ASSERT_FALSE(frameView->mainThreadScrollingReasons() & reason); |
| 1160 } | 1161 } |
| 1161 | 1162 |
| 1162 TEST_P(StyleRelatedMainThreadScrollingReasonTest, LCDTextEnabledTest) { | 1163 TEST_P(StyleRelatedMainThreadScrollingReasonTest, LCDTextEnabledTest) { |
| 1163 testStyle("transparent border-radius", | 1164 testStyle("transparent border-radius", |
| 1164 MainThreadScrollingReason::kHasOpacityAndLCDText | | 1165 MainThreadScrollingReason::kHasOpacityAndLCDText | |
| 1165 MainThreadScrollingReason::kHasBorderRadius); | 1166 MainThreadScrollingReason::kHasBorderRadius); |
| 1166 } | 1167 } |
| 1167 | 1168 |
| 1168 } // namespace blink | 1169 } // namespace blink |
| OLD | NEW |