| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google 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 * | 7 * |
| 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 | 62 |
| 63 // WebAnimationDelegate implementation. | 63 // WebAnimationDelegate implementation. |
| 64 virtual void notifyAnimationStarted(double time) OVERRIDE; | 64 virtual void notifyAnimationStarted(double time) OVERRIDE; |
| 65 virtual void notifyAnimationFinished(double time) OVERRIDE; | 65 virtual void notifyAnimationFinished(double time) OVERRIDE; |
| 66 | 66 |
| 67 // LinkHighlightClient inplementation. | 67 // LinkHighlightClient inplementation. |
| 68 virtual void invalidate() OVERRIDE; | 68 virtual void invalidate() OVERRIDE; |
| 69 virtual WebLayer* layer() OVERRIDE; | 69 virtual WebLayer* layer() OVERRIDE; |
| 70 virtual void clearCurrentGraphicsLayer() OVERRIDE; | 70 virtual void clearCurrentGraphicsLayer() OVERRIDE; |
| 71 | 71 |
| 72 WebCore::GraphicsLayerChromium* currentGraphicsLayerForTesting() const { ret
urn m_currentGraphicsLayer; } |
| 73 |
| 72 private: | 74 private: |
| 73 LinkHighlight(WebCore::Node*, WebViewImpl*); | 75 LinkHighlight(WebCore::Node*, WebViewImpl*); |
| 74 | 76 |
| 75 void releaseResources(); | 77 void releaseResources(); |
| 76 | 78 |
| 77 WebCore::RenderLayer* computeEnclosingCompositingLayer(); | 79 WebCore::RenderLayer* computeEnclosingCompositingLayer(); |
| 78 void clearGraphicsLayerLinkHighlightPointer(); | 80 void clearGraphicsLayerLinkHighlightPointer(); |
| 79 // This function computes the highlight path, and returns true if it has cha
nged | 81 // This function computes the highlight path, and returns true if it has cha
nged |
| 80 // size since the last call to this function. | 82 // size since the last call to this function. |
| 81 bool computeHighlightLayerPathAndPosition(WebCore::RenderLayer*); | 83 bool computeHighlightLayerPathAndPosition(WebCore::RenderLayer*); |
| 82 | 84 |
| 83 OwnPtr<WebContentLayer> m_contentLayer; | 85 OwnPtr<WebContentLayer> m_contentLayer; |
| 84 OwnPtr<WebLayer> m_clipLayer; | 86 OwnPtr<WebLayer> m_clipLayer; |
| 85 WebCore::Path m_path; | 87 WebCore::Path m_path; |
| 86 | 88 |
| 87 RefPtr<WebCore::Node> m_node; | 89 RefPtr<WebCore::Node> m_node; |
| 88 OwnPtr<WebAnimation> m_animation; | 90 OwnPtr<WebAnimation> m_animation; |
| 89 WebViewImpl* m_owningWebViewImpl; | 91 WebViewImpl* m_owningWebViewImpl; |
| 90 WebCore::GraphicsLayerChromium* m_currentGraphicsLayer; | 92 WebCore::GraphicsLayerChromium* m_currentGraphicsLayer; |
| 91 bool m_usingNonCompositedContentHost; | 93 bool m_usingNonCompositedContentHost; |
| 92 | 94 |
| 93 bool m_geometryNeedsUpdate; | 95 bool m_geometryNeedsUpdate; |
| 94 bool m_isAnimating; | 96 bool m_isAnimating; |
| 95 double m_startTime; | 97 double m_startTime; |
| 96 }; | 98 }; |
| 97 | 99 |
| 98 } // namespace WebKit | 100 } // namespace WebKit |
| 99 | 101 |
| 100 #endif | 102 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 15670013:
Merge 149838 "Reland "Clear highlight when the highlighted node ..." (Closed)
Base URL: svn://svn.chromium.org/blink/branches/chromium/1500/