Title: [108216] trunk/Source/WebKit2
- Revision
- 108216
- Author
- [email protected]
- Date
- 2012-02-20 00:38:05 -0800 (Mon, 20 Feb 2012)
Log Message
[GTK][WK2] WebKit2 does not build if gtk-unix-printing-3.0 is not available
https://bugs.webkit.org/show_bug.cgi?id=79011
Fix the build when gtk-unix-printing-3.0 is not present.
* UIProcess/API/gtk/WebKitPrintOperation.cpp:
(webkitPrintOperationRunDialog):
(webkitPrintOperationRunDialogForFrame):
* WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:
(WebKit::WebPrintOperationGtk::create):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (108215 => 108216)
--- trunk/Source/WebKit2/ChangeLog 2012-02-20 08:37:23 UTC (rev 108215)
+++ trunk/Source/WebKit2/ChangeLog 2012-02-20 08:38:05 UTC (rev 108216)
@@ -1,3 +1,16 @@
+2012-02-20 Martin Robinson <[email protected]>
+
+ [GTK][WK2] WebKit2 does not build if gtk-unix-printing-3.0 is not available
+ https://bugs.webkit.org/show_bug.cgi?id=79011
+
+ Fix the build when gtk-unix-printing-3.0 is not present.
+
+ * UIProcess/API/gtk/WebKitPrintOperation.cpp:
+ (webkitPrintOperationRunDialog):
+ (webkitPrintOperationRunDialogForFrame):
+ * WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:
+ (WebKit::WebPrintOperationGtk::create):
+
2012-02-18 Dan Bernstein <[email protected]>
<rdar://problem/10891801> BackingStore::scroll() unnecessarily copies pixels around
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp (108215 => 108216)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2012-02-20 08:37:23 UTC (rev 108215)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2012-02-20 08:38:05 UTC (rev 108216)
@@ -197,7 +197,7 @@
}
#ifdef HAVE_GTK_UNIX_PRINTING
-static WebKitPrintOperationResponse webkitPrintOperationRunDialogUnix(WebKitPrintOperation* printOperation, GtkWindow* parent)
+static WebKitPrintOperationResponse webkitPrintOperationRunDialog(WebKitPrintOperation* printOperation, GtkWindow* parent)
{
GtkPrintUnixDialog* printDialog = GTK_PRINT_UNIX_DIALOG(gtk_print_unix_dialog_new(0, parent));
gtk_print_unix_dialog_set_manual_capabilities(printDialog, static_cast<GtkPrintCapabilities>(GTK_PRINT_CAPABILITY_NUMBER_UP
@@ -228,10 +228,9 @@
return returnValue;
}
-#endif // HAVE_GTK_UNIX_PRINTING
-
-#ifdef G_OS_WIN32
-static WebKitPrintOperationResponse webkitPrintOperationRunDialogWin32(WebKitPrintOperation*, GtkWindow*)
+#else
+// TODO: We need to add an implementation for Windows.
+static WebKitPrintOperationResponse webkitPrintOperationRunDialog(WebKitPrintOperation*, GtkWindow*)
{
notImplemented();
return WEBKIT_PRINT_OPERATION_RESPONSE_CANCEL;
@@ -261,13 +260,8 @@
if (WebCore::widgetIsOnscreenToplevelWindow(toplevel))
parent = GTK_WINDOW(toplevel);
}
-#ifdef HAVE_GTK_UNIX_PRINTING
- WebKitPrintOperationResponse response = webkitPrintOperationRunDialogUnix(printOperation, parent);
-#endif
-#ifdef G_OS_WIN32
- WebKitPrintOperationResponse response = webkitPrintOperationRunDialogWin32(printOperation, parent);
-#endif
+ WebKitPrintOperationResponse response = webkitPrintOperationRunDialog(printOperation, parent);
if (response == WEBKIT_PRINT_OPERATION_RESPONSE_CANCEL)
return response;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp (108215 => 108216)
--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2012-02-20 08:37:23 UTC (rev 108215)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2012-02-20 08:38:05 UTC (rev 108216)
@@ -367,9 +367,10 @@
{
#ifdef HAVE_GTK_UNIX_PRINTING
return adoptRef(new WebPrintOperationGtkUnix(page, printInfo));
-#endif
-#ifdef G_OS_WIN32
+#elif defined(G_OS_WIN32)
return adoptRef(new WebPrintOperationGtkWin32(page, printInfo));
+#else
+ return 0;
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
