Changeset 167535 in webkit


Ignore:
Timestamp:
Apr 19, 2014 10:36:16 AM (10 years ago)
Author:
Simon Fraser
Message:

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:
Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r167530 r167535  
     12014-04-18  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Use 'override' in GraphicsLayerCA
     4        https://bugs.webkit.org/show_bug.cgi?id=131882
     5
     6        Reviewed by Tim Horton.
     7
     8        Add 'override' to all overridden functions. Found a few that need
     9        not have been virtual. Removed "allowTiledLayer" stuff that was
     10        never called.
     11
     12        * WebCore.exp.in:
     13        * platform/graphics/ca/GraphicsLayerCA.cpp:
     14        (WebCore::GraphicsLayerCA::GraphicsLayerCA):
     15        (WebCore::GraphicsLayerCA::requiresTiledLayer):
     16        (WebCore::GraphicsLayerCA::setAllowTiledLayer): Deleted.
     17        * platform/graphics/ca/GraphicsLayerCA.h:
     18        (WebCore::GraphicsLayerCA::platformCALayer):
     19        (WebCore::GraphicsLayerCA::hasContentsLayer): Deleted.
     20        (WebCore::GraphicsLayerCA::allowTiledLayer): Deleted.
     21        (WebCore::GraphicsLayerCA::isGraphicsLayerCA): Deleted.
     22        (WebCore::GraphicsLayerCA::platformCALayerLayoutSublayersOfLayer): Deleted.
     23        (WebCore::GraphicsLayerCA::platformCALayerRespondsToLayoutChanges): Deleted.
     24        (WebCore::GraphicsLayerCA::platformCALayerContentsOrientation): Deleted.
     25        (WebCore::GraphicsLayerCA::platformCALayerShowDebugBorders): Deleted.
     26        (WebCore::GraphicsLayerCA::platformCALayerIncrementRepaintCount): Deleted.
     27        (WebCore::GraphicsLayerCA::platformCALayerContentsOpaque): Deleted.
     28        (WebCore::GraphicsLayerCA::platformCALayerDrawsContent): Deleted.
     29        (WebCore::GraphicsLayerCA::platformCALayerLayerDidDisplay): Deleted.
     30
    1312014-04-18  Timothy Hatcher  <timothy@apple.com>
    232

  • trunk/Source/WebCore/WebCore.exp.in

    r167530 r167535  
    554554__ZN7WebCore15GraphicsLayerCA17setCustomBehaviorENS_13GraphicsLayer14CustomBehaviorE
    555555__ZN7WebCore15GraphicsLayerCA17suspendAnimationsEd
    556 __ZN7WebCore15GraphicsLayerCA18setAllowTiledLayerEb
    557556__ZN7WebCore15GraphicsLayerCA18setBackgroundColorERKNS_5ColorE
    558557__ZN7WebCore15GraphicsLayerCA18setContentsToImageEPNS_5ImageE

  • trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

    r167498 r167535  
    364364    : GraphicsLayer(client)
    365365    , m_contentsLayerPurpose(NoContentsLayer)
    366     , m_allowTiledLayer(true)
    367366    , m_isPageTiledBackingLayer(false)
    368367    , m_rootRelativeScaleFactor(1)
    … …  
    657656    GraphicsLayer::setAcceleratesDrawing(acceleratesDrawing);
    658657    noteLayerPropertyChanged(AcceleratesDrawingChanged);
    659 }
    660 
    661 void GraphicsLayerCA::setAllowTiledLayer(bool allowTiledLayer)
    662 {
    663     if (allowTiledLayer == m_allowTiledLayer)
    664         return;
    665 
    666     m_allowTiledLayer = allowTiledLayer;
    667    
    668     // Handling this as a BoundsChanged will cause use to switch in or out of tiled layer as needed
    669     noteLayerPropertyChanged(GeometryChanged);
    670658}
    671659
    … …  
    31343122bool GraphicsLayerCA::requiresTiledLayer(float pageScaleFactor) const
    31353123{
    3136     if (!m_drawsContent || !m_allowTiledLayer || m_isPageTiledBackingLayer)
     3124    if (!m_drawsContent || m_isPageTiledBackingLayer)
    31373125        return false;
    31383126

  • trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h

    r167529 r167535  
    6161    virtual void initialize() override;
    6262
    63     virtual void setName(const String&);
     63    virtual void setName(const String&) override;
    6464
    6565    virtual PlatformLayerID primaryLayerID() const override;
    6666
    67     virtual PlatformLayer* platformLayer() const;
    68     virtual PlatformCALayer* platformCALayer() const { return primaryLayer(); }
    69 
    70     virtual bool setChildren(const Vector<GraphicsLayer*>&);
    71     virtual void addChild(GraphicsLayer*);
    72     virtual void addChildAtIndex(GraphicsLayer*, int index);
    73     virtual void addChildAbove(GraphicsLayer* layer, GraphicsLayer* sibling);
    74     virtual void addChildBelow(GraphicsLayer* layer, GraphicsLayer* sibling);
    75     virtual bool replaceChild(GraphicsLayer* oldChild, GraphicsLayer* newChild);
    76 
    77     virtual void removeFromParent();
    78 
    79     virtual void setMaskLayer(GraphicsLayer*);
    80     virtual void setReplicatedLayer(GraphicsLayer*);
    81 
    82     virtual void setPosition(const FloatPoint&);
    83     virtual void setAnchorPoint(const FloatPoint3D&);
    84     virtual void setSize(const FloatSize&);
    85     virtual void setBoundsOrigin(const FloatPoint&);
    86 
    87     virtual void setTransform(const TransformationMatrix&);
    88 
    89     virtual void setChildrenTransform(const TransformationMatrix&);
    90 
    91     virtual void setPreserves3D(bool);
    92     virtual void setMasksToBounds(bool);
    93     virtual void setDrawsContent(bool);
    94     virtual void setContentsVisible(bool);
    95     virtual void setAcceleratesDrawing(bool);
    96 
    97     virtual void setBackgroundColor(const Color&);
    98 
    99     virtual void setContentsOpaque(bool);
    100     virtual void setBackfaceVisibility(bool);
     67    virtual PlatformLayer* platformLayer() const override;
     68    PlatformCALayer* platformCALayer() const { return primaryLayer(); }
     69
     70    virtual bool setChildren(const Vector<GraphicsLayer*>&) override;
     71    virtual void addChild(GraphicsLayer*) override;
     72    virtual void addChildAtIndex(GraphicsLayer*, int index) override;
     73    virtual void addChildAbove(GraphicsLayer*, GraphicsLayer* sibling) override;
     74    virtual void addChildBelow(GraphicsLayer*, GraphicsLayer* sibling) override;
     75    virtual bool replaceChild(GraphicsLayer* oldChild, GraphicsLayer* newChild) override;
     76
     77    virtual void removeFromParent() override;
     78
     79    virtual void setMaskLayer(GraphicsLayer*) override;
     80    virtual void setReplicatedLayer(GraphicsLayer*) override;
     81
     82    virtual void setPosition(const FloatPoint&) override;
     83    virtual void setAnchorPoint(const FloatPoint3D&) override;
     84    virtual void setSize(const FloatSize&) override;
     85    virtual void setBoundsOrigin(const FloatPoint&) override;
     86
     87    virtual void setTransform(const TransformationMatrix&) override;
     88
     89    virtual void setChildrenTransform(const TransformationMatrix&) override;
     90
     91    virtual void setPreserves3D(bool) override;
     92    virtual void setMasksToBounds(bool) override;
     93    virtual void setDrawsContent(bool) override;
     94    virtual void setContentsVisible(bool) override;
     95    virtual void setAcceleratesDrawing(bool) override;
     96
     97    virtual void setBackgroundColor(const Color&) override;
     98
     99    virtual void setContentsOpaque(bool) override;
     100    virtual void setBackfaceVisibility(bool) override;
    101101
    102102    // return true if we started an animation
    103     virtual void setOpacity(float);
     103    virtual void setOpacity(float) override;
    104104
    105105#if ENABLE(CSS_FILTERS)
    106     virtual bool setFilters(const FilterOperations&);
     106    virtual bool setFilters(const FilterOperations&) override;
    107107    virtual bool filtersCanBeComposited(const FilterOperations&);
    108108#endif
    … …  
    112112#endif
    113113
    114     virtual void setNeedsDisplay();
    115     virtual void setNeedsDisplayInRect(const FloatRect&, ShouldClipToLayer = ClipToLayer);
    116     virtual void setContentsNeedsDisplay();
     114    virtual void setNeedsDisplay() override;
     115    virtual void setNeedsDisplayInRect(const FloatRect&, ShouldClipToLayer = ClipToLayer) override;
     116    virtual void setContentsNeedsDisplay() override;
    117117   
    118118    virtual void setContentsRect(const FloatRect&) override;
    119119    virtual void setContentsClippingRect(const FloatRect&) override;
    120120   
    121     virtual void suspendAnimations(double time);
    122     virtual void resumeAnimations();
    123 
    124     virtual bool addAnimation(const KeyframeValueList&, const FloatSize& boxSize, const Animation*, const String& animationName, double timeOffset);
    125     virtual void pauseAnimation(const String& animationName, double timeOffset);
    126     virtual void removeAnimation(const String& animationName);
    127 
    128     virtual void setContentsToImage(Image*);
    129     virtual void setContentsToMedia(PlatformLayer*);
     121    virtual void suspendAnimations(double time) override;
     122    virtual void resumeAnimations() override;
     123
     124    virtual bool addAnimation(const KeyframeValueList&, const FloatSize& boxSize, const Animation*, const String& animationName, double timeOffset) override;
     125    virtual void pauseAnimation(const String& animationName, double timeOffset) override;
     126    virtual void removeAnimation(const String& animationName) override;
     127
     128    virtual void setContentsToImage(Image*) override;
     129    virtual void setContentsToMedia(PlatformLayer*) override;
    130130#if PLATFORM(IOS)
    131131    virtual PlatformLayer* contentsLayerForMedia() const override;
    132132#endif
    133     virtual void setContentsToCanvas(PlatformLayer*);
    134     virtual void setContentsToSolidColor(const Color&);
     133    virtual void setContentsToCanvas(PlatformLayer*) override;
     134    virtual void setContentsToSolidColor(const Color&) override;
    135135
    136136    virtual bool usesContentsLayer() const override { return m_contentsLayerPurpose != NoContentsLayer; }
    … …  
    139139    virtual void setShowRepaintCounter(bool) override;
    140140
    141     virtual void setDebugBackgroundColor(const Color&);
    142     virtual void setDebugBorder(const Color&, float borderWidth);
    143 
    144     virtual void setCustomAppearance(CustomAppearance);
    145     virtual void setCustomBehavior(CustomBehavior);
    146 
    147     virtual void layerDidDisplay(PlatformLayer*);
    148 
    149     virtual void setMaintainsPixelAlignment(bool);
     141    virtual void setDebugBackgroundColor(const Color&) override;
     142    virtual void setDebugBorder(const Color&, float borderWidth) override;
     143
     144    virtual void setCustomAppearance(CustomAppearance) override;
     145    virtual void setCustomBehavior(CustomBehavior) override;
     146
     147    virtual void layerDidDisplay(PlatformLayer*) override;
     148
     149    virtual void setMaintainsPixelAlignment(bool) override;
    150150#if PLATFORM(IOS)
    151151    virtual FloatSize pixelAlignmentOffset() const override { return m_pixelAlignmentOffset; }
    152152#endif
    153     virtual void deviceOrPageScaleFactorChanged();
     153    virtual void deviceOrPageScaleFactorChanged() override;
    154154
    155155    struct CommitState {
    … …  
    163163    void recursiveCommitChanges(const CommitState&, const TransformState&, const TransformationMatrix& rootRelativeTransformForScaling, float pageScaleFactor = 1, const FloatPoint& positionRelativeToBase = FloatPoint(), bool affectedByPageScale = false);
    164164
    165     virtual void flushCompositingState(const FloatRect&);
    166     virtual void flushCompositingStateForThisLayerOnly();
     165    virtual void flushCompositingState(const FloatRect&) override;
     166    virtual void flushCompositingStateForThisLayerOnly() override;
    167167
    168168    virtual bool visibleRectChangeRequiresFlush(const FloatRect& visibleRect) const override;
    … …  
    170170    virtual TiledBacking* tiledBacking() const override;
    171171
    172     bool allowTiledLayer() const { return m_allowTiledLayer; }
    173     virtual void setAllowTiledLayer(bool b);
    174 
    175172protected:
    176     virtual void setOpacityInternal(float);
     173    virtual void setOpacityInternal(float) override;
    177174   
    178175    bool animationCanBeAccelerated(const KeyframeValueList&, const Animation*) const;
    179176
    180177private:
    181     virtual bool isGraphicsLayerCA() const { return true; }
    182 
    183     virtual void willBeDestroyed();
     178    virtual bool isGraphicsLayerCA() const override { return true; }
     179
     180    virtual void willBeDestroyed() override;
    184181
    185182    // PlatformCALayerClient overrides
    186     virtual void platformCALayerLayoutSublayersOfLayer(PlatformCALayer*) { }
    187     virtual bool platformCALayerRespondsToLayoutChanges() const { return false; }
    188 
    189     virtual void platformCALayerAnimationStarted(CFTimeInterval beginTime);
    190     virtual CompositingCoordinatesOrientation platformCALayerContentsOrientation() const { return contentsOrientation(); }
    191     virtual void platformCALayerPaintContents(PlatformCALayer*, GraphicsContext&, const FloatRect& clip);
    192     virtual bool platformCALayerShowDebugBorders() const { return isShowingDebugBorder(); }
    193     virtual bool platformCALayerShowRepaintCounter(PlatformCALayer*) const;
    194     virtual int platformCALayerIncrementRepaintCount(PlatformCALayer*) { return incrementRepaintCount(); }
    195 
    196     virtual bool platformCALayerContentsOpaque() const { return contentsOpaque(); }
    197     virtual bool platformCALayerDrawsContent() const { return drawsContent(); }
    198     virtual void platformCALayerLayerDidDisplay(PlatformLayer* layer) { return layerDidDisplay(layer); }
     183    virtual void platformCALayerLayoutSublayersOfLayer(PlatformCALayer*) override { }
     184    virtual bool platformCALayerRespondsToLayoutChanges() const override { return false; }
     185
     186    virtual void platformCALayerAnimationStarted(CFTimeInterval beginTime) override;
     187    virtual CompositingCoordinatesOrientation platformCALayerContentsOrientation() const override { return contentsOrientation(); }
     188    virtual void platformCALayerPaintContents(PlatformCALayer*, GraphicsContext&, const FloatRect& clip) override;
     189    virtual bool platformCALayerShowDebugBorders() const override { return isShowingDebugBorder(); }
     190    virtual bool platformCALayerShowRepaintCounter(PlatformCALayer*) const override;
     191    virtual int platformCALayerIncrementRepaintCount(PlatformCALayer*) override { return incrementRepaintCount(); }
     192
     193    virtual bool platformCALayerContentsOpaque() const override { return contentsOpaque(); }
     194    virtual bool platformCALayerDrawsContent() const override { return drawsContent(); }
     195    virtual void platformCALayerLayerDidDisplay(PlatformLayer* layer) override { return layerDidDisplay(layer); }
    199196    virtual void platformCALayerSetNeedsToRevalidateTiles() override;
    200197    virtual float platformCALayerDeviceScaleFactor() const override;
    … …  
    205202    virtual bool isCommittingChanges() const override { return m_isCommittingChanges; }
    206203
    207     virtual double backingStoreMemoryEstimate() const;
     204    virtual double backingStoreMemoryEstimate() const override;
    208205
    209206    virtual bool shouldRepaintOnSizeChange() const override;
    … …  
    283280#endif
    284281
    285     virtual void setReplicatedByLayer(GraphicsLayer*);
    286 
    287     virtual void getDebugBorderInfo(Color&, float& width) const;
    288     virtual void dumpAdditionalProperties(TextStream&, int indent, LayerTreeAsTextBehavior) const;
     282    virtual void setReplicatedByLayer(GraphicsLayer*) override;
     283
     284    virtual void getDebugBorderInfo(Color&, float& width) const override;
     285    virtual void dumpAdditionalProperties(TextStream&, int indent, LayerTreeAsTextBehavior) const override;
    289286
    290287    void computePixelAlignment(float pixelAlignmentScale, const FloatPoint& positionRelativeToBase,
    … …  
    303300    bool recursiveVisibleRectChangeRequiresFlush(const TransformState&) const;
    304301
    305     virtual bool canThrottleLayerFlush() const;
     302    virtual bool canThrottleLayerFlush() const override;
    306303
    307304    // Used to track the path down the tree for replica layers.
    … …  
    496493   
    497494    ContentsLayerPurpose m_contentsLayerPurpose;
    498     bool m_allowTiledLayer : 1;
    499495    bool m_isPageTiledBackingLayer : 1;
    500496   

  • trunk/Source/WebKit2/ChangeLog

    r167534 r167535  
     12014-04-18  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Use 'override' in GraphicsLayerCA
     4        https://bugs.webkit.org/show_bug.cgi?id=131882
     5
     6        Reviewed by Tim Horton.
     7       
     8        Add an 'override'.
     9
     10        * WebProcess/WebPage/mac/GraphicsLayerCARemote.h:
     11
    1122014-04-19  Darin Adler  <darin@apple.com>
    213

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h

    r167266 r167535  
    4949
    5050private:
    51     virtual bool isGraphicsLayerCARemote() const { return true; }
     51    virtual bool isGraphicsLayerCARemote() const override { return true; }
    5252
    5353    virtual PassRefPtr<WebCore::PlatformCALayer> createPlatformCALayer(WebCore::PlatformCALayer::LayerType, WebCore::PlatformCALayerClient* owner) override;
Note: See TracChangeset for help on using the changeset viewer.