Title: [229705] trunk/Source/WebCore
- Revision
- 229705
- Author
- zandober...@gmail.com
- Date
- 2018-03-19 01:40:56 -0700 (Mon, 19 Mar 2018)
Log Message
Unreviewed GCC 4.9 build-fix after r229672.
* platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp:
(Nicosia::createCommand): Don't depend on implicit conversion of the
returning std::unique_ptr<> object, and instead only wrap the
heap-allocated PaintingOperation-derived in a std::unique_ptr<> at the
point of return.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (229704 => 229705)
--- trunk/Source/WebCore/ChangeLog 2018-03-19 03:38:39 UTC (rev 229704)
+++ trunk/Source/WebCore/ChangeLog 2018-03-19 08:40:56 UTC (rev 229705)
@@ -1,3 +1,13 @@
+2018-03-19 Zan Dobersek <zdober...@igalia.com>
+
+ Unreviewed GCC 4.9 build-fix after r229672.
+
+ * platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp:
+ (Nicosia::createCommand): Don't depend on implicit conversion of the
+ returning std::unique_ptr<> object, and instead only wrap the
+ heap-allocated PaintingOperation-derived in a std::unique_ptr<> at the
+ point of return.
+
2018-03-18 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r229689.
Modified: trunk/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp (229704 => 229705)
--- trunk/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp 2018-03-19 03:38:39 UTC (rev 229704)
+++ trunk/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp 2018-03-19 08:40:56 UTC (rev 229705)
@@ -59,9 +59,9 @@
template<typename T, typename... Args>
auto createCommand(Args&&... arguments) -> std::enable_if_t<std::is_base_of<OperationData<std::decay_t<Args>...>, T>::value, std::unique_ptr<PaintingOperation>>
{
- auto command = std::make_unique<T>();
+ auto* command = new T();
command->arguments = std::make_tuple(std::forward<Args>(arguments)...);
- return command;
+ return std::unique_ptr<PaintingOperation>(command);
}
template<typename T>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
