| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 2 * Copyright (C) 2011 Adobe Systems Incorporated. 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 | 8 * 1. Redistributions of source code must retain the above |
| 9 * copyright notice, this list of conditions and the following | 9 * copyright notice, this list of conditions and the following |
| 10 * disclaimer. | 10 * disclaimer. |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR | 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR |
| 25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF | 25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF |
| 26 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 26 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| 27 * SUCH DAMAGE. | 27 * SUCH DAMAGE. |
| 28 */ | 28 */ |
| 29 | 29 |
| 30 #include "config.h" | 30 #include "config.h" |
| 31 #include "core/rendering/RenderRegion.h" | 31 #include "core/rendering/RenderRegion.h" |
| 32 | 32 |
| 33 #include "Range.h" | |
| 34 #include "core/css/StyleResolver.h" | 33 #include "core/css/StyleResolver.h" |
| 34 #include "core/dom/Range.h" |
| 35 #include "core/platform/graphics/GraphicsContext.h" | 35 #include "core/platform/graphics/GraphicsContext.h" |
| 36 #include "core/platform/graphics/IntRect.h" | 36 #include "core/platform/graphics/IntRect.h" |
| 37 #include "core/rendering/FlowThreadController.h" | 37 #include "core/rendering/FlowThreadController.h" |
| 38 #include "core/rendering/HitTestResult.h" | 38 #include "core/rendering/HitTestResult.h" |
| 39 #include "core/rendering/LayoutRepainter.h" | 39 #include "core/rendering/LayoutRepainter.h" |
| 40 #include "core/rendering/PaintInfo.h" | 40 #include "core/rendering/PaintInfo.h" |
| 41 #include "core/rendering/RenderBoxRegionInfo.h" | 41 #include "core/rendering/RenderBoxRegionInfo.h" |
| 42 #include "core/rendering/RenderNamedFlowThread.h" | 42 #include "core/rendering/RenderNamedFlowThread.h" |
| 43 #include "core/rendering/RenderView.h" | 43 #include "core/rendering/RenderView.h" |
| 44 | 44 |
| (...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 648 if (!hasOverrideHeight()) | 648 if (!hasOverrideHeight()) |
| 649 return; | 649 return; |
| 650 | 650 |
| 651 LayoutUnit newLogicalHeight = overrideLogicalContentHeight() + borderAndPadd
ingLogicalHeight(); | 651 LayoutUnit newLogicalHeight = overrideLogicalContentHeight() + borderAndPadd
ingLogicalHeight(); |
| 652 ASSERT(newLogicalHeight < LayoutUnit::max() / 2); | 652 ASSERT(newLogicalHeight < LayoutUnit::max() / 2); |
| 653 if (newLogicalHeight > logicalHeight()) | 653 if (newLogicalHeight > logicalHeight()) |
| 654 setLogicalHeight(newLogicalHeight); | 654 setLogicalHeight(newLogicalHeight); |
| 655 } | 655 } |
| 656 | 656 |
| 657 } // namespace WebCore | 657 } // namespace WebCore |
| OLD | NEW |