| 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 ->RootGraphicsLayer()); | 79 ->RootGraphicsLayer()); |
| 80 } | 80 } |
| 81 | 81 |
| 82 ~ScrollingCoordinatorTest() override { | 82 ~ScrollingCoordinatorTest() override { |
| 83 Platform::Current() | 83 Platform::Current() |
| 84 ->GetURLLoaderMockFactory() | 84 ->GetURLLoaderMockFactory() |
| 85 ->UnregisterAllURLsAndClearMemoryCache(); | 85 ->UnregisterAllURLsAndClearMemoryCache(); |
| 86 } | 86 } |
| 87 | 87 |
| 88 void NavigateTo(const std::string& url) { | 88 void NavigateTo(const std::string& url) { |
| 89 FrameTestHelpers::LoadFrame(GetWebView()->MainFrame(), url); | 89 FrameTestHelpers::LoadFrame(GetWebView()->MainFrameImpl(), url); |
| 90 } | 90 } |
| 91 | 91 |
| 92 void LoadHTML(const std::string& html) { | 92 void LoadHTML(const std::string& html) { |
| 93 FrameTestHelpers::LoadHTMLString(GetWebView()->MainFrameImpl(), html, | 93 FrameTestHelpers::LoadHTMLString(GetWebView()->MainFrameImpl(), html, |
| 94 URLTestHelpers::ToKURL("about:blank")); | 94 URLTestHelpers::ToKURL("about:blank")); |
| 95 } | 95 } |
| 96 | 96 |
| 97 void ForceFullCompositingUpdate() { | 97 void ForceFullCompositingUpdate() { |
| 98 GetWebView()->UpdateAllLifecyclePhases(); | 98 GetWebView()->UpdateAllLifecyclePhases(); |
| 99 } | 99 } |
| (...skipping 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1257 ForceFullCompositingUpdate(); | 1257 ForceFullCompositingUpdate(); |
| 1258 PaintLayerScrollableArea* scrollable_area2 = | 1258 PaintLayerScrollableArea* scrollable_area2 = |
| 1259 ToLayoutBoxModelObject(container2->GetLayoutObject()) | 1259 ToLayoutBoxModelObject(container2->GetLayoutObject()) |
| 1260 ->GetScrollableArea(); | 1260 ->GetScrollableArea(); |
| 1261 ASSERT_TRUE(scrollable_area2); | 1261 ASSERT_TRUE(scrollable_area2); |
| 1262 EXPECT_TRUE(scrollable_area2->GetNonCompositedMainThreadScrollingReasons() & | 1262 EXPECT_TRUE(scrollable_area2->GetNonCompositedMainThreadScrollingReasons() & |
| 1263 MainThreadScrollingReason::kHasBorderRadius); | 1263 MainThreadScrollingReason::kHasBorderRadius); |
| 1264 } | 1264 } |
| 1265 | 1265 |
| 1266 } // namespace blink | 1266 } // namespace blink |
| OLD | NEW |