Changeset 100290 in webkit


Ignore:
Timestamp:
Nov 15, 2011 9:54:52 AM (12 years ago)
Author:
andersca@apple.com
Message:

HostWindow invalidation functions should use root view coordinates
​https://bugs.webkit.org/show_bug.cgi?id=72338

Reviewed by Dan Bernstein.

Source/WebCore:

Rename invalidateWindow to invalidateRootView, and invalidateContentsAndWindow
to invalidateContentsAndRootView. Make sure that the rects passed to the renamed functions
are in root view coordinates by changing contentsToWindow calls to contentsToRootView.

In practice this doesn't matter because for all platforms except Mac WebKit1, root view coordinates
and window coordinates are equivalent, and Mac WebKit1 doesn't use these invalidation functions.

  • loader/EmptyClients.h:
  • page/Chrome.cpp:

(WebCore::Chrome::invalidateRootView):
(WebCore::Chrome::invalidateContentsAndRootView):

  • page/Chrome.h:
  • page/ChromeClient.h:
  • page/Frame.cpp:

(WebCore::Frame::tiledBackingStorePaintEnd):

  • page/FrameView.cpp:

(WebCore::FrameView::invalidateRect):
(WebCore::FrameView::scrollContentsFastPath):

  • platform/HostWindow.h:
  • platform/ScrollView.cpp:

(WebCore::ScrollView::rectToCopyOnScroll):
(WebCore::ScrollView::scrollContents):
(WebCore::ScrollView::wheelEvent):

  • platform/chromium/FramelessScrollView.cpp:

(WebCore::FramelessScrollView::invalidateRect):

  • svg/graphics/SVGImage.cpp:

(WebCore::SVGImageChromeClient::invalidateContentsAndRootView):

Source/WebKit/chromium:

  • src/ChromeClientImpl.cpp:

(WebKit::ChromeClientImpl::invalidateRootView):
(WebKit::ChromeClientImpl::invalidateContentsAndRootView):
(WebKit::ChromeClientImpl::invalidateContentsForSlowScroll):

  • src/ChromeClientImpl.h:
  • src/WebPopupMenuImpl.cpp:

(WebKit::WebPopupMenuImpl::invalidateRootView):
(WebKit::WebPopupMenuImpl::invalidateContentsAndRootView):
(WebKit::WebPopupMenuImpl::invalidateContentsForSlowScroll):

  • src/WebPopupMenuImpl.h:

Source/WebKit/efl:

  • WebCoreSupport/ChromeClientEfl.cpp:

(WebCore::ChromeClientEfl::invalidateRootView):
(WebCore::ChromeClientEfl::invalidateContentsAndRootView):
(WebCore::ChromeClientEfl::invalidateContentsForSlowScroll):

  • WebCoreSupport/ChromeClientEfl.h:

Source/WebKit/gtk:

  • WebCoreSupport/ChromeClientGtk.cpp:

(WebKit::ChromeClient::invalidateRootView):
(WebKit::ChromeClient::invalidateContentsAndRootView):
(WebKit::ChromeClient::invalidateContentsForSlowScroll):

  • WebCoreSupport/ChromeClientGtk.h:

Source/WebKit/mac:

  • WebCoreSupport/WebChromeClient.h:
  • WebCoreSupport/WebChromeClient.mm:

(WebChromeClient::invalidateRootView):
(WebChromeClient::invalidateContentsAndRootView):
(WebChromeClient::invalidateContentsForSlowScroll):

Source/WebKit/qt:

  • WebCoreSupport/ChromeClientQt.cpp:

(WebCore::ChromeClientQt::invalidateRootView):
(WebCore::ChromeClientQt::invalidateContentsAndRootView):
(WebCore::ChromeClientQt::invalidateContentsForSlowScroll):

  • WebCoreSupport/ChromeClientQt.h:

Source/WebKit/win:

  • WebCoreSupport/WebChromeClient.cpp:

(WebChromeClient::invalidateRootView):
(WebChromeClient::invalidateContentsAndRootView):

  • WebCoreSupport/WebChromeClient.h:

Source/WebKit/wince:

  • WebCoreSupport/ChromeClientWinCE.cpp:

(WebKit::ChromeClientWinCE::invalidateRootView):
(WebKit::ChromeClientWinCE::invalidateContentsAndRootView):
(WebKit::ChromeClientWinCE::invalidateContentsForSlowScroll):
(WebKit::ChromeClientWinCE::scroll):

  • WebCoreSupport/ChromeClientWinCE.h:

Source/WebKit/wx:

  • WebKitSupport/ChromeClientWx.cpp:

(WebCore::ChromeClientWx::invalidateRootView):
(WebCore::ChromeClientWx::invalidateContentsForSlowScroll):
(WebCore::ChromeClientWx::invalidateContentsAndRootView):

  • WebKitSupport/ChromeClientWx.h:

