<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167535] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167535">167535</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-04-19 10:36:16 -0700 (Sat, 19 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use 'override' in GraphicsLayerCA
https://bugs.webkit.org/show_bug.cgi?id=131882
Reviewed by Tim Horton.
Source/WebCore:
Add 'override' to all overridden functions. Found a few that need
not have been virtual. Removed "allowTiledLayer" stuff that was
never called.
* WebCore.exp.in:
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::GraphicsLayerCA):
(WebCore::GraphicsLayerCA::requiresTiledLayer):
(WebCore::GraphicsLayerCA::setAllowTiledLayer): Deleted.
* platform/graphics/ca/GraphicsLayerCA.h:
(WebCore::GraphicsLayerCA::platformCALayer):
(WebCore::GraphicsLayerCA::hasContentsLayer): Deleted.
(WebCore::GraphicsLayerCA::allowTiledLayer): Deleted.
(WebCore::GraphicsLayerCA::isGraphicsLayerCA): Deleted.
(WebCore::GraphicsLayerCA::platformCALayerLayoutSublayersOfLayer): Deleted.
(WebCore::GraphicsLayerCA::platformCALayerRespondsToLayoutChanges): Deleted.
(WebCore::GraphicsLayerCA::platformCALayerContentsOrientation): Deleted.
(WebCore::GraphicsLayerCA::platformCALayerShowDebugBorders): Deleted.
(WebCore::GraphicsLayerCA::platformCALayerIncrementRepaintCount): Deleted.
(WebCore::GraphicsLayerCA::platformCALayerContentsOpaque): Deleted.
(WebCore::GraphicsLayerCA::platformCALayerDrawsContent): Deleted.
(WebCore::GraphicsLayerCA::platformCALayerLayerDidDisplay): Deleted.
Source/WebKit2:
Add an 'override'.
* WebProcess/WebPage/mac/GraphicsLayerCARemote.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacGraphicsLayerCARemoteh">trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167534 => 167535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-19 17:04:52 UTC (rev 167534)
+++ trunk/Source/WebCore/ChangeLog 2014-04-19 17:36:16 UTC (rev 167535)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-04-18 Simon Fraser <simon.fraser@apple.com>
+
+ Use 'override' in GraphicsLayerCA
+ https://bugs.webkit.org/show_bug.cgi?id=131882
+
+ Reviewed by Tim Horton.
+
+ Add 'override' to all overridden functions. Found a few that need
+ not have been virtual. Removed "allowTiledLayer" stuff that was
+ never called.
+
+ * WebCore.exp.in:
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::GraphicsLayerCA):
+ (WebCore::GraphicsLayerCA::requiresTiledLayer):
+ (WebCore::GraphicsLayerCA::setAllowTiledLayer): Deleted.
+ * platform/graphics/ca/GraphicsLayerCA.h:
+ (WebCore::GraphicsLayerCA::platformCALayer):
+ (WebCore::GraphicsLayerCA::hasContentsLayer): Deleted.
+ (WebCore::GraphicsLayerCA::allowTiledLayer): Deleted.
+ (WebCore::GraphicsLayerCA::isGraphicsLayerCA): Deleted.
+ (WebCore::GraphicsLayerCA::platformCALayerLayoutSublayersOfLayer): Deleted.
+ (WebCore::GraphicsLayerCA::platformCALayerRespondsToLayoutChanges): Deleted.
+ (WebCore::GraphicsLayerCA::platformCALayerContentsOrientation): Deleted.
+ (WebCore::GraphicsLayerCA::platformCALayerShowDebugBorders): Deleted.
+ (WebCore::GraphicsLayerCA::platformCALayerIncrementRepaintCount): Deleted.
+ (WebCore::GraphicsLayerCA::platformCALayerContentsOpaque): Deleted.
+ (WebCore::GraphicsLayerCA::platformCALayerDrawsContent): Deleted.
+ (WebCore::GraphicsLayerCA::platformCALayerLayerDidDisplay): Deleted.
+
</ins><span class="cx"> 2014-04-18 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Move InspectorProfilerAgent to JavaScriptCore
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (167534 => 167535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-04-19 17:04:52 UTC (rev 167534)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-19 17:36:16 UTC (rev 167535)
</span><span class="lines">@@ -553,7 +553,6 @@
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA17setContentsOpaqueEb
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA17setCustomBehaviorENS_13GraphicsLayer14CustomBehaviorE
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA17suspendAnimationsEd
</span><del>-__ZN7WebCore15GraphicsLayerCA18setAllowTiledLayerEb
</del><span class="cx"> __ZN7WebCore15GraphicsLayerCA18setBackgroundColorERKNS_5ColorE
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA18setContentsToImageEPNS_5ImageE
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA18setContentsToMediaEP7CALayer
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (167534 => 167535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-04-19 17:04:52 UTC (rev 167534)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-04-19 17:36:16 UTC (rev 167535)
</span><span class="lines">@@ -363,7 +363,6 @@
</span><span class="cx"> GraphicsLayerCA::GraphicsLayerCA(GraphicsLayerClient* client)
</span><span class="cx"> : GraphicsLayer(client)
</span><span class="cx"> , m_contentsLayerPurpose(NoContentsLayer)
</span><del>- , m_allowTiledLayer(true)
</del><span class="cx"> , m_isPageTiledBackingLayer(false)
</span><span class="cx"> , m_rootRelativeScaleFactor(1)
</span><span class="cx"> , m_uncommittedChanges(0)
</span><span class="lines">@@ -658,17 +657,6 @@
</span><span class="cx"> noteLayerPropertyChanged(AcceleratesDrawingChanged);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsLayerCA::setAllowTiledLayer(bool allowTiledLayer)
-{
- if (allowTiledLayer == m_allowTiledLayer)
- return;
-
- m_allowTiledLayer = allowTiledLayer;
-
- // Handling this as a BoundsChanged will cause use to switch in or out of tiled layer as needed
- noteLayerPropertyChanged(GeometryChanged);
-}
-
</del><span class="cx"> void GraphicsLayerCA::setBackgroundColor(const Color& color)
</span><span class="cx"> {
</span><span class="cx"> if (m_backgroundColor == color)
</span><span class="lines">@@ -3133,7 +3121,7 @@
</span><span class="cx">
</span><span class="cx"> bool GraphicsLayerCA::requiresTiledLayer(float pageScaleFactor) const
</span><span class="cx"> {
</span><del>- if (!m_drawsContent || !m_allowTiledLayer || m_isPageTiledBackingLayer)
</del><ins>+ if (!m_drawsContent || m_isPageTiledBackingLayer)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // FIXME: catch zero-size height or width here (or earlier)?
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (167534 => 167535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-04-19 17:04:52 UTC (rev 167534)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-04-19 17:36:16 UTC (rev 167535)
</span><span class="lines">@@ -60,50 +60,50 @@
</span><span class="cx">
</span><span class="cx"> virtual void initialize() override;
</span><span class="cx">
</span><del>- virtual void setName(const String&);
</del><ins>+ virtual void setName(const String&) override;
</ins><span class="cx">
</span><span class="cx"> virtual PlatformLayerID primaryLayerID() const override;
</span><span class="cx">
</span><del>- virtual PlatformLayer* platformLayer() const;
- virtual PlatformCALayer* platformCALayer() const { return primaryLayer(); }
</del><ins>+ virtual PlatformLayer* platformLayer() const override;
+ PlatformCALayer* platformCALayer() const { return primaryLayer(); }
</ins><span class="cx">
</span><del>- virtual bool setChildren(const Vector<GraphicsLayer*>&);
- virtual void addChild(GraphicsLayer*);
- virtual void addChildAtIndex(GraphicsLayer*, int index);
- virtual void addChildAbove(GraphicsLayer* layer, GraphicsLayer* sibling);
- virtual void addChildBelow(GraphicsLayer* layer, GraphicsLayer* sibling);
- virtual bool replaceChild(GraphicsLayer* oldChild, GraphicsLayer* newChild);
</del><ins>+ virtual bool setChildren(const Vector<GraphicsLayer*>&) override;
+ virtual void addChild(GraphicsLayer*) override;
+ virtual void addChildAtIndex(GraphicsLayer*, int index) override;
+ virtual void addChildAbove(GraphicsLayer*, GraphicsLayer* sibling) override;
+ virtual void addChildBelow(GraphicsLayer*, GraphicsLayer* sibling) override;
+ virtual bool replaceChild(GraphicsLayer* oldChild, GraphicsLayer* newChild) override;
</ins><span class="cx">
</span><del>- virtual void removeFromParent();
</del><ins>+ virtual void removeFromParent() override;
</ins><span class="cx">
</span><del>- virtual void setMaskLayer(GraphicsLayer*);
- virtual void setReplicatedLayer(GraphicsLayer*);
</del><ins>+ virtual void setMaskLayer(GraphicsLayer*) override;
+ virtual void setReplicatedLayer(GraphicsLayer*) override;
</ins><span class="cx">
</span><del>- virtual void setPosition(const FloatPoint&);
- virtual void setAnchorPoint(const FloatPoint3D&);
- virtual void setSize(const FloatSize&);
- virtual void setBoundsOrigin(const FloatPoint&);
</del><ins>+ virtual void setPosition(const FloatPoint&) override;
+ virtual void setAnchorPoint(const FloatPoint3D&) override;
+ virtual void setSize(const FloatSize&) override;
+ virtual void setBoundsOrigin(const FloatPoint&) override;
</ins><span class="cx">
</span><del>- virtual void setTransform(const TransformationMatrix&);
</del><ins>+ virtual void setTransform(const TransformationMatrix&) override;
</ins><span class="cx">
</span><del>- virtual void setChildrenTransform(const TransformationMatrix&);
</del><ins>+ virtual void setChildrenTransform(const TransformationMatrix&) override;
</ins><span class="cx">
</span><del>- virtual void setPreserves3D(bool);
- virtual void setMasksToBounds(bool);
- virtual void setDrawsContent(bool);
- virtual void setContentsVisible(bool);
- virtual void setAcceleratesDrawing(bool);
</del><ins>+ virtual void setPreserves3D(bool) override;
+ virtual void setMasksToBounds(bool) override;
+ virtual void setDrawsContent(bool) override;
+ virtual void setContentsVisible(bool) override;
+ virtual void setAcceleratesDrawing(bool) override;
</ins><span class="cx">
</span><del>- virtual void setBackgroundColor(const Color&);
</del><ins>+ virtual void setBackgroundColor(const Color&) override;
</ins><span class="cx">
</span><del>- virtual void setContentsOpaque(bool);
- virtual void setBackfaceVisibility(bool);
</del><ins>+ virtual void setContentsOpaque(bool) override;
+ virtual void setBackfaceVisibility(bool) override;
</ins><span class="cx">
</span><span class="cx"> // return true if we started an animation
</span><del>- virtual void setOpacity(float);
</del><ins>+ virtual void setOpacity(float) override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><del>- virtual bool setFilters(const FilterOperations&);
</del><ins>+ virtual bool setFilters(const FilterOperations&) override;
</ins><span class="cx"> virtual bool filtersCanBeComposited(const FilterOperations&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -111,46 +111,46 @@
</span><span class="cx"> virtual void setBlendMode(BlendMode) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual void setNeedsDisplay();
- virtual void setNeedsDisplayInRect(const FloatRect&, ShouldClipToLayer = ClipToLayer);
- virtual void setContentsNeedsDisplay();
</del><ins>+ virtual void setNeedsDisplay() override;
+ virtual void setNeedsDisplayInRect(const FloatRect&, ShouldClipToLayer = ClipToLayer) override;
+ virtual void setContentsNeedsDisplay() override;
</ins><span class="cx">
</span><span class="cx"> virtual void setContentsRect(const FloatRect&) override;
</span><span class="cx"> virtual void setContentsClippingRect(const FloatRect&) override;
</span><span class="cx">
</span><del>- virtual void suspendAnimations(double time);
- virtual void resumeAnimations();
</del><ins>+ virtual void suspendAnimations(double time) override;
+ virtual void resumeAnimations() override;
</ins><span class="cx">
</span><del>- virtual bool addAnimation(const KeyframeValueList&, const FloatSize& boxSize, const Animation*, const String& animationName, double timeOffset);
- virtual void pauseAnimation(const String& animationName, double timeOffset);
- virtual void removeAnimation(const String& animationName);
</del><ins>+ virtual bool addAnimation(const KeyframeValueList&, const FloatSize& boxSize, const Animation*, const String& animationName, double timeOffset) override;
+ virtual void pauseAnimation(const String& animationName, double timeOffset) override;
+ virtual void removeAnimation(const String& animationName) override;
</ins><span class="cx">
</span><del>- virtual void setContentsToImage(Image*);
- virtual void setContentsToMedia(PlatformLayer*);
</del><ins>+ virtual void setContentsToImage(Image*) override;
+ virtual void setContentsToMedia(PlatformLayer*) override;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual PlatformLayer* contentsLayerForMedia() const override;
</span><span class="cx"> #endif
</span><del>- virtual void setContentsToCanvas(PlatformLayer*);
- virtual void setContentsToSolidColor(const Color&);
</del><ins>+ virtual void setContentsToCanvas(PlatformLayer*) override;
+ virtual void setContentsToSolidColor(const Color&) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool usesContentsLayer() const override { return m_contentsLayerPurpose != NoContentsLayer; }
</span><span class="cx">
</span><span class="cx"> virtual void setShowDebugBorder(bool) override;
</span><span class="cx"> virtual void setShowRepaintCounter(bool) override;
</span><span class="cx">
</span><del>- virtual void setDebugBackgroundColor(const Color&);
- virtual void setDebugBorder(const Color&, float borderWidth);
</del><ins>+ virtual void setDebugBackgroundColor(const Color&) override;
+ virtual void setDebugBorder(const Color&, float borderWidth) override;
</ins><span class="cx">
</span><del>- virtual void setCustomAppearance(CustomAppearance);
- virtual void setCustomBehavior(CustomBehavior);
</del><ins>+ virtual void setCustomAppearance(CustomAppearance) override;
+ virtual void setCustomBehavior(CustomBehavior) override;
</ins><span class="cx">
</span><del>- virtual void layerDidDisplay(PlatformLayer*);
</del><ins>+ virtual void layerDidDisplay(PlatformLayer*) override;
</ins><span class="cx">
</span><del>- virtual void setMaintainsPixelAlignment(bool);
</del><ins>+ virtual void setMaintainsPixelAlignment(bool) override;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual FloatSize pixelAlignmentOffset() const override { return m_pixelAlignmentOffset; }
</span><span class="cx"> #endif
</span><del>- virtual void deviceOrPageScaleFactorChanged();
</del><ins>+ virtual void deviceOrPageScaleFactorChanged() override;
</ins><span class="cx">
</span><span class="cx"> struct CommitState {
</span><span class="cx"> bool ancestorHasTransformAnimation;
</span><span class="lines">@@ -162,40 +162,37 @@
</span><span class="cx"> };
</span><span class="cx"> void recursiveCommitChanges(const CommitState&, const TransformState&, const TransformationMatrix& rootRelativeTransformForScaling, float pageScaleFactor = 1, const FloatPoint& positionRelativeToBase = FloatPoint(), bool affectedByPageScale = false);
</span><span class="cx">
</span><del>- virtual void flushCompositingState(const FloatRect&);
- virtual void flushCompositingStateForThisLayerOnly();
</del><ins>+ virtual void flushCompositingState(const FloatRect&) override;
+ virtual void flushCompositingStateForThisLayerOnly() override;
</ins><span class="cx">
</span><span class="cx"> virtual bool visibleRectChangeRequiresFlush(const FloatRect& visibleRect) const override;
</span><span class="cx">
</span><span class="cx"> virtual TiledBacking* tiledBacking() const override;
</span><span class="cx">
</span><del>- bool allowTiledLayer() const { return m_allowTiledLayer; }
- virtual void setAllowTiledLayer(bool b);
-
</del><span class="cx"> protected:
</span><del>- virtual void setOpacityInternal(float);
</del><ins>+ virtual void setOpacityInternal(float) override;
</ins><span class="cx">
</span><span class="cx"> bool animationCanBeAccelerated(const KeyframeValueList&, const Animation*) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool isGraphicsLayerCA() const { return true; }
</del><ins>+ virtual bool isGraphicsLayerCA() const override { return true; }
</ins><span class="cx">
</span><del>- virtual void willBeDestroyed();
</del><ins>+ virtual void willBeDestroyed() override;
</ins><span class="cx">
</span><span class="cx"> // PlatformCALayerClient overrides
</span><del>- virtual void platformCALayerLayoutSublayersOfLayer(PlatformCALayer*) { }
- virtual bool platformCALayerRespondsToLayoutChanges() const { return false; }
</del><ins>+ virtual void platformCALayerLayoutSublayersOfLayer(PlatformCALayer*) override { }
+ virtual bool platformCALayerRespondsToLayoutChanges() const override { return false; }
</ins><span class="cx">
</span><del>- virtual void platformCALayerAnimationStarted(CFTimeInterval beginTime);
- virtual CompositingCoordinatesOrientation platformCALayerContentsOrientation() const { return contentsOrientation(); }
- virtual void platformCALayerPaintContents(PlatformCALayer*, GraphicsContext&, const FloatRect& clip);
- virtual bool platformCALayerShowDebugBorders() const { return isShowingDebugBorder(); }
- virtual bool platformCALayerShowRepaintCounter(PlatformCALayer*) const;
- virtual int platformCALayerIncrementRepaintCount(PlatformCALayer*) { return incrementRepaintCount(); }
</del><ins>+ virtual void platformCALayerAnimationStarted(CFTimeInterval beginTime) override;
+ virtual CompositingCoordinatesOrientation platformCALayerContentsOrientation() const override { return contentsOrientation(); }
+ virtual void platformCALayerPaintContents(PlatformCALayer*, GraphicsContext&, const FloatRect& clip) override;
+ virtual bool platformCALayerShowDebugBorders() const override { return isShowingDebugBorder(); }
+ virtual bool platformCALayerShowRepaintCounter(PlatformCALayer*) const override;
+ virtual int platformCALayerIncrementRepaintCount(PlatformCALayer*) override { return incrementRepaintCount(); }
</ins><span class="cx">
</span><del>- virtual bool platformCALayerContentsOpaque() const { return contentsOpaque(); }
- virtual bool platformCALayerDrawsContent() const { return drawsContent(); }
- virtual void platformCALayerLayerDidDisplay(PlatformLayer* layer) { return layerDidDisplay(layer); }
</del><ins>+ virtual bool platformCALayerContentsOpaque() const override { return contentsOpaque(); }
+ virtual bool platformCALayerDrawsContent() const override { return drawsContent(); }
+ virtual void platformCALayerLayerDidDisplay(PlatformLayer* layer) override { return layerDidDisplay(layer); }
</ins><span class="cx"> virtual void platformCALayerSetNeedsToRevalidateTiles() override;
</span><span class="cx"> virtual float platformCALayerDeviceScaleFactor() const override;
</span><span class="cx"> virtual float platformCALayerContentsScaleMultiplierForNewTiles(PlatformCALayer*) const override;
</span><span class="lines">@@ -204,7 +201,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isCommittingChanges() const override { return m_isCommittingChanges; }
</span><span class="cx">
</span><del>- virtual double backingStoreMemoryEstimate() const;
</del><ins>+ virtual double backingStoreMemoryEstimate() const override;
</ins><span class="cx">
</span><span class="cx"> virtual bool shouldRepaintOnSizeChange() const override;
</span><span class="cx">
</span><span class="lines">@@ -282,10 +279,10 @@
</span><span class="cx"> bool mediaLayerMustBeUpdatedOnMainThread() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual void setReplicatedByLayer(GraphicsLayer*);
</del><ins>+ virtual void setReplicatedByLayer(GraphicsLayer*) override;
</ins><span class="cx">
</span><del>- virtual void getDebugBorderInfo(Color&, float& width) const;
- virtual void dumpAdditionalProperties(TextStream&, int indent, LayerTreeAsTextBehavior) const;
</del><ins>+ virtual void getDebugBorderInfo(Color&, float& width) const override;
+ virtual void dumpAdditionalProperties(TextStream&, int indent, LayerTreeAsTextBehavior) const override;
</ins><span class="cx">
</span><span class="cx"> void computePixelAlignment(float pixelAlignmentScale, const FloatPoint& positionRelativeToBase,
</span><span class="cx"> FloatPoint& position, FloatSize&, FloatPoint3D& anchorPoint, FloatSize& alignmentOffset) const;
</span><span class="lines">@@ -302,7 +299,7 @@
</span><span class="cx">
</span><span class="cx"> bool recursiveVisibleRectChangeRequiresFlush(const TransformState&) const;
</span><span class="cx">
</span><del>- virtual bool canThrottleLayerFlush() const;
</del><ins>+ virtual bool canThrottleLayerFlush() const override;
</ins><span class="cx">
</span><span class="cx"> // Used to track the path down the tree for replica layers.
</span><span class="cx"> struct ReplicaState {
</span><span class="lines">@@ -495,7 +492,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ContentsLayerPurpose m_contentsLayerPurpose;
</span><del>- bool m_allowTiledLayer : 1;
</del><span class="cx"> bool m_isPageTiledBackingLayer : 1;
</span><span class="cx">
</span><span class="cx"> float m_rootRelativeScaleFactor;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167534 => 167535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-19 17:04:52 UTC (rev 167534)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-19 17:36:16 UTC (rev 167535)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-04-18 Simon Fraser <simon.fraser@apple.com>
+
+ Use 'override' in GraphicsLayerCA
+ https://bugs.webkit.org/show_bug.cgi?id=131882
+
+ Reviewed by Tim Horton.
+
+ Add an 'override'.
+
+ * WebProcess/WebPage/mac/GraphicsLayerCARemote.h:
+
</ins><span class="cx"> 2014-04-19 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Assertion in WebPage::runModal accesses object after it may have been destroyed
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacGraphicsLayerCARemoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h (167534 => 167535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h 2014-04-19 17:04:52 UTC (rev 167534)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h 2014-04-19 17:36:16 UTC (rev 167535)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool isGraphicsLayerCARemote() const { return true; }
</del><ins>+ virtual bool isGraphicsLayerCARemote() const override { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual PassRefPtr<WebCore::PlatformCALayer> createPlatformCALayer(WebCore::PlatformCALayer::LayerType, WebCore::PlatformCALayerClient* owner) override;
</span><span class="cx"> virtual PassRefPtr<WebCore::PlatformCALayer> createPlatformCALayer(PlatformLayer*, WebCore::PlatformCALayerClient* owner) override;
</span></span></pre>
</div>
</div>
</body>
</html>