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

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

Issue 91183002: Timeline: do not rely on UpdateLayer & PaintLayer trace events (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: re-upload Created 7 years 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/inspector/TimelineTraceEventProcessor.cpp ('k') | no next file » | 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) 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010, 2011 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 1731 matching lines...) Expand 10 before | Expand all | Expand 10 after
1742 context.restore(); 1742 context.restore();
1743 } 1743 }
1744 1744
1745 // Up-call from compositing layer drawing callback. 1745 // Up-call from compositing layer drawing callback.
1746 void CompositedLayerMapping::paintContents(const GraphicsLayer* graphicsLayer, G raphicsContext& context, GraphicsLayerPaintingPhase paintingPhase, const IntRect & clip) 1746 void CompositedLayerMapping::paintContents(const GraphicsLayer* graphicsLayer, G raphicsContext& context, GraphicsLayerPaintingPhase paintingPhase, const IntRect & clip)
1747 { 1747 {
1748 #ifndef NDEBUG 1748 #ifndef NDEBUG
1749 if (Page* page = renderer()->frame()->page()) 1749 if (Page* page = renderer()->frame()->page())
1750 page->setIsPainting(true); 1750 page->setIsPainting(true);
1751 #endif 1751 #endif
1752 InspectorInstrumentation::willPaint(m_owningLayer->renderer()); 1752 InspectorInstrumentation::willPaint(m_owningLayer->renderer(), graphicsLayer );
1753 1753
1754 if (graphicsLayer == m_graphicsLayer.get() 1754 if (graphicsLayer == m_graphicsLayer.get()
1755 || graphicsLayer == m_foregroundLayer.get() 1755 || graphicsLayer == m_foregroundLayer.get()
1756 || graphicsLayer == m_backgroundLayer.get() 1756 || graphicsLayer == m_backgroundLayer.get()
1757 || graphicsLayer == m_maskLayer.get() 1757 || graphicsLayer == m_maskLayer.get()
1758 || graphicsLayer == m_childClippingMaskLayer.get() 1758 || graphicsLayer == m_childClippingMaskLayer.get()
1759 || graphicsLayer == m_scrollingContentsLayer.get()) { 1759 || graphicsLayer == m_scrollingContentsLayer.get()) {
1760 1760
1761 GraphicsLayerPaintInfo paintInfo; 1761 GraphicsLayerPaintInfo paintInfo;
1762 paintInfo.renderLayer = m_owningLayer; 1762 paintInfo.renderLayer = m_owningLayer;
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
2031 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { 2031 } else if (graphicsLayer == m_scrollingContentsLayer.get()) {
2032 name = "Scrolling Contents Layer"; 2032 name = "Scrolling Contents Layer";
2033 } else { 2033 } else {
2034 ASSERT_NOT_REACHED(); 2034 ASSERT_NOT_REACHED();
2035 } 2035 }
2036 2036
2037 return name; 2037 return name;
2038 } 2038 }
2039 2039
2040 } // namespace WebCore 2040 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/inspector/TimelineTraceEventProcessor.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698