Changeset 195295 in webkit


Ignore:
Timestamp:
Jan 19, 2016 10:21:26 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r187471.
https://bugs.webkit.org/show_bug.cgi?id=153236

purportedly caused a significant memory regression and want to
see if that is true (Requested by thorton on #webkit).

Reverted changeset:

"First in-window viewStateChange synchronously blocks despite
not previously being in-window"
https://bugs.webkit.org/show_bug.cgi?id=147344
http://trac.webkit.org/changeset/187471

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r195288 r195295  
     12016-01-19  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r187471.
     4        https://bugs.webkit.org/show_bug.cgi?id=153236
     5
     6        purportedly caused a significant memory regression and want to
     7        see if that is true (Requested by thorton on #webkit).
     8
     9        Reverted changeset:
     10
     11        "First in-window viewStateChange synchronously blocks despite
     12        not previously being in-window"
     13        https://bugs.webkit.org/show_bug.cgi?id=147344
     14        http://trac.webkit.org/changeset/187471
     15
    1162016-01-19  Carlos Garcia Campos  <cgarcia@igalia.com>
    217
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r195235 r195295  
    13401340    if (flagsToUpdate & ViewState::IsVisibleOrOccluded && m_pageClient.isViewVisibleOrOccluded())
    13411341        m_viewState |= ViewState::IsVisibleOrOccluded;
    1342     if (flagsToUpdate & ViewState::IsInWindow && m_pageClient.isViewInWindow())
     1342    if (flagsToUpdate & ViewState::IsInWindow && m_pageClient.isViewInWindow()) {
    13431343        m_viewState |= ViewState::IsInWindow;
     1344        m_viewWasEverInWindow = true;
     1345    }
    13441346    if (flagsToUpdate & ViewState::IsVisuallyIdle && m_pageClient.isVisuallyIdle())
    13451347        m_viewState |= ViewState::IsVisuallyIdle;
     
    14091411    ViewState::Flags changed = m_viewState ^ previousViewState;
    14101412
    1411     bool isNowInWindow = (changed & ViewState::IsInWindow) && isInWindow();
    14121413    // We always want to wait for the Web process to reply if we've been in-window before and are coming back in-window.
    1413     if (m_viewWasEverInWindow && isNowInWindow && m_drawingArea->hasVisibleContent())
     1414    if (m_viewWasEverInWindow && (changed & ViewState::IsInWindow) && isInWindow() && m_drawingArea->hasVisibleContent())
    14141415        m_viewStateChangeWantsSynchronousReply = true;
    14151416
     
    14461447    m_potentiallyChangedViewStateFlags = ViewState::NoFlags;
    14471448    m_viewStateChangeWantsSynchronousReply = false;
    1448     m_viewWasEverInWindow |= isNowInWindow;
    14491449}
    14501450
Note: See TracChangeset for help on using the changeset viewer.