Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(536)

Unified Diff: third_party/WebKit/Source/core/style/StyleBoxData.h

Issue 2854333002: Move StyleBoxData.h to a nested class in ComputedStyle. (Closed)
Patch Set: rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/style/StyleBoxData.h
diff --git a/third_party/WebKit/Source/core/style/StyleBoxData.h b/third_party/WebKit/Source/core/style/StyleBoxData.h
deleted file mode 100644
index 4017dbb7f13d7c9354b2c8d911ce7bd33916854f..0000000000000000000000000000000000000000
--- a/third_party/WebKit/Source/core/style/StyleBoxData.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
- * (C) 2000 Antti Koivisto (koivisto@kde.org)
- * (C) 2000 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
- * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef StyleBoxData_h
-#define StyleBoxData_h
-
-#include "core/CoreExport.h"
-#include "core/style/ComputedStyleConstants.h"
-#include "platform/Length.h"
-#include "platform/wtf/PassRefPtr.h"
-#include "platform/wtf/RefCounted.h"
-
-namespace blink {
-
-// TODO(sashab): Move this into a private class on ComputedStyle, and remove
-// all methods on it, merging them into copy/creation methods on ComputedStyle
-// instead. Keep the allocation logic, only allocating a new object if needed.
-class CORE_EXPORT StyleBoxData : public RefCountedCopyable<StyleBoxData> {
- public:
- static PassRefPtr<StyleBoxData> Create() {
- return AdoptRef(new StyleBoxData);
- }
- PassRefPtr<StyleBoxData> Copy() const {
- return AdoptRef(new StyleBoxData(*this));
- }
-
- bool operator==(const StyleBoxData& other) const {
- return width_ == other.width_ && height_ == other.height_ &&
- min_width_ == other.min_width_ && max_width_ == other.max_width_ &&
- min_height_ == other.min_height_ &&
- max_height_ == other.max_height_ &&
- vertical_align_length_ == other.vertical_align_length_ &&
- z_index_ == other.z_index_ &&
- has_auto_z_index_ == other.has_auto_z_index_ &&
- box_sizing_ == other.box_sizing_ &&
- box_decoration_break_ == other.box_decoration_break_;
- }
- bool operator!=(const StyleBoxData& o) const { return !(*this == o); }
-
- private:
- friend class ComputedStyle;
-
- StyleBoxData()
- : width_(Length()),
- height_(Length()),
- min_width_(Length()),
- max_width_(Length(kMaxSizeNone)),
- min_height_(Length()),
- max_height_(Length(kMaxSizeNone)),
- z_index_(0),
- has_auto_z_index_(static_cast<unsigned>(true)),
- box_sizing_(static_cast<unsigned>(EBoxSizing::kContentBox)),
- box_decoration_break_(
- static_cast<unsigned>(EBoxDecorationBreak::kSlice)) {}
-
- StyleBoxData(const StyleBoxData&) = default;
-
- Length width_;
- Length height_;
-
- Length min_width_;
- Length max_width_;
-
- Length min_height_;
- Length max_height_;
-
- Length vertical_align_length_;
-
- int z_index_;
- unsigned has_auto_z_index_ : 1;
- unsigned box_sizing_ : 1; // EBoxSizing
- unsigned box_decoration_break_ : 1; // EBoxDecorationBreak
-};
-
-} // namespace blink
-
-#endif // StyleBoxData_h
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698