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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutThemeAndroid.cpp

Issue 1690493002: Switch to LayoutThemeMobile when emulating mobile device in DevTools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Invalidate tapHighlightColor only Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/LayoutThemeAndroid.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutThemeAndroid.cpp b/third_party/WebKit/Source/core/layout/LayoutThemeAndroid.cpp
index fe9782e1cdff54a04fe702692a0ce6237395c7eb..59f5aa7b471615c91ea40714fe40292819ce04f9 100644
--- a/third_party/WebKit/Source/core/layout/LayoutThemeAndroid.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutThemeAndroid.cpp
@@ -1,43 +1,9 @@
-/*
- * 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
#include "core/layout/LayoutThemeAndroid.h"
-#include "core/CSSValueKeywords.h"
-#include "core/InputTypeNames.h"
-#include "core/layout/LayoutObject.h"
-#include "core/layout/LayoutProgress.h"
-#include "core/layout/LayoutSlider.h"
-#include "platform/LayoutTestSupport.h"
-#include "platform/PlatformResourceLoader.h"
-#include "platform/graphics/Color.h"
-#include "platform/scroll/ScrollbarTheme.h"
-#include "public/platform/Platform.h"
-#include "public/platform/WebThemeEngine.h"
-#include "wtf/StdLibExtras.h"
-
namespace blink {
PassRefPtr<LayoutTheme> LayoutThemeAndroid::create()
@@ -45,7 +11,7 @@ PassRefPtr<LayoutTheme> LayoutThemeAndroid::create()
return adoptRef(new LayoutThemeAndroid());
}
-LayoutTheme& LayoutTheme::theme()
+LayoutTheme& LayoutTheme::nativeTheme()
{
DEFINE_STATIC_REF(LayoutTheme, layoutTheme, (LayoutThemeAndroid::create()));
return *layoutTheme;
@@ -55,31 +21,4 @@ LayoutThemeAndroid::~LayoutThemeAndroid()
{
}
-String LayoutThemeAndroid::extraMediaControlsStyleSheet()
-{
- return loadResourceAsASCIIString(
- RuntimeEnabledFeatures::newMediaPlaybackUiEnabled() ?
- "mediaControlsAndroidNew.css" : "mediaControlsAndroid.css");
-}
-
-String LayoutThemeAndroid::extraDefaultStyleSheet()
-{
- return LayoutThemeDefault::extraDefaultStyleSheet() +
- loadResourceAsASCIIString("themeChromiumLinux.css") +
- loadResourceAsASCIIString("themeChromiumAndroid.css");
-
-}
-
-void LayoutThemeAndroid::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));
- }
-}
-
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutThemeAndroid.h ('k') | third_party/WebKit/Source/core/layout/LayoutThemeDefault.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698