| OLD | NEW | 
|---|
| 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, 2013 Apple Inc. | 5  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. | 
| 6  * All rights reserved. | 6  * All rights reserved. | 
| 7  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 7  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 
| 8  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 8  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 
| 9  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 9  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 
| 10  * (http://www.torchmobile.com/) | 10  * (http://www.torchmobile.com/) | 
| (...skipping 1355 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1366       return false; | 1366       return false; | 
| 1367   } | 1367   } | 
| 1368 } | 1368 } | 
| 1369 | 1369 | 
| 1370 static bool shouldIgnoreTextTrackAuthorStyle(const Document& document) { | 1370 static bool shouldIgnoreTextTrackAuthorStyle(const Document& document) { | 
| 1371   Settings* settings = document.settings(); | 1371   Settings* settings = document.settings(); | 
| 1372   if (!settings) | 1372   if (!settings) | 
| 1373     return false; | 1373     return false; | 
| 1374   // Ignore author specified settings for text tracks when any of the user | 1374   // Ignore author specified settings for text tracks when any of the user | 
| 1375   // settings are present. | 1375   // settings are present. | 
| 1376   if (!settings->textTrackBackgroundColor().isEmpty() || | 1376   if (!settings->GetTextTrackBackgroundColor().isEmpty() || | 
| 1377       !settings->textTrackFontFamily().isEmpty() || | 1377       !settings->GetTextTrackFontFamily().isEmpty() || | 
| 1378       !settings->textTrackFontStyle().isEmpty() || | 1378       !settings->GetTextTrackFontStyle().isEmpty() || | 
| 1379       !settings->textTrackFontVariant().isEmpty() || | 1379       !settings->GetTextTrackFontVariant().isEmpty() || | 
| 1380       !settings->textTrackTextColor().isEmpty() || | 1380       !settings->GetTextTrackTextColor().isEmpty() || | 
| 1381       !settings->textTrackTextShadow().isEmpty() || | 1381       !settings->GetTextTrackTextShadow().isEmpty() || | 
| 1382       !settings->textTrackTextSize().isEmpty()) | 1382       !settings->GetTextTrackTextSize().isEmpty()) | 
| 1383     return true; | 1383     return true; | 
| 1384   return false; | 1384   return false; | 
| 1385 } | 1385 } | 
| 1386 | 1386 | 
| 1387 static inline bool isPropertyInWhitelist( | 1387 static inline bool isPropertyInWhitelist( | 
| 1388     PropertyWhitelistType propertyWhitelistType, | 1388     PropertyWhitelistType propertyWhitelistType, | 
| 1389     CSSPropertyID property, | 1389     CSSPropertyID property, | 
| 1390     const Document& document) { | 1390     const Document& document) { | 
| 1391   if (propertyWhitelistType == PropertyWhitelistNone) | 1391   if (propertyWhitelistType == PropertyWhitelistNone) | 
| 1392     return true;  // Early bail for the by far most common case. | 1392     return true;  // Early bail for the by far most common case. | 
| (...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1924 | 1924 | 
| 1925 DEFINE_TRACE(StyleResolver) { | 1925 DEFINE_TRACE(StyleResolver) { | 
| 1926   visitor->trace(m_matchedPropertiesCache); | 1926   visitor->trace(m_matchedPropertiesCache); | 
| 1927   visitor->trace(m_selectorFilter); | 1927   visitor->trace(m_selectorFilter); | 
| 1928   visitor->trace(m_styleSharingLists); | 1928   visitor->trace(m_styleSharingLists); | 
| 1929   visitor->trace(m_document); | 1929   visitor->trace(m_document); | 
| 1930   visitor->trace(m_tracker); | 1930   visitor->trace(m_tracker); | 
| 1931 } | 1931 } | 
| 1932 | 1932 | 
| 1933 }  // namespace blink | 1933 }  // namespace blink | 
| OLD | NEW | 
|---|