Changeset 225505 in webkit

Timestamp:

Dec 4, 2017 4:13:09 PM (6 years ago)

Author:

Wenson Hsieh

Message:

Rename a static helper in TouchBarMenuItemData.cpp to match style guidelines.
​https://bugs.webkit.org/show_bug.cgi?id=180305

Reviewed by Andy Estes.

Style guidelines state that we should use bare words for getters, so getItemType should just be
itemType. Since this collides with the itemType member variable, this patch also renames that
member variable to the more concise "type".

No change in behavior.

• Shared/TouchBarMenuItemData.cpp:

(WebKit::itemType):
(WebKit::TouchBarMenuItemData::TouchBarMenuItemData):
(WebKit::TouchBarMenuItemData::encode const):
(WebKit::TouchBarMenuItemData::decode):
(WebKit::getItemType): Deleted.

• Shared/TouchBarMenuItemData.h:

(WebKit::operator==):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/TouchBarMenuItemData.cpp (modified) (4 diffs)
• Shared/TouchBarMenuItemData.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-12-04  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Rename a static helper in TouchBarMenuItemData.cpp to match style guidelines.
+        https://bugs.webkit.org/show_bug.cgi?id=180305
+
+        Reviewed by Andy Estes.
+
+        Style guidelines state that we should use bare words for getters, so getItemType should just be
+        itemType. Since this collides with the itemType member variable, this patch also renames that
+        member variable to the more concise "type".
+
+        No change in behavior.
+
+        * Shared/TouchBarMenuItemData.cpp:
+        (WebKit::itemType):
+        (WebKit::TouchBarMenuItemData::TouchBarMenuItemData):
+        (WebKit::TouchBarMenuItemData::encode const):
+        (WebKit::TouchBarMenuItemData::decode):
+        (WebKit::getItemType): Deleted.
+        * Shared/TouchBarMenuItemData.h:
+        (WebKit::operator==):
+
 2017-12-04  Brian Burg  <bburg@apple.com>
 

trunk/Source/WebKit/Shared/TouchBarMenuItemData.cpp

@@ -34 +34 @@
 namespace WebKit {
 
-static ItemType getItemType(const String&)
+static ItemType itemType(const String&)
 {
     return ItemType::Button;
@@ -41 +41 @@
 TouchBarMenuItemData::TouchBarMenuItemData(const WebCore::HTMLMenuItemElement& element)
 {
-    itemType = getItemType(element.attributeWithoutSynchronization(WebCore::HTMLNames::typeAttr));
+    type = itemType(element.attributeWithoutSynchronization(WebCore::HTMLNames::typeAttr));
     identifier = element.attributeWithoutSynchronization(WebCore::HTMLNames::idAttr);
     priority = element.attributeWithoutSynchronization(WebCore::HTMLNames::valueAttr).toFloat();
@@ -48 +48 @@
 void TouchBarMenuItemData::encode(IPC::Encoder& encoder) const
 {
-    encoder.encodeEnum(itemType);
+    encoder.encodeEnum(type);
     
     encoder << identifier;
@@ -57 +57 @@
 {
     TouchBarMenuItemData result;
-    if (!decoder.decodeEnum(result.itemType))
+    if (!decoder.decodeEnum(result.type))
         return std::nullopt;
     

trunk/Source/WebKit/Shared/TouchBarMenuItemData.h

@@ -52 +52 @@
     static std::optional<TouchBarMenuItemData> decode(IPC::Decoder&);
     
-    ItemType itemType { ItemType::Button };
+    ItemType type { ItemType::Button };
     String identifier;
     float priority { 0.0 };
@@ -81 +81 @@
 inline bool operator==(const TouchBarMenuItemData& lhs, const TouchBarMenuItemData& rhs)
 {
-    return lhs.itemType == rhs.itemType
-    && lhs.identifier == rhs.identifier
-    && lhs.priority == rhs.priority;
+    return lhs.type == rhs.type
+        && lhs.identifier == rhs.identifier
+        && lhs.priority == rhs.priority;
 }