Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. |
| 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) | 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) |
| 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. | 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. |
| 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. | 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. |
| (...skipping 3012 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3023 } | 3023 } |
| 3024 } | 3024 } |
| 3025 | 3025 |
| 3026 bool Document::shouldMergeWithLegacyDescription(ViewportDescription::Type origin ) | 3026 bool Document::shouldMergeWithLegacyDescription(ViewportDescription::Type origin ) |
| 3027 { | 3027 { |
| 3028 return settings() && settings()->viewportMetaMergeContentQuirk() && m_legacy ViewportDescription.isMetaViewportType() && m_legacyViewportDescription.type == origin; | 3028 return settings() && settings()->viewportMetaMergeContentQuirk() && m_legacy ViewportDescription.isMetaViewportType() && m_legacyViewportDescription.type == origin; |
| 3029 } | 3029 } |
| 3030 | 3030 |
| 3031 void Document::setViewportDescription(const ViewportDescription& viewportDescrip tion) | 3031 void Document::setViewportDescription(const ViewportDescription& viewportDescrip tion) |
| 3032 { | 3032 { |
| 3033 // The UA defined min-width is used by the processing of legacy meta tags. | |
|
apavlov
2014/03/31 16:47:19
UA-defined
kenneth.r.christiansen
2014/03/31 20:37:09
Done.
| |
| 3034 if (!viewportDescription.isSpecifiedByAuthor()) | |
| 3035 m_viewportDefaultMinWidth = viewportDescription.minWidth; | |
| 3036 | |
| 3033 if (viewportDescription.isLegacyViewportType()) { | 3037 if (viewportDescription.isLegacyViewportType()) { |
| 3034 if (settings() && !settings()->viewportMetaEnabled()) | 3038 if (settings() && !settings()->viewportMetaEnabled()) |
| 3035 return; | 3039 return; |
| 3036 | 3040 |
| 3037 m_legacyViewportDescription = viewportDescription; | 3041 m_legacyViewportDescription = viewportDescription; |
| 3038 | 3042 |
| 3039 // When no author style for @viewport is present, and a meta tag for def ining | 3043 // When no author style for @viewport is present, and a meta tag for def ining |
| 3040 // the viewport is, apply the meta tag viewport instead of the UA styles . | 3044 // the viewport is, apply the meta tag viewport instead of the UA styles . |
| 3041 if (m_viewportDescription.type == ViewportDescription::AuthorStyleSheet) | 3045 if (m_viewportDescription.type == ViewportDescription::AuthorStyleSheet) |
| 3042 return; | 3046 return; |
| (...skipping 2448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5491 } | 5495 } |
| 5492 | 5496 |
| 5493 void Document::invalidateNodeListCaches(const QualifiedName* attrName) | 5497 void Document::invalidateNodeListCaches(const QualifiedName* attrName) |
| 5494 { | 5498 { |
| 5495 HashSet<LiveNodeListBase*>::iterator end = m_listsInvalidatedAtDocument.end( ); | 5499 HashSet<LiveNodeListBase*>::iterator end = m_listsInvalidatedAtDocument.end( ); |
| 5496 for (HashSet<LiveNodeListBase*>::iterator it = m_listsInvalidatedAtDocument. begin(); it != end; ++it) | 5500 for (HashSet<LiveNodeListBase*>::iterator it = m_listsInvalidatedAtDocument. begin(); it != end; ++it) |
| 5497 (*it)->invalidateCache(attrName); | 5501 (*it)->invalidateCache(attrName); |
| 5498 } | 5502 } |
| 5499 | 5503 |
| 5500 } // namespace WebCore | 5504 } // namespace WebCore |
| OLD | NEW |