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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/GraphicsLayer.h

Issue 2218533002: Backporting JSONValues from protocol::Values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Switch back to partition allocator Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2013 Intel Corporation. All rights reserved. 3 * Copyright (C) 2013 Intel Corporation. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 195
196 // For hosting this GraphicsLayer in a native layer hierarchy. 196 // For hosting this GraphicsLayer in a native layer hierarchy.
197 WebLayer* platformLayer() const; 197 WebLayer* platformLayer() const;
198 198
199 int paintCount() const { return m_paintCount; } 199 int paintCount() const { return m_paintCount; }
200 200
201 // Return a string with a human readable form of the layer tree, If debug is true 201 // Return a string with a human readable form of the layer tree, If debug is true
202 // pointers for the layers and timing data will be included in the returned string. 202 // pointers for the layers and timing data will be included in the returned string.
203 String layerTreeAsText(LayerTreeFlags = LayerTreeNormal) const; 203 String layerTreeAsText(LayerTreeFlags = LayerTreeNormal) const;
204 204
205 PassRefPtr<JSONObject> layerTreeAsJSON(LayerTreeFlags) const; 205 std::unique_ptr<JSONObject> layerTreeAsJSON(LayerTreeFlags) const;
206 206
207 void setTracksPaintInvalidations(bool); 207 void setTracksPaintInvalidations(bool);
208 bool isTrackingOrCheckingPaintInvalidations() const 208 bool isTrackingOrCheckingPaintInvalidations() const
209 { 209 {
210 #if DCHECK_IS_ON() 210 #if DCHECK_IS_ON()
211 if (RuntimeEnabledFeatures::slimmingPaintUnderInvalidationCheckingEnable d()) 211 if (RuntimeEnabledFeatures::slimmingPaintUnderInvalidationCheckingEnable d())
212 return true; 212 return true;
213 #endif 213 #endif
214 return m_isTrackingPaintInvalidations; 214 return m_isTrackingPaintInvalidations;
215 } 215 }
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 void updateChildList(); 289 void updateChildList();
290 void updateLayerIsDrawable(); 290 void updateLayerIsDrawable();
291 void updateContentsRect(); 291 void updateContentsRect();
292 292
293 void setContentsTo(WebLayer*); 293 void setContentsTo(WebLayer*);
294 void setupContentsLayer(WebLayer*); 294 void setupContentsLayer(WebLayer*);
295 void clearContentsLayerIfUnregistered(); 295 void clearContentsLayerIfUnregistered();
296 WebLayer* contentsLayerIfRegistered(); 296 WebLayer* contentsLayerIfRegistered();
297 297
298 typedef HashMap<int, int> RenderingContextMap; 298 typedef HashMap<int, int> RenderingContextMap;
299 PassRefPtr<JSONObject> layerTreeAsJSONInternal(LayerTreeFlags, RenderingCont extMap&) const; 299 std::unique_ptr<JSONObject> layerTreeAsJSONInternal(LayerTreeFlags, Renderin gContextMap&) const;
300 300
301 #if DCHECK_IS_ON() 301 #if DCHECK_IS_ON()
302 PassRefPtr<SkPicture> capturePicture(); 302 PassRefPtr<SkPicture> capturePicture();
303 void checkPaintUnderInvalidations(const SkPicture&); 303 void checkPaintUnderInvalidations(const SkPicture&);
304 #endif 304 #endif
305 305
306 GraphicsLayerClient* m_client; 306 GraphicsLayerClient* m_client;
307 307
308 // Offset from the owning layoutObject 308 // Offset from the owning layoutObject
309 DoubleSize m_offsetFromLayoutObject; 309 DoubleSize m_offsetFromLayoutObject;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 }; 379 };
380 380
381 } // namespace blink 381 } // namespace blink
382 382
383 #ifndef NDEBUG 383 #ifndef NDEBUG
384 // Outside the blink namespace for ease of invocation from gdb. 384 // Outside the blink namespace for ease of invocation from gdb.
385 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); 385 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*);
386 #endif 386 #endif
387 387
388 #endif // GraphicsLayer_h 388 #endif // GraphicsLayer_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/JSONValues.cpp ('k') | third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698