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

Side by Side Diff: Source/core/css/resolver/ViewportStyleResolver.cpp

Issue 15547002: Compile fix for ENABLE_CSS_DEVICE_ADAPTATION. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 7 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
« no previous file with comments | « no previous file | no next file » | 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) 2012 Intel Corporation. All rights reserved. 2 * Copyright (C) 2012 Intel Corporation. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 ViewportArguments arguments(ViewportArguments::CSSDeviceAdaptation); 84 ViewportArguments arguments(ViewportArguments::CSSDeviceAdaptation);
85 85
86 arguments.userZoom = getViewportArgumentValue(CSSPropertyUserZoom); 86 arguments.userZoom = getViewportArgumentValue(CSSPropertyUserZoom);
87 arguments.zoom = getViewportArgumentValue(CSSPropertyZoom); 87 arguments.zoom = getViewportArgumentValue(CSSPropertyZoom);
88 arguments.minZoom = getViewportArgumentValue(CSSPropertyMinZoom); 88 arguments.minZoom = getViewportArgumentValue(CSSPropertyMinZoom);
89 arguments.maxZoom = getViewportArgumentValue(CSSPropertyMaxZoom); 89 arguments.maxZoom = getViewportArgumentValue(CSSPropertyMaxZoom);
90 arguments.minWidth = getViewportArgumentValue(CSSPropertyMinWidth); 90 arguments.minWidth = getViewportArgumentValue(CSSPropertyMinWidth);
91 arguments.maxWidth = getViewportArgumentValue(CSSPropertyMaxWidth); 91 arguments.maxWidth = getViewportArgumentValue(CSSPropertyMaxWidth);
92 arguments.minHeight = getViewportArgumentValue(CSSPropertyMinHeight); 92 arguments.minHeight = getViewportArgumentValue(CSSPropertyMinHeight);
93 arguments.maxHeight = getViewportArgumentValue(CSSPropertyMaxHeight); 93 arguments.maxHeight = getViewportArgumentValue(CSSPropertyMaxHeight);
94 arguments.orientation = getViewportArgumentValue(CSSPropertyOrientation);
95 94
96 m_document->setViewportArguments(arguments); 95 m_document->setViewportArguments(arguments);
97 m_document->updateViewportArguments(); 96 m_document->updateViewportArguments();
98 97
99 m_propertySet = 0; 98 m_propertySet = 0;
100 } 99 }
101 100
102 float ViewportStyleResolver::getViewportArgumentValue(CSSPropertyID id) const 101 float ViewportStyleResolver::getViewportArgumentValue(CSSPropertyID id) const
103 { 102 {
104 float defaultValue = ViewportArguments::ValueAuto; 103 float defaultValue = ViewportArguments::ValueAuto;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 case CSSValueFixed: 157 case CSSValueFixed:
159 return 0; 158 return 0;
160 default: 159 default:
161 return defaultValue; 160 return defaultValue;
162 } 161 }
163 } 162 }
164 163
165 } // namespace WebCore 164 } // namespace WebCore
166 165
167 #endif // ENABLE(CSS_DEVICE_ADAPTATION) 166 #endif // ENABLE(CSS_DEVICE_ADAPTATION)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698