equal
deleted
inserted
replaced
505 IntRect panScrollIconDirtyRect = IntRect(panIconDirtySquareLocation , IntSize(panIconDirtySquareSizeLength, panIconDirtySquareSizeLength)); |
505 IntRect panScrollIconDirtyRect = IntRect(panIconDirtySquareLocation , IntSize(panIconDirtySquareSizeLength, panIconDirtySquareSizeLength)); |
506 panScrollIconDirtyRect.intersect(clipRect); |
506 panScrollIconDirtyRect.intersect(clipRect); |
507 hostWindow()->repaint(panScrollIconDirtyRect, true); |
507 hostWindow()->repaint(panScrollIconDirtyRect, true); |
508 } |
508 } |
509 |
509 |
510 if (canBlitOnScroll() && !rootPreventsBlitting()) { // The main frame can just blit the WebView window |
510 if (canBlitOnScroll()) { // The main frame can just blit the WebView window |
511 // FIXME: Find a way to blit subframes without blitting overlapping content |
511 // FIXME: Find a way to blit subframes without blitting overlapping content |
512 hostWindow()->scroll(-scrollDelta, scrollViewRect, clipRect); |
512 hostWindow()->scroll(-scrollDelta, scrollViewRect, clipRect); |
513 } else { |
513 } else { |
514 // We need to go ahead and repaint the entire backing store. Do it now before moving the |
514 // We need to go ahead and repaint the entire backing store. Do it now before moving the |
515 // windowed plugins. |
515 // windowed plugins. |
594 if (parentView == parent()) |
594 if (parentView == parent()) |
595 return; |
595 return; |
596 |
596 |
597 if (m_scrollbarsAvoidingResizer && parent()) |
597 if (m_scrollbarsAvoidingResizer && parent()) |
598 parent()->adjustScrollbarsAvoidingResizerCount(-m_scrollbarsAvoidingResizer); |
598 parent()->adjustScrollbarsAvoidingResizerCount(-m_scrollbarsAvoidingResizer); |
599 |
|
600 #if PLATFORM(QT) |
|
601 if (m_widgetsPreventingBlitting && parent()) |
|
602 parent()->adjustWidgetsPreventingBlittingCount(-m_widgetsPreventingBlitting); |
|
603 |
|
604 if (m_widgetsPreventingBlitting && parentView) |
|
605 parentView->adjustWidgetsPreventingBlittingCount(m_widgetsPreventingBlitting); |
|
606 #endif |
|
607 |
599 |
608 Widget::setParent(parentView); |
600 Widget::setParent(parentView); |
609 |
601 |
610 if (m_scrollbarsAvoidingResizer && parent()) |
602 if (m_scrollbarsAvoidingResizer && parent()) |
611 parent()->adjustScrollbarsAvoidingResizerCount(m_scrollbarsAvoidingResizer); |
603 parent()->adjustScrollbarsAvoidingResizerCount(m_scrollbarsAvoidingResizer); |