| 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 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 } | 299 } |
| 300 | 300 |
| 301 void LinkHighlight::clearGraphicsLayerLinkHighlightPointer() | 301 void LinkHighlight::clearGraphicsLayerLinkHighlightPointer() |
| 302 { | 302 { |
| 303 if (m_currentGraphicsLayer) { | 303 if (m_currentGraphicsLayer) { |
| 304 m_currentGraphicsLayer->removeLinkHighlight(this); | 304 m_currentGraphicsLayer->removeLinkHighlight(this); |
| 305 m_currentGraphicsLayer = 0; | 305 m_currentGraphicsLayer = 0; |
| 306 } | 306 } |
| 307 } | 307 } |
| 308 | 308 |
| 309 void LinkHighlight::notifyAnimationStarted(double, WebCompositorAnimation::Targe
tProperty) | 309 void LinkHighlight::notifyAnimationStarted(double, int) |
| 310 { | 310 { |
| 311 } | 311 } |
| 312 | 312 |
| 313 void LinkHighlight::notifyAnimationFinished(double, WebCompositorAnimation::Targ
etProperty) | 313 void LinkHighlight::notifyAnimationFinished(double, int) |
| 314 { | 314 { |
| 315 // Since WebViewImpl may hang on to us for a while, make sure we | 315 // Since WebViewImpl may hang on to us for a while, make sure we |
| 316 // release resources as soon as possible. | 316 // release resources as soon as possible. |
| 317 clearGraphicsLayerLinkHighlightPointer(); | 317 clearGraphicsLayerLinkHighlightPointer(); |
| 318 releaseResources(); | 318 releaseResources(); |
| 319 } | 319 } |
| 320 | 320 |
| 321 void LinkHighlight::updateGeometry() | 321 void LinkHighlight::updateGeometry() |
| 322 { | 322 { |
| 323 // To avoid unnecessary updates (e.g. other entities have requested animatio
ns from our WebViewImpl), | 323 // To avoid unnecessary updates (e.g. other entities have requested animatio
ns from our WebViewImpl), |
| (...skipping 28 matching lines...) Expand all Loading... |
| 352 // Make sure we update geometry on the next callback from WebViewImpl::layou
t(). | 352 // Make sure we update geometry on the next callback from WebViewImpl::layou
t(). |
| 353 m_geometryNeedsUpdate = true; | 353 m_geometryNeedsUpdate = true; |
| 354 } | 354 } |
| 355 | 355 |
| 356 WebLayer* LinkHighlight::layer() | 356 WebLayer* LinkHighlight::layer() |
| 357 { | 357 { |
| 358 return clipLayer(); | 358 return clipLayer(); |
| 359 } | 359 } |
| 360 | 360 |
| 361 } // namespace blink | 361 } // namespace blink |
| OLD | NEW |