| 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 do { | 117 do { |
| 118 repaintContainer = renderer->containerForRepaint(); | 118 repaintContainer = renderer->containerForRepaint(); |
| 119 if (!repaintContainer) { | 119 if (!repaintContainer) { |
| 120 renderer = renderer->frame()->ownerRenderer(); | 120 renderer = renderer->frame()->ownerRenderer(); |
| 121 if (!renderer) | 121 if (!renderer) |
| 122 return 0; | 122 return 0; |
| 123 } | 123 } |
| 124 } while (!repaintContainer); | 124 } while (!repaintContainer); |
| 125 RenderLayer* renderLayer = repaintContainer->layer(); | 125 RenderLayer* renderLayer = repaintContainer->layer(); |
| 126 | 126 |
| 127 if (!renderLayer || !renderLayer->isComposited()) | 127 if (!renderLayer || renderLayer->compositingState() == NotComposited) |
| 128 return 0; | 128 return 0; |
| 129 | 129 |
| 130 GraphicsLayer* newGraphicsLayer = renderLayer->backing()->graphicsLayer(); | 130 GraphicsLayer* newGraphicsLayer = renderLayer->backing()->graphicsLayer(); |
| 131 m_clipLayer->setSublayerTransform(SkMatrix44()); | 131 m_clipLayer->setSublayerTransform(SkMatrix44()); |
| 132 | 132 |
| 133 if (!newGraphicsLayer->drawsContent()) { | 133 if (!newGraphicsLayer->drawsContent()) { |
| 134 if (renderLayer->usesCompositedScrolling()) { | 134 if (renderLayer->usesCompositedScrolling()) { |
| 135 ASSERT(renderLayer->backing() && renderLayer->backing()->scrollingCo
ntentsLayer()); | 135 ASSERT(renderLayer->backing() && renderLayer->backing()->scrollingCo
ntentsLayer()); |
| 136 newGraphicsLayer = renderLayer->backing()->scrollingContentsLayer(); | 136 newGraphicsLayer = renderLayer->backing()->scrollingContentsLayer(); |
| 137 } else | 137 } else |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 // Make sure we update geometry on the next callback from WebViewImpl::layou
t(). | 335 // Make sure we update geometry on the next callback from WebViewImpl::layou
t(). |
| 336 m_geometryNeedsUpdate = true; | 336 m_geometryNeedsUpdate = true; |
| 337 } | 337 } |
| 338 | 338 |
| 339 WebLayer* LinkHighlight::layer() | 339 WebLayer* LinkHighlight::layer() |
| 340 { | 340 { |
| 341 return clipLayer(); | 341 return clipLayer(); |
| 342 } | 342 } |
| 343 | 343 |
| 344 } // namespace WeKit | 344 } // namespace WeKit |
| OLD | NEW |