| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 3351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3362 if (isLayoutView()) { | 3362 if (isLayoutView()) { |
| 3363 DoublePoint position = toLayoutView(this)->frameView()->scrollPositionDo
uble(); | 3363 DoublePoint position = toLayoutView(this)->frameView()->scrollPositionDo
uble(); |
| 3364 adjustedLocation.move(position.x(), position.y()); | 3364 adjustedLocation.move(position.x(), position.y()); |
| 3365 } | 3365 } |
| 3366 | 3366 |
| 3367 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set(); | 3367 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set(); |
| 3368 FloatingObjectSetIterator begin = floatingObjectSet.begin(); | 3368 FloatingObjectSetIterator begin = floatingObjectSet.begin(); |
| 3369 for (FloatingObjectSetIterator it = floatingObjectSet.end(); it != begin;) { | 3369 for (FloatingObjectSetIterator it = floatingObjectSet.end(); it != begin;) { |
| 3370 --it; | 3370 --it; |
| 3371 const FloatingObject& floatingObject = *it->get(); | 3371 const FloatingObject& floatingObject = *it->get(); |
| 3372 if (floatingObject.shouldPaint() && !floatingObject.layoutObject()->hasS
elfPaintingLayer()) { | 3372 if (floatingObject.shouldPaint()) { |
| 3373 LayoutUnit xOffset = xPositionForFloatIncludingMargin(floatingObject
) - floatingObject.layoutObject()->location().x(); | 3373 LayoutUnit xOffset = xPositionForFloatIncludingMargin(floatingObject
) - floatingObject.layoutObject()->location().x(); |
| 3374 LayoutUnit yOffset = yPositionForFloatIncludingMargin(floatingObject
) - floatingObject.layoutObject()->location().y(); | 3374 LayoutUnit yOffset = yPositionForFloatIncludingMargin(floatingObject
) - floatingObject.layoutObject()->location().y(); |
| 3375 LayoutPoint childPoint = flipFloatForWritingModeForChild(floatingObj
ect, adjustedLocation + LayoutSize(xOffset, yOffset)); | 3375 LayoutPoint childPoint = flipFloatForWritingModeForChild(floatingObj
ect, adjustedLocation + LayoutSize(xOffset, yOffset)); |
| 3376 if (floatingObject.layoutObject()->hitTest(result, locationInContain
er, childPoint)) { | 3376 if (floatingObject.layoutObject()->hitTest(result, locationInContain
er, childPoint)) { |
| 3377 updateHitTestResult(result, locationInContainer.point() - toLayo
utSize(childPoint)); | 3377 updateHitTestResult(result, locationInContainer.point() - toLayo
utSize(childPoint)); |
| 3378 return true; | 3378 return true; |
| 3379 } | 3379 } |
| 3380 } | 3380 } |
| 3381 } | 3381 } |
| 3382 | 3382 |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3841 if (!rect.isEmpty()) | 3841 if (!rect.isEmpty()) |
| 3842 rects.append(rect); | 3842 rects.append(rect); |
| 3843 } | 3843 } |
| 3844 } | 3844 } |
| 3845 | 3845 |
| 3846 if (inlineElementContinuation) | 3846 if (inlineElementContinuation) |
| 3847 inlineElementContinuation->addOutlineRects(rects, additionalOffset + (in
lineElementContinuation->containingBlock()->location() - location()), includeBlo
ckOverflows); | 3847 inlineElementContinuation->addOutlineRects(rects, additionalOffset + (in
lineElementContinuation->containingBlock()->location() - location()), includeBlo
ckOverflows); |
| 3848 } | 3848 } |
| 3849 | 3849 |
| 3850 } // namespace blink | 3850 } // namespace blink |
| OLD | NEW |