Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(776)

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutThemeMac.mm

Issue 2097983002: Merge to M52: Exclude more CSS properties for fullscreen video on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Google, Inc. 3 * Copyright (C) 2008, 2009 Google, Inc.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 1054
1055 if (tint != oldTint) 1055 if (tint != oldTint)
1056 [cell setControlTint:tint]; 1056 [cell setControlTint:tint];
1057 } 1057 }
1058 1058
1059 void LayoutThemeMac::adjustMediaSliderThumbSize(ComputedStyle& style) const 1059 void LayoutThemeMac::adjustMediaSliderThumbSize(ComputedStyle& style) const
1060 { 1060 {
1061 MediaControlsPainter::adjustMediaSliderThumbSize(style); 1061 MediaControlsPainter::adjustMediaSliderThumbSize(style);
1062 } 1062 }
1063 1063
1064 String LayoutThemeMac::extraFullScreenStyleSheet() 1064 String LayoutThemeMac::extraFullscreenStyleSheet()
1065 { 1065 {
1066 // FIXME: Chromium may wish to style its default media controls differently in fullscreen. 1066 // FIXME: Chromium may wish to style its default media controls differently in fullscreen.
1067 return String(); 1067 return String();
1068 } 1068 }
1069 1069
1070 String LayoutThemeMac::extraDefaultStyleSheet() 1070 String LayoutThemeMac::extraDefaultStyleSheet()
1071 { 1071 {
1072 return LayoutTheme::extraDefaultStyleSheet() + 1072 return LayoutTheme::extraDefaultStyleSheet() +
1073 loadResourceAsASCIIString("themeInputMultipleFields.css") + 1073 loadResourceAsASCIIString("themeInputMultipleFields.css") +
1074 loadResourceAsASCIIString("themeMac.css"); 1074 loadResourceAsASCIIString("themeMac.css");
(...skipping 29 matching lines...) Expand all
1104 1104
1105 bool LayoutThemeMac::shouldUseFallbackTheme(const ComputedStyle& style) const 1105 bool LayoutThemeMac::shouldUseFallbackTheme(const ComputedStyle& style) const
1106 { 1106 {
1107 ControlPart part = style.appearance(); 1107 ControlPart part = style.appearance();
1108 if (part == CheckboxPart || part == RadioPart) 1108 if (part == CheckboxPart || part == RadioPart)
1109 return style.effectiveZoom() != 1; 1109 return style.effectiveZoom() != 1;
1110 return false; 1110 return false;
1111 } 1111 }
1112 1112
1113 } // namespace blink 1113 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutThemeMac.h ('k') | third_party/WebKit/Source/core/layout/LayoutThemeMobile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698