Title: [216403] releases/WebKitGTK/webkit-2.16/Source/WebCore
- Revision
- 216403
- Author
- carlo...@webkit.org
- Date
- 2017-05-08 06:22:32 -0700 (Mon, 08 May 2017)
Log Message
Merge r216131 - RenderSearchField should not use isTextField() in SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT
https://bugs.webkit.org/show_bug.cgi?id=171608
Reviewed by Simon Fraser.
isTextField() is true for any generic single line text control.
* rendering/RenderObject.h:
(WebCore::RenderObject::isSearchField):
* rendering/RenderSearchField.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (216402 => 216403)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-05-08 13:14:54 UTC (rev 216402)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-05-08 13:22:32 UTC (rev 216403)
@@ -1,3 +1,16 @@
+2017-05-03 Zalan Bujtas <za...@apple.com>
+
+ RenderSearchField should not use isTextField() in SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT
+ https://bugs.webkit.org/show_bug.cgi?id=171608
+
+ Reviewed by Simon Fraser.
+
+ isTextField() is true for any generic single line text control.
+
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::isSearchField):
+ * rendering/RenderSearchField.h:
+
2017-05-03 Daniel Bates <daba...@apple.com>
Abandon the current load once the provisional loader detaches from the frame
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderObject.h (216402 => 216403)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderObject.h 2017-05-08 13:14:54 UTC (rev 216402)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderObject.h 2017-05-08 13:22:32 UTC (rev 216403)
@@ -266,6 +266,7 @@
virtual bool isTextControl() const { return false; }
virtual bool isTextArea() const { return false; }
virtual bool isTextField() const { return false; }
+ virtual bool isSearchField() const { return false; }
virtual bool isTextControlInnerBlock() const { return false; }
virtual bool isVideo() const { return false; }
virtual bool isWidget() const { return false; }
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderSearchField.h (216402 => 216403)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderSearchField.h 2017-05-08 13:14:54 UTC (rev 216402)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderSearchField.h 2017-05-08 13:22:32 UTC (rev 216403)
@@ -45,6 +45,8 @@
void hidePopup();
private:
+ bool isSearchField() const final { return true; }
+
void willBeDestroyed() override;
void centerContainerIfNeeded(RenderBox*) const override;
LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const override;
@@ -92,4 +94,4 @@
} // namespace WebCore
-SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderSearchField, isTextField())
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderSearchField, isSearchField())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
