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

Side by Side Diff: Source/web/painting/ContinuousPainter.cpp

Issue 1264483002: PageOverlays: Remove PageOverlayList (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 5 years, 4 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/web/painting/ContinuousPainter.h ('k') | Source/web/web.gypi » ('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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 10 *
(...skipping 13 matching lines...) Expand all
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "config.h" 29 #include "config.h"
30 #include "web/painting/ContinuousPainter.h" 30 #include "web/painting/ContinuousPainter.h"
31 31
32 #include "platform/TraceEvent.h" 32 #include "platform/TraceEvent.h"
33 #include "platform/graphics/GraphicsLayer.h" 33 #include "platform/graphics/GraphicsLayer.h"
34 #include "web/PageOverlayList.h"
35 34
36 using namespace blink; 35 using namespace blink;
37 36
38 namespace blink { 37 namespace blink {
39 38
40 void ContinuousPainter::setNeedsDisplayRecursive(GraphicsLayer* layer, PageOverl ayList* pageOverlays) 39 void ContinuousPainter::setNeedsDisplayRecursive(GraphicsLayer* layer, GraphicsL ayer* overlayLayer)
41 { 40 {
42 if (!layer) 41 if (!layer)
43 return; 42 return;
44 43
45 if (pageOverlays && pageOverlays->findGraphicsLayer(layer) != WTF::kNotFound ) 44 if (layer == overlayLayer)
46 return; 45 return;
47 46
48 TRACE_EVENT0("blink", "ContinuousPainter::setNeedsDisplayRecursive"); 47 TRACE_EVENT0("blink", "ContinuousPainter::setNeedsDisplayRecursive");
49 layer->setNeedsDisplay(); 48 layer->setNeedsDisplay();
50 49
51 setNeedsDisplayRecursive(layer->maskLayer(), pageOverlays); 50 setNeedsDisplayRecursive(layer->maskLayer(), overlayLayer);
52 setNeedsDisplayRecursive(layer->contentsClippingMaskLayer(), pageOverlays); 51 setNeedsDisplayRecursive(layer->contentsClippingMaskLayer(), overlayLayer);
53 setNeedsDisplayRecursive(layer->replicaLayer(), pageOverlays); 52 setNeedsDisplayRecursive(layer->replicaLayer(), overlayLayer);
54 53
55 const Vector<GraphicsLayer*>& children = layer->children(); 54 const Vector<GraphicsLayer*>& children = layer->children();
56 Vector<GraphicsLayer*>::const_iterator it; 55 Vector<GraphicsLayer*>::const_iterator it;
57 for (it = children.begin(); it != children.end(); ++it) 56 for (it = children.begin(); it != children.end(); ++it)
58 setNeedsDisplayRecursive(*it, pageOverlays); 57 setNeedsDisplayRecursive(*it, overlayLayer);
59 } 58 }
60 59
61 } // namespace blink 60 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/painting/ContinuousPainter.h ('k') | Source/web/web.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698