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

Side by Side Diff: Source/core/rendering/RenderTreeAsText.cpp

Issue 23728003: Return Frame&, not Frame* from RenderView::frame() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed PopupMenuTest build Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderLayerCompositor.cpp ('k') | Source/core/rendering/RenderView.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 for (RenderObject* child = o.firstChild(); child; child = child->nextSibling ()) { 512 for (RenderObject* child = o.firstChild(); child; child = child->nextSibling ()) {
513 if (child->hasLayer()) 513 if (child->hasLayer())
514 continue; 514 continue;
515 write(ts, *child, indent + 1, behavior); 515 write(ts, *child, indent + 1, behavior);
516 } 516 }
517 517
518 if (o.isWidget()) { 518 if (o.isWidget()) {
519 Widget* widget = toRenderWidget(&o)->widget(); 519 Widget* widget = toRenderWidget(&o)->widget();
520 if (widget && widget->isFrameView()) { 520 if (widget && widget->isFrameView()) {
521 FrameView* view = toFrameView(widget); 521 FrameView* view = toFrameView(widget);
522 RenderView* root = view->frame()->contentRenderer(); 522 RenderView* root = view->frame().contentRenderer();
523 if (root) { 523 if (root) {
524 view->layout(); 524 view->layout();
525 RenderLayer* l = root->layer(); 525 RenderLayer* l = root->layer();
526 if (l) 526 if (l)
527 writeLayers(ts, l, l, l->rect(), indent + 1, behavior); 527 writeLayers(ts, l, l, l->rect(), indent + 1, behavior);
528 } 528 }
529 } 529 }
530 } 530 }
531 } 531 }
532 532
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 element->document().updateLayout(); 849 element->document().updateLayout();
850 850
851 RenderObject* renderer = element->renderer(); 851 RenderObject* renderer = element->renderer();
852 if (!renderer || !renderer->isListItem()) 852 if (!renderer || !renderer->isListItem())
853 return String(); 853 return String();
854 854
855 return toRenderListItem(renderer)->markerText(); 855 return toRenderListItem(renderer)->markerText();
856 } 856 }
857 857
858 } // namespace WebCore 858 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayerCompositor.cpp ('k') | Source/core/rendering/RenderView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698