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. All rights reserv
ed. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * | 9 * |
10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
(...skipping 856 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
867 cb = cb->containingBlock(); | 867 cb = cb->containingBlock(); |
868 } | 868 } |
869 } | 869 } |
870 | 870 |
871 o = getNextOrPrevRenderObjectBasedOnDirection(o, stop, continueExploring
, exploringBackwards); | 871 o = getNextOrPrevRenderObjectBasedOnDirection(o, stop, continueExploring
, exploringBackwards); |
872 } | 872 } |
873 | 873 |
874 if (!m_frameView || blockRepaintMode == RepaintNothing) | 874 if (!m_frameView || blockRepaintMode == RepaintNothing) |
875 return; | 875 return; |
876 | 876 |
877 FrameView::DeferredRepaintScope deferRepaints(*m_frameView); | |
878 | |
879 // Have any of the old selected objects changed compared to the new selectio
n? | 877 // Have any of the old selected objects changed compared to the new selectio
n? |
880 for (SelectedObjectMap::iterator i = oldSelectedObjects.begin(); i != oldObj
ectsEnd; ++i) { | 878 for (SelectedObjectMap::iterator i = oldSelectedObjects.begin(); i != oldObj
ectsEnd; ++i) { |
881 RenderObject* obj = i->key; | 879 RenderObject* obj = i->key; |
882 RenderSelectionInfo* newInfo = newSelectedObjects.get(obj); | 880 RenderSelectionInfo* newInfo = newSelectedObjects.get(obj); |
883 RenderSelectionInfo* oldInfo = i->value.get(); | 881 RenderSelectionInfo* oldInfo = i->value.get(); |
884 if (!newInfo || oldInfo->rect() != newInfo->rect() || oldInfo->state() !
= newInfo->state() || | 882 if (!newInfo || oldInfo->rect() != newInfo->rect() || oldInfo->state() !
= newInfo->state() || |
885 (m_selectionStart == obj && oldStartPos != m_selectionStartPos) || | 883 (m_selectionStart == obj && oldStartPos != m_selectionStartPos) || |
886 (m_selectionEnd == obj && oldEndPos != m_selectionEndPos)) { | 884 (m_selectionEnd == obj && oldEndPos != m_selectionEndPos)) { |
887 oldInfo->repaint(); | 885 oldInfo->repaint(); |
888 if (newInfo) { | 886 if (newInfo) { |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1156 return viewWidth(ScrollableArea::IncludeScrollbars) / scale; | 1154 return viewWidth(ScrollableArea::IncludeScrollbars) / scale; |
1157 } | 1155 } |
1158 | 1156 |
1159 double RenderView::layoutViewportHeight() const | 1157 double RenderView::layoutViewportHeight() const |
1160 { | 1158 { |
1161 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1; | 1159 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1; |
1162 return viewHeight(ScrollableArea::IncludeScrollbars) / scale; | 1160 return viewHeight(ScrollableArea::IncludeScrollbars) / scale; |
1163 } | 1161 } |
1164 | 1162 |
1165 } // namespace WebCore | 1163 } // namespace WebCore |
OLD | NEW |