Title: [125660] trunk/Source/WebCore
- Revision
- 125660
- Author
- [email protected]
- Date
- 2012-08-15 02:51:56 -0700 (Wed, 15 Aug 2012)
Log Message
[Refactoring] The debug version and release version of toHTMLSelectElement can be merged without any penalty
https://bugs.webkit.org/show_bug.cgi?id=94084
Reviewed by Kent Tamura.
We have two versions of toHTMLSelectElement. One has ASSERT() and the other one does not have ASSERT().
We can merge them without any penalty.
No new tests, no change in behavior.
* html/HTMLSelectElement.cpp:
* html/HTMLSelectElement.h:
(WebCore::isHTMLSelectElement):
(WebCore::toHTMLSelectElement):
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (125659 => 125660)
--- trunk/Source/WebCore/ChangeLog 2012-08-15 09:37:32 UTC (rev 125659)
+++ trunk/Source/WebCore/ChangeLog 2012-08-15 09:51:56 UTC (rev 125660)
@@ -1,5 +1,23 @@
2012-08-15 Shinya Kawanaka <[email protected]>
+ [Refactoring] The debug version and release version of toHTMLSelectElement can be merged without any penalty
+ https://bugs.webkit.org/show_bug.cgi?id=94084
+
+ Reviewed by Kent Tamura.
+
+ We have two versions of toHTMLSelectElement. One has ASSERT() and the other one does not have ASSERT().
+ We can merge them without any penalty.
+
+ No new tests, no change in behavior.
+
+ * html/HTMLSelectElement.cpp:
+ * html/HTMLSelectElement.h:
+ (WebCore::isHTMLSelectElement):
+ (WebCore::toHTMLSelectElement):
+ (WebCore):
+
+2012-08-15 Shinya Kawanaka <[email protected]>
+
AuthorShadowDOM for meter element
https://bugs.webkit.org/show_bug.cgi?id=91970
Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (125659 => 125660)
--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2012-08-15 09:37:32 UTC (rev 125659)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2012-08-15 09:51:56 UTC (rev 125660)
@@ -1591,20 +1591,4 @@
return options;
}
-#ifndef NDEBUG
-
-HTMLSelectElement* toHTMLSelectElement(Node* node)
-{
- ASSERT(!node || node->hasTagName(selectTag));
- return static_cast<HTMLSelectElement*>(node);
-}
-
-const HTMLSelectElement* toHTMLSelectElement(const Node* node)
-{
- ASSERT(!node || node->hasTagName(selectTag));
- return static_cast<const HTMLSelectElement*>(node);
-}
-
-#endif
-
} // namespace
Modified: trunk/Source/WebCore/html/HTMLSelectElement.h (125659 => 125660)
--- trunk/Source/WebCore/html/HTMLSelectElement.h 2012-08-15 09:37:32 UTC (rev 125659)
+++ trunk/Source/WebCore/html/HTMLSelectElement.h 2012-08-15 09:51:56 UTC (rev 125660)
@@ -197,25 +197,24 @@
mutable bool m_shouldRecalcListItems;
};
-HTMLSelectElement* toHTMLSelectElement(Node*);
-const HTMLSelectElement* toHTMLSelectElement(const Node*);
-void toHTMLSelectElement(const HTMLSelectElement*); // This overload will catch anyone doing an unnecessary cast.
+inline bool isHTMLSelectElement(const Node* node)
+{
+ return node->hasTagName(HTMLNames::selectTag);
+}
-#ifdef NDEBUG
-
-// The debug versions of these, with assertions, are not inlined.
-
inline HTMLSelectElement* toHTMLSelectElement(Node* node)
{
+ ASSERT(!node || isHTMLSelectElement(node));
return static_cast<HTMLSelectElement*>(node);
}
inline const HTMLSelectElement* toHTMLSelectElement(const Node* node)
{
+ ASSERT(!node || isHTMLSelectElement(node));
return static_cast<const HTMLSelectElement*>(node);
}
-#endif
+void toHTMLSelectElement(const HTMLSelectElement*); // This overload will catch anyone doing an unnecessary cast.
} // namespace
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
