Title: [220661] releases/WebKitGTK/webkit-2.18/Source/WebCore
- Revision
- 220661
- Author
- carlo...@webkit.org
- Date
- 2017-08-14 02:00:28 -0700 (Mon, 14 Aug 2017)
Log Message
Merge r220531 - Addressing post-review comments after r219173.
https://bugs.webkit.org/show_bug.cgi?id=174149
Unreviewed.
* css/CSSFontStyleValue.h:
* editing/EditingStyle.cpp:
(WebCore::identifierForStyleProperty):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (220660 => 220661)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-14 08:59:16 UTC (rev 220660)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-14 09:00:28 UTC (rev 220661)
@@ -1,3 +1,14 @@
+2017-08-10 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Addressing post-review comments after r219173.
+ https://bugs.webkit.org/show_bug.cgi?id=174149
+
+ Unreviewed.
+
+ * css/CSSFontStyleValue.h:
+ * editing/EditingStyle.cpp:
+ (WebCore::identifierForStyleProperty):
+
2017-08-10 Antti Koivisto <an...@apple.com>
Try to fix windows build.
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/css/CSSFontStyleValue.h (220660 => 220661)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/css/CSSFontStyleValue.h 2017-08-14 08:59:16 UTC (rev 220660)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/css/CSSFontStyleValue.h 2017-08-14 09:00:28 UTC (rev 220661)
@@ -46,7 +46,7 @@
bool equals(const CSSFontStyleValue&) const;
- bool isItalic() const
+ bool isItalicOrOblique() const
{
if (!obliqueValue) {
auto valueID = fontStyleValue->valueID();
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/editing/EditingStyle.cpp (220660 => 220661)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/editing/EditingStyle.cpp 2017-08-14 08:59:16 UTC (rev 220660)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/editing/EditingStyle.cpp 2017-08-14 09:00:28 UTC (rev 220661)
@@ -142,7 +142,7 @@
int identifierForStyleProperty(T& style, CSSPropertyID propertyID)
{
RefPtr<CSSValue> value = extractPropertyValue(style, propertyID);
- if (propertyID == CSSPropertyFontStyle && is<CSSFontStyleValue>(value.get()) && downcast<CSSFontStyleValue>(value.get())->isItalic())
+ if (propertyID == CSSPropertyFontStyle && is<CSSFontStyleValue>(value.get()) && downcast<CSSFontStyleValue>(value.get())->isItalicOrOblique())
return CSSValueItalic;
if (!is<CSSPrimitiveValue>(value.get()))
return 0;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
