Title: [202085] trunk/Source/WebCore
Revision
202085
Author
mmaxfi...@apple.com
Date
2016-06-14 23:36:29 -0700 (Tue, 14 Jun 2016)

Log Message

Addressing post-review comments after r201971
https://bugs.webkit.org/show_bug.cgi?id=158450

Unreviewed.

* css/CSSFontFaceSet.cpp:
(WebCore::CSSFontFaceSet::add):
(WebCore::CSSFontFaceSet::remove):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (202084 => 202085)


--- trunk/Source/WebCore/ChangeLog	2016-06-15 05:04:17 UTC (rev 202084)
+++ trunk/Source/WebCore/ChangeLog	2016-06-15 06:36:29 UTC (rev 202085)
@@ -1,5 +1,16 @@
 2016-06-14  Myles C. Maxfield  <mmaxfi...@apple.com>
 
+        Addressing post-review comments after r201971
+        https://bugs.webkit.org/show_bug.cgi?id=158450
+
+        Unreviewed.
+
+        * css/CSSFontFaceSet.cpp:
+        (WebCore::CSSFontFaceSet::add):
+        (WebCore::CSSFontFaceSet::remove):
+
+2016-06-14  Myles C. Maxfield  <mmaxfi...@apple.com>
+
         Honor bidi unicode codepoints
         https://bugs.webkit.org/show_bug.cgi?id=149170
         <rdar://problem/26527378>

Modified: trunk/Source/WebCore/css/CSSFontFaceSet.cpp (202084 => 202085)


--- trunk/Source/WebCore/css/CSSFontFaceSet.cpp	2016-06-15 05:04:17 UTC (rev 202084)
+++ trunk/Source/WebCore/css/CSSFontFaceSet.cpp	2016-06-15 06:36:29 UTC (rev 202085)
@@ -190,8 +190,8 @@
         incrementActiveCount();
 
     if (face.cssConnection()) {
-        auto addResult = m_constituentCSSConnections.add(face.cssConnection(), &face);
-        ASSERT_UNUSED(addResult, addResult.isNewEntry);
+        ASSERT(!m_constituentCSSConnections.contains(face.cssConnection()));
+        m_constituentCSSConnections.add(face.cssConnection(), &face);
     }
 }
 
@@ -229,8 +229,8 @@
         removeFromFacesLookupTable(face, *face.families());
 
     if (face.cssConnection()) {
-        bool removed = m_constituentCSSConnections.remove(face.cssConnection());
-        ASSERT_UNUSED(removed, removed);
+        ASSERT(m_constituentCSSConnections.get(face.cssConnection()) == &face);
+        m_constituentCSSConnections.remove(face.cssConnection());
     }
 
     for (size_t i = 0; i < m_faces.size(); ++i) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to