Changeset 220378 in webkit

Timestamp:

Aug 7, 2017, 7:46:06 PM (8 years ago)

Author:

Simon Fraser

Message:

Inline ~Color and Color::isExtended()
​https://bugs.webkit.org/show_bug.cgi?id=175293

Reviewed by Zalan Bujtas.

The Color destructor and Color::isExtended() show up on profiles, so inline them.
Before r207265 the destructor was inlined.

Also make sure that LengthSize::operator== is inlined, which it was not (according
to profiles).

• platform/LengthSize.h:

(WebCore::operator==):

• platform/graphics/Color.cpp:

(WebCore::Color::~Color): Deleted.
(WebCore::Color::isExtended const): Deleted.

• platform/graphics/Color.h:

(WebCore::Color::~Color):
(WebCore::Color::isExtended const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/LengthSize.h (modified) (1 diff)
• platform/graphics/Color.cpp (modified) (2 diffs)
• platform/graphics/Color.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-07  Simon Fraser  <simon.fraser@apple.com>
+
+        Inline ~Color and Color::isExtended()
+        https://bugs.webkit.org/show_bug.cgi?id=175293
+
+        Reviewed by Zalan Bujtas.
+
+        The Color destructor and Color::isExtended() show up on profiles, so inline them.
+        Before r207265 the destructor was inlined.
+        
+        Also make sure that LengthSize::operator== is inlined, which it was not (according
+        to profiles).
+
+        * platform/LengthSize.h:
+        (WebCore::operator==):
+        * platform/graphics/Color.cpp:
+        (WebCore::Color::~Color): Deleted.
+        (WebCore::Color::isExtended const): Deleted.
+        * platform/graphics/Color.h:
+        (WebCore::Color::~Color):
+        (WebCore::Color::isExtended const):
+
 2017-08-04  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/platform/LengthSize.h

@@ -29 +29 @@
 };
 
-inline bool operator==(const LengthSize& a, const LengthSize& b)
+ALWAYS_INLINE bool operator==(const LengthSize& a, const LengthSize& b)
 {
     return a.width == b.width && a.height == b.height;

trunk/Source/WebCore/platform/graphics/Color.cpp

@@ -308 +308 @@
 }
 
-Color::~Color()
-{
-    if (isExtended())
-        m_colorData.extendedColor->deref();
-}
-
 Color& Color::operator=(const Color& other)
 {
@@ -666 +660 @@
 }
 
-bool Color::isExtended() const
-{
-    return !(m_colorData.rgbaAndFlags & invalidRGBAColor);
-}
-
 ExtendedColor& Color::asExtended() const
 {

trunk/Source/WebCore/platform/graphics/Color.h

@@ -174 +174 @@
     WEBCORE_EXPORT Color(Color&&);
 
-    WEBCORE_EXPORT ~Color();
+    ~Color()
+    {
+        if (isExtended())
+            m_colorData.extendedColor->deref();
+    }
 
     static Color createUnchecked(int r, int g, int b)
@@ -275 +279 @@
 #endif
 
-    WEBCORE_EXPORT bool isExtended() const;
+    bool isExtended() const
+    {
+        return !(m_colorData.rgbaAndFlags & invalidRGBAColor);
+    }
     WEBCORE_EXPORT ExtendedColor& asExtended() const;