Title: [184547] releases/WebKitGTK/webkit-2.4/Source
- Revision
- 184547
- Author
- [email protected]
- Date
- 2015-05-18 23:24:58 -0700 (Mon, 18 May 2015)
Log Message
[W32] GraphicsContextCairoWin.cpp fails to compile: unallowed function template partial specialization
https://bugs.webkit.org/show_bug.cgi?id=143761
Patch by Руслан Ижбулатов <[email protected]> on 2015-04-15
Reviewed by Darin Adler.
Fix deleteObject prototypte, fix header case
Apparently, <T> is unneeded here:
Source/WebCore:
In file included from ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp:35:0:
../webkitgtk-2.4.8/Source/WTF/wtf/win/GdiObject.h:114:58: error: function template partial specialization 'deleteObject<T>' is not allowed
template<typename T> inline void deleteObject<T>(T object)
^
As a bonus, change GdiObject.h -> GDIObject.h (this matters when
cross-compiling or when using case-sensitive filesystems on W32).
Source/WTF:
In file included from ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp:35:0:
../webkitgtk-2.4.8/Source/WTF/wtf/win/GdiObject.h:114:58: error: function template partial specialization 'deleteObject<T>' is not allowed
template<typename T> inline void deleteObject<T>(T object)
^
As a bonus, change GdiObject.h -> GDIObject.h (this matters when
cross-compiling or when using case-sensitive filesystems on W32).
* wtf/win/GDIObject.h:
(WTF::deleteObject):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WTF/ChangeLog (184546 => 184547)
--- releases/WebKitGTK/webkit-2.4/Source/WTF/ChangeLog 2015-05-19 06:19:14 UTC (rev 184546)
+++ releases/WebKitGTK/webkit-2.4/Source/WTF/ChangeLog 2015-05-19 06:24:58 UTC (rev 184547)
@@ -1,3 +1,24 @@
+2015-04-15 Руслан Ижбулатов <[email protected]>
+
+ [W32] GraphicsContextCairoWin.cpp fails to compile: unallowed function template partial specialization
+ https://bugs.webkit.org/show_bug.cgi?id=143761
+
+ Reviewed by Darin Adler.
+
+ Fix deleteObject prototypte, fix header case
+
+ Apparently, <T> is unneeded here:
+
+ In file included from ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp:35:0:
+ ../webkitgtk-2.4.8/Source/WTF/wtf/win/GdiObject.h:114:58: error: function template partial specialization 'deleteObject<T>' is not allowed
+ template<typename T> inline void deleteObject<T>(T object)
+ ^
+ As a bonus, change GdiObject.h -> GDIObject.h (this matters when
+ cross-compiling or when using case-sensitive filesystems on W32).
+
+ * wtf/win/GDIObject.h:
+ (WTF::deleteObject):
+
2015-04-17 Milan Crha <[email protected]>
[GTK] Replace M_SQRT2 with sqrtOfTwoDouble
Modified: releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/win/GDIObject.h (184546 => 184547)
--- releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/win/GDIObject.h 2015-05-19 06:19:14 UTC (rev 184546)
+++ releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/win/GDIObject.h 2015-05-19 06:24:58 UTC (rev 184547)
@@ -111,7 +111,7 @@
}
// Nearly all GDI types use the same DeleteObject call.
-template<typename T> inline void deleteObject<T>(T object)
+template<typename T> inline void deleteObject(T object)
{
if (object)
::DeleteObject(object);
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (184546 => 184547)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-19 06:19:14 UTC (rev 184546)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-19 06:24:58 UTC (rev 184547)
@@ -1,5 +1,23 @@
2015-04-15 Руслан Ижбулатов <[email protected]>
+ [W32] GraphicsContextCairoWin.cpp fails to compile: unallowed function template partial specialization
+ https://bugs.webkit.org/show_bug.cgi?id=143761
+
+ Reviewed by Darin Adler.
+
+ Fix deleteObject prototypte, fix header case
+
+ Apparently, <T> is unneeded here:
+
+ In file included from ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp:35:0:
+ ../webkitgtk-2.4.8/Source/WTF/wtf/win/GdiObject.h:114:58: error: function template partial specialization 'deleteObject<T>' is not allowed
+ template<typename T> inline void deleteObject<T>(T object)
+ ^
+ As a bonus, change GdiObject.h -> GDIObject.h (this matters when
+ cross-compiling or when using case-sensitive filesystems on W32).
+
+2015-04-15 Руслан Ижбулатов <[email protected]>
+
[W32][GTK] Conflict between NO_ERROR from W32API and GraphicsContext3D
https://bugs.webkit.org/show_bug.cgi?id=143768
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp (184546 => 184547)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp 2015-05-19 06:19:14 UTC (rev 184546)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp 2015-05-19 06:24:58 UTC (rev 184547)
@@ -32,7 +32,7 @@
#include <cairo-win32.h>
#include "GraphicsContextPlatformPrivateCairo.h"
-#include <wtf/win/GdiObject.h>
+#include <wtf/win/GDIObject.h>
using namespace std;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
