<!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>[203495] trunk/Source/WebKit2</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/203495">203495</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-21 00:04:59 -0700 (Thu, 21 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Avoid the redirected window resize when the view is realized in AC mode
https://bugs.webkit.org/show_bug.cgi?id=159463
Reviewed by Michael Catanzaro.
We are always creating the redirected window at 1x1 and then resizing it if we are in AC mode. When the view is
realized and AC mode is already enabled, which happens for example when AC mode is forced, or when the threaded
compositor is enabled, we could just pass the initial size to the redirected window constructor to create the
XWindow at the right size.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseResizeRedirectedWindow): We no longer need to pass the device scale factor, since the
RedirectedXCompositeWindow already knows it.
(webkitWebViewBaseRealize): Pass the WebPageProxy and an initial size to the RedirectedXCompositeWindow
constructor instead of the parent GdkWindow. If AC mode is disabled, the initial size will be empty. With the
WebPageProxy the redirected window has access to the device scale factor and view widget to get the parent
GdkWindow.
(deviceScaleFactorChanged): Resize the redirected window when device scale factor changes.
* UIProcess/gtk/RedirectedXCompositeWindow.cpp:
(WebKit::RedirectedXCompositeWindow::create):
(WebKit::RedirectedXCompositeWindow::RedirectedXCompositeWindow):
(WebKit::RedirectedXCompositeWindow::resize):
(WebKit::RedirectedXCompositeWindow::surface):
(WebKit::RedirectedXCompositeWindow::~RedirectedXCompositeWindow):
* UIProcess/gtk/RedirectedXCompositeWindow.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkRedirectedXCompositeWindowcpp">trunk/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkRedirectedXCompositeWindowh">trunk/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (203494 => 203495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-21 06:51:05 UTC (rev 203494)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-21 07:04:59 UTC (rev 203495)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2016-07-20 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Avoid the redirected window resize when the view is realized in AC mode
+ https://bugs.webkit.org/show_bug.cgi?id=159463
+
+ Reviewed by Michael Catanzaro.
+
+ We are always creating the redirected window at 1x1 and then resizing it if we are in AC mode. When the view is
+ realized and AC mode is already enabled, which happens for example when AC mode is forced, or when the threaded
+ compositor is enabled, we could just pass the initial size to the redirected window constructor to create the
+ XWindow at the right size.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseResizeRedirectedWindow): We no longer need to pass the device scale factor, since the
+ RedirectedXCompositeWindow already knows it.
+ (webkitWebViewBaseRealize): Pass the WebPageProxy and an initial size to the RedirectedXCompositeWindow
+ constructor instead of the parent GdkWindow. If AC mode is disabled, the initial size will be empty. With the
+ WebPageProxy the redirected window has access to the device scale factor and view widget to get the parent
+ GdkWindow.
+ (deviceScaleFactorChanged): Resize the redirected window when device scale factor changes.
+ * UIProcess/gtk/RedirectedXCompositeWindow.cpp:
+ (WebKit::RedirectedXCompositeWindow::create):
+ (WebKit::RedirectedXCompositeWindow::RedirectedXCompositeWindow):
+ (WebKit::RedirectedXCompositeWindow::resize):
+ (WebKit::RedirectedXCompositeWindow::surface):
+ (WebKit::RedirectedXCompositeWindow::~RedirectedXCompositeWindow):
+ * UIProcess/gtk/RedirectedXCompositeWindow.h:
+
+2016-07-20 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK][Threaded Compositor] Web Process crash when the page is closed before the web view is realized
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159918
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (203494 => 203495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-07-21 06:51:05 UTC (rev 203494)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-07-21 07:04:59 UTC (rev 203495)
</span><span class="lines">@@ -359,8 +359,8 @@
</span><span class="cx"> {
</span><span class="cx"> WebKitWebViewBasePrivate* priv = webView->priv;
</span><span class="cx"> DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(priv->pageProxy->drawingArea());
</span><del>- ASSERT(drawingArea);
- priv->redirectedWindow->setDeviceScaleFactor(priv->pageProxy->deviceScaleFactor());
</del><ins>+ if (!drawingArea)
+ return;
</ins><span class="cx"> priv->redirectedWindow->resize(drawingArea->size());
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -373,19 +373,19 @@
</span><span class="cx"> #if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</span><span class="cx"> if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::X11) {
</span><span class="cx"> ASSERT(!priv->redirectedWindow);
</span><ins>+ DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(priv->pageProxy->drawingArea());
</ins><span class="cx"> priv->redirectedWindow = RedirectedXCompositeWindow::create(
</span><del>- gtk_widget_get_parent_window(widget),
</del><ins>+ *priv->pageProxy,
+ drawingArea && drawingArea->isInAcceleratedCompositingMode() ? drawingArea->size() : IntSize(),
</ins><span class="cx"> [webView] {
</span><span class="cx"> DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(webView->priv->pageProxy->drawingArea());
</span><span class="cx"> if (drawingArea && drawingArea->isInAcceleratedCompositingMode())
</span><span class="cx"> gtk_widget_queue_draw(GTK_WIDGET(webView));
</span><span class="cx"> });
</span><del>- if (priv->redirectedWindow) {
- if (DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(priv->pageProxy->drawingArea())) {
- drawingArea->setNativeSurfaceHandleForCompositing(priv->redirectedWindow->windowID());
- if (drawingArea->isInAcceleratedCompositingMode())
- webkitWebViewBaseResizeRedirectedWindow(webView);
- }
</del><ins>+ if (priv->redirectedWindow && drawingArea) {
+ drawingArea->setNativeSurfaceHandleForCompositing(priv->redirectedWindow->windowID());
+ if (drawingArea->isInAcceleratedCompositingMode())
+ webkitWebViewBaseResizeRedirectedWindow(webView);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -1265,7 +1265,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</span><span class="cx"> if (webkitWebViewBase->priv->redirectedWindow)
</span><del>- webkitWebViewBase->priv->redirectedWindow->setDeviceScaleFactor(webkitWebViewBase->priv->pageProxy->deviceScaleFactor());
</del><ins>+ webkitWebViewBaseResizeRedirectedWindow(webkitWebViewBase);
</ins><span class="cx"> #endif
</span><span class="cx"> webkitWebViewBase->priv->pageProxy->setIntrinsicDeviceScaleFactor(gtk_widget_get_scale_factor(GTK_WIDGET(webkitWebViewBase)));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkRedirectedXCompositeWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.cpp (203494 => 203495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.cpp 2016-07-21 06:51:05 UTC (rev 203494)
+++ trunk/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.cpp 2016-07-21 07:04:59 UTC (rev 203495)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</span><span class="cx">
</span><ins>+#include "WebPageProxy.h"
</ins><span class="cx"> #include <WebCore/CairoUtilities.h>
</span><span class="cx"> #include <WebCore/PlatformDisplayX11.h>
</span><span class="cx"> #include <X11/Xlib.h>
</span><span class="lines">@@ -130,21 +131,26 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<RedirectedXCompositeWindow> RedirectedXCompositeWindow::create(GdkWindow* parentWindow, std::function<void()> damageNotify)
</del><ins>+std::unique_ptr<RedirectedXCompositeWindow> RedirectedXCompositeWindow::create(WebPageProxy& webPage, const IntSize& initialSize, std::function<void()>&& damageNotify)
</ins><span class="cx"> {
</span><ins>+ GdkWindow* parentWindow = gtk_widget_get_parent_window(webPage.viewWidget());
</ins><span class="cx"> ASSERT(GDK_IS_WINDOW(parentWindow));
</span><del>- return supportsXDamageAndXComposite(parentWindow) ? std::unique_ptr<RedirectedXCompositeWindow>(new RedirectedXCompositeWindow(parentWindow, damageNotify)) : nullptr;
</del><ins>+ if (!supportsXDamageAndXComposite(parentWindow))
+ return nullptr;
+ return std::unique_ptr<RedirectedXCompositeWindow>(new RedirectedXCompositeWindow(webPage, initialSize, WTFMove(damageNotify)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RedirectedXCompositeWindow::RedirectedXCompositeWindow(GdkWindow* parentWindow, std::function<void()> damageNotify)
- : m_display(GDK_DISPLAY_XDISPLAY(gdk_window_get_display(parentWindow)))
- , m_needsNewPixmapAfterResize(false)
- , m_deviceScale(1)
</del><ins>+RedirectedXCompositeWindow::RedirectedXCompositeWindow(WebPageProxy& webPage, const IntSize& initialSize, std::function<void()>&& damageNotify)
+ : m_webPage(webPage)
+ , m_display(GDK_DISPLAY_XDISPLAY(gdk_window_get_display(gtk_widget_get_parent_window(webPage.viewWidget()))))
+ , m_size(initialSize)
</ins><span class="cx"> {
</span><ins>+ m_size.scale(m_webPage.deviceScaleFactor());
+
</ins><span class="cx"> ASSERT(downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay()).native() == m_display);
</span><span class="cx"> Screen* screen = DefaultScreenOfDisplay(m_display);
</span><span class="cx">
</span><del>- GdkVisual* visual = gdk_window_get_visual(parentWindow);
</del><ins>+ GdkVisual* visual = gdk_window_get_visual(gtk_widget_get_parent_window(webPage.viewWidget()));
</ins><span class="cx"> XUniqueColormap colormap(XCreateColormap(m_display, RootWindowOfScreen(screen), GDK_VISUAL_XVISUAL(visual), AllocNone));
</span><span class="cx">
</span><span class="cx"> // This is based on code from Chromium: src/content/common/gpu/image_transport_surface_linux.cc
</span><span class="lines">@@ -214,8 +220,7 @@
</span><span class="cx"> void RedirectedXCompositeWindow::resize(const IntSize& size)
</span><span class="cx"> {
</span><span class="cx"> IntSize scaledSize(size);
</span><del>- scaledSize.scale(m_deviceScale);
-
</del><ins>+ scaledSize.scale(m_webPage.deviceScaleFactor());
</ins><span class="cx"> if (scaledSize == m_size)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -261,7 +266,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<cairo_surface_t> newSurface = adoptRef(cairo_xlib_surface_create(m_display, newPixmap.get(), windowAttributes.visual, m_size.width(), m_size.height()));
</span><del>- cairoSurfaceSetDeviceScale(newSurface.get(), m_deviceScale, m_deviceScale);
</del><ins>+ cairoSurfaceSetDeviceScale(newSurface.get(), m_webPage.deviceScaleFactor(), m_webPage.deviceScaleFactor());
</ins><span class="cx">
</span><span class="cx"> RefPtr<cairo_t> cr = adoptRef(cairo_create(newSurface.get()));
</span><span class="cx"> cairo_set_source_rgb(cr.get(), 1, 1, 1);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkRedirectedXCompositeWindowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.h (203494 => 203495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.h 2016-07-21 06:51:05 UTC (rev 203494)
+++ trunk/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.h 2016-07-21 07:04:59 UTC (rev 203495)
</span><span class="lines">@@ -40,21 +40,24 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+class WebPageProxy;
+
</ins><span class="cx"> class RedirectedXCompositeWindow {
</span><ins>+ WTF_MAKE_NONCOPYABLE(RedirectedXCompositeWindow); WTF_MAKE_FAST_ALLOCATED;
</ins><span class="cx"> public:
</span><del>- static std::unique_ptr<RedirectedXCompositeWindow> create(GdkWindow*, std::function<void()> damageNotify);
</del><ins>+ static std::unique_ptr<RedirectedXCompositeWindow> create(WebPageProxy&, const WebCore::IntSize&, std::function<void ()>&& damageNotify);
</ins><span class="cx"> ~RedirectedXCompositeWindow();
</span><span class="cx">
</span><span class="cx"> Window windowID() const { return m_window.get(); }
</span><span class="cx"> void resize(const WebCore::IntSize&);
</span><del>- void setDeviceScaleFactor(float scale) { m_deviceScale = scale; }
</del><span class="cx"> cairo_surface_t* surface();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RedirectedXCompositeWindow(GdkWindow*, std::function<void()> damageNotify);
</del><ins>+ RedirectedXCompositeWindow(WebPageProxy&, const WebCore::IntSize&, std::function<void ()>&& damageNotify);
</ins><span class="cx"> void cleanupPixmapAndPixmapSurface();
</span><span class="cx">
</span><del>- Display* m_display;
</del><ins>+ WebPageProxy& m_webPage;
+ Display* m_display { nullptr };
</ins><span class="cx"> WebCore::IntSize m_size;
</span><span class="cx"> WebCore::XUniqueWindow m_window;
</span><span class="cx"> WebCore::XUniqueWindow m_parentWindow;
</span><span class="lines">@@ -61,8 +64,7 @@
</span><span class="cx"> WebCore::XUniquePixmap m_pixmap;
</span><span class="cx"> WebCore::XUniqueDamage m_damage;
</span><span class="cx"> RefPtr<cairo_surface_t> m_surface;
</span><del>- bool m_needsNewPixmapAfterResize;
- float m_deviceScale;
</del><ins>+ bool m_needsNewPixmapAfterResize { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>