Merge to M52: Exclude more CSS properties for fullscreen video on Android.

third_party/WebKit/Source/core/layout/LayoutThemeMobile.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 31 matching lines @@
 
 PassRefPtr<LayoutTheme> LayoutThemeMobile::create()
 {
     return adoptRef(new LayoutThemeMobile());
 }
 
 LayoutThemeMobile::~LayoutThemeMobile()
 {
 }
 
+String LayoutThemeMobile::extraDefaultStyleSheet()
+{
+    return LayoutThemeDefault::extraDefaultStyleSheet() +
+        loadResourceAsASCIIString("themeChromiumLinux.css") +
+        loadResourceAsASCIIString("themeChromiumAndroid.css");
+
+}
+
 String LayoutThemeMobile::extraMediaControlsStyleSheet()
 {
     return loadResourceAsASCIIString(
         RuntimeEnabledFeatures::newMediaPlaybackUiEnabled() ?
         "mediaControlsAndroidNew.css" : "mediaControlsAndroid.css");
 }
 
-String LayoutThemeMobile::extraDefaultStyleSheet()
+String LayoutThemeMobile::extraFullscreenStyleSheet()
 {
-    return LayoutThemeDefault::extraDefaultStyleSheet() +
-        loadResourceAsASCIIString("themeChromiumLinux.css") +
-        loadResourceAsASCIIString("themeChromiumAndroid.css");
-
+    return loadResourceAsASCIIString("fullscreenAndroid.css");
 }
 
 void LayoutThemeMobile::adjustInnerSpinButtonStyle(ComputedStyle& style) const
 {
     if (LayoutTestSupport::isRunningLayoutTest()) {
         // Match Linux spin button style in layout tests.
         // FIXME: Consider removing the conditional if a future Android theme matches this.
         IntSize size = Platform::current()->themeEngine()->getSize(WebThemeEngine::PartInnerSpinButton);
 
         style.setWidth(Length(size.width(), Fixed));
         style.setMinWidth(Length(size.width(), Fixed));
     }
 }
 
 bool LayoutThemeMobile::shouldUseFallbackTheme(const ComputedStyle& style) const
 {
 #if OS(MACOSX)
     // Mac WebThemeEngine cannot handle these controls.
     ControlPart part = style.appearance();
     if (part == CheckboxPart || part == RadioPart)
         return true;
 #endif
     return LayoutThemeDefault::shouldUseFallbackTheme(style);
 }
 
 } // namespace blink