| 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 3359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3370 if (isLayoutView()) { | 3370 if (isLayoutView()) { |
| 3371 DoublePoint position = toLayoutView(this)->frameView()->scrollPositionDo
uble(); | 3371 DoublePoint position = toLayoutView(this)->frameView()->scrollPositionDo
uble(); |
| 3372 adjustedLocation.move(position.x(), position.y()); | 3372 adjustedLocation.move(position.x(), position.y()); |
| 3373 } | 3373 } |
| 3374 | 3374 |
| 3375 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set(); | 3375 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set(); |
| 3376 FloatingObjectSetIterator begin = floatingObjectSet.begin(); | 3376 FloatingObjectSetIterator begin = floatingObjectSet.begin(); |
| 3377 for (FloatingObjectSetIterator it = floatingObjectSet.end(); it != begin;) { | 3377 for (FloatingObjectSetIterator it = floatingObjectSet.end(); it != begin;) { |
| 3378 --it; | 3378 --it; |
| 3379 const FloatingObject& floatingObject = *it->get(); | 3379 const FloatingObject& floatingObject = *it->get(); |
| 3380 if (floatingObject.shouldPaint() && !floatingObject.layoutObject()->hasS
elfPaintingLayer()) { | 3380 if (floatingObject.shouldPaint()) { |
| 3381 LayoutUnit xOffset = xPositionForFloatIncludingMargin(floatingObject
) - floatingObject.layoutObject()->location().x(); | 3381 LayoutUnit xOffset = xPositionForFloatIncludingMargin(floatingObject
) - floatingObject.layoutObject()->location().x(); |
| 3382 LayoutUnit yOffset = yPositionForFloatIncludingMargin(floatingObject
) - floatingObject.layoutObject()->location().y(); | 3382 LayoutUnit yOffset = yPositionForFloatIncludingMargin(floatingObject
) - floatingObject.layoutObject()->location().y(); |
| 3383 LayoutPoint childPoint = flipFloatForWritingModeForChild(floatingObj
ect, adjustedLocation + LayoutSize(xOffset, yOffset)); | 3383 LayoutPoint childPoint = flipFloatForWritingModeForChild(floatingObj
ect, adjustedLocation + LayoutSize(xOffset, yOffset)); |
| 3384 if (floatingObject.layoutObject()->hitTest(result, locationInContain
er, childPoint)) { | 3384 if (floatingObject.layoutObject()->hitTest(result, locationInContain
er, childPoint)) { |
| 3385 updateHitTestResult(result, locationInContainer.point() - toLayo
utSize(childPoint)); | 3385 updateHitTestResult(result, locationInContainer.point() - toLayo
utSize(childPoint)); |
| 3386 return true; | 3386 return true; |
| 3387 } | 3387 } |
| 3388 } | 3388 } |
| 3389 } | 3389 } |
| 3390 | 3390 |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3849 if (!rect.isEmpty()) | 3849 if (!rect.isEmpty()) |
| 3850 rects.append(rect); | 3850 rects.append(rect); |
| 3851 } | 3851 } |
| 3852 } | 3852 } |
| 3853 | 3853 |
| 3854 if (inlineElementContinuation) | 3854 if (inlineElementContinuation) |
| 3855 inlineElementContinuation->addOutlineRects(rects, additionalOffset + (in
lineElementContinuation->containingBlock()->location() - location()), includeBlo
ckOverflows); | 3855 inlineElementContinuation->addOutlineRects(rects, additionalOffset + (in
lineElementContinuation->containingBlock()->location() - location()), includeBlo
ckOverflows); |
| 3856 } | 3856 } |
| 3857 | 3857 |
| 3858 } // namespace blink | 3858 } // namespace blink |
| OLD | NEW |