Commit 85007e5e authored by eae@chromium.org's avatar eae@chromium.org

Revert "Rename IntRectExtent to IntBoxExtent"

Revert r169675 (commit aca3f9e60c129c49e4e48cc9097f80d7f697c417) as it
might have caused the Mac ASAN bot to fail.

R=vandebo@chromium.org
BUG=

Review URL: https://codereview.chromium.org/208073005

git-svn-id: svn://svn.chromium.org/blink/trunk@169760 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent f31844b9
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "core/svg/graphics/filters/SVGFilterBuilder.h" #include "core/svg/graphics/filters/SVGFilterBuilder.h"
#include "platform/geometry/FloatRect.h" #include "platform/geometry/FloatRect.h"
#include "platform/geometry/IntBoxExtent.h" #include "platform/geometry/IntRectExtent.h"
#include "platform/geometry/LayoutRect.h" #include "platform/geometry/LayoutRect.h"
#include "platform/graphics/GraphicsContext.h" #include "platform/graphics/GraphicsContext.h"
#include "platform/graphics/ImageBuffer.h" #include "platform/graphics/ImageBuffer.h"
...@@ -118,7 +118,7 @@ private: ...@@ -118,7 +118,7 @@ private:
RefPtr<SourceGraphic> m_sourceGraphic; RefPtr<SourceGraphic> m_sourceGraphic;
RefPtr<FilterEffect> m_lastEffect; RefPtr<FilterEffect> m_lastEffect;
IntBoxExtent m_outsets; IntRectExtent m_outsets;
bool m_graphicsBufferAttached; bool m_graphicsBufferAttached;
bool m_hasFilterThatMovesPixels; bool m_hasFilterThatMovesPixels;
......
...@@ -428,10 +428,10 @@ ...@@ -428,10 +428,10 @@
'geometry/FloatRoundedRect.h', 'geometry/FloatRoundedRect.h',
'geometry/FloatSize.cpp', 'geometry/FloatSize.cpp',
'geometry/FloatSize.h', 'geometry/FloatSize.h',
'geometry/IntBoxExtent.h',
'geometry/IntPoint.h', 'geometry/IntPoint.h',
'geometry/IntRect.cpp', 'geometry/IntRect.cpp',
'geometry/IntRect.h', 'geometry/IntRect.h',
'geometry/IntRectExtent.h',
'geometry/IntSize.h', 'geometry/IntSize.h',
'geometry/IntSizeHash.h', 'geometry/IntSizeHash.h',
'geometry/LayoutBoxExtent.cpp', 'geometry/LayoutBoxExtent.cpp',
......
...@@ -27,16 +27,16 @@ ...@@ -27,16 +27,16 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef IntBoxExtent_h #ifndef IntRectExtent_h
#define IntBoxExtent_h #define IntRectExtent_h
#include "platform/geometry/LayoutRect.h" #include "platform/geometry/LayoutRect.h"
namespace WebCore { namespace WebCore {
class IntBoxExtent { class IntRectExtent {
public: public:
IntBoxExtent() IntRectExtent()
: m_top(0) : m_top(0)
, m_right(0) , m_right(0)
, m_bottom(0) , m_bottom(0)
...@@ -44,7 +44,7 @@ public: ...@@ -44,7 +44,7 @@ public:
{ {
} }
IntBoxExtent(int top, int right, int bottom, int left) IntRectExtent(int top, int right, int bottom, int left)
: m_top(top) : m_top(top)
, m_right(right) , m_right(right)
, m_bottom(bottom) , m_bottom(bottom)
...@@ -82,7 +82,7 @@ private: ...@@ -82,7 +82,7 @@ private:
int m_left; int m_left;
}; };
inline bool operator==(const IntBoxExtent& a, const IntBoxExtent& b) inline bool operator==(const IntRectExtent& a, const IntRectExtent& b)
{ {
return a.top() == b.top() return a.top() == b.top()
&& a.right() == b.right() && a.right() == b.right()
...@@ -90,12 +90,12 @@ inline bool operator==(const IntBoxExtent& a, const IntBoxExtent& b) ...@@ -90,12 +90,12 @@ inline bool operator==(const IntBoxExtent& a, const IntBoxExtent& b)
&& a.left() == b.left(); && a.left() == b.left();
} }
inline bool operator!=(const IntBoxExtent& a, const IntBoxExtent& b) inline bool operator!=(const IntRectExtent& a, const IntRectExtent& b)
{ {
return !(a == b); return !(a == b);
} }
inline void operator+=(IntBoxExtent& a, const IntBoxExtent& b) inline void operator+=(IntRectExtent& a, const IntRectExtent& b)
{ {
a.setTop(a.top() + b.top()); a.setTop(a.top() + b.top());
a.setRight(a.right() + b.right()); a.setRight(a.right() + b.right());
...@@ -106,4 +106,4 @@ inline void operator+=(IntBoxExtent& a, const IntBoxExtent& b) ...@@ -106,4 +106,4 @@ inline void operator+=(IntBoxExtent& a, const IntBoxExtent& b)
} // namespace WebCore } // namespace WebCore
#endif // IntBoxExtent_h #endif // IntRectExtent_h
...@@ -27,14 +27,14 @@ ...@@ -27,14 +27,14 @@
#define FilterOperations_h #define FilterOperations_h
#include "platform/PlatformExport.h" #include "platform/PlatformExport.h"
#include "platform/geometry/IntBoxExtent.h" #include "platform/geometry/IntRectExtent.h"
#include "platform/graphics/filters/FilterOperation.h" #include "platform/graphics/filters/FilterOperation.h"
#include "wtf/RefPtr.h" #include "wtf/RefPtr.h"
#include "wtf/Vector.h" #include "wtf/Vector.h"
namespace WebCore { namespace WebCore {
typedef IntBoxExtent FilterOutsets; typedef IntRectExtent FilterOutsets;
class PLATFORM_EXPORT FilterOperations { class PLATFORM_EXPORT FilterOperations {
WTF_MAKE_FAST_ALLOCATED; WTF_MAKE_FAST_ALLOCATED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment