Changeset 238472 in webkit

Timestamp:

Nov 24, 2018, 4:37:06 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Remove now unnecessary specialized ListHashSet from InlineItem.h
​https://bugs.webkit.org/show_bug.cgi?id=191946

Patch by Sam Weinig <​sam@webkit.org> on 2018-11-24
Reviewed by Zalan Bujtas.

Now that ListHashSet supports raw pointer overloads for smart pointers,
we can fix the FIXME in InlineItem.h and remove the specialized ListHashSet
and ListHashSet::find calls.

• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::splitInlineRunIfNeeded const):
(WebCore::Layout::InlineFormattingContext::collectInlineContentForSubtree const):

• layout/inlineformatting/InlineFormattingContextGeometry.cpp:

(WebCore::Layout::InlineFormattingContext::Geometry::runWidth):

• layout/inlineformatting/InlineItem.h:

(WebCore::Layout::InlineItemHashFunctions::hash): Deleted.
(WebCore::Layout::InlineItemHashFunctions::equal): Deleted.
(WebCore::Layout::InlineItemHashTranslator::hash): Deleted.
(WebCore::Layout::InlineItemHashTranslator::equal): Deleted.

• layout/inlineformatting/InlineLineBreaker.cpp:

(WebCore::Layout::InlineLineBreaker::textWidth const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineFormattingContext.cpp (modified) (2 diffs)
• layout/inlineformatting/InlineFormattingContextGeometry.cpp (modified) (1 diff)
• layout/inlineformatting/InlineItem.h (modified) (1 diff)
• layout/inlineformatting/InlineLineBreaker.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-24  Sam Weinig  <sam@webkit.org>
+
+        Remove now unnecessary specialized ListHashSet from InlineItem.h
+        https://bugs.webkit.org/show_bug.cgi?id=191946
+
+        Reviewed by Zalan Bujtas.
+
+        Now that ListHashSet supports raw pointer overloads for smart pointers,
+        we can fix the FIXME in InlineItem.h and remove the specialized ListHashSet
+        and ListHashSet::find calls.
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::splitInlineRunIfNeeded const):
+        (WebCore::Layout::InlineFormattingContext::collectInlineContentForSubtree const):
+        * layout/inlineformatting/InlineFormattingContextGeometry.cpp:
+        (WebCore::Layout::InlineFormattingContext::Geometry::runWidth):
+        * layout/inlineformatting/InlineItem.h:
+        (WebCore::Layout::InlineItemHashFunctions::hash): Deleted.
+        (WebCore::Layout::InlineItemHashFunctions::equal): Deleted.
+        (WebCore::Layout::InlineItemHashTranslator::hash): Deleted.
+        (WebCore::Layout::InlineItemHashTranslator::equal): Deleted.
+        * layout/inlineformatting/InlineLineBreaker.cpp:
+        (WebCore::Layout::InlineLineBreaker::textWidth const):
+
 2018-11-24  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp

@@ -163 +163 @@
     };
 
-    for (auto iterator = inlineContent.find<const InlineItem&, InlineItemHashTranslator>(inlineRun.inlineItem()); iterator != inlineContent.end() && remaningLength > 0; ++iterator) {
+    for (auto iterator = inlineContent.find(&inlineRun.inlineItem()); iterator != inlineContent.end() && remaningLength > 0; ++iterator) {
         auto& inlineItem = **iterator;
 
@@ -490 +490 @@
 
         if (lastInlineBoxBeforeContainer) {
-            auto iterator = inlineContent.find<const InlineItem&, InlineItemHashTranslator>(*lastInlineBoxBeforeContainer);
+            auto iterator = inlineContent.find(lastInlineBoxBeforeContainer);
             firstDescendantInlineBox = (*++iterator).get();
         } else

trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp

@@ -181 +181 @@
     LayoutUnit width;
     auto startPosition = from;
-    auto iterator = inlineContent.find<const InlineItem&, InlineItemHashTranslator>(inlineItem);
+    auto iterator = inlineContent.find(&inlineItem);
     auto inlineItemEnd = inlineContent.end();
     while (length) {

trunk/Source/WebCore/layout/inlineformatting/InlineItem.h

@@ -84 +84 @@
 };
 
-// FIXME: Fix HashSet/ListHashSet to support smart pointer types.
-struct InlineItemHashFunctions {
-    static unsigned hash(const std::unique_ptr<InlineItem>& key) { return PtrHash<InlineItem*>::hash(key.get()); }
-    static bool equal(const std::unique_ptr<InlineItem>& a, const std::unique_ptr<InlineItem>& b) { return a.get() == b.get(); }
-};
-
-struct InlineItemHashTranslator {
-    static unsigned hash(const InlineItem& key) { return PtrHash<const InlineItem*>::hash(&key); }
-    static bool equal(const std::unique_ptr<InlineItem>& a, const InlineItem& b) { return a.get() == &b; }
-};
-using InlineContent = ListHashSet<std::unique_ptr<InlineItem>, InlineItemHashFunctions>;
+using InlineContent = ListHashSet<std::unique_ptr<InlineItem>>;
 
 inline InlineItem::InlineItem(const Box& layoutBox)

trunk/Source/WebCore/layout/inlineformatting/InlineLineBreaker.cpp

@@ -162 +162 @@
     // FIXME: It does not do proper kerning/ligature handling.
     LayoutUnit width;
-    auto iterator = m_inlineContent.find<const InlineItem&, InlineItemHashTranslator>(inlineItem);
+    auto iterator = m_inlineContent.find(&inlineItem);
     auto inlineItemEnd = m_inlineContent.end();
     while (length) {