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

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

Issue 27030009: Revert "Make compositingState explicit (re-land #2 with bogus ASSERT removed)" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix build error Created 7 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
« no previous file with comments | « Source/core/rendering/RenderObject.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 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 if (l.renderBox() && l.renderBox()->pixelSnappedClientHeight() != l.scro llHeight()) 573 if (l.renderBox() && l.renderBox()->pixelSnappedClientHeight() != l.scro llHeight())
574 ts << " scrollHeight " << l.scrollHeight(); 574 ts << " scrollHeight " << l.scrollHeight();
575 } 575 }
576 576
577 if (paintPhase == LayerPaintPhaseBackground) 577 if (paintPhase == LayerPaintPhaseBackground)
578 ts << " layerType: background only"; 578 ts << " layerType: background only";
579 else if (paintPhase == LayerPaintPhaseForeground) 579 else if (paintPhase == LayerPaintPhaseForeground)
580 ts << " layerType: foreground only"; 580 ts << " layerType: foreground only";
581 581
582 if (behavior & RenderAsTextShowCompositedLayers) { 582 if (behavior & RenderAsTextShowCompositedLayers) {
583 if (l.compositedLayerMapping()) { 583 if (l.isComposited()) {
584 ts << " (composited, bounds=" 584 ts << " (composited, bounds="
585 << l.compositedLayerMapping()->compositedBounds() 585 << l.compositedLayerMapping()->compositedBounds()
586 << ", drawsContent=" 586 << ", drawsContent="
587 << l.compositedLayerMapping()->mainGraphicsLayer()->drawsContent () 587 << l.compositedLayerMapping()->mainGraphicsLayer()->drawsContent ()
588 << ", paints into ancestor=" 588 << ", paints into ancestor="
589 << l.compositedLayerMapping()->paintsIntoCompositedAncestor() 589 << l.compositedLayerMapping()->paintsIntoCompositedAncestor()
590 << ")"; 590 << ")";
591 } 591 }
592 } 592 }
593 593
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 element->document().updateLayout(); 856 element->document().updateLayout();
857 857
858 RenderObject* renderer = element->renderer(); 858 RenderObject* renderer = element->renderer();
859 if (!renderer || !renderer->isListItem()) 859 if (!renderer || !renderer->isListItem())
860 return String(); 860 return String();
861 861
862 return toRenderListItem(renderer)->markerText(); 862 return toRenderListItem(renderer)->markerText();
863 } 863 }
864 864
865 } // namespace WebCore 865 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/RenderView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698