| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1348 #if USE(ACCELERATED_COMPOSITING) | 1348 #if USE(ACCELERATED_COMPOSITING) |
| 1349 updateCompositingLayersAfterLayout(); | 1349 updateCompositingLayersAfterLayout(); |
| 1350 #endif | 1350 #endif |
| 1351 | 1351 |
| 1352 m_layoutCount++; | 1352 m_layoutCount++; |
| 1353 | 1353 |
| 1354 #if PLATFORM(MAC) || PLATFORM(CHROMIUM) | 1354 #if PLATFORM(MAC) || PLATFORM(CHROMIUM) |
| 1355 if (AXObjectCache* cache = root->document()->existingAXObjectCache()) | 1355 if (AXObjectCache* cache = root->document()->existingAXObjectCache()) |
| 1356 cache->postNotification(root, AXObjectCache::AXLayoutComplete, true); | 1356 cache->postNotification(root, AXObjectCache::AXLayoutComplete, true); |
| 1357 #endif | 1357 #endif |
| 1358 #if ENABLE(DASHBOARD_SUPPORT) || ENABLE(DRAGGABLE_REGION) | 1358 #if ENABLE(DRAGGABLE_REGION) |
| 1359 updateAnnotatedRegions(); | 1359 updateAnnotatedRegions(); |
| 1360 #endif | 1360 #endif |
| 1361 | 1361 |
| 1362 ASSERT(!root->needsLayout()); | 1362 ASSERT(!root->needsLayout()); |
| 1363 | 1363 |
| 1364 updateCanBlitOnScrollRecursively(); | 1364 updateCanBlitOnScrollRecursively(); |
| 1365 | 1365 |
| 1366 if (document->hasListenerType(Document::OVERFLOWCHANGED_LISTENER)) | 1366 if (document->hasListenerType(Document::OVERFLOWCHANGED_LISTENER)) |
| 1367 updateOverflowStatus(layoutWidth() < contentsWidth(), | 1367 updateOverflowStatus(layoutWidth() < contentsWidth(), |
| 1368 layoutHeight() < contentsHeight()); | 1368 layoutHeight() < contentsHeight()); |
| (...skipping 1770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3139 bool FrameView::scrollAnimatorEnabled() const | 3139 bool FrameView::scrollAnimatorEnabled() const |
| 3140 { | 3140 { |
| 3141 #if ENABLE(SMOOTH_SCROLLING) | 3141 #if ENABLE(SMOOTH_SCROLLING) |
| 3142 if (Page* page = m_frame->page()) | 3142 if (Page* page = m_frame->page()) |
| 3143 return page->settings()->scrollAnimatorEnabled(); | 3143 return page->settings()->scrollAnimatorEnabled(); |
| 3144 #endif | 3144 #endif |
| 3145 | 3145 |
| 3146 return false; | 3146 return false; |
| 3147 } | 3147 } |
| 3148 | 3148 |
| 3149 #if ENABLE(DASHBOARD_SUPPORT) || ENABLE(DRAGGABLE_REGION) | 3149 #if ENABLE(DRAGGABLE_REGION) |
| 3150 void FrameView::updateAnnotatedRegions() | 3150 void FrameView::updateAnnotatedRegions() |
| 3151 { | 3151 { |
| 3152 Document* document = m_frame->document(); | 3152 Document* document = m_frame->document(); |
| 3153 if (!document->hasAnnotatedRegions()) | 3153 if (!document->hasAnnotatedRegions()) |
| 3154 return; | 3154 return; |
| 3155 Vector<AnnotatedRegionValue> newRegions; | 3155 Vector<AnnotatedRegionValue> newRegions; |
| 3156 document->renderBox()->collectAnnotatedRegions(newRegions); | 3156 document->renderBox()->collectAnnotatedRegions(newRegions); |
| 3157 if (newRegions == document->annotatedRegions()) | 3157 if (newRegions == document->annotatedRegions()) |
| 3158 return; | 3158 return; |
| 3159 document->setAnnotatedRegions(newRegions); | 3159 document->setAnnotatedRegions(newRegions); |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3484 | 3484 |
| 3485 m_isPainting = false; | 3485 m_isPainting = false; |
| 3486 | 3486 |
| 3487 if (flatteningPaint && isRootFrame) | 3487 if (flatteningPaint && isRootFrame) |
| 3488 notifyWidgetsInAllFrames(DidPaintFlattened); | 3488 notifyWidgetsInAllFrames(DidPaintFlattened); |
| 3489 | 3489 |
| 3490 m_paintBehavior = oldPaintBehavior; | 3490 m_paintBehavior = oldPaintBehavior; |
| 3491 m_lastPaintTime = currentTime(); | 3491 m_lastPaintTime = currentTime(); |
| 3492 | 3492 |
| 3493 // Regions may have changed as a result of the visibility/z-index of element
changing. | 3493 // Regions may have changed as a result of the visibility/z-index of element
changing. |
| 3494 #if ENABLE(DASHBOARD_SUPPORT) || ENABLE(DRAGGABLE_REGION) | 3494 #if ENABLE(DRAGGABLE_REGION) |
| 3495 if (document->annotatedRegionsDirty()) | 3495 if (document->annotatedRegionsDirty()) |
| 3496 updateAnnotatedRegions(); | 3496 updateAnnotatedRegions(); |
| 3497 #endif | 3497 #endif |
| 3498 | 3498 |
| 3499 if (isTopLevelPainter) | 3499 if (isTopLevelPainter) |
| 3500 sCurrentPaintTimeStamp = 0; | 3500 sCurrentPaintTimeStamp = 0; |
| 3501 | 3501 |
| 3502 InspectorInstrumentation::didPaint(renderView, p, rect); | 3502 InspectorInstrumentation::didPaint(renderView, p, rect); |
| 3503 } | 3503 } |
| 3504 | 3504 |
| (...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4034 { | 4034 { |
| 4035 #if USE(ACCELERATED_COMPOSITING) | 4035 #if USE(ACCELERATED_COMPOSITING) |
| 4036 if (TiledBacking* tiledBacking = this->tiledBacking()) | 4036 if (TiledBacking* tiledBacking = this->tiledBacking()) |
| 4037 tiledBacking->setScrollingPerformanceLoggingEnabled(flag); | 4037 tiledBacking->setScrollingPerformanceLoggingEnabled(flag); |
| 4038 #else | 4038 #else |
| 4039 UNUSED_PARAM(flag); | 4039 UNUSED_PARAM(flag); |
| 4040 #endif | 4040 #endif |
| 4041 } | 4041 } |
| 4042 | 4042 |
| 4043 } // namespace WebCore | 4043 } // namespace WebCore |
| OLD | NEW |