Changeset 83852 in webkit


Ignore:
Timestamp:
Apr 14, 2011 6:59:04 AM (13 years ago)
Author:
Adam Roben
Message:

Replace some known-to-fail assertions with FIXMEs

These assertions get hit during various layout tests. They indicate that we're sometimes
doing some extra work when a page goes into accelerated compositing mode, but otherwise
there's no bad effect.

See <http://webkit.org/b/58539> for more details.

Rubber-stamped by John Sullivan.

  • WebView.cpp:

(WebView::paintIntoBackingStore):
(WebView::paintIntoWindow):
Replaced assertions with FIXMEs.

Location:
trunk/Source/WebKit/win
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/win/ChangeLog

    r83820 r83852  
     12011-04-14  Adam Roben  <aroben@apple.com>
     2
     3        Replace some known-to-fail assertions with FIXMEs
     4
     5        These assertions get hit during various layout tests. They indicate that we're sometimes
     6        doing some extra work when a page goes into accelerated compositing mode, but otherwise
     7        there's no bad effect.
     8
     9        See <http://webkit.org/b/58539> for more details.
     10
     11        Rubber-stamped by John Sullivan.
     12
     13        * WebView.cpp:
     14        (WebView::paintIntoBackingStore):
     15        (WebView::paintIntoWindow):
     16        Replaced assertions with FIXMEs.
     17
    1182011-04-13  James Robinson  <jamesr@chromium.org>
    219
  • trunk/Source/WebKit/win/WebView.cpp

    r83628 r83852  
    10801080void WebView::paintIntoBackingStore(FrameView* frameView, HDC bitmapDC, const IntRect& dirtyRect, WindowsToPaint windowsToPaint)
    10811081{
    1082 #if USE(ACCELERATED_COMPOSITING)
    1083     ASSERT(!isAcceleratedCompositing());
    1084 #endif
     1082    // FIXME: This function should never be called in accelerated compositing mode, and we should
     1083    // assert as such. But currently it *is* sometimes called, so we can't assert yet. See
     1084    // <http://webkit.org/b/58539>.
    10851085
    10861086    LOCAL_GDI_COUNTER(0, __FUNCTION__);
     
    11231123void WebView::paintIntoWindow(HDC bitmapDC, HDC windowDC, const IntRect& dirtyRect)
    11241124{
    1125 #if USE(ACCELERATED_COMPOSITING)
    1126     ASSERT(!isAcceleratedCompositing());
    1127 #endif
     1125    // FIXME: This function should never be called in accelerated compositing mode, and we should
     1126    // assert as such. But currently it *is* sometimes called, so we can't assert yet. See
     1127    // <http://webkit.org/b/58539>.
    11281128
    11291129    LOCAL_GDI_COUNTER(0, __FUNCTION__);
Note: See TracChangeset for help on using the changeset viewer.