| 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 3299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3310 if (isLayoutView()) { | 3310 if (isLayoutView()) { |
| 3311 DoublePoint position = toLayoutView(this)->frameView()->scrollPositionDo
uble(); | 3311 DoublePoint position = toLayoutView(this)->frameView()->scrollPositionDo
uble(); |
| 3312 adjustedLocation.move(position.x(), position.y()); | 3312 adjustedLocation.move(position.x(), position.y()); |
| 3313 } | 3313 } |
| 3314 | 3314 |
| 3315 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set(); | 3315 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set(); |
| 3316 FloatingObjectSetIterator begin = floatingObjectSet.begin(); | 3316 FloatingObjectSetIterator begin = floatingObjectSet.begin(); |
| 3317 for (FloatingObjectSetIterator it = floatingObjectSet.end(); it != begin;) { | 3317 for (FloatingObjectSetIterator it = floatingObjectSet.end(); it != begin;) { |
| 3318 --it; | 3318 --it; |
| 3319 const FloatingObject& floatingObject = *it->get(); | 3319 const FloatingObject& floatingObject = *it->get(); |
| 3320 if (floatingObject.shouldPaint() && !floatingObject.layoutObject()->hasS
elfPaintingLayer()) { | 3320 if (floatingObject.shouldPaint()) { |
| 3321 LayoutUnit xOffset = xPositionForFloatIncludingMargin(floatingObject
) - floatingObject.layoutObject()->location().x(); | 3321 LayoutUnit xOffset = xPositionForFloatIncludingMargin(floatingObject
) - floatingObject.layoutObject()->location().x(); |
| 3322 LayoutUnit yOffset = yPositionForFloatIncludingMargin(floatingObject
) - floatingObject.layoutObject()->location().y(); | 3322 LayoutUnit yOffset = yPositionForFloatIncludingMargin(floatingObject
) - floatingObject.layoutObject()->location().y(); |
| 3323 LayoutPoint childPoint = flipFloatForWritingModeForChild(floatingObj
ect, adjustedLocation + LayoutSize(xOffset, yOffset)); | 3323 LayoutPoint childPoint = flipFloatForWritingModeForChild(floatingObj
ect, adjustedLocation + LayoutSize(xOffset, yOffset)); |
| 3324 if (floatingObject.layoutObject()->hitTest(result, locationInContain
er, childPoint)) { | 3324 if (floatingObject.layoutObject()->hitTest(result, locationInContain
er, childPoint)) { |
| 3325 updateHitTestResult(result, locationInContainer.point() - toLayo
utSize(childPoint)); | 3325 updateHitTestResult(result, locationInContainer.point() - toLayo
utSize(childPoint)); |
| 3326 return true; | 3326 return true; |
| 3327 } | 3327 } |
| 3328 } | 3328 } |
| 3329 } | 3329 } |
| 3330 | 3330 |
| (...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3793 if (inlineElementContinuation) | 3793 if (inlineElementContinuation) |
| 3794 inlineElementContinuation->addOutlineRects(rects, additionalOffset + (in
lineElementContinuation->containingBlock()->location() - location()), includeBlo
ckOverflows); | 3794 inlineElementContinuation->addOutlineRects(rects, additionalOffset + (in
lineElementContinuation->containingBlock()->location() - location()), includeBlo
ckOverflows); |
| 3795 } | 3795 } |
| 3796 | 3796 |
| 3797 PaintInvalidationReason LayoutBlockFlow::invalidatePaintIfNeeded(const PaintInva
lidatorContext& context) const | 3797 PaintInvalidationReason LayoutBlockFlow::invalidatePaintIfNeeded(const PaintInva
lidatorContext& context) const |
| 3798 { | 3798 { |
| 3799 return BlockFlowPaintInvalidator(*this, context).invalidatePaintIfNeeded(); | 3799 return BlockFlowPaintInvalidator(*this, context).invalidatePaintIfNeeded(); |
| 3800 } | 3800 } |
| 3801 | 3801 |
| 3802 } // namespace blink | 3802 } // namespace blink |
| OLD | NEW |