| Index: Source/web/LinkHighlight.h
|
| diff --git a/Source/web/LinkHighlight.h b/Source/web/LinkHighlight.h
|
| index 274e6aecafff712d537bdd412c5d87e383837ff9..985dc07b803fcdaea6ef9afbb0c8ee15af951817 100644
|
| --- a/Source/web/LinkHighlight.h
|
| +++ b/Source/web/LinkHighlight.h
|
| @@ -38,20 +38,17 @@
|
| #include "wtf/Vector.h"
|
|
|
| namespace blink {
|
| +
|
| class RenderLayer;
|
| class RenderObject;
|
| class Node;
|
| -}
|
| -
|
| -namespace blink {
|
| -
|
| struct WebFloatRect;
|
| struct WebRect;
|
| class WebViewImpl;
|
|
|
| -class LinkHighlight FINAL : public WebContentLayerClient, public WebCompositorAnimationDelegate, blink::LinkHighlightClient {
|
| +class LinkHighlight FINAL : public WebContentLayerClient, public WebCompositorAnimationDelegate, LinkHighlightClient {
|
| public:
|
| - static PassOwnPtr<LinkHighlight> create(blink::Node*, WebViewImpl*);
|
| + static PassOwnPtr<LinkHighlight> create(Node*, WebViewImpl*);
|
| virtual ~LinkHighlight();
|
|
|
| WebContentLayer* contentLayer();
|
| @@ -64,35 +61,35 @@ public:
|
| WebContentLayerClient::GraphicsContextStatus = GraphicsContextEnabled) OVERRIDE;
|
|
|
| // WebCompositorAnimationDelegate implementation.
|
| - virtual void notifyAnimationStarted(double monotonicTime, blink::WebCompositorAnimation::TargetProperty) OVERRIDE;
|
| - virtual void notifyAnimationFinished(double monotonicTime, blink::WebCompositorAnimation::TargetProperty) OVERRIDE;
|
| + virtual void notifyAnimationStarted(double monotonicTime, WebCompositorAnimation::TargetProperty) OVERRIDE;
|
| + virtual void notifyAnimationFinished(double monotonicTime, WebCompositorAnimation::TargetProperty) OVERRIDE;
|
|
|
| // LinkHighlightClient inplementation.
|
| virtual void invalidate() OVERRIDE;
|
| virtual WebLayer* layer() OVERRIDE;
|
| virtual void clearCurrentGraphicsLayer() OVERRIDE;
|
|
|
| - blink::GraphicsLayer* currentGraphicsLayerForTesting() const { return m_currentGraphicsLayer; }
|
| + GraphicsLayer* currentGraphicsLayerForTesting() const { return m_currentGraphicsLayer; }
|
|
|
| private:
|
| - LinkHighlight(blink::Node*, WebViewImpl*);
|
| + LinkHighlight(Node*, WebViewImpl*);
|
|
|
| void releaseResources();
|
| - void computeQuads(blink::Node*, WTF::Vector<blink::FloatQuad>&) const;
|
| + void computeQuads(Node*, WTF::Vector<FloatQuad>&) const;
|
|
|
| - blink::RenderLayer* computeEnclosingCompositingLayer();
|
| + RenderLayer* computeEnclosingCompositingLayer();
|
| void clearGraphicsLayerLinkHighlightPointer();
|
| // This function computes the highlight path, and returns true if it has changed
|
| // size since the last call to this function.
|
| - bool computeHighlightLayerPathAndPosition(blink::RenderLayer*);
|
| + bool computeHighlightLayerPathAndPosition(RenderLayer*);
|
|
|
| OwnPtr<WebContentLayer> m_contentLayer;
|
| OwnPtr<WebLayer> m_clipLayer;
|
| - blink::Path m_path;
|
| + Path m_path;
|
|
|
| - RefPtrWillBePersistent<blink::Node> m_node;
|
| + RefPtrWillBePersistent<Node> m_node;
|
| WebViewImpl* m_owningWebViewImpl;
|
| - blink::GraphicsLayer* m_currentGraphicsLayer;
|
| + GraphicsLayer* m_currentGraphicsLayer;
|
|
|
| bool m_geometryNeedsUpdate;
|
| bool m_isAnimating;
|
|
|