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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp

Issue 2391383002: Moving platform tracing things into platform/tracing. (Closed)
Patch Set: Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
14 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
16 * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE 16 * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE
17 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 17 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
19 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 19 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
20 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 20 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
23 * DAMAGE. 23 * DAMAGE.
24 */ 24 */
25 25
26 #include "platform/graphics/ContentLayerDelegate.h" 26 #include "platform/graphics/ContentLayerDelegate.h"
27 27
28 #include "platform/RuntimeEnabledFeatures.h" 28 #include "platform/RuntimeEnabledFeatures.h"
29 #include "platform/TraceEvent.h"
30 #include "platform/TracedValue.h"
31 #include "platform/geometry/IntRect.h" 29 #include "platform/geometry/IntRect.h"
32 #include "platform/graphics/GraphicsContext.h" 30 #include "platform/graphics/GraphicsContext.h"
33 #include "platform/graphics/GraphicsLayer.h" 31 #include "platform/graphics/GraphicsLayer.h"
34 #include "platform/graphics/paint/PaintArtifactToSkCanvas.h" 32 #include "platform/graphics/paint/PaintArtifactToSkCanvas.h"
35 #include "platform/graphics/paint/PaintController.h" 33 #include "platform/graphics/paint/PaintController.h"
34 #include "platform/tracing/TraceEvent.h"
35 #include "platform/tracing/TracedValue.h"
36 #include "public/platform/WebDisplayItemList.h" 36 #include "public/platform/WebDisplayItemList.h"
37 #include "public/platform/WebRect.h" 37 #include "public/platform/WebRect.h"
38 #include "third_party/skia/include/core/SkPicture.h" 38 #include "third_party/skia/include/core/SkPicture.h"
39 #include "ui/gfx/geometry/rect.h" 39 #include "ui/gfx/geometry/rect.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 ContentLayerDelegate::ContentLayerDelegate(GraphicsLayer* graphicsLayer) 43 ContentLayerDelegate::ContentLayerDelegate(GraphicsLayer* graphicsLayer)
44 : m_graphicsLayer(graphicsLayer) {} 44 : m_graphicsLayer(graphicsLayer) {}
45 45
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 107
108 paintController.setDisplayItemConstructionIsDisabled(false); 108 paintController.setDisplayItemConstructionIsDisabled(false);
109 paintController.setSubsequenceCachingIsDisabled(false); 109 paintController.setSubsequenceCachingIsDisabled(false);
110 } 110 }
111 111
112 size_t ContentLayerDelegate::approximateUnsharedMemoryUsage() const { 112 size_t ContentLayerDelegate::approximateUnsharedMemoryUsage() const {
113 return m_graphicsLayer->getPaintController().approximateUnsharedMemoryUsage(); 113 return m_graphicsLayer->getPaintController().approximateUnsharedMemoryUsage();
114 } 114 }
115 115
116 } // namespace blink 116 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698