| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 Platform::Current() | 84 Platform::Current() |
| 85 ->GetURLLoaderMockFactory() | 85 ->GetURLLoaderMockFactory() |
| 86 ->UnregisterAllURLsAndClearMemoryCache(); | 86 ->UnregisterAllURLsAndClearMemoryCache(); |
| 87 } | 87 } |
| 88 | 88 |
| 89 void NavigateTo(const std::string& url) { | 89 void NavigateTo(const std::string& url) { |
| 90 FrameTestHelpers::LoadFrame(GetWebView()->MainFrame(), url); | 90 FrameTestHelpers::LoadFrame(GetWebView()->MainFrame(), url); |
| 91 } | 91 } |
| 92 | 92 |
| 93 void LoadHTML(const std::string& html) { | 93 void LoadHTML(const std::string& html) { |
| 94 FrameTestHelpers::LoadHTMLString(GetWebView()->MainFrame(), html, | 94 FrameTestHelpers::LoadHTMLString(GetWebView()->MainFrameImpl(), html, |
| 95 URLTestHelpers::ToKURL("about:blank")); | 95 URLTestHelpers::ToKURL("about:blank")); |
| 96 } | 96 } |
| 97 | 97 |
| 98 void ForceFullCompositingUpdate() { | 98 void ForceFullCompositingUpdate() { |
| 99 GetWebView()->UpdateAllLifecyclePhases(); | 99 GetWebView()->UpdateAllLifecyclePhases(); |
| 100 } | 100 } |
| 101 | 101 |
| 102 void RegisterMockedHttpURLLoad(const std::string& file_name) { | 102 void RegisterMockedHttpURLLoad(const std::string& file_name) { |
| 103 URLTestHelpers::RegisterMockedURLLoadFromBase( | 103 URLTestHelpers::RegisterMockedURLLoadFromBase( |
| 104 WebString::FromUTF8(base_url_), testing::WebTestDataPath(), | 104 WebString::FromUTF8(base_url_), testing::WebTestDataPath(), |
| (...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1261 ForceFullCompositingUpdate(); | 1261 ForceFullCompositingUpdate(); |
| 1262 PaintLayerScrollableArea* scrollable_area2 = | 1262 PaintLayerScrollableArea* scrollable_area2 = |
| 1263 ToLayoutBoxModelObject(container2->GetLayoutObject()) | 1263 ToLayoutBoxModelObject(container2->GetLayoutObject()) |
| 1264 ->GetScrollableArea(); | 1264 ->GetScrollableArea(); |
| 1265 ASSERT_TRUE(scrollable_area2); | 1265 ASSERT_TRUE(scrollable_area2); |
| 1266 EXPECT_TRUE(scrollable_area2->GetNonCompositedMainThreadScrollingReasons() & | 1266 EXPECT_TRUE(scrollable_area2->GetNonCompositedMainThreadScrollingReasons() & |
| 1267 MainThreadScrollingReason::kHasBorderRadius); | 1267 MainThreadScrollingReason::kHasBorderRadius); |
| 1268 } | 1268 } |
| 1269 | 1269 |
| 1270 } // namespace blink | 1270 } // namespace blink |
| OLD | NEW |