OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 } | 113 } |
114 | 114 |
115 std::unique_ptr<WebImageLayer> TestingCompositorSupport::createImageLayer() { | 115 std::unique_ptr<WebImageLayer> TestingCompositorSupport::createImageLayer() { |
116 return nullptr; | 116 return nullptr; |
117 } | 117 } |
118 | 118 |
119 std::unique_ptr<WebScrollbarLayer> | 119 std::unique_ptr<WebScrollbarLayer> |
120 TestingCompositorSupport::createScrollbarLayer( | 120 TestingCompositorSupport::createScrollbarLayer( |
121 std::unique_ptr<WebScrollbar>, | 121 std::unique_ptr<WebScrollbar>, |
122 WebScrollbarThemePainter, | 122 WebScrollbarThemePainter, |
123 std::unique_ptr<WebScrollbarThemeGeometry>) { | 123 std::unique_ptr<WebScrollbarThemeGeometry>, |
| 124 WebLayer* scrollLayer) { |
124 return nullptr; | 125 return nullptr; |
125 } | 126 } |
126 | 127 |
127 std::unique_ptr<WebScrollbarLayer> | 128 std::unique_ptr<WebScrollbarLayer> |
128 TestingCompositorSupport::createOverlayScrollbarLayer( | 129 TestingCompositorSupport::createOverlayScrollbarLayer( |
129 std::unique_ptr<WebScrollbar>, | 130 std::unique_ptr<WebScrollbar>, |
130 WebScrollbarThemePainter, | 131 WebScrollbarThemePainter, |
131 std::unique_ptr<WebScrollbarThemeGeometry>) { | 132 std::unique_ptr<WebScrollbarThemeGeometry>, |
| 133 WebLayer* scrollLayer) { |
132 return nullptr; | 134 return nullptr; |
133 } | 135 } |
134 | 136 |
135 std::unique_ptr<WebScrollbarLayer> | 137 std::unique_ptr<WebScrollbarLayer> |
136 TestingCompositorSupport::createSolidColorScrollbarLayer( | 138 TestingCompositorSupport::createSolidColorScrollbarLayer( |
137 WebScrollbar::Orientation, | 139 WebScrollbar::Orientation, |
138 int thumbThickness, | 140 int thumbThickness, |
139 int trackStart, | 141 int trackStart, |
140 bool isLeftSideVerticalScrollbar) { | 142 bool isLeftSideVerticalScrollbar, |
| 143 WebLayer* scrollLayer) { |
141 return nullptr; | 144 return nullptr; |
142 } | 145 } |
143 | 146 |
144 TestingPlatformSupport::TestingPlatformSupport() | 147 TestingPlatformSupport::TestingPlatformSupport() |
145 : TestingPlatformSupport(TestingPlatformSupport::Config()) {} | 148 : TestingPlatformSupport(TestingPlatformSupport::Config()) {} |
146 | 149 |
147 TestingPlatformSupport::TestingPlatformSupport(const Config& config) | 150 TestingPlatformSupport::TestingPlatformSupport(const Config& config) |
148 : m_config(config), | 151 : m_config(config), |
149 m_oldPlatform(Platform::current()), | 152 m_oldPlatform(Platform::current()), |
150 m_interfaceProvider(new TestingInterfaceProvider) { | 153 m_interfaceProvider(new TestingInterfaceProvider) { |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 ThreadState::attachMainThread(); | 353 ThreadState::attachMainThread(); |
351 ThreadState::current()->registerTraceDOMWrappers(nullptr, nullptr, nullptr, | 354 ThreadState::current()->registerTraceDOMWrappers(nullptr, nullptr, nullptr, |
352 nullptr); | 355 nullptr); |
353 HTTPNames::init(); | 356 HTTPNames::init(); |
354 FetchInitiatorTypeNames::init(); | 357 FetchInitiatorTypeNames::init(); |
355 } | 358 } |
356 | 359 |
357 ScopedUnittestsEnvironmentSetup::~ScopedUnittestsEnvironmentSetup() {} | 360 ScopedUnittestsEnvironmentSetup::~ScopedUnittestsEnvironmentSetup() {} |
358 | 361 |
359 } // namespace blink | 362 } // namespace blink |
OLD | NEW |