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

Unified Diff: third_party/WebKit/Source/core/layout/ng/inline/ng_inline_node_test.cc

Issue 2836293004: [LayoutNG] Move NGInlineNode data to NGInlineNodeData. (Closed)
Patch Set: rebase. Created 3 years, 8 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
Index: third_party/WebKit/Source/core/layout/ng/inline/ng_inline_node_test.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_node_test.cc b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_node_test.cc
index f19c6872e2bcdf4722e492a5f5bcdefde1d9fc6b..4adb7f83aeb8e920a6bcd4fe72d614d6428303ea 100644
--- a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_node_test.cc
+++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_node_test.cc
@@ -22,33 +22,34 @@ class NGInlineNodeForTest : public NGInlineNode {
public:
using NGInlineNode::NGInlineNode;
- String& Text() { return text_content_; }
- Vector<NGInlineItem>& Items() { return items_; }
+ String& Text() { return MutableData().text_content_; }
+ Vector<NGInlineItem>& Items() { return MutableData().items_; }
void Append(const String& text,
const ComputedStyle* style = nullptr,
LayoutObject* layout_object = nullptr) {
- unsigned start = text_content_.length();
- text_content_.append(text);
- items_.push_back(NGInlineItem(NGInlineItem::kText, start,
- start + text.length(), style, layout_object));
+ unsigned start = Data().text_content_.length();
+ MutableData().text_content_.append(text);
+ MutableData().items_.push_back(NGInlineItem(NGInlineItem::kText, start,
+ start + text.length(), style,
+ layout_object));
}
void Append(UChar character) {
- text_content_.append(character);
- unsigned end = text_content_.length();
- items_.push_back(
+ MutableData().text_content_.append(character);
+ unsigned end = Data().text_content_.length();
+ MutableData().items_.push_back(
NGInlineItem(NGInlineItem::kBidiControl, end - 1, end, nullptr));
- is_bidi_enabled_ = true;
+ MutableData().is_bidi_enabled_ = true;
}
void ClearText() {
- text_content_ = String();
- items_.clear();
+ MutableData().text_content_ = String();
+ MutableData().items_.clear();
}
void SegmentText() {
- is_bidi_enabled_ = true;
+ MutableData().is_bidi_enabled_ = true;
NGInlineNode::SegmentText();
}
@@ -60,13 +61,19 @@ class NGInlineNodeTest : public RenderingTest {
protected:
void SetUp() override {
RenderingTest::SetUp();
+ RuntimeEnabledFeatures::setLayoutNGEnabled(true);
style_ = ComputedStyle::Create();
style_->GetFont().Update(nullptr);
}
+ void TearDown() override {
+ RuntimeEnabledFeatures::setLayoutNGEnabled(false);
+ RenderingTest::TearDown();
+ }
+
void SetupHtml(const char* id, String html) {
SetBodyInnerHTML(html);
- layout_block_flow_ = ToLayoutBlockFlow(GetLayoutObjectByElementId(id));
+ layout_block_flow_ = ToLayoutNGBlockFlow(GetLayoutObjectByElementId(id));
layout_object_ = layout_block_flow_->FirstChild();
style_ = layout_object_->Style();
}
@@ -103,7 +110,7 @@ class NGInlineNodeTest : public RenderingTest {
}
RefPtr<const ComputedStyle> style_;
- LayoutBlockFlow* layout_block_flow_ = nullptr;
+ LayoutNGBlockFlow* layout_block_flow_ = nullptr;
LayoutObject* layout_object_ = nullptr;
FontCachePurgePreventer purge_preventer_;
};

Powered by Google App Engine
This is Rietveld 408576698