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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106525 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 1fbcd69..656175c 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+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>
 
         [Texmap] Use glScissors for clipping in TextureMapperGL when possible

diff --git a/Source/WebCore/platform/graphics/Region.cpp b/Source/WebCore/platform/graphics/Region.cpp
index 73e6ddc..5427c6c 100644 (file)
--- a/Source/WebCore/platform/graphics/Region.cpp
+++ b/Source/WebCore/platform/graphics/Region.cpp
@@ -65,11 +65,6 @@ Vector<IntRect> Region::rects() const
     return rects;
 }
 
-bool Region::contains(const Region& region) const
-{
-    return WebCore::intersect(region, *this) == region;
-}
-
 Region::Shape::Shape()
 {
 }

diff --git a/Source/WebCore/platform/graphics/Region.h b/Source/WebCore/platform/graphics/Region.h
index 9170af4..b5359bb 100644 (file)
--- a/Source/WebCore/platform/graphics/Region.h
+++ b/Source/WebCore/platform/graphics/Region.h
@@ -47,9 +47,6 @@ public:
 
     void translate(const IntSize&);
 
-    // Returns true if the query region is a subset of this region.
-    bool contains(const Region&) const;
-
 #ifndef NDEBUG
     void dump() const;
 #endif
@@ -107,18 +104,13 @@ private:
 
         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&);
 };
 
 static inline Region intersect(const Region& a, const Region& b)
@@ -145,21 +137,6 @@ static inline Region translate(const Region& region, const IntSize& offset)
     return result;
 }
 
-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
 
 #endif // Region_h