Cleanup usage of CSSPropertyID and CSSValueID inside Blink.

Source/core/css/MediaQueryEvaluator.cpp

 /*
  * CSS Media Query Evaluator
  *
  * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 218 matching lines @@
 {
     return view->layoutSize(ScrollableArea::IncludeScrollbars);
 }
 
 static bool orientationMediaFeatureEval(CSSValue* value, RenderStyle*, Frame* frame, MediaFeaturePrefix)
 {
     FrameView* view = frame->view();
     int width = viewportSize(view).width();
     int height = viewportSize(view).height();
     if (value && value->isPrimitiveValue()) {
-        const int id = toCSSPrimitiveValue(value)->getIdent();
+        const CSSValueID id = toCSSPrimitiveValue(value)->getValueID();
         if (width > height) // Square viewport is portrait.
             return CSSValueLandscape == id;
         return CSSValuePortrait == id;
     }
 
     // Expression (orientation) evaluates to true if width and height >= 0.
     return height >= 0 && width >= 0;
 }
 
 static bool aspectRatioMediaFeatureEval(CSSValue* value, RenderStyle*, Frame* frame, MediaFeaturePrefix op)
@@ skipping 328 matching lines @@
     }
     return returnValueIfNoParameter;
 }
 
 static bool viewModeMediaFeatureEval(CSSValue* value, RenderStyle*, Frame* frame, MediaFeaturePrefix op)
 {
     UNUSED_PARAM(op);
     if (!value)
         return true;
 
-    return toCSSPrimitiveValue(value)->getIdent() == CSSValueWindowed;
+    return toCSSPrimitiveValue(value)->getValueID() == CSSValueWindowed;
 }
 
 enum PointerDeviceType { TouchPointer, MousePointer, NoPointer, UnknownPointer };
 
 static PointerDeviceType leastCapablePrimaryPointerDeviceType(Frame* frame)
 {
     if (frame->settings()->deviceSupportsTouch())
         return TouchPointer;
 
     // FIXME: We should also try to determine if we know we have a mouse.
@@ skipping 36 matching lines @@
     // as if this feature feature isn't supported.
     if (pointer == UnknownPointer)
         return false;
 
     if (!value)
         return pointer != NoPointer;
 
     if (!value->isPrimitiveValue())
         return false;
 
-    const int id = toCSSPrimitiveValue(value)->getIdent();
+    const CSSValueID id = toCSSPrimitiveValue(value)->getValueID();
     return (pointer == NoPointer && id == CSSValueNone)
         || (pointer == TouchPointer && id == CSSValueCoarse)
         || (pointer == MousePointer && id == CSSValueFine);
 }
 
 static bool scanMediaFeatureEval(CSSValue* value, RenderStyle*, Frame* frame, MediaFeaturePrefix)
 {
     // Scan only applies to tv media.
     if (!equalIgnoringCase(frame->view()->mediaType(), "tv"))
         return false;
 
     if (!value)
         return true;
 
     if (!value->isPrimitiveValue())
         return false;
 
     // If a platform interface supplies progressive/interlace info for TVs in the
     // future, it needs to be handled here. For now, assume a modern TV with
     // progressive display.
-    const int id = toCSSPrimitiveValue(value)->getIdent();
+    const CSSValueID id = toCSSPrimitiveValue(value)->getValueID();

[eseidel, 2013/06/06 19:41:16]

This local is very silly. :)

     return id == CSSValueProgressive;
 }
 
 static void createFunctionMap()
 {
     // Create the table.
     gFunctionMap = new FunctionMap;
 #define ADD_TO_FUNCTIONMAP(name, str)  \
     gFunctionMap->set(name##MediaFeature.impl(), name##MediaFeatureEval);
     CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(ADD_TO_FUNCTIONMAP);
@@ skipping 15 matching lines @@
     // and let trampoline functions override the prefix if prefix is
     // used
     EvalFunc func = gFunctionMap->get(expr->mediaFeature().impl());
     if (func)
         return func(expr->value(), m_style.get(), m_frame, NoPrefix);
 
     return false;
 }
 
 } // namespace