Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |
| 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #ifndef LayoutThemeAndroid_h | 26 #ifndef LayoutThemeMobile_h |
| 27 #define LayoutThemeAndroid_h | 27 #define LayoutThemeMobile_h |
| 28 | 28 |
| 29 #include "core/layout/LayoutThemeDefault.h" | 29 #include "core/layout/LayoutThemeDefault.h" |
| 30 | 30 |
| 31 namespace blink { | 31 namespace blink { |
| 32 | 32 |
| 33 class LayoutThemeAndroid final : public LayoutThemeDefault { | 33 class LayoutThemeMobile : public LayoutThemeDefault { |
| 34 public: | 34 public: |
| 35 static PassRefPtr<LayoutTheme> create(); | 35 static PassRefPtr<LayoutTheme> create(); |
| 36 String extraDefaultStyleSheet() override; | 36 String extraDefaultStyleSheet() override; |
| 37 | 37 |
| 38 #if !USE(NEW_THEME) | |
|
pdr.
2016/02/12 06:36:14
This is basically a "#if !OSX" check... won't this
dgozman
2016/02/19 19:15:16
Good point. I've reworked the patch to avoid this
| |
| 38 void adjustInnerSpinButtonStyle(ComputedStyle&) const override; | 39 void adjustInnerSpinButtonStyle(ComputedStyle&) const override; |
| 40 #endif | |
| 39 | 41 |
| 40 bool delegatesMenuListRendering() const override { return true; } | 42 bool delegatesMenuListRendering() const override { return true; } |
| 41 | 43 |
| 42 String extraMediaControlsStyleSheet() override; | 44 String extraMediaControlsStyleSheet() override; |
| 43 | 45 |
| 44 Color platformTapHighlightColor() const override | 46 Color platformTapHighlightColor() const override |
| 45 { | 47 { |
| 46 return LayoutThemeAndroid::defaultTapHighlightColor; | 48 return LayoutThemeMobile::defaultTapHighlightColor; |
| 47 } | 49 } |
| 48 | 50 |
| 49 Color platformActiveSelectionBackgroundColor() const override | 51 Color platformActiveSelectionBackgroundColor() const override |
| 50 { | 52 { |
| 51 return LayoutThemeAndroid::defaultActiveSelectionBackgroundColor; | 53 return LayoutThemeMobile::defaultActiveSelectionBackgroundColor; |
| 52 } | 54 } |
| 53 | 55 |
| 56 protected: | |
| 57 ~LayoutThemeMobile() override; | |
| 58 | |
| 54 private: | 59 private: |
| 55 ~LayoutThemeAndroid() override; | |
| 56 | |
| 57 static const RGBA32 defaultTapHighlightColor = 0x6633b5e5; | 60 static const RGBA32 defaultTapHighlightColor = 0x6633b5e5; |
| 58 static const RGBA32 defaultActiveSelectionBackgroundColor = 0x6633b5e5; | 61 static const RGBA32 defaultActiveSelectionBackgroundColor = 0x6633b5e5; |
| 59 }; | 62 }; |
| 60 | 63 |
| 61 } // namespace blink | 64 } // namespace blink |
| 62 | 65 |
| 63 #endif // LayoutThemeAndroid_h | 66 #endif // LayoutThemeMobile_h |
| OLD | NEW |