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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTreeAsText.cpp

Issue 2810873007: Replace LayoutPart::GetFrameViewBase with GetNodeFrameView (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 } 522 }
523 523
524 for (LayoutObject* child = o.SlowFirstChild(); child; 524 for (LayoutObject* child = o.SlowFirstChild(); child;
525 child = child->NextSibling()) { 525 child = child->NextSibling()) {
526 if (child->HasLayer()) 526 if (child->HasLayer())
527 continue; 527 continue;
528 Write(ts, *child, indent + 1, behavior); 528 Write(ts, *child, indent + 1, behavior);
529 } 529 }
530 530
531 if (o.IsLayoutPart()) { 531 if (o.IsLayoutPart()) {
532 FrameViewBase* frame_view_base = ToLayoutPart(o).GetFrameViewBase(); 532 FrameView* frame_view = ToLayoutPart(o).GetNodeFrameView();
533 if (frame_view_base && frame_view_base->IsFrameView()) { 533 if (frame_view) {
534 FrameView* view = ToFrameView(frame_view_base); 534 LayoutViewItem root_item = frame_view->GetLayoutViewItem();
535 LayoutViewItem root_item = view->GetLayoutViewItem();
536 if (!root_item.IsNull()) { 535 if (!root_item.IsNull()) {
537 root_item.UpdateStyleAndLayout(); 536 root_item.UpdateStyleAndLayout();
538 PaintLayer* layer = root_item.Layer(); 537 PaintLayer* layer = root_item.Layer();
539 if (layer) 538 if (layer)
540 LayoutTreeAsText::WriteLayers(ts, layer, layer, layer->Rect(), 539 LayoutTreeAsText::WriteLayers(ts, layer, layer, layer->Rect(),
541 indent + 1, behavior); 540 indent + 1, behavior);
542 } 541 }
543 } 542 }
544 } 543 }
545 } 544 }
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
895 element->GetDocument().UpdateStyleAndLayout(); 894 element->GetDocument().UpdateStyleAndLayout();
896 895
897 LayoutObject* layout_object = element->GetLayoutObject(); 896 LayoutObject* layout_object = element->GetLayoutObject();
898 if (!layout_object || !layout_object->IsListItem()) 897 if (!layout_object || !layout_object->IsListItem())
899 return String(); 898 return String();
900 899
901 return ToLayoutListItem(layout_object)->MarkerText(); 900 return ToLayoutListItem(layout_object)->MarkerText();
902 } 901 }
903 902
904 } // namespace blink 903 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698