Ticket #4244: scale-fast.patch

webkitgtk-1.10.1/Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp

@@ -100 +100 @@
 
     cairo_surface_flush(m_private->m_surface.get());
     XCopyArea(m_private->m_display, m_private->m_pixmap, m_private->m_pixmap, m_private->m_gc, 
-              targetRect.x() - scrollOffset.width(), targetRect.y() - scrollOffset.height(),
-              targetRect.width(), targetRect.height(),
-              targetRect.x(), targetRect.y());
+              (targetRect.x() - scrollOffset.width()) * 1.4, (targetRect.y() - scrollOffset.height()) * 1.4,
+              targetRect.width() * 1.4, targetRect.height() * 1.4,
+              targetRect.x() * 1.4, targetRect.y() * 1.4);
     cairo_surface_mark_dirty_rectangle(m_private->m_surface.get(),
                                        targetRect.x(), targetRect.y(),
                                        targetRect.width(), targetRect.height());

webkitgtk-1.10.1/Source/WebCore/platform/gtk/ScrollViewGtk.cpp

@@ -87 +87 @@
     GtkAllocation allocation;
     gtk_widget_get_allocation(measuredWidget, &allocation);
     return IntRect(IntPoint(m_scrollOffset.width(), m_scrollOffset.height()),
-                   IntSize(allocation.width, allocation.height));
+                   IntSize(allocation.width / 1.4, allocation.height / 1.4));
 }
 
 void ScrollView::setScrollbarModes(ScrollbarMode horizontalMode, ScrollbarMode verticalMode, bool horizontalLock, bool verticalLock)

webkitgtk-1.10.1/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

@@ -146 +146 @@
 {
     GtkAllocation allocation;
     gtk_widget_get_allocation(GTK_WIDGET(webView), &allocation);
-    return IntRect(allocation.x, allocation.y, allocation.width, allocation.height);
+    return IntRect(allocation.x / 1.4, allocation.y / 1.4, allocation.width / 1.4, allocation.height / 1.4);
 }
 
 FloatRect ChromeClient::pageRect()
@@ -546 +546 @@
     for (size_t i = 0; i < m_rectsToScroll.size(); i++) {
         IntRect& scrollRect = m_rectsToScroll[i];
         m_webView->priv->backingStore->scroll(scrollRect, m_scrollOffsets[i]);
-        gtk_widget_queue_draw_area(GTK_WIDGET(m_webView), scrollRect.x(), scrollRect.y(), scrollRect.width(), scrollRect.height());
+        gtk_widget_queue_draw_area(GTK_WIDGET(m_webView), scrollRect.x() * 1.4, scrollRect.y() * 1.4, scrollRect.width() * 1.4, scrollRect.height() * 1.4);
     }
 
     m_rectsToScroll.clear();
@@ -582 +582 @@
     }
 
     const IntRect& rect = m_dirtyRegion.bounds();
-    gtk_widget_queue_draw_area(GTK_WIDGET(m_webView), rect.x(), rect.y(), rect.width(), rect.height());
+    gtk_widget_queue_draw_area(GTK_WIDGET(m_webView), rect.x() * 1.4, rect.y() * 1.4, rect.width() * 1.4, rect.height() * 1.4);
 
     m_dirtyRegion = Region();
     m_lastDisplayTime = currentTime();

webkitgtk-1.10.1/Source/WebKit/gtk/webkit/webkitwebview.cpp

@@ -3616 +3616 @@
     pageClients.inspectorClient = new WebKit::InspectorClient(webView);
 
     priv->corePage = new Page(pageClients);
+    priv->corePage->setDeviceScaleFactor(1.4);
 
 #if ENABLE(GEOLOCATION)
     if (DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled()) {