Changeset 248336 in webkit


Ignore:
Timestamp:
Aug 6, 2019 6:44:55 PM (5 years ago)
Author:
Fujii Hironori
Message:

ASSERTION FAILED: m_observers.isEmpty() if WKPageSetPageStateClient is used
​https://bugs.webkit.org/show_bug.cgi?id=200465

Reviewed by Alex Christensen.

Source/WebKit:

PageLoadState::Observer should be removed before destructing
WebPageProxy.

  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::~WebPageProxy): Call
setPageLoadStateObserver with nullptr to remove
PageLoadState::Observer.

Tools:

  • TestWebKitAPI/Tests/WebKit/PageLoadState.cpp:

(TestWebKitAPI::WebKit.PageLoadState): Set PageStateClient before
finishing the test.

  • TestWebKitAPI/win/PlatformWebViewWin.cpp:

(TestWebKitAPI::PlatformWebView::~PlatformWebView): Release m_view.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r248333 r248336  
     12019-08-06  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        ASSERTION FAILED: m_observers.isEmpty() if WKPageSetPageStateClient is used
     4        https://bugs.webkit.org/show_bug.cgi?id=200465
     5
     6        Reviewed by Alex Christensen.
     7
     8        PageLoadState::Observer should be removed before destructing
     9        WebPageProxy.
     10
     11        * UIProcess/WebPageProxy.cpp:
     12        (WebKit::WebPageProxy::~WebPageProxy): Call
     13        setPageLoadStateObserver with nullptr to remove
     14        PageLoadState::Observer.
     15
    1162019-08-06  Chris Dumez  <cdumez@apple.com>
    217

  • trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

    r248029 r248336  
    501501#endif
    502502
     503    setPageLoadStateObserver(nullptr);
     504
    503505    if (!m_isClosed)
    504506        close();

  • trunk/Tools/ChangeLog

    r248325 r248336  
     12019-08-06  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        ASSERTION FAILED: m_observers.isEmpty() if WKPageSetPageStateClient is used
     4        https://bugs.webkit.org/show_bug.cgi?id=200465
     5
     6        Reviewed by Alex Christensen.
     7
     8        * TestWebKitAPI/Tests/WebKit/PageLoadState.cpp:
     9        (TestWebKitAPI::WebKit.PageLoadState): Set PageStateClient before
     10        finishing the test.
     11        * TestWebKitAPI/win/PlatformWebViewWin.cpp:
     12        (TestWebKitAPI::PlatformWebView::~PlatformWebView): Release m_view.
     13
    1142019-08-06  Jiewen Tan  <jiewen_tan@apple.com>
    215

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadState.cpp

    r248029 r248336  
    296296
    297297    EXPECT_EQ(state.didChangeActiveURL, 4);
     298
     299    WKPageSetPageStateClient(webView.page(), &stateClient.base);
    298300}
    299301

  • trunk/Tools/TestWebKitAPI/win/PlatformWebViewWin.cpp

    r239092 r248336  
    9494{
    9595    ::DestroyWindow(m_window);
     96    WKRelease(m_view);
    9697}
    9798
Note: See TracChangeset for help on using the changeset viewer.