Changeset 209971 in webkit

Timestamp:

Dec 18, 2016 12:11:45 AM (7 years ago)

Author:

Simon Fraser

Message:

Build fix: linking WebCore was failing: you can't export inline functions.

• css/DeprecatedCSSOMPrimitiveValue.cpp:

(WebCore::DeprecatedCSSOMPrimitiveValue::primitiveType):
(WebCore::DeprecatedCSSOMPrimitiveValue::setFloatValue):
(WebCore::DeprecatedCSSOMPrimitiveValue::getFloatValue):
(WebCore::DeprecatedCSSOMPrimitiveValue::setStringValue):
(WebCore::DeprecatedCSSOMPrimitiveValue::getStringValue):

• css/DeprecatedCSSOMPrimitiveValue.h:

(WebCore::DeprecatedCSSOMPrimitiveValue::primitiveType): Deleted.
(WebCore::DeprecatedCSSOMPrimitiveValue::setFloatValue): Deleted.
(WebCore::DeprecatedCSSOMPrimitiveValue::getFloatValue): Deleted.
(WebCore::DeprecatedCSSOMPrimitiveValue::setStringValue): Deleted.
(WebCore::DeprecatedCSSOMPrimitiveValue::getStringValue): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/DeprecatedCSSOMPrimitiveValue.cpp (modified) (1 diff)
• css/DeprecatedCSSOMPrimitiveValue.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-12-17  Simon Fraser  <simon.fraser@apple.com>
+
+        Build fix: linking WebCore was failing: you can't export inline functions.
+
+        * css/DeprecatedCSSOMPrimitiveValue.cpp:
+        (WebCore::DeprecatedCSSOMPrimitiveValue::primitiveType):
+        (WebCore::DeprecatedCSSOMPrimitiveValue::setFloatValue):
+        (WebCore::DeprecatedCSSOMPrimitiveValue::getFloatValue):
+        (WebCore::DeprecatedCSSOMPrimitiveValue::setStringValue):
+        (WebCore::DeprecatedCSSOMPrimitiveValue::getStringValue):
+        * css/DeprecatedCSSOMPrimitiveValue.h:
+        (WebCore::DeprecatedCSSOMPrimitiveValue::primitiveType): Deleted.
+        (WebCore::DeprecatedCSSOMPrimitiveValue::setFloatValue): Deleted.
+        (WebCore::DeprecatedCSSOMPrimitiveValue::getFloatValue): Deleted.
+        (WebCore::DeprecatedCSSOMPrimitiveValue::setStringValue): Deleted.
+        (WebCore::DeprecatedCSSOMPrimitiveValue::getStringValue): Deleted.
+
 2016-12-16  Dave Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/css/DeprecatedCSSOMPrimitiveValue.cpp

@@ -38 +38 @@
 // more complicated.
 
+
+unsigned short DeprecatedCSSOMPrimitiveValue::primitiveType() const
+{
+    return m_value->primitiveType();
+}
+
+ExceptionOr<void> DeprecatedCSSOMPrimitiveValue::setFloatValue(unsigned short unitType, double floatValue)
+{
+    return m_value->setFloatValue(unitType, floatValue);
+}
+
+ExceptionOr<float> DeprecatedCSSOMPrimitiveValue::getFloatValue(unsigned short unitType) const
+{
+    return m_value->getFloatValue(unitType);
+}
+
+ExceptionOr<void> DeprecatedCSSOMPrimitiveValue::setStringValue(unsigned short stringType, const String& stringValue)
+{
+    return m_value->setStringValue(stringType, stringValue);
+}
+
+ExceptionOr<String> DeprecatedCSSOMPrimitiveValue::getStringValue() const
+{
+    return m_value->getStringValue();
+}
+
 ExceptionOr<Ref<DeprecatedCSSOMCounter>> DeprecatedCSSOMPrimitiveValue::getCounterValue() const
 {

trunk/Source/WebCore/css/DeprecatedCSSOMPrimitiveValue.h

@@ -82 +82 @@
     // FIXME: Eventually these will contain more code and not just call through to
     // CSSPrimitiveValue.
-    WEBCORE_EXPORT unsigned short primitiveType() const { return m_value->primitiveType(); }
-    WEBCORE_EXPORT ExceptionOr<void> setFloatValue(unsigned short unitType, double floatValue) { return m_value->setFloatValue(unitType, floatValue); }
-    WEBCORE_EXPORT ExceptionOr<float> getFloatValue(unsigned short unitType) const { return m_value->getFloatValue(unitType); }
-    WEBCORE_EXPORT ExceptionOr<void> setStringValue(unsigned short stringType, const String& stringValue) { return m_value->setStringValue(stringType, stringValue); }
-    WEBCORE_EXPORT ExceptionOr<String> getStringValue() const { return m_value->getStringValue(); }
+    WEBCORE_EXPORT unsigned short primitiveType() const;
+    WEBCORE_EXPORT ExceptionOr<void> setFloatValue(unsigned short unitType, double);
+    WEBCORE_EXPORT ExceptionOr<float> getFloatValue(unsigned short unitType) const;
+    WEBCORE_EXPORT ExceptionOr<void> setStringValue(unsigned short stringType, const String&);
+    WEBCORE_EXPORT ExceptionOr<String> getStringValue() const;
     WEBCORE_EXPORT ExceptionOr<Ref<DeprecatedCSSOMCounter>> getCounterValue() const;
     WEBCORE_EXPORT ExceptionOr<Ref<DeprecatedCSSOMRect>> getRectValue() const;