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

Side by Side Diff: sky/engine/core/css/parser/CSSPropertyParser.cpp

Issue 714783003: Remove some straggling zoom-related code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/core/css/CSSValueKeywords.in ('k') | sky/engine/core/events/EventTypeNames.in » ('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) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 6073 matching lines...) Expand 10 before | Expand all | Expand 10 after
6084 ASSERT(RuntimeEnabledFeatures::cssViewportEnabled() || isUASheetBehavior(m_c ontext.mode())); 6084 ASSERT(RuntimeEnabledFeatures::cssViewportEnabled() || isUASheetBehavior(m_c ontext.mode()));
6085 6085
6086 CSSParserValue* value = m_valueList->current(); 6086 CSSParserValue* value = m_valueList->current();
6087 if (!value) 6087 if (!value)
6088 return false; 6088 return false;
6089 6089
6090 CSSValueID id = value->id; 6090 CSSValueID id = value->id;
6091 bool validPrimitive = false; 6091 bool validPrimitive = false;
6092 6092
6093 switch (propId) { 6093 switch (propId) {
6094 case CSSPropertyMinWidth: // auto | extend-to-zoom | <length> | <percentage> 6094 case CSSPropertyMinWidth: // auto | <length> | <percentage>
6095 case CSSPropertyMaxWidth: 6095 case CSSPropertyMaxWidth:
6096 case CSSPropertyMinHeight: 6096 case CSSPropertyMinHeight:
6097 case CSSPropertyMaxHeight: 6097 case CSSPropertyMaxHeight:
6098 if (id == CSSValueAuto || id == CSSValueInternalExtendToZoom) 6098 if (id == CSSValueAuto)
6099 validPrimitive = true; 6099 validPrimitive = true;
6100 else 6100 else
6101 validPrimitive = (!id && validUnit(value, FLength | FPercent | FNonN eg)); 6101 validPrimitive = (!id && validUnit(value, FLength | FPercent | FNonN eg));
6102 break; 6102 break;
6103 case CSSPropertyWidth: // shorthand 6103 case CSSPropertyWidth: // shorthand
6104 return parseViewportShorthand(propId, CSSPropertyMinWidth, CSSPropertyMa xWidth, important); 6104 return parseViewportShorthand(propId, CSSPropertyMinWidth, CSSPropertyMa xWidth, important);
6105 case CSSPropertyHeight: 6105 case CSSPropertyHeight:
6106 return parseViewportShorthand(propId, CSSPropertyMinHeight, CSSPropertyM axHeight, important); 6106 return parseViewportShorthand(propId, CSSPropertyMinHeight, CSSPropertyM axHeight, important);
6107 case CSSPropertyOrientation: // auto | portrait | landscape 6107 case CSSPropertyOrientation: // auto | portrait | landscape
6108 if (id == CSSValueAuto || id == CSSValuePortrait || id == CSSValueLandsc ape) 6108 if (id == CSSValueAuto || id == CSSValuePortrait || id == CSSValueLandsc ape)
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
6233 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 6233 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
6234 } 6234 }
6235 6235
6236 bool CSSPropertyParser::isSystemColor(int id) 6236 bool CSSPropertyParser::isSystemColor(int id)
6237 { 6237 {
6238 // FIXME(sky): remove 6238 // FIXME(sky): remove
6239 return false; 6239 return false;
6240 } 6240 }
6241 6241
6242 } // namespace blink 6242 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/CSSValueKeywords.in ('k') | sky/engine/core/events/EventTypeNames.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698