~ubuntu-branches/ubuntu/lucid/qt4-x11/lucid

« back to all changes in this revision

Viewing changes to src/3rdparty/webkit/WebCore/platform/ScrollView.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi, Jonathan Riddell, Alessandro Ghersi
  • Date: 2010-02-25 02:23:43 UTC
  • mfrom: (1.1.29 upstream)
  • Revision ID: james.westby@ubuntu.com-20100225022343-qy63knnsv86fi6tc
Tags: 4:4.6.2-0ubuntu1
[ Jonathan Riddell ]
* New upstream release
* Update kubuntu_07_phonon_4.3.80.diff
* Update 05_append_qt4_target.diff

[ Alessandro Ghersi ]
* Update patches:
  - 0180-window-role.diff
  - 15_fix_qmake_makefile_generation.diff
  - 18_enable_qt3support_qtwebkit_debug_info.diff
  - 81_hurd_architecture.diff
  - 82_hurd_SA_SIGINFO.diff
  - 96_powerpc_no_gc_sections.diff
* Sync 92_armel_gcc43_valist_compat.diff with Debian
* Add kubuntu_11_fix_main_window_without_central_widget.diff (LP: #515132)
  (backport from Qt 4.6.3)
* In libqt4-dbg add conflicts with qt-x11-free-dbg (LP: #517263)
* qt4-dev-tools replaces libqt4-core (<= 4.5.3really4.5.2-0ubuntu1)
  (LP: #527534)
* Sync manpages/qdbus.1 with Debian
  - Update libqt4-dev.manpages
* qt4-dev-tools conflicts with qt3-dev-tools-embedded
* qt4-dev-tools suggests qt4-doc-html
* Update all symbol files
* Bump build dependency of debhelper and pkg-kde-tools to version 0.6.4 as it
  is needed to handle symbol files and build with pkgkde symbolshelper and
  parallel addon
* Call dh_auto_build instead of $(MAKE) for parallel build
* In override_dh_makeshlibs: do not FTBS if there are lost symbols
* Drop rules to generating libphonon4 symbols, no longer need

Show diffs side-by-side

added added

removed removed

Lines of Context:
507
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
511
       // FIXME: Find a way to blit subframes without blitting overlapping content
512
512
       hostWindow()->scroll(-scrollDelta, scrollViewRect, clipRect);
513
513
    } else { 
597
597
    if (m_scrollbarsAvoidingResizer && parent())
598
598
        parent()->adjustScrollbarsAvoidingResizerCount(-m_scrollbarsAvoidingResizer);
599
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
 
 
608
600
    Widget::setParent(parentView);
609
601
 
610
602
    if (m_scrollbarsAvoidingResizer && parent())