Changeset 87449 in webkit


Ignore:
Timestamp:
May 26, 2011 4:47:32 PM (13 years ago)
Author:
adamk@chromium.org
Message:

2011-05-26 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r87444.
http://trac.webkit.org/changeset/87444
https://bugs.webkit.org/show_bug.cgi?id=61582

Layout test regressions in Chromium/WebKit: fast/css/first-
letter-text-fragment-crash.html, fast/css/first-letter-
visibility.html (Requested by aklein on #webkit).

  • page/Chrome.cpp:
  • page/Chrome.h:
  • page/ChromeClient.h:
  • page/FrameView.cpp: (WebCore::FrameView::setContentsSize):
  • page/FrameView.h:

2011-05-26 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r87444.
http://trac.webkit.org/changeset/87444
https://bugs.webkit.org/show_bug.cgi?id=61582

Layout test regressions in Chromium/WebKit: fast/css/first-
letter-text-fragment-crash.html, fast/css/first-letter-
visibility.html (Requested by aklein on #webkit).

  • public/WebFrameClient.h:
  • src/ChromeClientImpl.cpp:
  • src/ChromeClientImpl.h:
Location:
trunk/Source
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r87444 r87449  
     12011-05-26  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r87444.
     4        http://trac.webkit.org/changeset/87444
     5        https://bugs.webkit.org/show_bug.cgi?id=61582
     6
     7        Layout test regressions in Chromium/WebKit: fast/css/first-
     8        letter-text-fragment-crash.html, fast/css/first-letter-
     9        visibility.html (Requested by aklein on #webkit).
     10
     11        * page/Chrome.cpp:
     12        * page/Chrome.h:
     13        * page/ChromeClient.h:
     14        * page/FrameView.cpp:
     15        (WebCore::FrameView::setContentsSize):
     16        * page/FrameView.h:
     17
    1182011-05-26  David Levin  <levin@chromium.org>
    219
  • trunk/Source/WebCore/page/Chrome.cpp

    r87444 r87449  
    115115}
    116116
    117 void Chrome::contentsPreferredSizeChanged(Frame* frame, const IntSize& size) const
    118 {
    119     m_client->contentsPreferredSizeChanged(frame, size);
    120 }
    121 
    122117void Chrome::scrollRectIntoView(const IntRect& rect) const
    123118{
  • trunk/Source/WebCore/page/Chrome.h

    r87444 r87449  
    8585
    8686        void contentsSizeChanged(Frame*, const IntSize&) const;
    87         void contentsPreferredSizeChanged(Frame*, const IntSize&) const;
    8887
    8988        void setWindowRect(const FloatRect&) const;
  • trunk/Source/WebCore/page/ChromeClient.h

    r87444 r87449  
    162162
    163163        virtual void contentsSizeChanged(Frame*, const IntSize&) const = 0;
    164         virtual void contentsPreferredSizeChanged(Frame*, const IntSize&) const { }
    165164        virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const = 0; // Currently only Mac has a non empty implementation.
    166165       
  • trunk/Source/WebCore/page/FrameView.cpp

    r87444 r87449  
    476476void FrameView::setContentsSize(const IntSize& size)
    477477{
    478     bool contentsSizeChanged = size != contentsSize();
     478    if (size == contentsSize())
     479        return;
     480
     481    m_deferSetNeedsLayouts++;
     482
     483    ScrollView::setContentsSize(size);
     484    scrollAnimator()->contentsResized();
     485   
    479486    Page* page = frame() ? frame()->page() : 0;
    480     if (contentsSizeChanged) {
    481         m_deferSetNeedsLayouts++;
    482 
    483         ScrollView::setContentsSize(size);
    484         scrollAnimator()->contentsResized();
    485         if (page)
    486             page->chrome()->contentsSizeChanged(frame(), size); // notify only
    487     }
    488 
    489     if (page) {
    490         Document* document = frame()->document();
    491         if (document && document->renderView() && document->documentElement()) {
    492             IntSize preferedSize(document->renderView()->minPreferredLogicalWidth(),
    493                                  document->documentElement()->scrollHeight());
    494             if (preferedSize != m_lastPreferedSize) {
    495                 m_lastPreferedSize = preferedSize;
    496                 page->chrome()->contentsPreferredSizeChanged(frame(), preferedSize);
    497             }
    498         }
    499     }
    500 
    501     if (contentsSizeChanged) {
    502         m_deferSetNeedsLayouts--;
    503 
    504         if (!m_deferSetNeedsLayouts)
    505             m_setNeedsLayoutWasDeferred = false; // FIXME: Find a way to make the deferred layout actually happen.
    506     }
     487    if (!page)
     488        return;
     489
     490    page->chrome()->contentsSizeChanged(frame(), size); //notify only
     491
     492    m_deferSetNeedsLayouts--;
     493   
     494    if (!m_deferSetNeedsLayouts)
     495        m_setNeedsLayoutWasDeferred = false; // FIXME: Find a way to make the deferred layout actually happen.
    507496}
    508497
  • trunk/Source/WebCore/page/FrameView.h

    r87444 r87449  
    393393    Color m_baseBackgroundColor;
    394394    IntSize m_lastLayoutSize;
    395     IntSize m_lastPreferedSize;
    396395    float m_lastZoomFactor;
    397396
  • trunk/Source/WebKit/chromium/ChangeLog

    r87444 r87449  
     12011-05-26  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r87444.
     4        http://trac.webkit.org/changeset/87444
     5        https://bugs.webkit.org/show_bug.cgi?id=61582
     6
     7        Layout test regressions in Chromium/WebKit: fast/css/first-
     8        letter-text-fragment-crash.html, fast/css/first-letter-
     9        visibility.html (Requested by aklein on #webkit).
     10
     11        * public/WebFrameClient.h:
     12        * src/ChromeClientImpl.cpp:
     13        * src/ChromeClientImpl.h:
     14
    1152011-05-26  David Levin  <levin@chromium.org>
    216
  • trunk/Source/WebKit/chromium/public/WebFrameClient.h

    r87444 r87449  
    308308    virtual void didChangeContentsSize(WebFrame*, const WebSize&) { }
    309309
    310     // The preferred dimensions for the rendered HTML contents changed.
    311     virtual void didChangeContentsPreferredSize(WebFrame*, const WebSize&) const { }
    312 
    313310    // The main frame scrolled.
    314311    virtual void didChangeScrollOffset(WebFrame*) { }
  • trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp

    r87444 r87449  
    589589}
    590590
    591 void ChromeClientImpl::contentsPreferredSizeChanged(Frame* frame, const IntSize& size) const
    592 {
    593     WebFrameImpl* webframe = WebFrameImpl::fromFrame(frame);
    594     if (webframe->client())
    595         webframe->client()->didChangeContentsPreferredSize(webframe, size);
    596 }
    597 
    598591void ChromeClientImpl::scrollbarsModeDidChange() const
    599592{
  • trunk/Source/WebKit/chromium/src/ChromeClientImpl.h

    r87444 r87449  
    120120    virtual PlatformPageClient platformPageClient() const { return 0; }
    121121    virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const;
    122     virtual void contentsPreferredSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const;
    123122    virtual void scrollRectIntoView(
    124123        const WebCore::IntRect&, const WebCore::ScrollView*) const { }
Note: See TracChangeset for help on using the changeset viewer.