<!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>[167195] trunk/Source</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/167195">167195</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-13 04:23:23 -0700 (Sun, 13 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/167168">r167168</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/167194">r167194</a>.
https://bugs.webkit.org/show_bug.cgi?id=131589
Caused massive ASSERTION failures on the GTK Debug bot
(Requested by philn on #webkit).
Reverted changesets:
"[GTK] Add HighDPI support for non-accelerated compositing
contents"
https://bugs.webkit.org/show_bug.cgi?id=131562
http://trac.webkit.org/changeset/167168
Source/WebCore:
"Unreviewed. Fix GTK+ build with recent cairo and GTK+ after
<a href="http://trac.webkit.org/projects/webkit/changeset/167168">r167168</a>."
http://trac.webkit.org/changeset/167194
Source/WebKit2:
"Unreviewed. Fix GTK+ build with recent cairo and GTK+ after
<a href="http://trac.webkit.org/projects/webkit/changeset/167168">r167168</a>."
http://trac.webkit.org/changeset/167194</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformcairoWidgetBackingStoreh">trunk/Source/WebCore/platform/cairo/WidgetBackingStore.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcairoWidgetBackingStoreCairocpp">trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcairoWidgetBackingStoreCairoh">trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoCairoUtilitiescpp">trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoCairoUtilitiesh">trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkWidgetBackingStoreGtkX11cpp">trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkWidgetBackingStoreGtkX11h">trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h</a></li>
<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="#trunkSourceWebKit2UIProcesscairoBackingStoreCairocpp">trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167194 => 167195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-13 09:46:34 UTC (rev 167194)
+++ trunk/Source/WebCore/ChangeLog 2014-04-13 11:23:23 UTC (rev 167195)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-04-13 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r167168 and r167194.
+ https://bugs.webkit.org/show_bug.cgi?id=131589
+
+ Caused massive ASSERTION failures on the GTK Debug bot
+ (Requested by philn on #webkit).
+
+ Reverted changesets:
+
+ "[GTK] Add HighDPI support for non-accelerated compositing
+ contents"
+ https://bugs.webkit.org/show_bug.cgi?id=131562
+ http://trac.webkit.org/changeset/167168
+
+ "Unreviewed. Fix GTK+ build with recent cairo and GTK+ after
+ r167168."
+ http://trac.webkit.org/changeset/167194
+
</ins><span class="cx"> 2014-04-13 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [GStreamer] No CORS support for media elements
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcairoWidgetBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cairo/WidgetBackingStore.h (167194 => 167195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cairo/WidgetBackingStore.h 2014-04-13 09:46:34 UTC (rev 167194)
+++ trunk/Source/WebCore/platform/cairo/WidgetBackingStore.h 2014-04-13 11:23:23 UTC (rev 167195)
</span><span class="lines">@@ -49,17 +49,11 @@
</span><span class="cx"> virtual cairo_surface_t* cairoSurface() = 0;
</span><span class="cx"> virtual void scroll(const IntRect& scrollRect, const IntSize& scrollOffset) = 0;
</span><span class="cx"> const IntSize& size() { return m_size; }
</span><del>-
- WidgetBackingStore(const IntSize& size, float deviceScaleFactor)
- : m_size(size)
- , m_deviceScaleFactor(deviceScaleFactor)
- { }
-
</del><ins>+ WidgetBackingStore(const IntSize& size) : m_size(size) { }
</ins><span class="cx"> virtual ~WidgetBackingStore() { }
</span><span class="cx">
</span><del>-protected:
</del><ins>+private:
</ins><span class="cx"> IntSize m_size;
</span><del>- float m_deviceScaleFactor;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcairoWidgetBackingStoreCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp (167194 => 167195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp 2014-04-13 09:46:34 UTC (rev 167194)
+++ trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp 2014-04-13 11:23:23 UTC (rev 167195)
</span><span class="lines">@@ -26,10 +26,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static PassRefPtr<cairo_surface_t> createSurfaceForBackingStore(PlatformWidget widget, IntSize size, float deviceScaleFactor)
</del><ins>+static PassRefPtr<cairo_surface_t> createSurfaceForBackingStore(PlatformWidget widget, const IntSize& size)
</ins><span class="cx"> {
</span><del>- size.scale(deviceScaleFactor);
-
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> return adoptRef(gdk_window_create_similar_surface(gtk_widget_get_window(widget), CAIRO_CONTENT_COLOR_ALPHA, size.width(), size.height()));
</span><span class="cx"> #else
</span><span class="lines">@@ -38,20 +36,20 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<WidgetBackingStore> WidgetBackingStoreCairo::create(PlatformWidget widget, const IntSize& size, float deviceScaleFactor)
</del><ins>+PassOwnPtr<WidgetBackingStore> WidgetBackingStoreCairo::create(PlatformWidget widget, const IntSize& size)
</ins><span class="cx"> {
</span><del>- return adoptPtr(new WidgetBackingStoreCairo(widget, size, deviceScaleFactor));
</del><ins>+ return adoptPtr(new WidgetBackingStoreCairo(widget, size));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // We keep two copies of the surface here, which will double the memory usage, but increase
</span><span class="cx"> // scrolling performance since we do not have to keep reallocating a memory region during
</span><span class="cx"> // quick scrolling requests.
</span><del>-WidgetBackingStoreCairo::WidgetBackingStoreCairo(PlatformWidget widget, const IntSize& size, float deviceScaleFactor)
- : WidgetBackingStore(size, deviceScaleFactor)
- , m_surface(createSurfaceForBackingStore(widget, size, deviceScaleFactor))
- , m_scrollSurface(createSurfaceForBackingStore(widget, size, deviceScaleFactor))
</del><ins>+WidgetBackingStoreCairo::WidgetBackingStoreCairo(PlatformWidget widget, const IntSize& size)
+ : WidgetBackingStore(size)
+ , m_surface(createSurfaceForBackingStore(widget, size))
+ , m_scrollSurface(createSurfaceForBackingStore(widget, size))
+
</ins><span class="cx"> {
</span><del>- cairoSurfaceSetDeviceScale(m_surface.get(), deviceScaleFactor, deviceScaleFactor);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WidgetBackingStoreCairo::~WidgetBackingStoreCairo()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcairoWidgetBackingStoreCairoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h (167194 => 167195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h 2014-04-13 09:46:34 UTC (rev 167194)
+++ trunk/Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h 2014-04-13 11:23:23 UTC (rev 167195)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> class WidgetBackingStoreCairo : public WidgetBackingStore {
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<WidgetBackingStore> create(PlatformWidget, const IntSize&, float deviceScaleFactor);
- WidgetBackingStoreCairo(PlatformWidget, const IntSize&, float deviceScaleFactor);
</del><ins>+ static PassOwnPtr<WidgetBackingStore> create(PlatformWidget, const IntSize&);
+ WidgetBackingStoreCairo(PlatformWidget, const IntSize&);
</ins><span class="cx"> ~WidgetBackingStoreCairo();
</span><span class="cx"> cairo_surface_t* cairoSurface();
</span><span class="cx"> void scroll(const IntRect&, const IntSize&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoCairoUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp (167194 => 167195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp 2014-04-13 09:46:34 UTC (rev 167194)
+++ trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp 2014-04-13 11:23:23 UTC (rev 167195)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "Path.h"
</span><span class="cx"> #include "PlatformPathCairo.h"
</span><span class="cx"> #include "RefPtrCairo.h"
</span><del>-#include <wtf/Assertions.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span><span class="lines">@@ -260,15 +259,4 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void cairoSurfaceSetDeviceScale(cairo_surface_t* surface, double xScale, double yScale)
-{
- // This function was added pretty much simultaneous to when 1.13 was branched.
-#if HAVE(CAIRO_SURFACE_SET_DEVICE_SCALE)
- cairo_surface_set_device_scale(surface, xScale, yScale);
-#else
- UNUSED_PARAM(surface);
- ASSERT_UNUSED(xScale, 1 == xScale);
- ASSERT_UNUSED(yScale, 1 == yScale);
-#endif
-}
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoCairoUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.h (167194 => 167195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.h 2014-04-13 09:46:34 UTC (rev 167194)
+++ trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.h 2014-04-13 11:23:23 UTC (rev 167195)
</span><span class="lines">@@ -31,9 +31,6 @@
</span><span class="cx"> #include "IntSize.h"
</span><span class="cx"> #include <cairo.h>
</span><span class="cx">
</span><del>-// This function was added pretty much simultaneous to when 1.13 was branched.
-#define HAVE_CAIRO_SURFACE_SET_DEVICE_SCALE CAIRO_VERSION_MAJOR > 1 || (CAIRO_VERSION_MAJOR == 1 && CAIRO_VERSION_MINOR >= 13)
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> class AffineTransform;
</span><span class="cx"> class Color;
</span><span class="lines">@@ -59,7 +56,6 @@
</span><span class="cx"> void copyRectFromOneSurfaceToAnother(cairo_surface_t* from, cairo_surface_t* to, const IntSize& offset, const IntRect&, const IntSize& = IntSize(), cairo_operator_t = CAIRO_OPERATOR_OVER);
</span><span class="cx">
</span><span class="cx"> IntSize cairoSurfaceSize(cairo_surface_t*);
</span><del>-void cairoSurfaceSetDeviceScale(cairo_surface_t*, double xScale, double yScale);
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkWidgetBackingStoreGtkX11cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp (167194 => 167195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp 2014-04-13 09:46:34 UTC (rev 167194)
+++ trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp 2014-04-13 11:23:23 UTC (rev 167195)
</span><span class="lines">@@ -19,7 +19,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WidgetBackingStoreGtkX11.h"
</span><span class="cx">
</span><del>-#include "CairoUtilities.h"
</del><span class="cx"> #include "GtkVersioning.h"
</span><span class="cx"> #include "RefPtrCairo.h"
</span><span class="cx"> #include <cairo-xlib.h>
</span><span class="lines">@@ -28,28 +27,23 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassOwnPtr<WidgetBackingStore> WidgetBackingStoreGtkX11::create(GtkWidget* widget, const IntSize& size, float deviceScaleFactor)
</del><ins>+PassOwnPtr<WidgetBackingStore> WidgetBackingStoreGtkX11::create(GtkWidget* widget, const IntSize& size)
</ins><span class="cx"> {
</span><del>- return adoptPtr(new WidgetBackingStoreGtkX11(widget, size, deviceScaleFactor));
</del><ins>+ return adoptPtr(new WidgetBackingStoreGtkX11(widget, size));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-WidgetBackingStoreGtkX11::WidgetBackingStoreGtkX11(GtkWidget* widget, const IntSize& size, float deviceScaleFactor)
- : WidgetBackingStore(size, deviceScaleFactor)
</del><ins>+WidgetBackingStoreGtkX11::WidgetBackingStoreGtkX11(GtkWidget* widget, const IntSize& size)
+ : WidgetBackingStore(size)
</ins><span class="cx"> {
</span><del>- IntSize scaledSize = size;
- scaledSize.scale(deviceScaleFactor);
-
</del><span class="cx"> GdkVisual* visual = gtk_widget_get_visual(widget);
</span><span class="cx"> GdkScreen* screen = gdk_visual_get_screen(visual);
</span><span class="cx"> m_display = GDK_SCREEN_XDISPLAY(screen);
</span><span class="cx"> m_pixmap = XCreatePixmap(m_display, GDK_WINDOW_XID(gdk_screen_get_root_window(screen)),
</span><del>- scaledSize.width(), scaledSize.height(), gdk_visual_get_depth(visual));
</del><ins>+ size.width(), size.height(), gdk_visual_get_depth(visual));
</ins><span class="cx"> m_gc = XCreateGC(m_display, m_pixmap, 0, 0);
</span><span class="cx">
</span><span class="cx"> m_surface = adoptRef(cairo_xlib_surface_create(m_display, m_pixmap,
</span><del>- GDK_VISUAL_XVISUAL(visual), scaledSize.width(), scaledSize.height()));
-
- cairoSurfaceSetDeviceScale(m_surface.get(), deviceScaleFactor, deviceScaleFactor);
</del><ins>+ GDK_VISUAL_XVISUAL(visual), size.width(), size.height()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WidgetBackingStoreGtkX11::~WidgetBackingStoreGtkX11()
</span><span class="lines">@@ -73,14 +67,9 @@
</span><span class="cx"> if (targetRect.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- targetRect.scale(m_deviceScaleFactor);
-
- IntSize scaledScrollOffset = scrollOffset;
- scaledScrollOffset.scale(m_deviceScaleFactor);
-
</del><span class="cx"> cairo_surface_flush(m_surface.get());
</span><span class="cx"> XCopyArea(m_display, m_pixmap, m_pixmap, m_gc,
</span><del>- targetRect.x() - scaledScrollOffset.width(), targetRect.y() - scaledScrollOffset.height(),
</del><ins>+ targetRect.x() - scrollOffset.width(), targetRect.y() - scrollOffset.height(),
</ins><span class="cx"> targetRect.width(), targetRect.height(),
</span><span class="cx"> targetRect.x(), targetRect.y());
</span><span class="cx"> cairo_surface_mark_dirty_rectangle(m_surface.get(),
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkWidgetBackingStoreGtkX11h"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h (167194 => 167195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h 2014-04-13 09:46:34 UTC (rev 167194)
+++ trunk/Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h 2014-04-13 11:23:23 UTC (rev 167195)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> class WidgetBackingStoreGtkX11 : public WidgetBackingStore {
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<WidgetBackingStore> create(GtkWidget*, const IntSize&, float deviceScaleFactor);
- WidgetBackingStoreGtkX11(GtkWidget*, const IntSize&, float deviceScaleFactor);
</del><ins>+ static PassOwnPtr<WidgetBackingStore> create(GtkWidget*, const IntSize&);
+ WidgetBackingStoreGtkX11(GtkWidget*, const IntSize&);
</ins><span class="cx"> ~WidgetBackingStoreGtkX11();
</span><span class="cx"> cairo_surface_t* cairoSurface();
</span><span class="cx"> void scroll(const IntRect& scrollRect, const IntSize& scrollOffset);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167194 => 167195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-13 09:46:34 UTC (rev 167194)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-13 11:23:23 UTC (rev 167195)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-04-13 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r167168 and r167194.
+ https://bugs.webkit.org/show_bug.cgi?id=131589
+
+ Caused massive ASSERTION failures on the GTK Debug bot
+ (Requested by philn on #webkit).
+
+ Reverted changesets:
+
+ "[GTK] Add HighDPI support for non-accelerated compositing
+ contents"
+ https://bugs.webkit.org/show_bug.cgi?id=131562
+ http://trac.webkit.org/changeset/167168
+
+ "Unreviewed. Fix GTK+ build with recent cairo and GTK+ after
+ r167168."
+ http://trac.webkit.org/changeset/167194
+
</ins><span class="cx"> 2014-04-13 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix GTK+ build with recent cairo and GTK+ after r167168.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (167194 => 167195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-04-13 09:46:34 UTC (rev 167194)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-04-13 11:23:23 UTC (rev 167195)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include "WebPreferences.h"
</span><span class="cx"> #include "WebViewBaseInputMethodFilter.h"
</span><del>-#include <WebCore/CairoUtilities.h>
</del><span class="cx"> #include <WebCore/ClipboardUtilitiesGtk.h>
</span><span class="cx"> #include <WebCore/DataObjectGtk.h>
</span><span class="cx"> #include <WebCore/DragData.h>
</span><span class="lines">@@ -79,10 +78,6 @@
</span><span class="cx"> #include <WebCore/RedirectedXCompositeWindow.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// gtk_widget_get_scale_factor() appeared in GTK 3.10, but we also need
-// to make sure we have cairo new enough to support cairo_surface_set_device_scale
-#define HAVE_GTK_SCALE_FACTOR HAVE_CAIRO_SURFACE_SET_DEVICE_SCALE && GTK_CHECK_VERSION(3, 10, 0)
-
</del><span class="cx"> using namespace WebKit;
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -966,15 +961,6 @@
</span><span class="cx"> priv->pageProxy->pageGroup().preferences().setAcceleratedCompositingEnabled(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if HAVE(GTK_SCALE_FACTOR)
-static void scaleFactorChanged(GObject* object, GParamSpec*)
-{
- WebKitWebViewBasePrivate* priv = WEBKIT_WEB_VIEW_BASE(object)->priv;
- ASSERT(priv->pageProxy);
- priv->pageProxy->setIntrinsicDeviceScaleFactor(gtk_widget_get_scale_factor(GTK_WIDGET(object)));
-}
-#endif // HAVE(GTK_SCALE_FACTOR)
-
</del><span class="cx"> void webkitWebViewBaseCreateWebPage(WebKitWebViewBase* webkitWebViewBase, WebContext* context, WebPageGroup* pageGroup, WebPageProxy* relatedPage)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
</span><span class="lines">@@ -990,12 +976,6 @@
</span><span class="cx"> priv->pageProxy->setAcceleratedCompositingWindowId(priv->redirectedWindow->windowId());
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if HAVE(GTK_SCALE_FACTOR)
- // We attach this here, because changes in scale factor are passed directly to the page proxy.
- priv->pageProxy->setIntrinsicDeviceScaleFactor(gtk_widget_get_scale_factor(GTK_WIDGET(webkitWebViewBase)));
- g_signal_connect(webkitWebViewBase, "notify::scale-factor", G_CALLBACK(scaleFactorChanged), nullptr);
-#endif
-
</del><span class="cx"> webkitWebViewBaseUpdatePreferences(webkitWebViewBase);
</span><span class="cx">
</span><span class="cx"> // This must happen here instead of the instance initializer, because the input method
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesscairoBackingStoreCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp (167194 => 167195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2014-04-13 09:46:34 UTC (rev 167194)
+++ trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2014-04-13 11:23:23 UTC (rev 167195)
</span><span class="lines">@@ -48,14 +48,14 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>-static OwnPtr<WidgetBackingStore> createBackingStoreForGTK(GtkWidget* widget, const IntSize& size, float deviceScaleFactor)
</del><ins>+static OwnPtr<WidgetBackingStore> createBackingStoreForGTK(GtkWidget* widget, const IntSize& size)
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(X11) && defined(GDK_WINDOWING_X11)
</span><span class="cx"> GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get());
</span><span class="cx"> if (GDK_IS_X11_DISPLAY(display))
</span><del>- return WebCore::WidgetBackingStoreGtkX11::create(widget, size, deviceScaleFactor);
</del><ins>+ return WebCore::WidgetBackingStoreGtkX11::create(widget, size);
</ins><span class="cx"> #endif
</span><del>- return WebCore::WidgetBackingStoreCairo::create(widget, size, deviceScaleFactor);
</del><ins>+ return WebCore::WidgetBackingStoreCairo::create(widget, size);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -73,9 +73,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_backingStore)
</span><span class="cx"> #if PLATFORM(EFL)
</span><del>- m_backingStore = WidgetBackingStoreCairo::create(EwkView::toEvasObject(toAPI(m_webPageProxy)), size(), deviceScaleFactor());
</del><ins>+ m_backingStore = WidgetBackingStoreCairo::create(EwkView::toEvasObject(toAPI(m_webPageProxy)), size());
</ins><span class="cx"> #else
</span><del>- m_backingStore = createBackingStoreForGTK(m_webPageProxy->viewWidget(), size(), deviceScaleFactor());
</del><ins>+ m_backingStore = createBackingStoreForGTK(m_webPageProxy->viewWidget(), size());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> scroll(updateInfo.scrollRect, updateInfo.scrollOffset);
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> IntRect updateRect = updateInfo.updateRects[i];
</span><span class="cx"> IntRect srcRect = updateRect;
</span><span class="cx"> srcRect.move(-updateRectLocation.x(), -updateRectLocation.y());
</span><del>- bitmap->paint(graphicsContext, deviceScaleFactor(), updateRect.location(), srcRect);
</del><ins>+ bitmap->paint(graphicsContext, updateRect.location(), srcRect);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>