Changeset 122054 in webkit


Ignore:
Timestamp:
Jul 7, 2012 12:49:34 PM (12 years ago)
Author:
zandobersek@gmail.com
Message:

REGRESSION (r122035): fullscreen/exit-full-screen-iframe.html failing on GTK Linux 64-bit Release
https://bugs.webkit.org/show_bug.cgi?id=90719

Reviewed by Martin Robinson.

Source/WebKit/gtk:

Follow the approach of the BlackBerry port outlined in r122035, using in exitFullScreenForElement
the fullscreen element to which the reference was saved when enterFullScreenForElement was called.

  • WebCoreSupport/ChromeClientGtk.cpp:

(WebKit::ChromeClient::exitFullScreenForElement):

LayoutTests:

Remove the crashing test expectation for the affected test.

  • platform/gtk/TestExpectations:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r122052 r122054  
     12012-07-07  Zan Dobersek  <zandobersek@gmail.com>
     2
     3        REGRESSION (r122035): fullscreen/exit-full-screen-iframe.html failing on GTK Linux 64-bit Release
     4        https://bugs.webkit.org/show_bug.cgi?id=90719
     5
     6        Reviewed by Martin Robinson.
     7
     8        Remove the crashing test expectation for the affected test.
     9
     10        * platform/gtk/TestExpectations:
     11
    1122012-07-07  Filip Pizlo  <fpizlo@apple.com>
    213
  • trunk/LayoutTests/platform/gtk/TestExpectations

    r122048 r122054  
    373373
    374374BUGWK90589 RELEASE : fast/css/user-drag-none.html = CRASH TIMEOUT
    375 
    376 BUGWK90719 : fullscreen/exit-full-screen-iframe.html = CRASH
    377375
    378376//////////////////////////////////////////////////////////////////////////////////////////
  • trunk/Source/WebKit/gtk/ChangeLog

    r121707 r122054  
     12012-07-07  Zan Dobersek  <zandobersek@gmail.com>
     2
     3        REGRESSION (r122035): fullscreen/exit-full-screen-iframe.html failing on GTK Linux 64-bit Release
     4        https://bugs.webkit.org/show_bug.cgi?id=90719
     5
     6        Reviewed by Martin Robinson.
     7
     8        Follow the approach of the BlackBerry port outlined in r122035, using in exitFullScreenForElement
     9        the fullscreen element to which the reference was saved when enterFullScreenForElement was called.
     10
     11        * WebCoreSupport/ChromeClientGtk.cpp:
     12        (WebKit::ChromeClient::exitFullScreenForElement):
     13
    1142012-07-02  Benjamin Poulain  <bpoulain@apple.com>
    215
  • trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

    r120918 r122054  
    946946}
    947947
    948 void ChromeClient::exitFullScreenForElement(WebCore::Element* element)
    949 {
     948void ChromeClient::exitFullScreenForElement(WebCore::Element*)
     949{
     950    // The element passed into this function is not reliable, i.e. it could
     951    // be null. In addition the parameter may be disappearing in the future.
     952    // So we use the reference to the element we saved above.
     953    ASSERT(m_fullScreenElement);
     954
    950955    gboolean returnValue;
    951     GRefPtr<WebKitDOMHTMLElement> kitElement(adoptGRef(kit(reinterpret_cast<HTMLElement*>(element))));
     956    GRefPtr<WebKitDOMHTMLElement> kitElement(adoptGRef(kit(reinterpret_cast<HTMLElement*>(m_fullScreenElement.get()))));
    952957    g_signal_emit_by_name(m_webView, "leaving-fullscreen", kitElement.get(), &returnValue);
    953958    if (returnValue)
     
    958963    g_signal_handlers_disconnect_by_func(window, reinterpret_cast<void*>(onFullscreenGtkKeyPressEvent), this);
    959964
    960     element->document()->webkitWillExitFullScreenForElement(element);
     965    m_fullScreenElement->document()->webkitWillExitFullScreenForElement(m_fullScreenElement.get());
    961966    gtk_window_unfullscreen(GTK_WINDOW(window));
    962967    m_adjustmentWatcher.enableAllScrollbars();
    963     element->document()->webkitDidExitFullScreenForElement(element);
     968    m_fullScreenElement->document()->webkitDidExitFullScreenForElement(m_fullScreenElement.get());
    964969    m_fullScreenElement.clear();
    965970}
Note: See TracChangeset for help on using the changeset viewer.