[webkit-changes] [218250] trunk/Source/WebKit2

[carlosgc]

Title: [218250] trunk/Source/WebKit2

Revision

218250

Author

carlo...@webkit.org

Date

2017-06-14 03:41:33 -0700 (Wed, 14 Jun 2017)

Log Message

Unreviewed. Fix GTK+ build with GCC 4.9 after r218244.

It seems that GCC 4.9 gets confused by enum named General and value of Print enum named General too. This
renames the Print enum value as Generic.

* Shared/API/APIError.h:
* Shared/gtk/WebErrorsGtk.cpp:
(WebKit::printError):
* UIProcess/API/gtk/WebKitPrivate.cpp:
(toWebKitError):
(toWebCoreError):

Modified Paths

• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/Shared/API/APIError.h
• trunk/Source/WebKit2/Shared/gtk/WebErrorsGtk.cpp
• trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp

Diff

Modified: trunk/Source/WebKit2/ChangeLog (218249 => 218250)

--- trunk/Source/WebKit2/ChangeLog	2017-06-14 10:06:35 UTC (rev 218249)
+++ trunk/Source/WebKit2/ChangeLog	2017-06-14 10:41:33 UTC (rev 218250)
@@ -1,3 +1,17 @@
+2017-06-14  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        Unreviewed. Fix GTK+ build with GCC 4.9 after r218244.
+
+        It seems that GCC 4.9 gets confused by enum named General and value of Print enum named General too. This
+        renames the Print enum value as Generic.
+
+        * Shared/API/APIError.h:
+        * Shared/gtk/WebErrorsGtk.cpp:
+        (WebKit::printError):
+        * UIProcess/API/gtk/WebKitPrivate.cpp:
+        (toWebKitError):
+        (toWebCoreError):
+
 2017-06-13  Carlos Garcia Campos  <cgar...@igalia.com>
 
         Do not mix C and C++ API error constants

Modified: trunk/Source/WebKit2/Shared/API/APIError.h (218249 => 218250)

--- trunk/Source/WebKit2/Shared/API/APIError.h	2017-06-14 10:06:35 UTC (rev 218249)
+++ trunk/Source/WebKit2/Shared/API/APIError.h	2017-06-14 10:41:33 UTC (rev 218250)
@@ -90,7 +90,7 @@
 
 #if PLATFORM(GTK)
     enum Print {
-        General = 599,
+        Generic = 599,
         PrinterNotFound = 500,
         InvalidPageRange = 501
     };

Modified: trunk/Source/WebKit2/Shared/gtk/WebErrorsGtk.cpp (218249 => 218250)

--- trunk/Source/WebKit2/Shared/gtk/WebErrorsGtk.cpp	2017-06-14 10:06:35 UTC (rev 218249)
+++ trunk/Source/WebKit2/Shared/gtk/WebErrorsGtk.cpp	2017-06-14 10:41:33 UTC (rev 218250)
@@ -36,7 +36,7 @@
 
 ResourceError printError(const URL& failingURL, const String& localizedDescription)
 {
-    return ResourceError(API::Error::webKitPrintErrorDomain(), API::Error::Print::General, failingURL, localizedDescription);
+    return ResourceError(API::Error::webKitPrintErrorDomain(), API::Error::Print::Generic, failingURL, localizedDescription);
 }
 
 ResourceError printerNotFoundError(const URL& failingURL)

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp (218249 => 218250)

--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp	2017-06-14 10:06:35 UTC (rev 218249)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp	2017-06-14 10:41:33 UTC (rev 218250)
@@ -109,7 +109,7 @@
         return WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER;
     case API::Error::Download::Destination:
         return WEBKIT_DOWNLOAD_ERROR_DESTINATION;
-    case API::Error::Print::General:
+    case API::Error::Print::Generic:
         return WEBKIT_PRINT_ERROR_GENERAL;
     case API::Error::Print::PrinterNotFound:
         return WEBKIT_PRINT_ERROR_PRINTER_NOT_FOUND;
@@ -153,7 +153,7 @@
     case WEBKIT_DOWNLOAD_ERROR_DESTINATION:
         return API::Error::Download::Destination;
     case WEBKIT_PRINT_ERROR_GENERAL:
-        return API::Error::Print::General;
+        return API::Error::Print::Generic;
     case WEBKIT_PRINT_ERROR_PRINTER_NOT_FOUND:
         return API::Error::Print::PrinterNotFound;
     case WEBKIT_PRINT_ERROR_INVALID_PAGE_RANGE:

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes