Removed m_isQuirkValue and used CSSPrimitiveValue::QuirkyEms instead

Source/core/css/CSSPrimitiveValue.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 472 matching lines @@
     // The logic in this function is duplicated in MediaValues::computeLength
     // because MediaValues::computeLength needs nearly identical logic, but we haven't found a way to make
     // CSSPrimitiveValue::computeLengthDouble more generic (to solve both cases) without hurting performance.
     if (type() == UnitType::Calc)
         return m_value.calc->computeLengthPx(conversionData);
 
     double factor;
 
     switch (type()) {
     case UnitType::Ems:
+    case UnitType::QuirkyEms:
         factor = conversionData.emFontSize();
         break;
     case UnitType::Exs:
         factor = conversionData.exFontSize();
         break;
     case UnitType::Rems:
         factor = conversionData.remFontSize();
         break;
     case UnitType::Chs:
         factor = conversionData.chFontSize();
@@ skipping 168 matching lines @@
     switch (unitType) {
     case CSSPrimitiveValue::UnitType::Pixels:
     case CSSPrimitiveValue::UnitType::Centimeters:
     case CSSPrimitiveValue::UnitType::Millimeters:
     case CSSPrimitiveValue::UnitType::Inches:
     case CSSPrimitiveValue::UnitType::Points:
     case CSSPrimitiveValue::UnitType::Picas:
         lengthType = UnitTypePixels;
         return true;
     case CSSPrimitiveValue::UnitType::Ems:
+    case CSSPrimitiveValue::UnitType::QuirkyEms:
         lengthType = UnitTypeFontSize;
         return true;
     case CSSPrimitiveValue::UnitType::Exs:
         lengthType = UnitTypeFontXSize;
         return true;
     case CSSPrimitiveValue::UnitType::Rems:
         lengthType = UnitTypeRootFontSize;
         return true;
     case CSSPrimitiveValue::UnitType::Chs:
         lengthType = UnitTypeZeroCharacterWidth;
@@ skipping 89 matching lines @@
 
 const char* CSSPrimitiveValue::unitTypeToString(UnitType type)
 {
     switch (type) {
     case UnitType::Number:
     case UnitType::Integer:
         return "";
     case UnitType::Percentage:
         return "%";
     case UnitType::Ems:
+    case UnitType::QuirkyEms:
         return "em";
     case UnitType::Exs:
         return "ex";
     case UnitType::Rems:
         return "rem";
     case UnitType::Chs:
         return "ch";
     case UnitType::Pixels:
         return "px";
     case UnitType::Centimeters:
@@ skipping 42 matching lines @@
     case UnitType::CustomIdentifier:
     case UnitType::String:
     case UnitType::URI:
     case UnitType::ValueID:
     case UnitType::PropertyID:
     case UnitType::RGBColor:
     case UnitType::Calc:
     case UnitType::Shape:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
-    case UnitType::QuirkyEms:
         break;
     };
     ASSERT_NOT_REACHED();
     return "";
 }
 
 String CSSPrimitiveValue::customCSSText() const
 {
     if (m_hasCachedCSSText) {
         ASSERT(cssTextCache().contains(this));
         return cssTextCache().get(this);
     }
 
     String text;
     switch (type()) {
     case UnitType::Unknown:
         // FIXME
         break;
     case UnitType::Integer:
         text = String::format("%d", getIntValue());
         break;
     case UnitType::Number:
     case UnitType::Percentage:
     case UnitType::Ems:
+    case UnitType::QuirkyEms:
     case UnitType::Exs:
     case UnitType::Rems:
     case UnitType::Chs:
     case UnitType::Pixels:
     case UnitType::Centimeters:
     case UnitType::DotsPerPixel:
     case UnitType::DotsPerInch:
     case UnitType::DotsPerCentimeter:
     case UnitType::Millimeters:
     case UnitType::Inches:
@@ skipping 35 matching lines @@
         break;
     }
     case UnitType::Calc:
         text = m_value.calc->customCSSText();
         break;
     case UnitType::Shape:
         text = m_value.shape->cssText();
         break;
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
-    case UnitType::QuirkyEms:
         ASSERT_NOT_REACHED();
         break;
     }
 
     ASSERT(!cssTextCache().contains(this));
     cssTextCache().set(this, text);
     m_hasCachedCSSText = true;
     return text;
 }
 
 bool CSSPrimitiveValue::equals(const CSSPrimitiveValue& other) const
 {
     if (type() != other.type())
         return false;
 
     switch (type()) {
     case UnitType::Unknown:
         return false;
     case UnitType::Number:
     case UnitType::Percentage:
     case UnitType::Ems:
+    case UnitType::QuirkyEms:

[Timothy Loh, 2015/09/02 01:59:03]

should still be unreachable

[sashab, 2015/09/02 03:54:49]

Done.

     case UnitType::Exs:
     case UnitType::Rems:
     case UnitType::Pixels:
     case UnitType::Centimeters:
     case UnitType::DotsPerPixel:
     case UnitType::DotsPerInch:
     case UnitType::DotsPerCentimeter:
     case UnitType::Millimeters:
     case UnitType::Inches:
     case UnitType::Points:
@@ skipping 23 matching lines @@
     case UnitType::RGBColor:
         return m_value.rgbcolor == other.m_value.rgbcolor;
     case UnitType::Calc:
         return m_value.calc && other.m_value.calc && m_value.calc->equals(*other.m_value.calc);
     case UnitType::Shape:
         return m_value.shape && other.m_value.shape && m_value.shape->equals(*other.m_value.shape);
     case UnitType::Integer:
     case UnitType::Chs:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
-    case UnitType::QuirkyEms:
         return false;
     }
     return false;
 }
 
 DEFINE_TRACE_AFTER_DISPATCH(CSSPrimitiveValue)
 {
 #if ENABLE(OILPAN)
     switch (type()) {
     case UnitType::Calc:
         visitor->trace(m_value.calc);
         break;
     case UnitType::Shape:
         visitor->trace(m_value.shape);
         break;
     default:
         break;
     }
 #endif
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink