Changeset 106525 in webkit

Timestamp:

Feb 1, 2012 6:46:10 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r106408.
​http://trac.webkit.org/changeset/106408
​https://bugs.webkit.org/show_bug.cgi?id=77592

crashes in chromium mac release tests (Requested by japhet on
#webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-02-01

• platform/graphics/Region.cpp:
• platform/graphics/Region.h:

(Region):
(Shape):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Region.cpp (modified) (1 diff)
• platform/graphics/Region.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r106408.
+        http://trac.webkit.org/changeset/106408
+        https://bugs.webkit.org/show_bug.cgi?id=77592
+
+        crashes in chromium mac release tests (Requested by japhet on
+        #webkit).
+
+        * platform/graphics/Region.cpp:
+        * platform/graphics/Region.h:
+        (Region):
+        (Shape):
+
 2012-02-01  No'am Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/Source/WebCore/platform/graphics/Region.cpp

@@ -66 +66 @@
 }
 
-bool Region::contains(const Region& region) const
-{
-    return WebCore::intersect(region, *this) == region;
-}
-
 Region::Shape::Shape()
 {

trunk/Source/WebCore/platform/graphics/Region.h

@@ -47 +47 @@
 
     void translate(const IntSize&);
-
-    // Returns true if the query region is a subset of this region.
-    bool contains(const Region&) const;
 
 #ifndef NDEBUG
@@ -108 +105 @@
         bool canCoalesce(SegmentIterator begin, SegmentIterator end);
 
-        Vector<int, 32> m_segments;
-        Vector<Span, 16> m_spans;
-
-        friend bool operator==(const Shape&, const Shape&);
+        // FIXME: These vectors should have inline sizes. Figure out a good optimal value.
+        Vector<int> m_segments;
+        Vector<Span> m_spans;        
     };
 
     IntRect m_bounds;
     Shape m_shape;
-
-    friend bool operator==(const Region&, const Region&);
-    friend bool operator==(const Shape&, const Shape&);
-    friend bool operator==(const Span&, const Span&);
 };
 
@@ -146 +138 @@
 }
 
-inline bool operator==(const Region& a, const Region& b)
-{
-    return a.m_bounds == b.m_bounds && a.m_shape == b.m_shape;
-}
-
-inline bool operator==(const Region::Shape& a, const Region::Shape& b)
-{
-    return a.m_spans == b.m_spans && a.m_segments == b.m_segments;
-}
-
-inline bool operator==(const Region::Span& a, const Region::Span& b)
-{
-    return a.y == b.y && a.segmentIndex == b.segmentIndex;
-}
-
 } // namespace WebCore