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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp

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, 6 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 179
180 ASSERT(!m_defaultStyle->features().hasIdsInSelectors()); 180 ASSERT(!m_defaultStyle->features().hasIdsInSelectors());
181 ASSERT(m_defaultStyle->features().siblingRules.isEmpty()); 181 ASSERT(m_defaultStyle->features().siblingRules.isEmpty());
182 } 182 }
183 183
184 void CSSDefaultStyleSheets::ensureDefaultStyleSheetForFullscreen() 184 void CSSDefaultStyleSheets::ensureDefaultStyleSheetForFullscreen()
185 { 185 {
186 if (m_fullscreenStyleSheet) 186 if (m_fullscreenStyleSheet)
187 return; 187 return;
188 188
189 String fullscreenRules = loadResourceAsASCIIString("fullscreen.css") + Layou tTheme::theme().extraFullScreenStyleSheet(); 189 String fullscreenRules = loadResourceAsASCIIString("fullscreen.css") + Layou tTheme::theme().extraFullscreenStyleSheet();
190 m_fullscreenStyleSheet = parseUASheet(fullscreenRules); 190 m_fullscreenStyleSheet = parseUASheet(fullscreenRules);
191 m_defaultStyle->addRulesFromSheet(fullscreenStyleSheet(), screenEval()); 191 m_defaultStyle->addRulesFromSheet(fullscreenStyleSheet(), screenEval());
192 m_defaultQuirksStyle->addRulesFromSheet(fullscreenStyleSheet(), screenEval() ); 192 m_defaultQuirksStyle->addRulesFromSheet(fullscreenStyleSheet(), screenEval() );
193 } 193 }
194 194
195 DEFINE_TRACE(CSSDefaultStyleSheets) 195 DEFINE_TRACE(CSSDefaultStyleSheets)
196 { 196 {
197 visitor->trace(m_defaultStyle); 197 visitor->trace(m_defaultStyle);
198 visitor->trace(m_defaultMobileViewportStyle); 198 visitor->trace(m_defaultMobileViewportStyle);
199 visitor->trace(m_defaultTelevisionViewportStyle); 199 visitor->trace(m_defaultTelevisionViewportStyle);
200 visitor->trace(m_defaultQuirksStyle); 200 visitor->trace(m_defaultQuirksStyle);
201 visitor->trace(m_defaultPrintStyle); 201 visitor->trace(m_defaultPrintStyle);
202 visitor->trace(m_defaultViewSourceStyle); 202 visitor->trace(m_defaultViewSourceStyle);
203 visitor->trace(m_defaultXHTMLMobileProfileStyle); 203 visitor->trace(m_defaultXHTMLMobileProfileStyle);
204 visitor->trace(m_defaultStyleSheet); 204 visitor->trace(m_defaultStyleSheet);
205 visitor->trace(m_mobileViewportStyleSheet); 205 visitor->trace(m_mobileViewportStyleSheet);
206 visitor->trace(m_televisionViewportStyleSheet); 206 visitor->trace(m_televisionViewportStyleSheet);
207 visitor->trace(m_quirksStyleSheet); 207 visitor->trace(m_quirksStyleSheet);
208 visitor->trace(m_svgStyleSheet); 208 visitor->trace(m_svgStyleSheet);
209 visitor->trace(m_mathmlStyleSheet); 209 visitor->trace(m_mathmlStyleSheet);
210 visitor->trace(m_mediaControlsStyleSheet); 210 visitor->trace(m_mediaControlsStyleSheet);
211 visitor->trace(m_fullscreenStyleSheet); 211 visitor->trace(m_fullscreenStyleSheet);
212 } 212 }
213 213
214 } // namespace blink 214 } // namespace blink
OLDNEW
« no previous file with comments | « content/child/blink_platform_impl.cc ('k') | third_party/WebKit/Source/core/css/fullscreenAndroid.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698