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 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
206 ASSERT(quads.size()); | 206 ASSERT(quads.size()); |
207 Path newPath; | 207 Path newPath; |
208 | 208 |
209 FloatPoint positionAdjustForCompositedScrolling = IntPoint(m_currentGraphics Layer->offsetFromLayoutObject()); | 209 FloatPoint positionAdjustForCompositedScrolling = IntPoint(m_currentGraphics Layer->offsetFromLayoutObject()); |
210 | 210 |
211 for (size_t quadIndex = 0; quadIndex < quads.size(); ++quadIndex) { | 211 for (size_t quadIndex = 0; quadIndex < quads.size(); ++quadIndex) { |
212 FloatQuad absoluteQuad = quads[quadIndex]; | 212 FloatQuad absoluteQuad = quads[quadIndex]; |
213 | 213 |
214 // FIXME: this hack should not be necessary. It's a consequence of the f act that composited layers for scrolling are represented | 214 // FIXME: this hack should not be necessary. It's a consequence of the f act that composited layers for scrolling are represented |
215 // differently in Blink than other composited layers. | 215 // differently in Blink than other composited layers. |
216 if (paintInvalidationContainer->layer()->needsCompositedScrolling() && m _node->layoutObject() != paintInvalidationContainer) | 216 if (!paintInvalidationContainer->layer()->hasBoxDecorationsOrBackground( ) && paintInvalidationContainer->layer()->needsCompositedScrolling() && m_node-> layoutObject() != paintInvalidationContainer) |
chrishtr
2015/04/27 17:50:03
Can you explain why it's not needed if there are b
pals
2015/04/28 10:28:24
I am not very familiar of this code. I thought as
chrishtr
2015/04/29 05:11:41
Ok. I'll need to think about this some more. This
chrishtr
2015/06/06 05:28:09
I just tried deleting the adjustment hack in lines
pals
2015/06/15 06:01:04
Done.
| |
217 absoluteQuad.move(-positionAdjustForCompositedScrolling.x(), -positi onAdjustForCompositedScrolling.y()); | 217 absoluteQuad.move(-positionAdjustForCompositedScrolling.x(), -positi onAdjustForCompositedScrolling.y()); |
218 | 218 |
219 // Transform node quads in target absolute coords to local coordinates i n the compositor layer. | 219 // Transform node quads in target absolute coords to local coordinates i n the compositor layer. |
220 FloatQuad transformedQuad; | 220 FloatQuad transformedQuad; |
221 convertTargetSpaceQuadToCompositedLayer(absoluteQuad, m_node->layoutObje ct(), paintInvalidationContainer, transformedQuad); | 221 convertTargetSpaceQuadToCompositedLayer(absoluteQuad, m_node->layoutObje ct(), paintInvalidationContainer, transformedQuad); |
222 | 222 |
223 // FIXME: for now, we'll only use rounded paths if we have a single node quad. The reason for this is that | 223 // FIXME: for now, we'll only use rounded paths if we have a single node quad. The reason for this is that |
224 // we may sometimes get a chain of adjacent boxes (e.g. for text nodes) which end up looking like sausage | 224 // we may sometimes get a chain of adjacent boxes (e.g. for text nodes) which end up looking like sausage |
225 // links: these should ideally be merged into a single rect before creat ing the path, but that's | 225 // links: these should ideally be merged into a single rect before creat ing the path, but that's |
226 // another CL. | 226 // another CL. |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
361 // Make sure we update geometry on the next callback from WebViewImpl::layou t(). | 361 // Make sure we update geometry on the next callback from WebViewImpl::layou t(). |
362 m_geometryNeedsUpdate = true; | 362 m_geometryNeedsUpdate = true; |
363 } | 363 } |
364 | 364 |
365 WebLayer* LinkHighlight::layer() | 365 WebLayer* LinkHighlight::layer() |
366 { | 366 { |
367 return clipLayer(); | 367 return clipLayer(); |
368 } | 368 } |
369 | 369 |
370 } // namespace blink | 370 } // namespace blink |
OLD | NEW |