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

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

Issue 10342008: Revert 114283 - Avoid using backing store for compositing layers that just need to clip (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1123/
Patch Set: Created 8 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
« no previous file with comments | « Source/WebCore/rendering/RenderObject.cpp ('k') | Source/WebCore/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 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 } 624 }
625 625
626 if (paintPhase == LayerPaintPhaseBackground) 626 if (paintPhase == LayerPaintPhaseBackground)
627 ts << " layerType: background only"; 627 ts << " layerType: background only";
628 else if (paintPhase == LayerPaintPhaseForeground) 628 else if (paintPhase == LayerPaintPhaseForeground)
629 ts << " layerType: foreground only"; 629 ts << " layerType: foreground only";
630 630
631 #if USE(ACCELERATED_COMPOSITING) 631 #if USE(ACCELERATED_COMPOSITING)
632 if (behavior & RenderAsTextShowCompositedLayers) { 632 if (behavior & RenderAsTextShowCompositedLayers) {
633 if (l.isComposited()) 633 if (l.isComposited())
634 ts << " (composited, bounds=" << l.backing()->compositedBounds() << ", drawsContent=" << l.backing()->graphicsLayer()->drawsContent() << ", paints i nto ancestor=" << l.backing()->paintsIntoCompositedAncestor() << ")"; 634 ts << " (composited, bounds " << l.backing()->compositedBounds() << ")";
635 } 635 }
636 #else 636 #else
637 UNUSED_PARAM(behavior); 637 UNUSED_PARAM(behavior);
638 #endif 638 #endif
639 639
640 ts << "\n"; 640 ts << "\n";
641 641
642 if (paintPhase != LayerPaintPhaseBackground) 642 if (paintPhase != LayerPaintPhaseBackground)
643 write(ts, *l.renderer(), indent + 1, behavior); 643 write(ts, *l.renderer(), indent + 1, behavior);
644 } 644 }
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 element->document()->updateLayout(); 887 element->document()->updateLayout();
888 888
889 RenderObject* renderer = element->renderer(); 889 RenderObject* renderer = element->renderer();
890 if (!renderer || !renderer->isListItem()) 890 if (!renderer || !renderer->isListItem())
891 return String(); 891 return String();
892 892
893 return toRenderListItem(renderer)->markerText(); 893 return toRenderListItem(renderer)->markerText();
894 } 894 }
895 895
896 } // namespace WebCore 896 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderObject.cpp ('k') | Source/WebCore/rendering/RenderView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698