webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 11 insertions, 12 deletions

diff --git a/Source/WebCore/rendering/line/TrailingObjects.h b/Source/WebCore/rendering/line/TrailingObjects.h
index 5aedea60e..dbd2b0d2b 100644
--- a/Source/WebCore/rendering/line/TrailingObjects.h
+++ b/Source/WebCore/rendering/line/TrailingObjects.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All right reserved.
+ * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2016 Apple Inc. All right reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2013 ChangSeok Oh <shivamidow@gmail.com>
  * Copyright (C) 2013 Adobe Systems Inc. All right reserved.
@@ -22,8 +22,7 @@
  *
  */
 
-#ifndef TrailingObjects_h
-#define TrailingObjects_h
+#pragma once
 
 #include <wtf/Vector.h>
 
@@ -34,11 +33,13 @@ class RenderBoxModelObject;
 class RenderText;
 
 struct BidiRun;
+struct BidiIsolatedRun;
 
 template <class Iterator, class Run> class BidiResolver;
-template <class Iterator> class MidpointState;
-typedef BidiResolver<InlineIterator, BidiRun> InlineBidiResolver;
-typedef MidpointState<InlineIterator> LineMidpointState;
+template <class Iterator, class Run, class IsolateRun> class BidiResolverWithIsolate;
+template <class Iterator> class WhitespaceCollapsingState;
+typedef BidiResolverWithIsolate<InlineIterator, BidiRun, BidiIsolatedRun> InlineBidiResolver;
+typedef WhitespaceCollapsingState<InlineIterator> LineWhitespaceCollapsingState;
 
 class TrailingObjects {
 public:
@@ -58,7 +59,7 @@ public:
         m_boxes.shrink(0); // Use shrink(0) instead of clear() to retain our capacity.
     }
 
-    void appendBoxIfNeeded(RenderBoxModelObject* box)
+    void appendBoxIfNeeded(RenderBoxModelObject& box)
     {
         if (m_whitespace)
             m_boxes.append(box);
@@ -66,13 +67,11 @@ public:
 
     enum CollapseFirstSpaceOrNot { DoNotCollapseFirstSpace, CollapseFirstSpace };
 
-    void updateMidpointsForTrailingBoxes(LineMidpointState&, const InlineIterator& lBreak, CollapseFirstSpaceOrNot);
+    void updateWhitespaceCollapsingTransitionsForTrailingBoxes(LineWhitespaceCollapsingState&, const InlineIterator& lBreak, CollapseFirstSpaceOrNot);
 
 private:
     RenderText* m_whitespace;
-    Vector<RenderBoxModelObject*, 4> m_boxes;
+    Vector<std::reference_wrapper<RenderBoxModelObject>, 4> m_boxes;
 };
 
-}
-
-#endif // TrailingObjects_h
+} // namespace WebCore