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

Side by Side Diff: third_party/WebKit/Source/core/dom/Node.cpp

Issue 2830583002: Rename NodeLayoutData -> NodeRenderingData (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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * 10 *
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 } 583 }
584 } 584 }
585 585
586 LayoutBox* Node::GetLayoutBox() const { 586 LayoutBox* Node::GetLayoutBox() const {
587 LayoutObject* layout_object = this->GetLayoutObject(); 587 LayoutObject* layout_object = this->GetLayoutObject();
588 return layout_object && layout_object->IsBox() ? ToLayoutBox(layout_object) 588 return layout_object && layout_object->IsBox() ? ToLayoutBox(layout_object)
589 : nullptr; 589 : nullptr;
590 } 590 }
591 591
592 void Node::SetLayoutObject(LayoutObject* layout_object) { 592 void Node::SetLayoutObject(LayoutObject* layout_object) {
593 NodeLayoutData* node_layout_data = HasRareData() 593 NodeRenderingData* node_layout_data =
594 ? data_.rare_data_->GetNodeLayoutData() 594 HasRareData() ? data_.rare_data_->GetNodeRenderingData()
595 : data_.node_layout_data_; 595 : data_.node_layout_data_;
596 596
597 // Already pointing to a non empty NodeLayoutData so just set the pointer to 597 // Already pointing to a non empty NodeRenderingData so just set the pointer
598 // the new LayoutObject. 598 // to the new LayoutObject.
599 if (!node_layout_data->IsSharedEmptyData()) { 599 if (!node_layout_data->IsSharedEmptyData()) {
600 node_layout_data->SetLayoutObject(layout_object); 600 node_layout_data->SetLayoutObject(layout_object);
601 return; 601 return;
602 } 602 }
603 603
604 if (!layout_object) 604 if (!layout_object)
605 return; 605 return;
606 606
607 // Swap the NodeLayoutData to point to a new NodeLayoutData instead of the 607 // Swap the NodeRenderingData to point to a new NodeRenderingData instead of
608 // static SharedEmptyData instance. 608 // the static SharedEmptyData instance.
609 DCHECK(!node_layout_data->GetNonAttachedStyle()); 609 DCHECK(!node_layout_data->GetNonAttachedStyle());
610 node_layout_data = new NodeLayoutData(layout_object, nullptr); 610 node_layout_data = new NodeRenderingData(layout_object, nullptr);
611 if (HasRareData()) 611 if (HasRareData())
612 data_.rare_data_->SetNodeLayoutData(node_layout_data); 612 data_.rare_data_->SetNodeRenderingData(node_layout_data);
613 else 613 else
614 data_.node_layout_data_ = node_layout_data; 614 data_.node_layout_data_ = node_layout_data;
615 } 615 }
616 616
617 void Node::SetNonAttachedStyle(RefPtr<ComputedStyle> non_attached_style) { 617 void Node::SetNonAttachedStyle(RefPtr<ComputedStyle> non_attached_style) {
618 NodeLayoutData* node_layout_data = HasRareData() 618 NodeRenderingData* node_layout_data =
619 ? data_.rare_data_->GetNodeLayoutData() 619 HasRareData() ? data_.rare_data_->GetNodeRenderingData()
620 : data_.node_layout_data_; 620 : data_.node_layout_data_;
621 621
622 // Already pointing to a non empty NodeLayoutData so just set the pointer to 622 // Already pointing to a non empty NodeRenderingData so just set the pointer
623 // the new LayoutObject. 623 // to the new LayoutObject.
624 if (!node_layout_data->IsSharedEmptyData()) { 624 if (!node_layout_data->IsSharedEmptyData()) {
625 node_layout_data->SetNonAttachedStyle(non_attached_style); 625 node_layout_data->SetNonAttachedStyle(non_attached_style);
626 return; 626 return;
627 } 627 }
628 628
629 if (!non_attached_style) 629 if (!non_attached_style)
630 return; 630 return;
631 631
632 // Swap the NodeLayoutData to point to a new NodeLayoutData instead of the 632 // Swap the NodeRenderingData to point to a new NodeRenderingData instead of
633 // static SharedEmptyData instance. 633 // the static SharedEmptyData instance.
634 DCHECK(!node_layout_data->GetLayoutObject()); 634 DCHECK(!node_layout_data->GetLayoutObject());
635 node_layout_data = new NodeLayoutData(nullptr, non_attached_style); 635 node_layout_data = new NodeRenderingData(nullptr, non_attached_style);
636 if (HasRareData()) 636 if (HasRareData())
637 data_.rare_data_->SetNodeLayoutData(node_layout_data); 637 data_.rare_data_->SetNodeRenderingData(node_layout_data);
638 else 638 else
639 data_.node_layout_data_ = node_layout_data; 639 data_.node_layout_data_ = node_layout_data;
640 } 640 }
641 641
642 LayoutBoxModelObject* Node::GetLayoutBoxModelObject() const { 642 LayoutBoxModelObject* Node::GetLayoutBoxModelObject() const {
643 LayoutObject* layout_object = this->GetLayoutObject(); 643 LayoutObject* layout_object = this->GetLayoutObject();
644 return layout_object && layout_object->IsBoxModelObject() 644 return layout_object && layout_object->IsBoxModelObject()
645 ? ToLayoutBoxModelObject(layout_object) 645 ? ToLayoutBoxModelObject(layout_object)
646 : nullptr; 646 : nullptr;
647 } 647 }
(...skipping 1945 matching lines...) Expand 10 before | Expand all | Expand 10 after
2593 if (node) { 2593 if (node) {
2594 std::stringstream stream; 2594 std::stringstream stream;
2595 node->PrintNodePathTo(stream); 2595 node->PrintNodePathTo(stream);
2596 LOG(INFO) << stream.str(); 2596 LOG(INFO) << stream.str();
2597 } else { 2597 } else {
2598 LOG(INFO) << "Cannot showNodePath for <null>"; 2598 LOG(INFO) << "Cannot showNodePath for <null>";
2599 } 2599 }
2600 } 2600 }
2601 2601
2602 #endif 2602 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Node.h ('k') | third_party/WebKit/Source/core/dom/NodeRareData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698