Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (165443 => 165444)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-03-11 11:03:46 UTC (rev 165443)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-03-11 11:07:15 UTC (rev 165444)
@@ -1,3 +1,12 @@
+2014-03-07 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Use final and override in WebPrintOperationGtk
+ https://bugs.webkit.org/show_bug.cgi?id=129868
+
+ Reviewed by Sergio Villar Senin.
+
+ * WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:
+
2014-03-06 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Close the page when the view is disposed instead of when finalized
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp (165443 => 165444)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2014-03-11 11:03:46 UTC (rev 165443)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2014-03-11 11:07:15 UTC (rev 165444)
@@ -52,7 +52,7 @@
namespace WebKit {
#ifdef HAVE_GTK_UNIX_PRINTING
-class WebPrintOperationGtkUnix: public WebPrintOperationGtk {
+class WebPrintOperationGtkUnix final: public WebPrintOperationGtk {
public:
WebPrintOperationGtkUnix(WebPage* page, const PrintInfo& printInfo)
: WebPrintOperationGtk(page, printInfo)
@@ -60,7 +60,7 @@
{
}
- void startPrint(WebCore::PrintContext* printContext, uint64_t callbackID)
+ void startPrint(WebCore::PrintContext* printContext, uint64_t callbackID) override
{
m_printContext = printContext;
m_callbackID = callbackID;
@@ -103,7 +103,7 @@
print(surface, 72, 72);
}
- void startPage(cairo_t* cr)
+ void startPage(cairo_t* cr) override
{
if (!currentPageIsFirstPageOfSheet())
return;
@@ -132,7 +132,7 @@
cairo_pdf_surface_set_size(surface, width, height);
}
- void endPage(cairo_t* cr)
+ void endPage(cairo_t* cr) override
{
if (currentPageIsLastPageOfSheet())
cairo_show_page(cr);
@@ -149,7 +149,7 @@
printOperation->deref();
}
- void endPrint()
+ void endPrint() override
{
cairo_surface_finish(gtk_print_job_get_surface(m_printJob.get(), 0));
// Make sure the operation is alive until the job is sent.
@@ -163,31 +163,31 @@
#endif
#ifdef G_OS_WIN32
-class WebPrintOperationGtkWin32: public WebPrintOperationGtk {
+class WebPrintOperationGtkWin32 final: public WebPrintOperationGtk {
public:
WebPrintOperationGtkWin32(WebPage* page, const PrintInfo& printInfo)
: WebPrintOperationGtk(page, printInfo)
{
}
- void startPrint(WebCore::PrintContext* printContext, uint64_t callbackID)
+ void startPrint(WebCore::PrintContext* printContext, uint64_t callbackID) override
{
m_printContext = printContext;
m_callbackID = callbackID;
notImplemented();
}
- void startPage(cairo_t* cr)
+ void startPage(cairo_t* cr) override
{
notImplemented();
}
- void endPage(cairo_t* cr)
+ void endPage(cairo_t* cr) override
{
notImplemented();
}
- void endPrint()
+ void endPrint() override
{
notImplemented();
}
