| OLD | NEW |
| 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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 void SetScrollableArea(ScrollableArea*, bool is_visual_viewport); | 242 void SetScrollableArea(ScrollableArea*, bool is_visual_viewport); |
| 243 ScrollableArea* GetScrollableArea() const { return scrollable_area_; } | 243 ScrollableArea* GetScrollableArea() const { return scrollable_area_; } |
| 244 | 244 |
| 245 WebContentLayer* ContentLayer() const { return layer_.get(); } | 245 WebContentLayer* ContentLayer() const { return layer_.get(); } |
| 246 | 246 |
| 247 static void RegisterContentsLayer(WebLayer*); | 247 static void RegisterContentsLayer(WebLayer*); |
| 248 static void UnregisterContentsLayer(WebLayer*); | 248 static void UnregisterContentsLayer(WebLayer*); |
| 249 | 249 |
| 250 IntRect InterestRect(); | 250 IntRect InterestRect(); |
| 251 void Paint(const IntRect* interest_rect, | 251 void Paint(const IntRect* interest_rect, |
| 252 HighContrastSettings* = nullptr, |
| 252 GraphicsContext::DisabledMode = GraphicsContext::kNothingDisabled); | 253 GraphicsContext::DisabledMode = GraphicsContext::kNothingDisabled); |
| 253 | 254 |
| 254 // cc::LayerClient implementation. | 255 // cc::LayerClient implementation. |
| 255 std::unique_ptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo( | 256 std::unique_ptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo( |
| 256 cc::Layer*) override; | 257 cc::Layer*) override; |
| 257 void didUpdateMainThreadScrollingReasons() override; | 258 void didUpdateMainThreadScrollingReasons() override; |
| 258 void didChangeScrollbarsHidden(bool); | 259 void didChangeScrollbarsHidden(bool); |
| 259 | 260 |
| 260 PaintController& GetPaintController(); | 261 PaintController& GetPaintController(); |
| 261 | 262 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 283 | 284 |
| 284 explicit GraphicsLayer(GraphicsLayerClient*); | 285 explicit GraphicsLayer(GraphicsLayerClient*); |
| 285 // for testing | 286 // for testing |
| 286 friend class CompositedLayerMappingTest; | 287 friend class CompositedLayerMappingTest; |
| 287 friend class PaintControllerPaintTestBase; | 288 friend class PaintControllerPaintTestBase; |
| 288 | 289 |
| 289 private: | 290 private: |
| 290 // Returns true if PaintController::paintArtifact() changed and needs commit. | 291 // Returns true if PaintController::paintArtifact() changed and needs commit. |
| 291 bool PaintWithoutCommit( | 292 bool PaintWithoutCommit( |
| 292 const IntRect* interest_rect, | 293 const IntRect* interest_rect, |
| 294 HighContrastSettings* = nullptr, |
| 293 GraphicsContext::DisabledMode = GraphicsContext::kNothingDisabled); | 295 GraphicsContext::DisabledMode = GraphicsContext::kNothingDisabled); |
| 294 | 296 |
| 295 // Adds a child without calling updateChildList(), so that adding children | 297 // Adds a child without calling updateChildList(), so that adding children |
| 296 // can be batched before updating. | 298 // can be batched before updating. |
| 297 void AddChildInternal(GraphicsLayer*); | 299 void AddChildInternal(GraphicsLayer*); |
| 298 | 300 |
| 299 #if DCHECK_IS_ON() | 301 #if DCHECK_IS_ON() |
| 300 bool HasAncestor(GraphicsLayer*) const; | 302 bool HasAncestor(GraphicsLayer*) const; |
| 301 #endif | 303 #endif |
| 302 | 304 |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 }; | 397 }; |
| 396 | 398 |
| 397 } // namespace blink | 399 } // namespace blink |
| 398 | 400 |
| 399 #ifndef NDEBUG | 401 #ifndef NDEBUG |
| 400 // Outside the blink namespace for ease of invocation from gdb. | 402 // Outside the blink namespace for ease of invocation from gdb. |
| 401 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); | 403 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); |
| 402 #endif | 404 #endif |
| 403 | 405 |
| 404 #endif // GraphicsLayer_h | 406 #endif // GraphicsLayer_h |
| OLD | NEW |