← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-security

« back to all changes in this revision

Viewing changes to WebCore/platform/ScrollView.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-01-06 21:25:06 UTC
  • mfrom: (1.2.6 upstream) (4.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100106212506-gd0czn4zrwf1j19l
http://bugs.debian.org/529271
http://bugs.debian.org/559420
* New upstream release
- adds basic Content-Encoding support, thanks to soup
  (Closes: #529271)
- fixes over-advertising content types as supported by
  the media player (Closes: #559420)
* debian/control:
- updated libsoup build requirement (>= 2.28.2)
* debian/libwebkit-1.0-2.symbols:
- updated with new symbols
* debian/copyright:
- updated information since 1.1.17
* Imported patch from https://bugs.webkit.org/show_bug.cgi?id=30623
- I am shipping this patch because I believe it is correct, it is the
  way to go, it fixes a race, and it needs testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/platform/ScrollView.cpp
49
49
    , m_updateScrollbarsPass(0)
50
50
    , m_drawPanScrollIcon(false)
51
51
    , m_useFixedLayout(false)
 
52
    , m_paintsEntireContents(false)
52
53
{
53
54
    platformInit();
54
55
}
168
169
    return m_canBlitOnScroll;
169
170
}
170
171
 
 
172
void ScrollView::setPaintsEntireContents(bool paintsEntireContents)
 
173
{
 
174
    m_paintsEntireContents = paintsEntireContents;
 
175
}
 
176
 
171
177
#if !PLATFORM(GTK)
172
178
IntRect ScrollView::visibleContentRect(bool includeScrollbars) const
173
179
{
707
713
 
708
714
void ScrollView::repaintContentRectangle(const IntRect& rect, bool now)
709
715
{
710
 
    IntRect visibleContent = visibleContentRect();
711
 
    visibleContent.intersect(rect);
712
 
    if (visibleContent.isEmpty())
 
716
    IntRect paintRect = rect;
 
717
    if (!paintsEntireContents())
 
718
        paintRect.intersect(visibleContentRect());
 
719
    if (paintRect.isEmpty())
713
720
        return;
714
721
 
715
722
    if (platformWidget()) {
716
 
        platformRepaintContentRectangle(visibleContent, now);
 
723
        platformRepaintContentRectangle(paintRect, now);
717
724
        return;
718
725
    }
719
726
 
720
727
    if (hostWindow())
721
 
        hostWindow()->repaint(contentsToWindow(visibleContent), true, now);
 
728
        hostWindow()->repaint(contentsToWindow(paintRect), true, now);
722
729
}
723
730
 
724
731
IntRect ScrollView::scrollCornerRect() const
973
980
 
974
981
#if !PLATFORM(MAC)
975
982
 
976
 
void ScrollView::platformSetScrollbarsSuppressed(bool repaintOnUnsuppress)
 
983
void ScrollView::platformSetScrollbarsSuppressed(bool)
977
984
{
978
985
}
979
986
 
1033
1040
    return true;
1034
1041
}
1035
1042
 
1036
 
void ScrollView::platformRepaintContentRectangle(const IntRect&, bool now)
 
1043
void ScrollView::platformRepaintContentRectangle(const IntRect&, bool /*now*/)
1037
1044
{
1038
1045
}
1039
1046