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

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

Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase build fix Created 6 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) 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 class PLATFORM_EXPORT GraphicsLayer : public GraphicsContextPainter, public WebC ompositorAnimationDelegate, public WebLayerScrollClient, public WebLayerClient { 80 class PLATFORM_EXPORT GraphicsLayer : public GraphicsContextPainter, public WebC ompositorAnimationDelegate, public WebLayerScrollClient, public WebLayerClient {
81 WTF_MAKE_NONCOPYABLE(GraphicsLayer); WTF_MAKE_FAST_ALLOCATED; 81 WTF_MAKE_NONCOPYABLE(GraphicsLayer); WTF_MAKE_FAST_ALLOCATED;
82 public: 82 public:
83 static PassOwnPtr<GraphicsLayer> create(GraphicsLayerFactory*, GraphicsLayer Client*); 83 static PassOwnPtr<GraphicsLayer> create(GraphicsLayerFactory*, GraphicsLayer Client*);
84 84
85 virtual ~GraphicsLayer(); 85 virtual ~GraphicsLayer();
86 86
87 GraphicsLayerClient* client() const { return m_client; } 87 GraphicsLayerClient* client() const { return m_client; }
88 88
89 // WebLayerClient implementation. 89 // WebLayerClient implementation.
90 virtual WebGraphicsLayerDebugInfo* takeDebugInfoFor(WebLayer*) OVERRIDE; 90 virtual WebGraphicsLayerDebugInfo* takeDebugInfoFor(WebLayer*) override;
91 91
92 GraphicsLayerDebugInfo& debugInfo(); 92 GraphicsLayerDebugInfo& debugInfo();
93 93
94 void setCompositingReasons(CompositingReasons); 94 void setCompositingReasons(CompositingReasons);
95 CompositingReasons compositingReasons() const { return m_debugInfo.compositi ngReasons(); } 95 CompositingReasons compositingReasons() const { return m_debugInfo.compositi ngReasons(); }
96 void setOwnerNodeId(int); 96 void setOwnerNodeId(int);
97 97
98 GraphicsLayer* parent() const { return m_parent; }; 98 GraphicsLayer* parent() const { return m_parent; };
99 void setParent(GraphicsLayer*); // Internal use only. 99 void setParent(GraphicsLayer*); // Internal use only.
100 100
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 225
226 void setScrollableArea(ScrollableArea*, bool isViewport); 226 void setScrollableArea(ScrollableArea*, bool isViewport);
227 ScrollableArea* scrollableArea() const { return m_scrollableArea; } 227 ScrollableArea* scrollableArea() const { return m_scrollableArea; }
228 228
229 WebContentLayer* contentLayer() const { return m_layer.get(); } 229 WebContentLayer* contentLayer() const { return m_layer.get(); }
230 230
231 static void registerContentsLayer(WebLayer*); 231 static void registerContentsLayer(WebLayer*);
232 static void unregisterContentsLayer(WebLayer*); 232 static void unregisterContentsLayer(WebLayer*);
233 233
234 // GraphicsContextPainter implementation. 234 // GraphicsContextPainter implementation.
235 virtual void paint(GraphicsContext&, const IntRect& clip) OVERRIDE; 235 virtual void paint(GraphicsContext&, const IntRect& clip) override;
236 236
237 // WebCompositorAnimationDelegate implementation. 237 // WebCompositorAnimationDelegate implementation.
238 virtual void notifyAnimationStarted(double monotonicTime, WebCompositorAnima tion::TargetProperty) OVERRIDE; 238 virtual void notifyAnimationStarted(double monotonicTime, WebCompositorAnima tion::TargetProperty) override;
239 virtual void notifyAnimationFinished(double monotonicTime, WebCompositorAnim ation::TargetProperty) OVERRIDE; 239 virtual void notifyAnimationFinished(double monotonicTime, WebCompositorAnim ation::TargetProperty) override;
240 240
241 // WebLayerScrollClient implementation. 241 // WebLayerScrollClient implementation.
242 virtual void didScroll() OVERRIDE; 242 virtual void didScroll() override;
243 243
244 protected: 244 protected:
245 String debugName(WebLayer*) const; 245 String debugName(WebLayer*) const;
246 246
247 explicit GraphicsLayer(GraphicsLayerClient*); 247 explicit GraphicsLayer(GraphicsLayerClient*);
248 // GraphicsLayerFactoryChromium that wants to create a GraphicsLayer need to be friends. 248 // GraphicsLayerFactoryChromium that wants to create a GraphicsLayer need to be friends.
249 friend class GraphicsLayerFactoryChromium; 249 friend class GraphicsLayerFactoryChromium;
250 250
251 // Exposed for tests. 251 // Exposed for tests.
252 virtual WebLayer* contentsLayer() const { return m_contentsLayer; } 252 virtual WebLayer* contentsLayer() const { return m_contentsLayer; }
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 }; 343 };
344 344
345 } // namespace blink 345 } // namespace blink
346 346
347 #ifndef NDEBUG 347 #ifndef NDEBUG
348 // Outside the WebCore namespace for ease of invocation from gdb. 348 // Outside the WebCore namespace for ease of invocation from gdb.
349 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*); 349 void PLATFORM_EXPORT showGraphicsLayerTree(const blink::GraphicsLayer*);
350 #endif 350 #endif
351 351
352 #endif // GraphicsLayer_h 352 #endif // GraphicsLayer_h
OLDNEW
« no previous file with comments | « Source/platform/graphics/GradientGeneratedImage.h ('k') | Source/platform/graphics/GraphicsLayerDebugInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698