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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 if (!renderLayer) { | 119 if (!renderLayer) { |
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 (!renderLayer); | 124 } while (!renderLayer); |
125 | 125 |
126 CompositedLayerMappingPtr compositedLayerMapping = renderLayer->compositingS
tate() == PaintsIntoGroupedBacking ? renderLayer->groupedMapping() : renderLayer
->compositedLayerMapping(); | 126 CompositedLayerMappingPtr compositedLayerMapping = renderLayer->compositingS
tate() == PaintsIntoGroupedBacking ? renderLayer->groupedMapping() : renderLayer
->compositedLayerMapping(); |
127 GraphicsLayer* newGraphicsLayer = renderLayer->compositingState() == PaintsI
ntoGroupedBacking ? compositedLayerMapping->squashingLayer() : compositedLayerMa
pping->mainGraphicsLayer(); | 127 GraphicsLayer* newGraphicsLayer = renderLayer->compositingState() == PaintsI
ntoGroupedBacking ? compositedLayerMapping->squashingLayer() : compositedLayerMa
pping->mainGraphicsLayer(); |
128 | 128 |
129 m_clipLayer->setTransform(SkMatrix44()); | 129 m_clipLayer->setTransform(SkMatrix44(SkMatrix44::kIdentity_Constructor)); |
130 | 130 |
131 if (!newGraphicsLayer->drawsContent()) { | 131 if (!newGraphicsLayer->drawsContent()) { |
132 if (renderLayer->scrollableArea() && renderLayer->scrollableArea()->uses
CompositedScrolling()) { | 132 if (renderLayer->scrollableArea() && renderLayer->scrollableArea()->uses
CompositedScrolling()) { |
133 ASSERT(renderLayer->hasCompositedLayerMapping() && renderLayer->comp
ositedLayerMapping()->scrollingContentsLayer()); | 133 ASSERT(renderLayer->hasCompositedLayerMapping() && renderLayer->comp
ositedLayerMapping()->scrollingContentsLayer()); |
134 newGraphicsLayer = compositedLayerMapping->scrollingContentsLayer(); | 134 newGraphicsLayer = compositedLayerMapping->scrollingContentsLayer(); |
135 } | 135 } |
136 } | 136 } |
137 | 137 |
138 if (m_currentGraphicsLayer != newGraphicsLayer) { | 138 if (m_currentGraphicsLayer != newGraphicsLayer) { |
139 if (m_currentGraphicsLayer) | 139 if (m_currentGraphicsLayer) |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
355 // Make sure we update geometry on the next callback from WebViewImpl::layou
t(). | 355 // Make sure we update geometry on the next callback from WebViewImpl::layou
t(). |
356 m_geometryNeedsUpdate = true; | 356 m_geometryNeedsUpdate = true; |
357 } | 357 } |
358 | 358 |
359 WebLayer* LinkHighlight::layer() | 359 WebLayer* LinkHighlight::layer() |
360 { | 360 { |
361 return clipLayer(); | 361 return clipLayer(); |
362 } | 362 } |
363 | 363 |
364 } // namespace WeKit | 364 } // namespace WeKit |
OLD | NEW |