| 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) { | |
| 125 return nullptr; | 124 return nullptr; |
| 126 } | 125 } |
| 127 | 126 |
| 128 std::unique_ptr<WebScrollbarLayer> | 127 std::unique_ptr<WebScrollbarLayer> |
| 129 TestingCompositorSupport::createOverlayScrollbarLayer( | 128 TestingCompositorSupport::createOverlayScrollbarLayer( |
| 130 std::unique_ptr<WebScrollbar>, | 129 std::unique_ptr<WebScrollbar>, |
| 131 WebScrollbarThemePainter, | 130 WebScrollbarThemePainter, |
| 132 std::unique_ptr<WebScrollbarThemeGeometry>, | 131 std::unique_ptr<WebScrollbarThemeGeometry>) { |
| 133 WebLayer* scrollLayer) { | |
| 134 return nullptr; | 132 return nullptr; |
| 135 } | 133 } |
| 136 | 134 |
| 137 std::unique_ptr<WebScrollbarLayer> | 135 std::unique_ptr<WebScrollbarLayer> |
| 138 TestingCompositorSupport::createSolidColorScrollbarLayer( | 136 TestingCompositorSupport::createSolidColorScrollbarLayer( |
| 139 WebScrollbar::Orientation, | 137 WebScrollbar::Orientation, |
| 140 int thumbThickness, | 138 int thumbThickness, |
| 141 int trackStart, | 139 int trackStart, |
| 142 bool isLeftSideVerticalScrollbar, | 140 bool isLeftSideVerticalScrollbar) { |
| 143 WebLayer* scrollLayer) { | |
| 144 return nullptr; | 141 return nullptr; |
| 145 } | 142 } |
| 146 | 143 |
| 147 TestingPlatformSupport::TestingPlatformSupport() | 144 TestingPlatformSupport::TestingPlatformSupport() |
| 148 : TestingPlatformSupport(TestingPlatformSupport::Config()) {} | 145 : TestingPlatformSupport(TestingPlatformSupport::Config()) {} |
| 149 | 146 |
| 150 TestingPlatformSupport::TestingPlatformSupport(const Config& config) | 147 TestingPlatformSupport::TestingPlatformSupport(const Config& config) |
| 151 : m_config(config), | 148 : m_config(config), |
| 152 m_oldPlatform(Platform::current()), | 149 m_oldPlatform(Platform::current()), |
| 153 m_interfaceProvider(new TestingInterfaceProvider) { | 150 m_interfaceProvider(new TestingInterfaceProvider) { |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 353 ThreadState::attachMainThread(); | 350 ThreadState::attachMainThread(); |
| 354 ThreadState::current()->registerTraceDOMWrappers(nullptr, nullptr, nullptr, | 351 ThreadState::current()->registerTraceDOMWrappers(nullptr, nullptr, nullptr, |
| 355 nullptr); | 352 nullptr); |
| 356 HTTPNames::init(); | 353 HTTPNames::init(); |
| 357 FetchInitiatorTypeNames::init(); | 354 FetchInitiatorTypeNames::init(); |
| 358 } | 355 } |
| 359 | 356 |
| 360 ScopedUnittestsEnvironmentSetup::~ScopedUnittestsEnvironmentSetup() {} | 357 ScopedUnittestsEnvironmentSetup::~ScopedUnittestsEnvironmentSetup() {} |
| 361 | 358 |
| 362 } // namespace blink | 359 } // namespace blink |
| OLD | NEW |