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

Side by Side Diff: Source/core/rendering/RenderVideo.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch 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
« no previous file with comments | « Source/core/rendering/RenderVTTCue.h ('k') | Source/core/rendering/RenderView.h » ('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) 2007, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2009, 2010 Apple 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
(...skipping 14 matching lines...) Expand all
25 25
26 #ifndef RenderVideo_h 26 #ifndef RenderVideo_h
27 #define RenderVideo_h 27 #define RenderVideo_h
28 28
29 #include "core/rendering/RenderMedia.h" 29 #include "core/rendering/RenderMedia.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 class HTMLVideoElement; 33 class HTMLVideoElement;
34 34
35 class RenderVideo FINAL : public RenderMedia { 35 class RenderVideo final : public RenderMedia {
36 public: 36 public:
37 RenderVideo(HTMLVideoElement*); 37 RenderVideo(HTMLVideoElement*);
38 virtual ~RenderVideo(); 38 virtual ~RenderVideo();
39 39
40 IntRect videoBox() const; 40 IntRect videoBox() const;
41 41
42 static IntSize defaultSize(); 42 static IntSize defaultSize();
43 43
44 bool supportsAcceleratedRendering() const; 44 bool supportsAcceleratedRendering() const;
45 45
46 bool shouldDisplayVideo() const; 46 bool shouldDisplayVideo() const;
47 HTMLVideoElement* videoElement() const; 47 HTMLVideoElement* videoElement() const;
48 bool acceleratedRenderingInUse(); 48 bool acceleratedRenderingInUse();
49 49
50 private: 50 private:
51 virtual void updateFromElement() OVERRIDE; 51 virtual void updateFromElement() override;
52 52
53 virtual void intrinsicSizeChanged() OVERRIDE; 53 virtual void intrinsicSizeChanged() override;
54 LayoutSize calculateIntrinsicSize(); 54 LayoutSize calculateIntrinsicSize();
55 void updateIntrinsicSize(); 55 void updateIntrinsicSize();
56 56
57 virtual void imageChanged(WrappedImagePtr, const IntRect*) OVERRIDE; 57 virtual void imageChanged(WrappedImagePtr, const IntRect*) override;
58 58
59 virtual const char* renderName() const OVERRIDE { return "RenderVideo"; } 59 virtual const char* renderName() const override { return "RenderVideo"; }
60 60
61 virtual bool isVideo() const OVERRIDE { return true; } 61 virtual bool isVideo() const override { return true; }
62 62
63 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) OVERRIDE; 63 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) override;
64 64
65 virtual void layout() OVERRIDE; 65 virtual void layout() override;
66 66
67 virtual LayoutUnit computeReplacedLogicalWidth(ShouldComputePreferred = Com puteActual) const OVERRIDE; 67 virtual LayoutUnit computeReplacedLogicalWidth(ShouldComputePreferred = Com puteActual) const override;
68 virtual LayoutUnit computeReplacedLogicalHeight() const OVERRIDE; 68 virtual LayoutUnit computeReplacedLogicalHeight() const override;
69 virtual LayoutUnit minimumReplacedHeight() const OVERRIDE; 69 virtual LayoutUnit minimumReplacedHeight() const override;
70 70
71 virtual LayoutUnit offsetLeft() const OVERRIDE; 71 virtual LayoutUnit offsetLeft() const override;
72 virtual LayoutUnit offsetTop() const OVERRIDE; 72 virtual LayoutUnit offsetTop() const override;
73 virtual LayoutUnit offsetWidth() const OVERRIDE; 73 virtual LayoutUnit offsetWidth() const override;
74 virtual LayoutUnit offsetHeight() const OVERRIDE; 74 virtual LayoutUnit offsetHeight() const override;
75 75
76 virtual CompositingReasons additionalCompositingReasons() const OVERRIDE; 76 virtual CompositingReasons additionalCompositingReasons() const override;
77 77
78 void updatePlayer(); 78 void updatePlayer();
79 79
80 80
81 LayoutSize m_cachedImageSize; 81 LayoutSize m_cachedImageSize;
82 }; 82 };
83 83
84 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderVideo, isVideo()); 84 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderVideo, isVideo());
85 85
86 } // namespace blink 86 } // namespace blink
87 87
88 #endif // RenderVideo_h 88 #endif // RenderVideo_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderVTTCue.h ('k') | Source/core/rendering/RenderView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698