| 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 2910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2921 } | 2921 } |
| 2922 | 2922 |
| 2923 bool Document::shouldMergeWithLegacyDescription(ViewportDescription::Type origin
) | 2923 bool Document::shouldMergeWithLegacyDescription(ViewportDescription::Type origin
) |
| 2924 { | 2924 { |
| 2925 return settings() && settings()->viewportMetaMergeContentQuirk() && m_legacy
ViewportDescription.isMetaViewportType() && m_legacyViewportDescription.type ==
origin; | 2925 return settings() && settings()->viewportMetaMergeContentQuirk() && m_legacy
ViewportDescription.isMetaViewportType() && m_legacyViewportDescription.type ==
origin; |
| 2926 } | 2926 } |
| 2927 | 2927 |
| 2928 void Document::setViewportDescription(const ViewportDescription& viewportDescrip
tion) | 2928 void Document::setViewportDescription(const ViewportDescription& viewportDescrip
tion) |
| 2929 { | 2929 { |
| 2930 if (viewportDescription.isLegacyViewportType()) { | 2930 if (viewportDescription.isLegacyViewportType()) { |
| 2931 if (settings() && !settings()->viewportMetaEnabled()) |
| 2932 return; |
| 2933 |
| 2931 m_legacyViewportDescription = viewportDescription; | 2934 m_legacyViewportDescription = viewportDescription; |
| 2932 | 2935 |
| 2933 // When no author style for @viewport is present, and a meta tag for def
ining | 2936 // When no author style for @viewport is present, and a meta tag for def
ining |
| 2934 // the viewport is, apply the meta tag viewport instead of the UA styles
. | 2937 // the viewport is, apply the meta tag viewport instead of the UA styles
. |
| 2935 if (m_viewportDescription.type == ViewportDescription::AuthorStyleSheet) | 2938 if (m_viewportDescription.type == ViewportDescription::AuthorStyleSheet) |
| 2936 return; | 2939 return; |
| 2937 m_viewportDescription = viewportDescription; | 2940 m_viewportDescription = viewportDescription; |
| 2938 } else { | 2941 } else { |
| 2939 // If the legacy viewport tag has higher priority than the cascaded @vie
wport | 2942 // If the legacy viewport tag has higher priority than the cascaded @vie
wport |
| 2940 // descriptors, use the values from the legacy tag. | 2943 // descriptors, use the values from the legacy tag. |
| (...skipping 2312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5253 void Document::modifiedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, Style
ResolverUpdateMode updateMode) | 5256 void Document::modifiedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, Style
ResolverUpdateMode updateMode) |
| 5254 { | 5257 { |
| 5255 if (!isActive()) | 5258 if (!isActive()) |
| 5256 return; | 5259 return; |
| 5257 | 5260 |
| 5258 styleEngine()->modifiedStyleSheet(sheet); | 5261 styleEngine()->modifiedStyleSheet(sheet); |
| 5259 styleResolverChanged(when, updateMode); | 5262 styleResolverChanged(when, updateMode); |
| 5260 } | 5263 } |
| 5261 | 5264 |
| 5262 } // namespace WebCore | 5265 } // namespace WebCore |
| OLD | NEW |