Addressing post-review comments after r196322

Unreviwed. * css/CSSFontFaceSource.cpp: (WebCore::CSSFontFaceSource::font): * css/CSSFontFaceSource.h: Canonical link: https://commits.webkit.org/172181@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196376 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Feb 10, 2016 · f2ca840ea9861fbd8566468cc19a286b1c5874f4 · f2ca840
1 parent 5bf0c32
commit f2ca840ea9861fbd8566468cc19a286b1c5874f4
Showing with 13 additions and 3 deletions.

+10 −0 Source/WebCore/ChangeLog

+1 −1 Source/WebCore/css/CSSFontFaceSource.cpp

+2 −2 Source/WebCore/css/CSSFontFaceSource.h
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2016-02-10  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Addressing post-review comments after r196322
+
+        Unreviwed.
+
+        * css/CSSFontFaceSource.cpp:
+        (WebCore::CSSFontFaceSource::font):
+        * css/CSSFontFaceSource.h:
+
 2016-02-10  Chris Dumez  <cdumez@apple.com>
 
         Attributes on the Window instance should be configurable unless [Unforgeable]

diff --git a/Source/WebCore/css/CSSFontFaceSource.cpp b/Source/WebCore/css/CSSFontFaceSource.cpp
@@ -147,7 +147,7 @@ RefPtr<Font> CSSFontFaceSource::font(const FontDescription& fontDescription, boo
 
 #if ENABLE(SVG_FONTS)
 #if ENABLE(SVG_OTF_CONVERTER)
-    if (!m_svgFontFaceElement->parentNode() || !is<SVGFontElement>(m_svgFontFaceElement->parentNode()))
+    if (!is<SVGFontElement>(m_svgFontFaceElement->parentNode()))
         return nullptr;
     SVGFontElement& fontElement = downcast<SVGFontElement>(*m_svgFontFaceElement->parentNode());
     // FIXME: Re-run this when script modifies the element or any of its descendents

diff --git a/Source/WebCore/css/CSSFontFaceSource.h b/Source/WebCore/css/CSSFontFaceSource.h
@@ -46,11 +46,11 @@ class CSSFontFaceSource final : public CachedFontClient {
     WTF_MAKE_FAST_ALLOCATED;
 public:
 
-    //                      => Succeeded
+    //                      => Success
     //                    //
     // Pending => Loading
     //                    \\.
-    //                      => Failed
+    //                      => Failure
     enum class Status {
         Pending,
         Loading,