| 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 852 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 863     } | 863     } | 
| 864 | 864 | 
| 865     return size; | 865     return size; | 
| 866 } | 866 } | 
| 867 | 867 | 
| 868 void RenderView::releaseWidgets(Vector<RenderWidget*>& renderWidgets) | 868 void RenderView::releaseWidgets(Vector<RenderWidget*>& renderWidgets) | 
| 869 { | 869 { | 
| 870     size_t size = renderWidgets.size(); | 870     size_t size = renderWidgets.size(); | 
| 871 | 871 | 
| 872     for (size_t i = 0; i < size; ++i) | 872     for (size_t i = 0; i < size; ++i) | 
| 873         renderWidgets[i]->deref(renderArena()); | 873         renderWidgets[i]->deref(); | 
| 874 } | 874 } | 
| 875 | 875 | 
| 876 void RenderView::updateWidgetPositions() | 876 void RenderView::updateWidgetPositions() | 
| 877 { | 877 { | 
| 878     // updateWidgetPosition() can possibly cause layout to be re-entered (via pl
      ug-ins running | 878     // updateWidgetPosition() can possibly cause layout to be re-entered (via pl
      ug-ins running | 
| 879     // scripts in response to NPP_SetWindow, for example), so we need to keep th
      e Widgets | 879     // scripts in response to NPP_SetWindow, for example), so we need to keep th
      e Widgets | 
| 880     // alive during enumeration. | 880     // alive during enumeration. | 
| 881 | 881 | 
| 882     Vector<RenderWidget*> renderWidgets; | 882     Vector<RenderWidget*> renderWidgets; | 
| 883     size_t size = getRetainedWidgets(renderWidgets); | 883     size_t size = getRetainedWidgets(renderWidgets); | 
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 985 { | 985 { | 
| 986     Frame* frame = m_frameView->frame(); | 986     Frame* frame = m_frameView->frame(); | 
| 987     return frame ? frame->pageZoomFactor() : 1; | 987     return frame ? frame->pageZoomFactor() : 1; | 
| 988 } | 988 } | 
| 989 | 989 | 
| 990 void RenderView::pushLayoutState(RenderObject* root) | 990 void RenderView::pushLayoutState(RenderObject* root) | 
| 991 { | 991 { | 
| 992     ASSERT(m_layoutStateDisableCount == 0); | 992     ASSERT(m_layoutStateDisableCount == 0); | 
| 993     ASSERT(m_layoutState == 0); | 993     ASSERT(m_layoutState == 0); | 
| 994 | 994 | 
| 995     m_layoutState = new (renderArena()) LayoutState(root); | 995     m_layoutState = new LayoutState(root); | 
| 996 } | 996 } | 
| 997 | 997 | 
| 998 bool RenderView::shouldDisableLayoutStateForSubtree(RenderObject* renderer) cons
      t | 998 bool RenderView::shouldDisableLayoutStateForSubtree(RenderObject* renderer) cons
      t | 
| 999 { | 999 { | 
| 1000     RenderObject* o = renderer; | 1000     RenderObject* o = renderer; | 
| 1001     while (o) { | 1001     while (o) { | 
| 1002         if (o->hasColumns() || o->hasTransform() || o->hasReflection()) | 1002         if (o->hasColumns() || o->hasTransform() || o->hasReflection()) | 
| 1003             return true; | 1003             return true; | 
| 1004         o = o->container(); | 1004         o = o->container(); | 
| 1005     } | 1005     } | 
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1141 #endif | 1141 #endif | 
| 1142 | 1142 | 
| 1143     if (layoutState) | 1143     if (layoutState) | 
| 1144         layoutState->m_isPaginated = m_fragmenting; | 1144         layoutState->m_isPaginated = m_fragmenting; | 
| 1145 | 1145 | 
| 1146     if (m_flowThreadState != RenderObject::NotInsideFlowThread) | 1146     if (m_flowThreadState != RenderObject::NotInsideFlowThread) | 
| 1147         m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); | 1147         m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); | 
| 1148 } | 1148 } | 
| 1149 | 1149 | 
| 1150 } // namespace WebCore | 1150 } // namespace WebCore | 
| OLD | NEW | 
|---|