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

Side by Side Diff: Source/core/dom/ViewportArguments.h

Issue 23101004: Make configurationForViewport match production code (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Renamed configurationForViewport to viewportAsText Created 7 years, 4 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) 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 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 , zoom(ValueAuto) 80 , zoom(ValueAuto)
81 , minZoom(ValueAuto) 81 , minZoom(ValueAuto)
82 , maxZoom(ValueAuto) 82 , maxZoom(ValueAuto)
83 , userZoom(ValueAuto) 83 , userZoom(ValueAuto)
84 , orientation(ValueAuto) 84 , orientation(ValueAuto)
85 , deprecatedTargetDensityDPI(ValueAuto) 85 , deprecatedTargetDensityDPI(ValueAuto)
86 { 86 {
87 } 87 }
88 88
89 // All arguments are in CSS units. 89 // All arguments are in CSS units.
90 PageScaleConstraints resolve(const FloatSize& initialViewportSize, const Flo atSize& deviceSize, int defaultWidth) const; 90 PageScaleConstraints resolve(const FloatSize& initialViewportSize, int defau ltWidth) const;
91 91
92 float width; 92 float width;
93 float minWidth; 93 float minWidth;
94 float maxWidth; 94 float maxWidth;
95 float height; 95 float height;
96 float minHeight; 96 float minHeight;
97 float maxHeight; 97 float maxHeight;
98 float zoom; 98 float zoom;
99 float minZoom; 99 float minZoom;
100 float maxZoom; 100 float maxZoom;
(...skipping 24 matching lines...) Expand all
125 return !(*this == other); 125 return !(*this == other);
126 } 126 }
127 }; 127 };
128 128
129 void setViewportFeature(const String& keyString, const String& valueString, Docu ment*, void* data); 129 void setViewportFeature(const String& keyString, const String& valueString, Docu ment*, void* data);
130 void reportViewportWarning(Document*, ViewportErrorCode, const String& replaceme nt1, const String& replacement2); 130 void reportViewportWarning(Document*, ViewportErrorCode, const String& replaceme nt1, const String& replacement2);
131 131
132 } // namespace WebCore 132 } // namespace WebCore
133 133
134 #endif // ViewportArguments_h 134 #endif // ViewportArguments_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/viewport/viewport-warnings-6.html ('k') | Source/core/dom/ViewportArguments.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698