| Index: cc/base/region.cc
|
| diff --git a/cc/base/region.cc b/cc/base/region.cc
|
| deleted file mode 100644
|
| index c048c89e5710ba0412910008c9eabb2fdaa37abc..0000000000000000000000000000000000000000
|
| --- a/cc/base/region.cc
|
| +++ /dev/null
|
| @@ -1,153 +0,0 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "cc/base/region.h"
|
| -
|
| -#include "base/trace_event/trace_event_argument.h"
|
| -#include "base/values.h"
|
| -#include "cc/base/simple_enclosed_region.h"
|
| -
|
| -namespace cc {
|
| -
|
| -Region::Region() {
|
| -}
|
| -
|
| -Region::Region(const Region& region)
|
| - : skregion_(region.skregion_) {
|
| -}
|
| -
|
| -Region::Region(const gfx::Rect& rect)
|
| - : skregion_(gfx::RectToSkIRect(rect)) {
|
| -}
|
| -
|
| -Region::~Region() {
|
| -}
|
| -
|
| -const Region& Region::operator=(const gfx::Rect& rect) {
|
| - skregion_ = SkRegion(gfx::RectToSkIRect(rect));
|
| - return *this;
|
| -}
|
| -
|
| -const Region& Region::operator=(const Region& region) {
|
| - skregion_ = region.skregion_;
|
| - return *this;
|
| -}
|
| -
|
| -void Region::Swap(Region* region) {
|
| - region->skregion_.swap(skregion_);
|
| -}
|
| -
|
| -void Region::Clear() {
|
| - skregion_.setEmpty();
|
| -}
|
| -
|
| -bool Region::IsEmpty() const {
|
| - return skregion_.isEmpty();
|
| -}
|
| -
|
| -int Region::GetRegionComplexity() const {
|
| - return skregion_.computeRegionComplexity();
|
| -}
|
| -
|
| -bool Region::Contains(const gfx::Point& point) const {
|
| - return skregion_.contains(point.x(), point.y());
|
| -}
|
| -
|
| -bool Region::Contains(const gfx::Rect& rect) const {
|
| - if (rect.IsEmpty())
|
| - return true;
|
| - return skregion_.contains(gfx::RectToSkIRect(rect));
|
| -}
|
| -
|
| -bool Region::Contains(const Region& region) const {
|
| - if (region.IsEmpty())
|
| - return true;
|
| - return skregion_.contains(region.skregion_);
|
| -}
|
| -
|
| -bool Region::Intersects(const gfx::Rect& rect) const {
|
| - return skregion_.intersects(gfx::RectToSkIRect(rect));
|
| -}
|
| -
|
| -bool Region::Intersects(const Region& region) const {
|
| - return skregion_.intersects(region.skregion_);
|
| -}
|
| -
|
| -void Region::Subtract(const gfx::Rect& rect) {
|
| - skregion_.op(gfx::RectToSkIRect(rect), SkRegion::kDifference_Op);
|
| -}
|
| -
|
| -void Region::Subtract(const Region& region) {
|
| - skregion_.op(region.skregion_, SkRegion::kDifference_Op);
|
| -}
|
| -
|
| -void Region::Subtract(const SimpleEnclosedRegion& region) {
|
| - for (size_t i = 0; i < region.GetRegionComplexity(); ++i) {
|
| - skregion_.op(gfx::RectToSkIRect(region.GetRect(i)),
|
| - SkRegion::kDifference_Op);
|
| - }
|
| -}
|
| -
|
| -void Region::Union(const gfx::Rect& rect) {
|
| - skregion_.op(gfx::RectToSkIRect(rect), SkRegion::kUnion_Op);
|
| -}
|
| -
|
| -void Region::Union(const Region& region) {
|
| - skregion_.op(region.skregion_, SkRegion::kUnion_Op);
|
| -}
|
| -
|
| -void Region::Intersect(const gfx::Rect& rect) {
|
| - skregion_.op(gfx::RectToSkIRect(rect), SkRegion::kIntersect_Op);
|
| -}
|
| -
|
| -void Region::Intersect(const Region& region) {
|
| - skregion_.op(region.skregion_, SkRegion::kIntersect_Op);
|
| -}
|
| -
|
| -std::string Region::ToString() const {
|
| - if (IsEmpty())
|
| - return gfx::Rect().ToString();
|
| -
|
| - std::string result;
|
| - for (Iterator it(*this); it.has_rect(); it.next()) {
|
| - if (!result.empty())
|
| - result += " | ";
|
| - result += it.rect().ToString();
|
| - }
|
| - return result;
|
| -}
|
| -
|
| -scoped_ptr<base::Value> Region::AsValue() const {
|
| - scoped_ptr<base::ListValue> result(new base::ListValue());
|
| - for (Iterator it(*this); it.has_rect(); it.next()) {
|
| - gfx::Rect rect(it.rect());
|
| - result->AppendInteger(rect.x());
|
| - result->AppendInteger(rect.y());
|
| - result->AppendInteger(rect.width());
|
| - result->AppendInteger(rect.height());
|
| - }
|
| - return result.Pass();
|
| -}
|
| -
|
| -void Region::AsValueInto(base::trace_event::TracedValue* result) const {
|
| - for (Iterator it(*this); it.has_rect(); it.next()) {
|
| - gfx::Rect rect(it.rect());
|
| - result->AppendInteger(rect.x());
|
| - result->AppendInteger(rect.y());
|
| - result->AppendInteger(rect.width());
|
| - result->AppendInteger(rect.height());
|
| - }
|
| -}
|
| -
|
| -Region::Iterator::Iterator() {
|
| -}
|
| -
|
| -Region::Iterator::Iterator(const Region& region)
|
| - : it_(region.skregion_) {
|
| -}
|
| -
|
| -Region::Iterator::~Iterator() {
|
| -}
|
| -
|
| -} // namespace cc
|
|
|