Source/WebKit2:

  • WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::invalidateRootView):
(WebKit::WebChromeClient::invalidateContentsAndRootView):

  • WebProcess/WebCoreSupport/WebChromeClient.h:
Location:
trunk/Source
Files:
40 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r100285 r100290  
     12011-11-14  Anders Carlsson  <andersca@apple.com>
     2
     3        HostWindow invalidation functions should use root view coordinates
     4        https://bugs.webkit.org/show_bug.cgi?id=72338
     5
     6        Reviewed by Dan Bernstein.
     7
     8        Rename invalidateWindow to invalidateRootView, and invalidateContentsAndWindow
     9        to invalidateContentsAndRootView. Make sure that the rects passed to the renamed functions
     10        are in root view coordinates by changing contentsToWindow calls to contentsToRootView.
     11       
     12        In practice this doesn't matter because for all platforms except Mac WebKit1, root view coordinates
     13        and window coordinates are equivalent, and Mac WebKit1 doesn't use these invalidation functions.
     14
     15        * loader/EmptyClients.h:
     16        * page/Chrome.cpp:
     17        (WebCore::Chrome::invalidateRootView):
     18        (WebCore::Chrome::invalidateContentsAndRootView):
     19        * page/Chrome.h:
     20        * page/ChromeClient.h:
     21        * page/Frame.cpp:
     22        (WebCore::Frame::tiledBackingStorePaintEnd):
     23        * page/FrameView.cpp:
     24        (WebCore::FrameView::invalidateRect):
     25        (WebCore::FrameView::scrollContentsFastPath):
     26        * platform/HostWindow.h:
     27        * platform/ScrollView.cpp:
     28        (WebCore::ScrollView::rectToCopyOnScroll):
     29        (WebCore::ScrollView::scrollContents):
     30        (WebCore::ScrollView::wheelEvent):
     31        * platform/chromium/FramelessScrollView.cpp:
     32        (WebCore::FramelessScrollView::invalidateRect):
     33        * svg/graphics/SVGImage.cpp:
     34        (WebCore::SVGImageChromeClient::invalidateContentsAndRootView):
     35
    1362011-11-15  Philip Rogers  <pdr@google.com>
    237

  • trunk/Source/WebCore/loader/EmptyClients.h

    r99403 r100290  
    158158    virtual IntRect windowResizerRect() const { return IntRect(); }
    159159
    160     virtual void invalidateWindow(const IntRect&, bool) { }
    161     virtual void invalidateContentsAndWindow(const IntRect&, bool) { }
    162     virtual void invalidateContentsForSlowScroll(const IntRect&, bool) {};
     160    virtual void invalidateRootView(const IntRect&, bool) OVERRIDE { }
     161    virtual void invalidateContentsAndRootView(const IntRect&, bool) OVERRIDE { }
     162    virtual void invalidateContentsForSlowScroll(const IntRect&, bool) OVERRIDE { }
    163163    virtual void scroll(const IntSize&, const IntRect&, const IntRect&) { }
    164164#if USE(TILED_BACKING_STORE)

  • trunk/Source/WebCore/page/Chrome.cpp

    r99403 r100290  
    7272}
    7373
    74 void Chrome::invalidateWindow(const IntRect& updateRect, bool immediate)
    75 {
    76     m_client->invalidateWindow(updateRect, immediate);
    77 }
    78 
    79 void Chrome::invalidateContentsAndWindow(const IntRect& updateRect, bool immediate)
    80 {
    81     m_client->invalidateContentsAndWindow(updateRect, immediate);
     74void Chrome::invalidateRootView(const IntRect& updateRect, bool immediate)
     75{
     76    m_client->invalidateRootView(updateRect, immediate);
     77}
     78
     79void Chrome::invalidateContentsAndRootView(const IntRect& updateRect, bool immediate)
     80{
     81    m_client->invalidateContentsAndRootView(updateRect, immediate);
    8282}
    8383

  • trunk/Source/WebCore/page/Chrome.h

    r99403 r100290  
    7070        // HostWindow methods.
    7171
    72         virtual void invalidateWindow(const IntRect&, bool);
    73         virtual void invalidateContentsAndWindow(const IntRect&, bool);
     72        virtual void invalidateRootView(const IntRect&, bool) OVERRIDE;
     73        virtual void invalidateContentsAndRootView(const IntRect&, bool) OVERRIDE;
    7474        virtual void invalidateContentsForSlowScroll(const IntRect&, bool);
    7575        virtual void scroll(const IntSize&, const IntRect&, const IntRect&);

  • trunk/Source/WebCore/page/ChromeClient.h

    r99403 r100290  
    147147
    148148        // Methods used by HostWindow.
    149         virtual void invalidateWindow(const IntRect&, bool) = 0;
    150         virtual void invalidateContentsAndWindow(const IntRect&, bool) = 0;
     149        virtual void invalidateRootView(const IntRect&, bool) = 0;
     150        virtual void invalidateContentsAndRootView(const IntRect&, bool) = 0;
    151151        virtual void invalidateContentsForSlowScroll(const IntRect&, bool) = 0;
    152152        virtual void scroll(const IntSize&, const IntRect&, const IntRect&) = 0;

  • trunk/Source/WebCore/page/Frame.cpp

    r100059 r100290  
    930930    // Request repaint from the system
    931931    for (int n = 0; n < size; ++n)
    932         m_page->chrome()->invalidateContentsAndWindow(m_view->contentsToWindow(paintedArea[n]), false);
     932        m_page->chrome()->invalidateContentsAndRootView(m_view->contentsToRootView(paintedArea[n]), false);
    933933}
    934934

  • trunk/Source/WebCore/page/FrameView.cpp

    r100059 r100290  
    378378    if (!parent()) {
    379379        if (hostWindow())
    380             hostWindow()->invalidateContentsAndWindow(rect, false /*immediate*/);
     380            hostWindow()->invalidateContentsAndRootView(rect, false /*immediate*/);
    381381        return;
    382382    }
    … …  
    14531453            continue;
    14541454        IntRect updateRect = renderBox->layer()->repaintRectIncludingDescendants();
    1455         updateRect = contentsToWindow(updateRect);
     1455        updateRect = contentsToRootView(updateRect);
    14561456        if (!isCompositedContentLayer && clipsRepaints())
    14571457            updateRect.intersect(rectToScroll);
    … …  
    14791479#if USE(ACCELERATED_COMPOSITING)
    14801480            if (isCompositedContentLayer) {
    1481                 updateRect = windowToContents(updateRect);
     1481                updateRect = rootViewToContents(updateRect);
    14821482                RenderView* root = rootRenderer(this);
    14831483                ASSERT(root);
    … …  
    14881488            if (clipsRepaints())
    14891489                updateRect.intersect(rectToScroll);
    1490             hostWindow()->invalidateContentsAndWindow(updateRect, false);
     1490            hostWindow()->invalidateContentsAndRootView(updateRect, false);
    14911491        }
    14921492        return true;

  • trunk/Source/WebCore/platform/HostWindow.h

    r97571 r100290  
    3939    virtual ~HostWindow() { }
    4040
    41     // Requests the host invalidate the window, not the contents. If immediate is true do so synchronously, otherwise async.
    42     virtual void invalidateWindow(const IntRect& updateRect, bool immediate) = 0;
     41    // Requests the host invalidate the root view, not the contents. If immediate is true do so synchronously, otherwise async.
     42    virtual void invalidateRootView(const IntRect& updateRect, bool immediate) = 0;
    4343
    44     // Requests the host invalidate the contents and the window. If immediate is true do so synchronously, otherwise async.
    45     virtual void invalidateContentsAndWindow(const IntRect& updateRect, bool immediate) = 0;
     44    // Requests the host invalidate the contents and the root view. If immediate is true do so synchronously, otherwise async.
     45    virtual void invalidateContentsAndRootView(const IntRect& updateRect, bool immediate) = 0;
    4646
    4747    // Requests the host scroll backingstore by the specified delta, rect to scroll, and clip rect.
    4848    virtual void scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect) = 0;
    4949
    50     // Requests the host invalidate the contents, not the window. This is the slow path for scrolling.
     50    // Requests the host invalidate the contents, not the root view. This is the slow path for scrolling.
    5151    virtual void invalidateContentsForSlowScroll(const IntRect& updateRect, bool immediate) = 0;
    5252

  • trunk/Source/WebCore/platform/ScrollView.cpp

    r99761 r100290  
    604604IntRect ScrollView::rectToCopyOnScroll() const
    605605{
    606     IntRect scrollViewRect = convertToContainingWindow(IntRect(0, 0, visibleWidth(), visibleHeight()));
     606    IntRect scrollViewRect = convertToRootView(IntRect(0, 0, visibleWidth(), visibleHeight()));
    607607    if (hasOverlayScrollbars()) {
    608608        int verticalScrollbarWidth = (verticalScrollbar() && !hasLayerForVerticalScrollbar()) ? verticalScrollbar()->width() : 0;
    … …  
    627627    updateRect.intersect(scrollViewRect);
    628628
    629     // Invalidate the window (not the backing store).
    630     hostWindow()->invalidateWindow(updateRect, false /*immediate*/);
     629    // Invalidate the root view (not the backing store).
     630    hostWindow()->invalidateRootView(updateRect, false /*immediate*/);
    631631
    632632    if (m_drawPanScrollIcon) {
    … …  
    637637        IntRect panScrollIconDirtyRect = IntRect(panIconDirtySquareLocation, IntSize(panIconDirtySquareSizeLength, panIconDirtySquareSizeLength));
    638638        panScrollIconDirtyRect.intersect(clipRect);
    639         hostWindow()->invalidateContentsAndWindow(panScrollIconDirtyRect, false /*immediate*/);
     639        hostWindow()->invalidateContentsAndRootView(panScrollIconDirtyRect, false /*immediate*/);
    640640    }
    641641
    … …  
    663663#endif
    664664    if (!horizontalOverhangRect.isEmpty())
    665         hostWindow()->invalidateContentsAndWindow(horizontalOverhangRect, false /*immediate*/);
     665        hostWindow()->invalidateContentsAndRootView(horizontalOverhangRect, false /*immediate*/);
    666666    if (!verticalOverhangRect.isEmpty())
    667         hostWindow()->invalidateContentsAndWindow(verticalOverhangRect, false /*immediate*/);
     667        hostWindow()->invalidateContentsAndRootView(verticalOverhangRect, false /*immediate*/);
    668668
    669669    // This call will move children with native widgets (plugins) and invalidate them as well.
    … …  
    671671
    672672    // Now blit the backingstore into the window which should be very fast.
    673     hostWindow()->invalidateWindow(IntRect(), true);
     673    hostWindow()->invalidateRootView(IntRect(), true);
    674674}
    675675
    … …  
    930930
    931931    if (hostWindow())
    932         hostWindow()->invalidateContentsAndWindow(contentsToWindow(paintRect), now /*immediate*/);
     932        hostWindow()->invalidateContentsAndRootView(contentsToWindow(paintRect), now /*immediate*/);
    933933}
    934934
    … …  
    12531253    m_drawPanScrollIcon = true;   
    12541254    m_panScrollIconPoint = IntPoint(iconPosition.x() - panIconSizeLength / 2 , iconPosition.y() - panIconSizeLength / 2) ;
    1255     hostWindow()->invalidateContentsAndWindow(IntRect(m_panScrollIconPoint, IntSize(panIconSizeLength, panIconSizeLength)), true /*immediate*/);
     1255    hostWindow()->invalidateContentsAndRootView(IntRect(m_panScrollIconPoint, IntSize(panIconSizeLength, panIconSizeLength)), true /*immediate*/);
    12561256}
    12571257
    … …  
    12611261        return;
    12621262    m_drawPanScrollIcon = false;
    1263     hostWindow()->invalidateContentsAndWindow(IntRect(m_panScrollIconPoint, IntSize(panIconSizeLength, panIconSizeLength)), true /*immediate*/);
     1263    hostWindow()->invalidateContentsAndRootView(IntRect(m_panScrollIconPoint, IntSize(panIconSizeLength, panIconSizeLength)), true /*immediate*/);
    12641264}
    12651265

  • trunk/Source/WebCore/platform/chromium/FramelessScrollView.cpp

    r96348 r100290  
    6767{
    6868    if (HostWindow* h = hostWindow())
    69         h->invalidateContentsAndWindow(rect, false /*immediate*/);
     69        h->invalidateContentsAndRootView(rect, false /*immediate*/);
    7070}
    7171

  • trunk/Source/WebCore/svg/graphics/SVGImage.cpp

    r99856 r100290  
    7474    }
    7575
    76     virtual void invalidateContentsAndWindow(const IntRect& r, bool)
     76    virtual void invalidateContentsAndRootView(const IntRect& r, bool)
    7777    {
    7878        if (m_image && m_image->imageObserver())

  • trunk/Source/WebKit/chromium/ChangeLog

    r100277 r100290  
     12011-11-14  Anders Carlsson  <andersca@apple.com>
     2
     3        HostWindow invalidation functions should use root view coordinates
     4        https://bugs.webkit.org/show_bug.cgi?id=72338
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * src/ChromeClientImpl.cpp:
     9        (WebKit::ChromeClientImpl::invalidateRootView):
     10        (WebKit::ChromeClientImpl::invalidateContentsAndRootView):
     11        (WebKit::ChromeClientImpl::invalidateContentsForSlowScroll):
     12        * src/ChromeClientImpl.h:
     13        * src/WebPopupMenuImpl.cpp:
     14        (WebKit::WebPopupMenuImpl::invalidateRootView):
     15        (WebKit::WebPopupMenuImpl::invalidateContentsAndRootView):
     16        (WebKit::WebPopupMenuImpl::invalidateContentsForSlowScroll):
     17        * src/WebPopupMenuImpl.h:
     18
    1192011-11-15  Pavel Feldman  <pfeldman@google.com>
    220

  • trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp

    r100098 r100290  
    507507#endif
    508508
    509 void ChromeClientImpl::invalidateWindow(const IntRect&, bool)
     509void ChromeClientImpl::invalidateRootView(const IntRect&, bool)
    510510{
    511511    notImplemented();
    512512}
    513513
    514 void ChromeClientImpl::invalidateContentsAndWindow(const IntRect& updateRect, bool /*immediate*/)
     514void ChromeClientImpl::invalidateContentsAndRootView(const IntRect& updateRect, bool /*immediate*/)
    515515{
    516516    if (updateRect.isEmpty())
    … …  
    530530{
    531531    m_webView->hidePopups();
    532     invalidateContentsAndWindow(updateRect, immediate);
     532    invalidateContentsAndRootView(updateRect, immediate);
    533533}
    534534

  • trunk/Source/WebKit/chromium/src/ChromeClientImpl.h

    r95919 r100290  
    106106    virtual void registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title);
    107107#endif
    108     virtual void invalidateWindow(const WebCore::IntRect&, bool);
    109     virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
     108    virtual void invalidateRootView(const WebCore::IntRect&, bool);
     109    virtual void invalidateContentsAndRootView(const WebCore::IntRect&, bool);
    110110    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
    111111#if ENABLE(REQUEST_ANIMATION_FRAME)

  • trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp

    r98782 r100290  
    349349}
    350350
    351 void WebPopupMenuImpl::invalidateWindow(const IntRect&, bool)
    352 {
    353     notImplemented();
    354 }
    355 
    356 void WebPopupMenuImpl::invalidateContentsAndWindow(const IntRect& paintRect, bool /*immediate*/)
     351void WebPopupMenuImpl::invalidateRootView(const IntRect&, bool)
     352{
     353    notImplemented();
     354}
     355
     356void WebPopupMenuImpl::invalidateContentsAndRootView(const IntRect& paintRect, bool /*immediate*/)
    357357{
    358358    if (paintRect.isEmpty())
    … …  
    364364void WebPopupMenuImpl::invalidateContentsForSlowScroll(const IntRect& updateRect, bool immediate)
    365365{
    366     invalidateContentsAndWindow(updateRect, immediate);
     366    invalidateContentsAndRootView(updateRect, immediate);
    367367}
    368368

  • trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.h

    r98669 r100290  
    117117    // WebCore::HostWindow methods:
    118118    virtual void invalidateContents(const WebCore::IntRect&, bool);
    119     virtual void invalidateWindow(const WebCore::IntRect&, bool);
    120     virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
     119    virtual void invalidateRootView(const WebCore::IntRect&, bool);
     120    virtual void invalidateContentsAndRootView(const WebCore::IntRect&, bool);
    121121    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
    122122    virtual void scheduleAnimation();

  • trunk/Source/WebKit/efl/ChangeLog

    r100261 r100290  
     12011-11-14  Anders Carlsson  <andersca@apple.com>
     2
     3        HostWindow invalidation functions should use root view coordinates
     4        https://bugs.webkit.org/show_bug.cgi?id=72338
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * WebCoreSupport/ChromeClientEfl.cpp:
     9        (WebCore::ChromeClientEfl::invalidateRootView):
     10        (WebCore::ChromeClientEfl::invalidateContentsAndRootView):
     11        (WebCore::ChromeClientEfl::invalidateContentsForSlowScroll):
     12        * WebCoreSupport/ChromeClientEfl.h:
     13
    1142011-11-15  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
    215

  • trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

    r99268 r100290  
    486486}
    487487
    488 void ChromeClientEfl::invalidateWindow(const IntRect& updateRect, bool immediate)
    489 {
    490     notImplemented();
    491 }
    492 
    493 void ChromeClientEfl::invalidateContentsAndWindow(const IntRect& updateRect, bool immediate)
     488void ChromeClientEfl::invalidateRootView(const IntRect& updateRect, bool immediate)
     489{
     490    notImplemented();
     491}
     492
     493void ChromeClientEfl::invalidateContentsAndRootView(const IntRect& updateRect, bool immediate)
    494494{
    495495    if (updateRect.isEmpty())
    … …  
    507507void ChromeClientEfl::invalidateContentsForSlowScroll(const IntRect& updateRect, bool immediate)
    508508{
    509     invalidateContentsAndWindow(updateRect, immediate);
     509    invalidateContentsAndRootView(updateRect, immediate);
    510510}
    511511

  • trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h

    r98472 r100290  
    153153
    154154    virtual void invalidateContents(const IntRect&, bool);
    155     virtual void invalidateWindow(const IntRect&, bool);
    156     virtual void invalidateContentsAndWindow(const IntRect&, bool);
     155    virtual void invalidateRootView(const IntRect&, bool);
     156    virtual void invalidateContentsAndRootView(const IntRect&, bool);
    157157    virtual void invalidateContentsForSlowScroll(const IntRect&, bool);
    158158    virtual void scroll(const IntSize&, const IntRect&, const IntRect&);

  • trunk/Source/WebKit/gtk/ChangeLog

    r100284 r100290  
     12011-11-14  Anders Carlsson  <andersca@apple.com>
     2
     3        HostWindow invalidation functions should use root view coordinates
     4        https://bugs.webkit.org/show_bug.cgi?id=72338
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * WebCoreSupport/ChromeClientGtk.cpp:
     9        (WebKit::ChromeClient::invalidateRootView):
     10        (WebKit::ChromeClient::invalidateContentsAndRootView):
     11        (WebKit::ChromeClient::invalidateContentsForSlowScroll):
     12        * WebCoreSupport/ChromeClientGtk.h:
     13
    1142011-11-15  Carlos Garcia Campos  <cgarcia@igalia.com>
    215

  • trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

    r100121 r100290  
    571571}
    572572
    573 void ChromeClient::invalidateWindow(const IntRect&, bool immediate)
    574 {
    575 }
    576 
    577 void ChromeClient::invalidateContentsAndWindow(const IntRect& updateRect, bool immediate)
     573void ChromeClient::invalidateRootView(const IntRect&, bool immediate)
     574{
     575}
     576
     577void ChromeClient::invalidateContentsAndRootView(const IntRect& updateRect, bool immediate)
    578578{
    579579    if (updateRect.isEmpty())
    … …  
    585585void ChromeClient::invalidateContentsForSlowScroll(const IntRect& updateRect, bool immediate)
    586586{
    587     invalidateContentsAndWindow(updateRect, immediate);
     587    invalidateContentsAndRootView(updateRect, immediate);
    588588    m_adjustmentWatcher.updateAdjustmentsFromScrollbarsLater();
    589589}

  • trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h

    r98827 r100290  
    103103        virtual void registerProtocolHandler(const WTF::String&, const WTF::String&, const WTF::String&, const WTF::String&);
    104104#endif
    105         virtual void invalidateWindow(const IntRect&, bool);
    106         virtual void invalidateContentsAndWindow(const IntRect&, bool);
     105        virtual void invalidateRootView(const IntRect&, bool);
     106        virtual void invalidateContentsAndRootView(const IntRect&, bool);
    107107        virtual void invalidateContentsForSlowScroll(const IntRect&, bool);
    108108        virtual void scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);

  • trunk/Source/WebKit/mac/ChangeLog

    r100226 r100290  
     12011-11-14  Anders Carlsson  <andersca@apple.com>
     2
     3        HostWindow invalidation functions should use root view coordinates
     4        https://bugs.webkit.org/show_bug.cgi?id=72338
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * WebCoreSupport/WebChromeClient.h:
     9        * WebCoreSupport/WebChromeClient.mm:
     10        (WebChromeClient::invalidateRootView):
     11        (WebChromeClient::invalidateContentsAndRootView):
     12        (WebChromeClient::invalidateContentsForSlowScroll):
     13
    1142011-11-14  Julien Chaffraix  <jchaffraix@webkit.org>
    215

  • trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h

    r95919 r100290  
    8989    virtual WebCore::IntRect windowResizerRect() const OVERRIDE;
    9090
    91     virtual void invalidateWindow(const WebCore::IntRect&, bool) OVERRIDE;
    92     virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool) OVERRIDE;
     91    virtual void invalidateRootView(const WebCore::IntRect&, bool) OVERRIDE;
     92    virtual void invalidateContentsAndRootView(const WebCore::IntRect&, bool) OVERRIDE;
    9393    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool) OVERRIDE;
    9494    virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect) OVERRIDE;

  • trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm

    r97538 r100290  
    542542}
    543543
    544 void WebChromeClient::invalidateWindow(const IntRect&, bool immediate)
     544void WebChromeClient::invalidateRootView(const IntRect&, bool immediate)
    545545{
    546546    if (immediate) {
    … …  
    550550}
    551551
    552 void WebChromeClient::invalidateContentsAndWindow(const IntRect& rect, bool immediate)
     552void WebChromeClient::invalidateContentsAndRootView(const IntRect& rect, bool immediate)
    553553{
    554554}
    … …  
    556556void WebChromeClient::invalidateContentsForSlowScroll(const IntRect& rect, bool immediate)
    557557{
    558     invalidateContentsAndWindow(rect, immediate);
     558    invalidateContentsAndRootView(rect, immediate);
    559559}
    560560

  • trunk/Source/WebKit/qt/ChangeLog

    r100123 r100290  
     12011-11-14  Anders Carlsson  <andersca@apple.com>
     2
     3        HostWindow invalidation functions should use root view coordinates
     4        https://bugs.webkit.org/show_bug.cgi?id=72338
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * WebCoreSupport/ChromeClientQt.cpp:
     9        (WebCore::ChromeClientQt::invalidateRootView):
     10        (WebCore::ChromeClientQt::invalidateContentsAndRootView):
     11        (WebCore::ChromeClientQt::invalidateContentsForSlowScroll):
     12        * WebCoreSupport/ChromeClientQt.h:
     13
    1142011-11-11  Pierre Rossi  <pierre.rossi@gmail.com>
    215

  • trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

    r99202 r100290  
    399399}
    400400
    401 void ChromeClientQt::invalidateWindow(const IntRect& windowRect, bool)
     401void ChromeClientQt::invalidateRootView(const IntRect& windowRect, bool)
    402402{
    403403#if USE(TILED_BACKING_STORE)
    … …  
    413413}
    414414
    415 void ChromeClientQt::invalidateContentsAndWindow(const IntRect& windowRect, bool immediate)
     415void ChromeClientQt::invalidateContentsAndRootView(const IntRect& windowRect, bool immediate)
    416416{
    417417    // No double buffer, so only update the QWidget if content changed.
    … …  
    430430void ChromeClientQt::invalidateContentsForSlowScroll(const IntRect& windowRect, bool immediate)
    431431{
    432     invalidateContentsAndWindow(windowRect, immediate);
     432    invalidateContentsAndRootView(windowRect, immediate);
    433433}
    434434

  • trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h

    r98472 r100290  
    115115    virtual IntRect windowResizerRect() const;
    116116
    117     virtual void invalidateWindow(const IntRect&, bool);
    118     virtual void invalidateContentsAndWindow(const IntRect&, bool);
     117    virtual void invalidateRootView(const IntRect&, bool);
     118    virtual void invalidateContentsAndRootView(const IntRect&, bool);
    119119    virtual void invalidateContentsForSlowScroll(const IntRect&, bool);
    120120    virtual void scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);

  • trunk/Source/WebKit/win/ChangeLog

    r99659 r100290  
     12011-11-14  Anders Carlsson  <andersca@apple.com>
     2
     3        HostWindow invalidation functions should use root view coordinates
     4        https://bugs.webkit.org/show_bug.cgi?id=72338
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * WebCoreSupport/WebChromeClient.cpp:
     9        (WebChromeClient::invalidateRootView):
     10        (WebChromeClient::invalidateContentsAndRootView):
     11        * WebCoreSupport/WebChromeClient.h:
     12
    1132011-11-07  Adam Barth  <abarth@webkit.org>
    214

  • trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp

    r96549 r100290  
    461461}
    462462
    463 void WebChromeClient::invalidateWindow(const IntRect& windowRect, bool immediate)
     463void WebChromeClient::invalidateRootView(const IntRect& windowRect, bool immediate)
    464464{
    465465    ASSERT(core(m_webView->topLevelFrame()));
    … …  
    467467}
    468468
    469 void WebChromeClient::invalidateContentsAndWindow(const IntRect& windowRect, bool immediate)
     469void WebChromeClient::invalidateContentsAndRootView(const IntRect& windowRect, bool immediate)
    470470{
    471471    ASSERT(core(m_webView->topLevelFrame()));

  • trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h

    r96549 r100290  
    9595    virtual WebCore::IntRect windowResizerRect() const;
    9696
    97     virtual void invalidateWindow(const WebCore::IntRect&, bool);
    98     virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
     97    virtual void invalidateRootView(const WebCore::IntRect&, bool);
     98    virtual void invalidateContentsAndRootView(const WebCore::IntRect&, bool);
    9999    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
    100100    virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect);

  • trunk/Source/WebKit/wince/ChangeLog

    r99270 r100290  
     12011-11-14  Anders Carlsson  <andersca@apple.com>
     2
     3        HostWindow invalidation functions should use root view coordinates
     4        https://bugs.webkit.org/show_bug.cgi?id=72338
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * WebCoreSupport/ChromeClientWinCE.cpp:
     9        (WebKit::ChromeClientWinCE::invalidateRootView):
     10        (WebKit::ChromeClientWinCE::invalidateContentsAndRootView):
     11        (WebKit::ChromeClientWinCE::invalidateContentsForSlowScroll):
     12        (WebKit::ChromeClientWinCE::scroll):
     13        * WebCoreSupport/ChromeClientWinCE.h:
     14
    1152011-11-04  Patrick Gansterer  <paroga@webkit.org>
    216

  • trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp

    r95919 r100290  
    227227}
    228228
    229 void ChromeClientWinCE::invalidateWindow(const IntRect&, bool)
    230 {
    231     notImplemented();
    232 }
    233 
    234 void ChromeClientWinCE::invalidateContentsAndWindow(const IntRect& updateRect, bool immediate)
     229void ChromeClientWinCE::invalidateRootView(const IntRect&, bool)
     230{
     231    notImplemented();
     232}
     233
     234void ChromeClientWinCE::invalidateContentsAndRootView(const IntRect& updateRect, bool immediate)
    235235{
    236236    RECT rect = updateRect;
    … …  
    243243void ChromeClientWinCE::invalidateContentsForSlowScroll(const IntRect& updateRect, bool immediate)
    244244{
    245     invalidateContentsAndWindow(updateRect, immediate);
     245    invalidateContentsAndRootView(updateRect, immediate);
    246246}
    247247
    248248void ChromeClientWinCE::scroll(const IntSize&, const IntRect& rectToScroll, const IntRect&)
    249249{
    250     invalidateContentsAndWindow(rectToScroll, false);
     250    invalidateContentsAndRootView(rectToScroll, false);
    251251}
    252252

  • trunk/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h

    r95919 r100290  
    9494
    9595    // Methods used by HostWindow.
    96     virtual void invalidateWindow(const WebCore::IntRect&, bool);
    97     virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
     96    virtual void invalidateRootView(const WebCore::IntRect&, bool);
     97    virtual void invalidateContentsAndRootView(const WebCore::IntRect&, bool);
    9898    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
    9999    virtual void scroll(const WebCore::IntSize&, const WebCore::IntRect&, const WebCore::IntRect&);

  • trunk/Source/WebKit/wx/ChangeLog

    r99096 r100290  
     12011-11-14  Anders Carlsson  <andersca@apple.com>
     2
     3        HostWindow invalidation functions should use root view coordinates
     4        https://bugs.webkit.org/show_bug.cgi?id=72338
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * WebKitSupport/ChromeClientWx.cpp:
     9        (WebCore::ChromeClientWx::invalidateRootView):
     10        (WebCore::ChromeClientWx::invalidateContentsForSlowScroll):
     11        (WebCore::ChromeClientWx::invalidateContentsAndRootView):
     12        * WebKitSupport/ChromeClientWx.h:
     13
    1142011-11-02  Tom Sepez  <tsepez@chromium.org>
    215

  • trunk/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp

    r95919 r100290  
    341341}
    342342
    343 void ChromeClientWx::invalidateWindow(const IntRect& rect, bool immediate)
     343void ChromeClientWx::invalidateRootView(const IntRect& rect, bool immediate)
    344344{
    345345    if (immediate)
    … …  
    349349void ChromeClientWx::invalidateContentsForSlowScroll(const IntRect& rect, bool immediate)
    350350{
    351     invalidateContentsAndWindow(rect, immediate);
    352 }
    353 
    354 void ChromeClientWx::invalidateContentsAndWindow(const IntRect& rect, bool immediate)
     351    invalidateContentsAndRootView(rect, immediate);
     352}
     353
     354void ChromeClientWx::invalidateContentsAndRootView(const IntRect& rect, bool immediate)
    355355{
    356356    if (!m_webView)

  • trunk/Source/WebKit/wx/WebKitSupport/ChromeClientWx.h

    r95919 r100290  
    104104    virtual void updateBackingStore();
    105105   
    106     virtual void invalidateWindow(const IntRect&, bool);
    107     virtual void invalidateContentsAndWindow(const IntRect&, bool);
     106    virtual void invalidateRootView(const IntRect&, bool);
     107    virtual void invalidateContentsAndRootView(const IntRect&, bool);
    108108    virtual void invalidateContentsForSlowScroll(const IntRect&, bool);
    109109    virtual void scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);

  • trunk/Source/WebKit2/ChangeLog

    r100284 r100290  
     12011-11-14  Anders Carlsson  <andersca@apple.com>
     2
     3        HostWindow invalidation functions should use root view coordinates
     4        https://bugs.webkit.org/show_bug.cgi?id=72338
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     9        (WebKit::WebChromeClient::invalidateRootView):
     10        (WebKit::WebChromeClient::invalidateContentsAndRootView):
     11        * WebProcess/WebCoreSupport/WebChromeClient.h:
     12
    1132011-11-15  Carlos Garcia Campos  <cgarcia@igalia.com>
    214

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r99725 r100290  
    371371}
    372372
    373 void WebChromeClient::invalidateWindow(const IntRect&, bool)
     373void WebChromeClient::invalidateRootView(const IntRect&, bool)
    374374{
    375375    // Do nothing here, there's no concept of invalidating the window in the web process.
    376376}
    377377
    378 void WebChromeClient::invalidateContentsAndWindow(const IntRect& rect, bool)
     378void WebChromeClient::invalidateContentsAndRootView(const IntRect& rect, bool)
    379379{
    380380    if (Document* document = m_page->corePage()->mainFrame()->document()) {

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h

    r98472 r100290  
    109109   
    110110    // HostWindow member function overrides.
    111     virtual void invalidateWindow(const WebCore::IntRect&, bool) OVERRIDE;
    112     virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool) OVERRIDE;
     111    virtual void invalidateRootView(const WebCore::IntRect&, bool) OVERRIDE;
     112    virtual void invalidateContentsAndRootView(const WebCore::IntRect&, bool) OVERRIDE;
    113113    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool) OVERRIDE;
    114114    virtual void scroll(const WebCore::IntSize& scrollOffset, const WebCore::IntRect& scrollRect, const WebCore::IntRect& clipRect) OVERRIDE;
Note: See TracChangeset for help on using the changeset viewer.