<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170078] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170078">170078</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-17 15:27:16 -0700 (Tue, 17 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Fix the handling of resize events after <a href="http://trac.webkit.org/projects/webkit/changeset/169505">r169505</a>.
https://bugs.webkit.org/show_bug.cgi?id=133517
Patch by Carlos Alberto Lopez Perez <clopez@igalia.com> on 2014-06-17
Reviewed by Martin Robinson.
Tools:
* Scripts/webkitpy/port/xvfbdriver.py:
(XvfbDriver._start): Set the resolution of Xvfb to XGA (1024x768).
The tests css3/viewport-percentage-lengths/viewport-percentage-lengths-*.html
need at least 900x640 pixels to pass.
* Scripts/webkitpy/port/xvfbdriver_unittest.py:
(XvfbDriverTest.test_start_no_pixel_tests): Update resolution.
(XvfbDriverTest.test_start_pixel_tests): Update resolution.
(XvfbDriverTest.test_start_arbitrary_worker_number): Update resolution.
(XvfbDriverTest.test_start_next_worker): Update resolution.
* WebKitTestRunner/gtk/PlatformWebViewGtk.cpp:
(WTR::PlatformWebView::PlatformWebView): gtk_widget_size_allocate should
be requested over the main widget instead of the window.
(WTR::PlatformWebView::resizeTo): Changed this to call setWindowFrame like
the Mac port.
(WTR::PlatformWebView::windowFrame): Remove legacy ifdef for GTK2.
(WTR::PlatformWebView::setWindowFrame): Set the size and position
of the Window and the web view.
LayoutTests:
* platform/gtk/TestExpectations: Remove the expectations for the
tests that now pass.
* platform/gtk/fast/dom/rtl-scroll-to-leftmost-and-resize-expected.txt:
Rebaseline results.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkfastdomrtlscrolltoleftmostandresizeexpectedtxt">trunk/LayoutTests/platform/gtk/fast/dom/rtl-scroll-to-leftmost-and-resize-expected.txt</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportxvfbdriverpy">trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportxvfbdriver_unittestpy">trunk/Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py</a></li>
<li><a href="#trunkToolsWebKitTestRunnergtkPlatformWebViewGtkcpp">trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (170077 => 170078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-06-17 22:26:15 UTC (rev 170077)
+++ trunk/LayoutTests/ChangeLog 2014-06-17 22:27:16 UTC (rev 170078)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-06-17 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [GTK] Fix the handling of resize events after r169505.
+ https://bugs.webkit.org/show_bug.cgi?id=133517
+
+ Reviewed by Martin Robinson.
+
+ * platform/gtk/TestExpectations: Remove the expectations for the
+ tests that now pass.
+ * platform/gtk/fast/dom/rtl-scroll-to-leftmost-and-resize-expected.txt:
+ Rebaseline results.
+
</ins><span class="cx"> 2014-06-17 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Input type=time elements styled with SVG fonts have 0 width
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (170077 => 170078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2014-06-17 22:26:15 UTC (rev 170077)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-06-17 22:27:16 UTC (rev 170078)
</span><span class="lines">@@ -808,10 +808,6 @@
</span><span class="cx"> webkit.org/b/132281 fast/workers/worker-constructor.html [ Timeout Pass ]
</span><span class="cx"> webkit.org/b/132282 fast/inline-block/14498-positionForCoordinates.html [ Failure Pass ]
</span><span class="cx">
</span><del>-#fast/dom/Window
-webkit.org/b/132255 fast/dom/Window/window-resize-and-move-sub-frame.html [ Timeout Pass ]
-webkit.org/b/132255 fast/dom/Window/window-resize-contents.html [ Timeout Pass ]
-
</del><span class="cx"> #Fast overflow
</span><span class="cx"> webkit.org/b/132258 fast/overflow/hit-test-overflow-controls.html [ Failure ImageOnlyFailure Pass ]
</span><span class="cx"> webkit.org/b/132258 fast/overflow/overflow-text-hit-testing.html [ Failure Pass ]
</span><span class="lines">@@ -852,8 +848,6 @@
</span><span class="cx"> webkit.org/b/133000 js/slow-stress/call-spread.html [ Pass Timeout ]
</span><span class="cx"> webkit.org/b/133001 fast/workers/worker-context-gc.html [ Pass Timeout ]
</span><span class="cx">
</span><del>-webkit.org/b/133807 fast/dynamic/window-resize-scrollbars-test.html [ Failure Timeout ]
-
</del><span class="cx"> webkit.org/b/133865 media/W3C/video/networkState/networkState_during_progress.html [ Failure Pass ]
</span><span class="cx"> webkit.org/b/133866 media/media-controls-cancel-events.html [ Failure Pass ]
</span><span class="cx"> webkit.org/b/133867 webaudio/audioprocessingevent.html [ Failure Pass ]
</span><span class="lines">@@ -1018,11 +1012,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/133151 js/cached-window-properties.html [ Timeout Pass ]
</span><span class="cx">
</span><del>-webkit.org/b/133517 css3/viewport-percentage-lengths/viewport-percentage-lengths-anonymous-block.html [ Timeout ]
-webkit.org/b/133517 css3/viewport-percentage-lengths/viewport-percentage-lengths-percent-size-child.html [ Timeout ]
-webkit.org/b/133517 css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size.html [ Timeout ]
-webkit.org/b/133517 css3/viewport-percentage-lengths/viewport-percentage-lengths-resize.html [ Timeout ]
-
</del><span class="cx"> webkit.org/b/133808 media/video-trackmenu-selection.html [ Timeout ]
</span><span class="cx">
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="lines">@@ -1204,7 +1193,6 @@
</span><span class="cx"> Bug(GTK) editing/selection/5136696.html [ Failure ]
</span><span class="cx"> Bug(GTK) editing/selection/inactive-selection.html [ Failure ]
</span><span class="cx"> Bug(GTK) fast/css/disabled-author-styles.html [ Failure ]
</span><del>-Bug(GTK) fast/dom/rtl-scroll-to-leftmost-and-resize.html [ Failure ]
</del><span class="cx"> Bug(GTK) fast/dom/Window/window-postmessage-clone.html [ Failure Timeout ]
</span><span class="cx"> Bug(GTK) fast/events/backspace-navigates-back.html [ Failure ]
</span><span class="cx"> Bug(GTK) fast/events/keydown-leftright-keys.html [ Failure ]
</span><span class="lines">@@ -1329,7 +1317,6 @@
</span><span class="cx"> webkit.org/b/53964 fast/forms/option-mouseevents.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> # Probably failing because resizing is asynchronous.
</span><del>-webkit.org/b/53959 fast/dom/Window/window-resize-and-move-arguments.html [ Failure Timeout ]
</del><span class="cx"> webkit.org/b/53959 fast/dom/Window/window-resize.html [ Failure Timeout ]
</span><span class="cx">
</span><span class="cx"> # keygen element rendering is broken
</span><span class="lines">@@ -1586,9 +1573,6 @@
</span><span class="cx"> webkit.org/b/94009 css2.1/20110323/c541-word-sp-000.htm [ ImageOnlyFailure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/80129 fast/frames/flattening/frameset-flattening-advanced.html [ Failure ]
</span><del>-webkit.org/b/131793 fast/frames/frame-programmatic-noresize.html [ Failure Pass ]
-webkit.org/b/131794 fast/frames/frame-with-noresize-can-be-resized-after-removal-of-noresize.html [ Failure Pass ]
-webkit.org/b/131794 fast/frames/frame-with-noresize-can-be-resized-after-setting-noResize-to-false.html [ Failure Pass ]
</del><span class="cx">
</span><span class="cx"> webkit.org/b/89663 editing/deleting/delete-3800834-fix.html [ Failure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkfastdomrtlscrolltoleftmostandresizeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/fast/dom/rtl-scroll-to-leftmost-and-resize-expected.txt (170077 => 170078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/fast/dom/rtl-scroll-to-leftmost-and-resize-expected.txt 2014-06-17 22:26:15 UTC (rev 170077)
+++ trunk/LayoutTests/platform/gtk/fast/dom/rtl-scroll-to-leftmost-and-resize-expected.txt 2014-06-17 22:27:16 UTC (rev 170078)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>-layer at (0,0) size 335x4018
- RenderView at (0,0) size 335x585
-layer at (0,0) size 335x4018
- RenderBlock {HTML} at (0,0) size 335x4018
- RenderBody {BODY} at (8,8) size 319x4002
- RenderBlock {DIV} at (-683,0) size 1002x4002 [border: (1px solid #FF0000)]
- RenderText {#text} at (-491,1) size 1492x19
</del><ins>+layer at (0,0) size 235x4018
+ RenderView at (0,0) size 235x585
+layer at (0,0) size 235x4018
+ RenderBlock {HTML} at (0,0) size 235x4018
+ RenderBody {BODY} at (8,8) size 219x4002
+ RenderBlock {DIV} at (-783,0) size 1002x4002 [border: (1px solid #FF0000)]
+ RenderText {#text} at (-491,1) size 1492x17
</ins><span class="cx"> text run at (-491,1) width 1492: "BEGINddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddEND"
</span><span class="cx"> scrolled to -716,0
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (170077 => 170078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-06-17 22:26:15 UTC (rev 170077)
+++ trunk/Tools/ChangeLog 2014-06-17 22:27:16 UTC (rev 170078)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-06-17 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [GTK] Fix the handling of resize events after r169505.
+ https://bugs.webkit.org/show_bug.cgi?id=133517
+
+ Reviewed by Martin Robinson.
+
+ * Scripts/webkitpy/port/xvfbdriver.py:
+ (XvfbDriver._start): Set the resolution of Xvfb to XGA (1024x768).
+ The tests css3/viewport-percentage-lengths/viewport-percentage-lengths-*.html
+ need at least 900x640 pixels to pass.
+ * Scripts/webkitpy/port/xvfbdriver_unittest.py:
+ (XvfbDriverTest.test_start_no_pixel_tests): Update resolution.
+ (XvfbDriverTest.test_start_pixel_tests): Update resolution.
+ (XvfbDriverTest.test_start_arbitrary_worker_number): Update resolution.
+ (XvfbDriverTest.test_start_next_worker): Update resolution.
+ * WebKitTestRunner/gtk/PlatformWebViewGtk.cpp:
+ (WTR::PlatformWebView::PlatformWebView): gtk_widget_size_allocate should
+ be requested over the main widget instead of the window.
+ (WTR::PlatformWebView::resizeTo): Changed this to call setWindowFrame like
+ the Mac port.
+ (WTR::PlatformWebView::windowFrame): Remove legacy ifdef for GTK2.
+ (WTR::PlatformWebView::setWindowFrame): Set the size and position
+ of the Window and the web view.
+
</ins><span class="cx"> 2014-06-17 Matthew Mirman <mmirman@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Added myself to list of contributors.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportxvfbdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py (170077 => 170078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py 2014-06-17 22:26:15 UTC (rev 170077)
+++ trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py 2014-06-17 22:27:16 UTC (rev 170078)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> if llvmpipe_libgl_path:
</span><span class="cx"> environment['LD_LIBRARY_PATH'] = '%s:%s' % (llvmpipe_libgl_path, os.environ.get('LD_LIBRARY_PATH', ''))
</span><span class="cx">
</span><del>- run_xvfb = ["Xvfb", ":%d" % display_id, "-screen", "0", "800x600x%s" % self._xvfb_screen_depth(), "-nolisten", "tcp"]
</del><ins>+ run_xvfb = ["Xvfb", ":%d" % display_id, "-screen", "0", "1024x768x%s" % self._xvfb_screen_depth(), "-nolisten", "tcp"]
</ins><span class="cx"> with open(os.devnull, 'w') as devnull:
</span><span class="cx"> self._xvfb_process = self._port.host.executive.popen(run_xvfb, stderr=devnull)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportxvfbdriver_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py (170077 => 170078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py 2014-06-17 22:26:15 UTC (rev 170077)
+++ trunk/Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py 2014-06-17 22:27:16 UTC (rev 170078)
</span><span class="lines">@@ -67,19 +67,19 @@
</span><span class="cx">
</span><span class="cx"> def test_start_no_pixel_tests(self):
</span><span class="cx"> driver = self.make_driver()
</span><del>- expected_logs = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x24', '-nolisten', 'tcp']\n"
</del><ins>+ expected_logs = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp']\n"
</ins><span class="cx"> self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0")
</span><span class="cx"> self.cleanup_driver(driver)
</span><span class="cx">
</span><span class="cx"> def test_start_pixel_tests(self):
</span><span class="cx"> driver = self.make_driver()
</span><del>- expected_logs = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x24', '-nolisten', 'tcp']\n"
</del><ins>+ expected_logs = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp']\n"
</ins><span class="cx"> self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0", pixel_tests=True)
</span><span class="cx"> self.cleanup_driver(driver)
</span><span class="cx">
</span><span class="cx"> def test_start_arbitrary_worker_number(self):
</span><span class="cx"> driver = self.make_driver(worker_number=17)
</span><del>- expected_logs = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x24', '-nolisten', 'tcp']\n"
</del><ins>+ expected_logs = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp']\n"
</ins><span class="cx"> self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0", pixel_tests=True)
</span><span class="cx"> self.cleanup_driver(driver)
</span><span class="cx">
</span><span class="lines">@@ -108,12 +108,12 @@
</span><span class="cx"> def test_start_next_worker(self):
</span><span class="cx"> driver = self.make_driver()
</span><span class="cx"> driver._next_free_display = lambda: 0
</span><del>- expected_logs = "MOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x24', '-nolisten', 'tcp']\n"
</del><ins>+ expected_logs = "MOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp']\n"
</ins><span class="cx"> self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0", pixel_tests=True)
</span><span class="cx"> self.cleanup_driver(driver)
</span><span class="cx"> driver = self.make_driver()
</span><span class="cx"> driver._next_free_display = lambda: 3
</span><del>- expected_logs = "MOCK popen: ['Xvfb', ':3', '-screen', '0', '800x600x24', '-nolisten', 'tcp']\n"
</del><ins>+ expected_logs = "MOCK popen: ['Xvfb', ':3', '-screen', '0', '1024x768x24', '-nolisten', 'tcp']\n"
</ins><span class="cx"> self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":3", pixel_tests=True)
</span><span class="cx"> self.cleanup_driver(driver)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnergtkPlatformWebViewGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp (170077 => 170078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2014-06-17 22:26:15 UTC (rev 170077)
+++ trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2014-06-17 22:27:16 UTC (rev 170078)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> gtk_container_add(GTK_CONTAINER(m_window), GTK_WIDGET(m_view));
</span><span class="cx">
</span><span class="cx"> GtkAllocation size = { 0, 0, 800, 600 };
</span><del>- gtk_widget_size_allocate(m_window, &size);
</del><ins>+ gtk_widget_size_allocate(GTK_WIDGET(m_view), &size);
</ins><span class="cx"> gtk_window_resize(GTK_WINDOW(m_window), 800, 600);
</span><span class="cx"> gtk_widget_show_all(m_window);
</span><span class="cx">
</span><span class="lines">@@ -58,14 +58,10 @@
</span><span class="cx">
</span><span class="cx"> void PlatformWebView::resizeTo(unsigned width, unsigned height)
</span><span class="cx"> {
</span><del>- // FIXME: Don't we need to resize the window too?
-
- GtkAllocation size = { 0, 0, static_cast<int>(width), static_cast<int>(height) };
- gtk_widget_size_allocate(m_window, &size);
- gtk_window_resize(GTK_WINDOW(m_window), width, height);
-
- while (gtk_events_pending())
- gtk_main_iteration();
</del><ins>+ WKRect frame = windowFrame();
+ frame.size.width = width;
+ frame.size.height = height;
+ setWindowFrame(frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKPageRef PlatformWebView::page()
</span><span class="lines">@@ -82,14 +78,8 @@
</span><span class="cx"> WKRect PlatformWebView::windowFrame()
</span><span class="cx"> {
</span><span class="cx"> GtkAllocation geometry;
</span><del>-#ifdef GTK_API_VERSION_2
- gint depth;
</del><span class="cx"> gdk_window_get_geometry(gtk_widget_get_window(GTK_WIDGET(m_window)),
</span><del>- &geometry.x, &geometry.y, &geometry.width, &geometry.height, &depth);
-#else
- gdk_window_get_geometry(gtk_widget_get_window(GTK_WIDGET(m_window)),
</del><span class="cx"> &geometry.x, &geometry.y, &geometry.width, &geometry.height);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> WKRect frame;
</span><span class="cx"> frame.origin.x = geometry.x;
</span><span class="lines">@@ -101,8 +91,13 @@
</span><span class="cx">
</span><span class="cx"> void PlatformWebView::setWindowFrame(WKRect frame)
</span><span class="cx"> {
</span><del>- gtk_window_move(GTK_WINDOW(m_window), frame.origin.x, frame.origin.y);
- resizeTo(frame.size.width, frame.size.height);
</del><ins>+ gdk_window_move_resize(gtk_widget_get_window(GTK_WIDGET(m_window)),
+ frame.origin.x, frame.origin.y, frame.size.width, frame.size.height);
+ GtkAllocation size = { 0, 0, static_cast<int>(frame.size.width), static_cast<int>(frame.size.height) };
+ gtk_widget_size_allocate(GTK_WIDGET(m_view), &size);
+
+ while (gtk_events_pending())
+ gtk_main_iteration();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformWebView::addChromeInputField()
</span></span></pre>
</div>
</div>
</body>
</html>