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

Side by Side Diff: Source/core/dom/Document.cpp

Issue 23691017: [Android WebView] Treat zero values in viewport arguments specially (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressed rune's comments Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/dom/ViewportArguments.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2911 matching lines...) Expand 10 before | Expand all | Expand 10 after
2922 void Document::processViewport(const String& features, ViewportArguments::Type o rigin) 2922 void Document::processViewport(const String& features, ViewportArguments::Type o rigin)
2923 { 2923 {
2924 ASSERT(!features.isNull()); 2924 ASSERT(!features.isNull());
2925 2925
2926 if (origin < m_viewportArguments.type) 2926 if (origin < m_viewportArguments.type)
2927 return; 2927 return;
2928 2928
2929 m_viewportArguments = ViewportArguments(origin); 2929 m_viewportArguments = ViewportArguments(origin);
2930 processArguments(features, (void*)&m_viewportArguments, &setViewportFeature) ; 2930 processArguments(features, (void*)&m_viewportArguments, &setViewportFeature) ;
2931 2931
2932 if (page() && page()->settings().viewportMetaZeroValuesQuirk() && m_viewport Arguments.type == ViewportArguments::ViewportMeta
2933 && m_viewportArguments.width == ViewportArguments::ValueDeviceWidth && ! static_cast<int>(m_viewportArguments.zoom))
2934 m_viewportArguments.zoom = 1.0;
2935
2932 updateViewportArguments(); 2936 updateViewportArguments();
2933 } 2937 }
2934 2938
2935 void Document::updateViewportArguments() 2939 void Document::updateViewportArguments()
2936 { 2940 {
2937 if (page() && page()->mainFrame() == frame()) { 2941 if (page() && page()->mainFrame() == frame()) {
2938 #ifndef NDEBUG 2942 #ifndef NDEBUG
2939 m_didDispatchViewportPropertiesChanged = true; 2943 m_didDispatchViewportPropertiesChanged = true;
2940 #endif 2944 #endif
2941 page()->chrome().dispatchViewportPropertiesDidChange(m_viewportArguments ); 2945 page()->chrome().dispatchViewportPropertiesDidChange(m_viewportArguments );
(...skipping 2352 matching lines...) Expand 10 before | Expand all | Expand 10 after
5294 { 5298 {
5295 return DocumentLifecycleNotifier::create(this); 5299 return DocumentLifecycleNotifier::create(this);
5296 } 5300 }
5297 5301
5298 DocumentLifecycleNotifier* Document::lifecycleNotifier() 5302 DocumentLifecycleNotifier* Document::lifecycleNotifier()
5299 { 5303 {
5300 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier()); 5304 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier());
5301 } 5305 }
5302 5306
5303 } // namespace WebCore 5307 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/ViewportArguments.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698