Changeset 170068 in webkit


Ignore:
Timestamp:
Jun 17, 2014 12:53:13 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r170058.
​https://bugs.webkit.org/show_bug.cgi?id=133993

Caused 4 webkitpy failures on the bots (Requested by bradee-oh
on #webkit).

Reverted changeset:

"[GTK] Fix the handling of resize events after r169505."
​https://bugs.webkit.org/show_bug.cgi?id=133517
​http://trac.webkit.org/changeset/170058

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r170058 r170068  
     12014-06-17  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r170058.
     4        https://bugs.webkit.org/show_bug.cgi?id=133993
     5
     6        Caused 4 webkitpy failures on the bots (Requested by bradee-oh
     7        on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[GTK] Fix the handling of resize events after r169505."
     12        https://bugs.webkit.org/show_bug.cgi?id=133517
     13        http://trac.webkit.org/changeset/170058
     14
    1152014-06-17  Carlos Alberto Lopez Perez  <clopez@igalia.com>
    216

  • trunk/LayoutTests/platform/gtk/TestExpectations

    r170058 r170068  
    809809webkit.org/b/132282 fast/inline-block/14498-positionForCoordinates.html [ Failure Pass ]
    810810
     811#fast/dom/Window
     812webkit.org/b/132255 fast/dom/Window/window-resize-and-move-sub-frame.html [ Timeout Pass ]
     813webkit.org/b/132255 fast/dom/Window/window-resize-contents.html [ Timeout Pass ]
     814
    811815#Fast overflow
    812816webkit.org/b/132258 fast/overflow/hit-test-overflow-controls.html [ Failure ImageOnlyFailure Pass ]
    … …  
    848852webkit.org/b/133000 js/slow-stress/call-spread.html [ Pass Timeout ]
    849853webkit.org/b/133001 fast/workers/worker-context-gc.html [ Pass Timeout ]
     854
     855webkit.org/b/133807 fast/dynamic/window-resize-scrollbars-test.html [ Failure Timeout ]
    850856
    851857webkit.org/b/133865 media/W3C/video/networkState/networkState_during_progress.html [ Failure Pass ]
    … …  
    10121018
    10131019webkit.org/b/133151 js/cached-window-properties.html [ Timeout Pass ]
     1020
     1021webkit.org/b/133517 css3/viewport-percentage-lengths/viewport-percentage-lengths-anonymous-block.html [ Timeout ]
     1022webkit.org/b/133517 css3/viewport-percentage-lengths/viewport-percentage-lengths-percent-size-child.html [ Timeout ]
     1023webkit.org/b/133517 css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size.html [ Timeout ]
     1024webkit.org/b/133517 css3/viewport-percentage-lengths/viewport-percentage-lengths-resize.html [ Timeout ]
    10141025
    10151026webkit.org/b/133808 media/video-trackmenu-selection.html [ Timeout ]
    … …  
    11941205Bug(GTK) editing/selection/inactive-selection.html [ Failure ]
    11951206Bug(GTK) fast/css/disabled-author-styles.html [ Failure ]
     1207Bug(GTK) fast/dom/rtl-scroll-to-leftmost-and-resize.html [ Failure ]
    11961208Bug(GTK) fast/dom/Window/window-postmessage-clone.html [ Failure Timeout ]
    11971209Bug(GTK) fast/events/backspace-navigates-back.html [ Failure ]
    … …  
    13181330
    13191331# Probably failing because resizing is asynchronous.
     1332webkit.org/b/53959 fast/dom/Window/window-resize-and-move-arguments.html [ Failure Timeout ]
    13201333webkit.org/b/53959 fast/dom/Window/window-resize.html [ Failure Timeout ]
    13211334
    … …  
    15741587
    15751588webkit.org/b/80129 fast/frames/flattening/frameset-flattening-advanced.html [ Failure ]
     1589webkit.org/b/131793 fast/frames/frame-programmatic-noresize.html [ Failure Pass ]
     1590webkit.org/b/131794 fast/frames/frame-with-noresize-can-be-resized-after-removal-of-noresize.html [ Failure Pass ]
     1591webkit.org/b/131794 fast/frames/frame-with-noresize-can-be-resized-after-setting-noResize-to-false.html [ Failure Pass ]
    15761592
    15771593webkit.org/b/89663 editing/deleting/delete-3800834-fix.html [ Failure ]

  • trunk/LayoutTests/platform/gtk/fast/dom/rtl-scroll-to-leftmost-and-resize-expected.txt

    r170058 r170068  
    1 layer at (0,0) size 235x4018
    2   RenderView at (0,0) size 235x585
    3 layer at (0,0) size 235x4018
    4   RenderBlock {HTML} at (0,0) size 235x4018
    5     RenderBody {BODY} at (8,8) size 219x4002
    6       RenderBlock {DIV} at (-783,0) size 1002x4002 [border: (1px solid #FF0000)]
    7         RenderText {#text} at (-491,1) size 1492x17
     1layer at (0,0) size 335x4018
     2  RenderView at (0,0) size 335x585
     3layer at (0,0) size 335x4018
     4  RenderBlock {HTML} at (0,0) size 335x4018
     5    RenderBody {BODY} at (8,8) size 319x4002
     6      RenderBlock {DIV} at (-683,0) size 1002x4002 [border: (1px solid #FF0000)]
     7        RenderText {#text} at (-491,1) size 1492x19
    88          text run at (-491,1) width 1492: "BEGINddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddEND"
    99scrolled to -716,0

  • trunk/Tools/ChangeLog

    r170062 r170068  
     12014-06-17  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r170058.
     4        https://bugs.webkit.org/show_bug.cgi?id=133993
     5
     6        Caused 4 webkitpy failures on the bots (Requested by bradee-oh
     7        on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[GTK] Fix the handling of resize events after r169505."
     12        https://bugs.webkit.org/show_bug.cgi?id=133517
     13        http://trac.webkit.org/changeset/170058
     14
    1152014-06-17  Rebecca Hauck  <rhauck@adobe.com>
    216

  • trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py

    r170058 r170068  
    8585            environment['LD_LIBRARY_PATH'] = '%s:%s' % (llvmpipe_libgl_path, os.environ.get('LD_LIBRARY_PATH', ''))
    8686
    87         run_xvfb = ["Xvfb", ":%d" % display_id, "-screen",  "0", "1024x768x%s" % self._xvfb_screen_depth(), "-nolisten", "tcp"]
     87        run_xvfb = ["Xvfb", ":%d" % display_id, "-screen",  "0", "800x600x%s" % self._xvfb_screen_depth(), "-nolisten", "tcp"]
    8888        with open(os.devnull, 'w') as devnull:
    8989            self._xvfb_process = self._port.host.executive.popen(run_xvfb, stderr=devnull)

  • trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp

    r170058 r170068  
    4444
    4545    GtkAllocation size = { 0, 0, 800, 600 };
    46     gtk_widget_size_allocate(GTK_WIDGET(m_view), &size);
     46    gtk_widget_size_allocate(m_window, &size);
    4747    gtk_window_resize(GTK_WINDOW(m_window), 800, 600);
    4848    gtk_widget_show_all(m_window);
    … …  
    5959void PlatformWebView::resizeTo(unsigned width, unsigned height)
    6060{
    61     WKRect frame = windowFrame();
    62     frame.size.width = width;
    63     frame.size.height = height;
    64     setWindowFrame(frame);
     61    // FIXME: Don't we need to resize the window too?
     62
     63    GtkAllocation size = { 0, 0, static_cast<int>(width), static_cast<int>(height) };
     64    gtk_widget_size_allocate(m_window, &size);
     65    gtk_window_resize(GTK_WINDOW(m_window), width, height);
     66
     67    while (gtk_events_pending())
     68        gtk_main_iteration();
    6569}
    6670
    … …  
    7983{
    8084    GtkAllocation geometry;
     85#ifdef GTK_API_VERSION_2
     86    gint depth;
     87    gdk_window_get_geometry(gtk_widget_get_window(GTK_WIDGET(m_window)),
     88                            &geometry.x, &geometry.y, &geometry.width, &geometry.height, &depth);
     89#else
    8190    gdk_window_get_geometry(gtk_widget_get_window(GTK_WIDGET(m_window)),
    8291                            &geometry.x, &geometry.y, &geometry.width, &geometry.height);
     92#endif
    8393
    8494    WKRect frame;
    … …  
    92102void PlatformWebView::setWindowFrame(WKRect frame)
    93103{
    94     gdk_window_move_resize(gtk_widget_get_window(GTK_WIDGET(m_window)),
    95         frame.origin.x, frame.origin.y, frame.size.width, frame.size.height);
    96     GtkAllocation size = { 0, 0, static_cast<int>(frame.size.width), static_cast<int>(frame.size.height) };
    97     gtk_widget_size_allocate(GTK_WIDGET(m_view), &size);
    98 
    99     while (gtk_events_pending())
    100         gtk_main_iteration();
     104    gtk_window_move(GTK_WINDOW(m_window), frame.origin.x, frame.origin.y);
     105    resizeTo(frame.size.width, frame.size.height);
    101106}
    102107
Note: See TracChangeset for help on using the changeset viewer.