Title: [106525] trunk/Source/WebCore
- Revision
- 106525
- Author
- [email protected]
- Date
- 2012-02-01 18:46:10 -0800 (Wed, 01 Feb 2012)
Log 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 <[email protected]> on 2012-02-01
* platform/graphics/Region.cpp:
* platform/graphics/Region.h:
(Region):
(Shape):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (106524 => 106525)
--- trunk/Source/WebCore/ChangeLog 2012-02-02 02:42:14 UTC (rev 106524)
+++ trunk/Source/WebCore/ChangeLog 2012-02-02 02:46:10 UTC (rev 106525)
@@ -1,3 +1,17 @@
+2012-02-01 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
[Texmap] Use glScissors for clipping in TextureMapperGL when possible
Modified: trunk/Source/WebCore/platform/graphics/Region.cpp (106524 => 106525)
--- trunk/Source/WebCore/platform/graphics/Region.cpp 2012-02-02 02:42:14 UTC (rev 106524)
+++ trunk/Source/WebCore/platform/graphics/Region.cpp 2012-02-02 02:46:10 UTC (rev 106525)
@@ -65,11 +65,6 @@
return rects;
}
-bool Region::contains(const Region& region) const
-{
- return WebCore::intersect(region, *this) == region;
-}
-
Region::Shape::Shape()
{
}
Modified: trunk/Source/WebCore/platform/graphics/Region.h (106524 => 106525)
--- trunk/Source/WebCore/platform/graphics/Region.h 2012-02-02 02:42:14 UTC (rev 106524)
+++ trunk/Source/WebCore/platform/graphics/Region.h 2012-02-02 02:46:10 UTC (rev 106525)
@@ -47,9 +47,6 @@
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 @@
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 @@
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
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
