| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. |
| 4 * All rights reserved. | 4 * All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 IncludeScrollbarsInRect includeScrollbars = | 229 IncludeScrollbarsInRect includeScrollbars = |
| 230 RuntimeEnabledFeatures::rootLayerScrollingEnabled() ? IncludeScrollbars | 230 RuntimeEnabledFeatures::rootLayerScrollingEnabled() ? IncludeScrollbars |
| 231 : ExcludeScrollbars; | 231 : ExcludeScrollbars; |
| 232 FloatSize viewSize(frameView()->visibleContentSize(includeScrollbars)); | 232 FloatSize viewSize(frameView()->visibleContentSize(includeScrollbars)); |
| 233 setShouldDoFullPaintInvalidationOnResizeIfNeeded( | 233 setShouldDoFullPaintInvalidationOnResizeIfNeeded( |
| 234 offsetWidth() != viewSize.width(), offsetHeight() != viewSize.height()); | 234 offsetWidth() != viewSize.width(), offsetHeight() != viewSize.height()); |
| 235 | 235 |
| 236 if (pageLogicalHeight() && shouldUsePrintingLayout()) { | 236 if (pageLogicalHeight() && shouldUsePrintingLayout()) { |
| 237 m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = logicalWidth(); | 237 m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = logicalWidth(); |
| 238 if (!m_fragmentationContext) { | 238 if (!m_fragmentationContext) { |
| 239 m_fragmentationContext = wrapUnique(new ViewFragmentationContext(*this)); | 239 m_fragmentationContext = |
| 240 WTF::wrapUnique(new ViewFragmentationContext(*this)); |
| 240 m_paginationStateChanged = true; | 241 m_paginationStateChanged = true; |
| 241 } | 242 } |
| 242 } else if (m_fragmentationContext) { | 243 } else if (m_fragmentationContext) { |
| 243 m_fragmentationContext.reset(); | 244 m_fragmentationContext.reset(); |
| 244 m_paginationStateChanged = true; | 245 m_paginationStateChanged = true; |
| 245 } | 246 } |
| 246 | 247 |
| 247 SubtreeLayoutScope layoutScope(*this); | 248 SubtreeLayoutScope layoutScope(*this); |
| 248 | 249 |
| 249 // Use calcWidth/Height to get the new width/height, since this will take the | 250 // Use calcWidth/Height to get the new width/height, since this will take the |
| (...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 936 result.setNodeAndPosition(node, adjustedPoint); | 937 result.setNodeAndPosition(node, adjustedPoint); |
| 937 } | 938 } |
| 938 } | 939 } |
| 939 | 940 |
| 940 bool LayoutView::usesCompositing() const { | 941 bool LayoutView::usesCompositing() const { |
| 941 return m_compositor && m_compositor->staleInCompositingMode(); | 942 return m_compositor && m_compositor->staleInCompositingMode(); |
| 942 } | 943 } |
| 943 | 944 |
| 944 PaintLayerCompositor* LayoutView::compositor() { | 945 PaintLayerCompositor* LayoutView::compositor() { |
| 945 if (!m_compositor) | 946 if (!m_compositor) |
| 946 m_compositor = wrapUnique(new PaintLayerCompositor(*this)); | 947 m_compositor = WTF::wrapUnique(new PaintLayerCompositor(*this)); |
| 947 | 948 |
| 948 return m_compositor.get(); | 949 return m_compositor.get(); |
| 949 } | 950 } |
| 950 | 951 |
| 951 void LayoutView::setIsInWindow(bool isInWindow) { | 952 void LayoutView::setIsInWindow(bool isInWindow) { |
| 952 if (m_compositor) | 953 if (m_compositor) |
| 953 m_compositor->setIsInWindow(isInWindow); | 954 m_compositor->setIsInWindow(isInWindow); |
| 954 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS | 955 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS |
| 955 // We don't invalidate layers during Document::detachLayoutTree(), so must | 956 // We don't invalidate layers during Document::detachLayoutTree(), so must |
| 956 // clear the should-keep-alive DisplayItemClients which may be deleted before | 957 // clear the should-keep-alive DisplayItemClients which may be deleted before |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1029 bool LayoutView::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const { | 1030 bool LayoutView::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const { |
| 1030 // Frame scroll corner is painted using LayoutView as the display item client. | 1031 // Frame scroll corner is painted using LayoutView as the display item client. |
| 1031 if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled() && | 1032 if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled() && |
| 1032 (frameView()->horizontalScrollbar() || frameView()->verticalScrollbar())) | 1033 (frameView()->horizontalScrollbar() || frameView()->verticalScrollbar())) |
| 1033 return false; | 1034 return false; |
| 1034 | 1035 |
| 1035 return LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize(); | 1036 return LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize(); |
| 1036 } | 1037 } |
| 1037 | 1038 |
| 1038 } // namespace blink | 1039 } // namespace blink |
| OLD | NEW |