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

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

Issue 625073002: Merge RenderWidget into single subclass, RenderPart (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: s/widget/part wherever it made sense Created 6 years, 2 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
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 29 matching lines...) Expand all
40 #include "core/rendering/RenderDetailsMarker.h" 40 #include "core/rendering/RenderDetailsMarker.h"
41 #include "core/rendering/RenderFileUploadControl.h" 41 #include "core/rendering/RenderFileUploadControl.h"
42 #include "core/rendering/RenderFlowThread.h" 42 #include "core/rendering/RenderFlowThread.h"
43 #include "core/rendering/RenderInline.h" 43 #include "core/rendering/RenderInline.h"
44 #include "core/rendering/RenderLayer.h" 44 #include "core/rendering/RenderLayer.h"
45 #include "core/rendering/RenderListItem.h" 45 #include "core/rendering/RenderListItem.h"
46 #include "core/rendering/RenderListMarker.h" 46 #include "core/rendering/RenderListMarker.h"
47 #include "core/rendering/RenderPart.h" 47 #include "core/rendering/RenderPart.h"
48 #include "core/rendering/RenderTableCell.h" 48 #include "core/rendering/RenderTableCell.h"
49 #include "core/rendering/RenderView.h" 49 #include "core/rendering/RenderView.h"
50 #include "core/rendering/RenderWidget.h"
51 #include "core/rendering/compositing/CompositedLayerMapping.h" 50 #include "core/rendering/compositing/CompositedLayerMapping.h"
52 #include "core/rendering/svg/RenderSVGContainer.h" 51 #include "core/rendering/svg/RenderSVGContainer.h"
53 #include "core/rendering/svg/RenderSVGGradientStop.h" 52 #include "core/rendering/svg/RenderSVGGradientStop.h"
54 #include "core/rendering/svg/RenderSVGImage.h" 53 #include "core/rendering/svg/RenderSVGImage.h"
55 #include "core/rendering/svg/RenderSVGInlineText.h" 54 #include "core/rendering/svg/RenderSVGInlineText.h"
56 #include "core/rendering/svg/RenderSVGPath.h" 55 #include "core/rendering/svg/RenderSVGPath.h"
57 #include "core/rendering/svg/RenderSVGRoot.h" 56 #include "core/rendering/svg/RenderSVGRoot.h"
58 #include "core/rendering/svg/RenderSVGText.h" 57 #include "core/rendering/svg/RenderSVGText.h"
59 #include "core/rendering/svg/SVGRenderTreeAsText.h" 58 #include "core/rendering/svg/SVGRenderTreeAsText.h"
60 #include "wtf/HexNumber.h" 59 #include "wtf/HexNumber.h"
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 writeTextRun(ts, text, *box); 474 writeTextRun(ts, text, *box);
476 } 475 }
477 } 476 }
478 477
479 for (RenderObject* child = o.slowFirstChild(); child; child = child->nextSib ling()) { 478 for (RenderObject* child = o.slowFirstChild(); child; child = child->nextSib ling()) {
480 if (child->hasLayer()) 479 if (child->hasLayer())
481 continue; 480 continue;
482 write(ts, *child, indent + 1, behavior); 481 write(ts, *child, indent + 1, behavior);
483 } 482 }
484 483
485 if (o.isWidget()) { 484 if (o.isRenderPart()) {
486 Widget* widget = toRenderWidget(o).widget(); 485 Widget* widget = toRenderPart(o).widget();
487 if (widget && widget->isFrameView()) { 486 if (widget && widget->isFrameView()) {
488 FrameView* view = toFrameView(widget); 487 FrameView* view = toFrameView(widget);
489 RenderView* root = view->renderView(); 488 RenderView* root = view->renderView();
490 if (root) { 489 if (root) {
491 view->layout(); 490 view->layout();
492 RenderLayer* l = root->layer(); 491 RenderLayer* l = root->layer();
493 if (l) 492 if (l)
494 RenderTreeAsText::writeLayers(ts, l, l, l->rect(), indent + 1, behavior); 493 RenderTreeAsText::writeLayers(ts, l, l, l->rect(), indent + 1, behavior);
495 } 494 }
496 } 495 }
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 element->document().updateLayout(); 772 element->document().updateLayout();
774 773
775 RenderObject* renderer = element->renderer(); 774 RenderObject* renderer = element->renderer();
776 if (!renderer || !renderer->isListItem()) 775 if (!renderer || !renderer->isListItem())
777 return String(); 776 return String();
778 777
779 return toRenderListItem(renderer)->markerText(); 778 return toRenderListItem(renderer)->markerText();
780 } 779 }
781 780
782 } // namespace blink 781 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698