Diff
Modified: trunk/Source/WebCore/ChangeLog (224338 => 224339)
--- trunk/Source/WebCore/ChangeLog 2017-11-02 17:00:20 UTC (rev 224338)
+++ trunk/Source/WebCore/ChangeLog 2017-11-02 17:13:34 UTC (rev 224339)
@@ -1,3 +1,24 @@
+2017-11-02 Michael Catanzaro <[email protected]>
+
+ WPE does not build with DragImage.cpp in unified sources.
+ https://bugs.webkit.org/show_bug.cgi?id=178844
+
+ Reviewed by Keith Miller.
+
+ Add a stub implementation of DragImage for WPE so that we can drop the @no-unify.
+
+ * Sources.txt:
+ * SourcesWPE.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/wpe/DragImageWPE.cpp: Added.
+ (WebCore::dragImageSize):
+ (WebCore::deleteDragImage):
+ (WebCore::scaleDragImage):
+ (WebCore::dissolveDragImageToFraction):
+ (WebCore::createDragImageFromImage):
+ (WebCore::createDragImageIconForCachedImageFilename):
+ (WebCore::createDragImageForLink):
+
2017-11-02 Eric Carlson <[email protected]>
[MediaStream] audioTrack.label is always empty on macOS
Modified: trunk/Source/WebCore/Sources.txt (224338 => 224339)
--- trunk/Source/WebCore/Sources.txt 2017-11-02 17:00:20 UTC (rev 224338)
+++ trunk/Source/WebCore/Sources.txt 2017-11-02 17:13:34 UTC (rev 224339)
@@ -1377,7 +1377,7 @@
platform/DateComponents.cpp
platform/Decimal.cpp
platform/DragData.cpp
-platform/DragImage.cpp @no-unify // FIXME: We only have this because WPE fails to build with it unified. See: https://bugs.webkit.org/show_bug.cgi?id=178844
+platform/DragImage.cpp
platform/EventTrackingRegions.cpp
platform/FileChooser.cpp
platform/FileHandle.cpp
Modified: trunk/Source/WebCore/SourcesWPE.txt (224338 => 224339)
--- trunk/Source/WebCore/SourcesWPE.txt 2017-11-02 17:00:20 UTC (rev 224338)
+++ trunk/Source/WebCore/SourcesWPE.txt 2017-11-02 17:13:34 UTC (rev 224339)
@@ -65,6 +65,7 @@
platform/unix/LoggingUnix.cpp
platform/wpe/CursorWPE.cpp
+platform/wpe/DragImageWPE.cpp
platform/wpe/LocalizedStringsWPE.cpp
platform/wpe/PasteboardWPE.cpp
platform/wpe/PlatformKeyboardEventWPE.cpp
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (224338 => 224339)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-11-02 17:00:20 UTC (rev 224338)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-11-02 17:13:34 UTC (rev 224339)
@@ -4066,7 +4066,6 @@
DE5F84771FA186EA006DB63A /* UnifiedSource398.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE5F83B71FA1867B006DB63A /* UnifiedSource398.cpp */; };
DE5F84781FA186EA006DB63A /* UnifiedSource399.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE5F83E61FA186A7006DB63A /* UnifiedSource399.cpp */; };
DE5F84791FA186EA006DB63A /* UnifiedSource400.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE5F83FB1FA186BD006DB63A /* UnifiedSource400.cpp */; };
- DE5F84831FA1895C006DB63A /* DragImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7CFB3CF0B7ED10A0070C32D /* DragImage.cpp */; };
DE5F85031FA1A4F8006DB63A /* UnifiedSource401.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE5F84D01FA1A4AC006DB63A /* UnifiedSource401.cpp */; };
DE5F85041FA1A4F8006DB63A /* UnifiedSource402.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE5F84A31FA1A482006DB63A /* UnifiedSource402.cpp */; };
DE5F85051FA1A4F8006DB63A /* UnifiedSource403.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE5F84BF1FA1A49C006DB63A /* UnifiedSource403.cpp */; };
@@ -30128,7 +30127,6 @@
31BC742D1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.cpp in Sources */,
1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */,
BE23480C18A9870B00E4B6E8 /* DataCue.cpp in Sources */,
- DE5F84831FA1895C006DB63A /* DragImage.cpp in Sources */,
515BE18F1D54F5FB00DD7C68 /* EmptyGamepadProvider.cpp in Sources */,
724ED32C1A3A7E5400F5F13C /* EXTBlendMinMax.cpp in Sources */,
72F1ADA21A3904DC00014E18 /* EXTFragDepth.cpp in Sources */,
Added: trunk/Source/WebCore/platform/wpe/DragImageWPE.cpp (0 => 224339)
--- trunk/Source/WebCore/platform/wpe/DragImageWPE.cpp (rev 0)
+++ trunk/Source/WebCore/platform/wpe/DragImageWPE.cpp 2017-11-02 17:13:34 UTC (rev 224339)
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2017 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "DragImage.h"
+
+#include "NotImplemented.h"
+
+namespace WebCore {
+
+IntSize dragImageSize(DragImageRef)
+{
+ return { 0, 0 };
+}
+
+void deleteDragImage(DragImageRef)
+{
+}
+
+DragImageRef scaleDragImage(DragImageRef, FloatSize)
+{
+ return nullptr;
+}
+
+DragImageRef dissolveDragImageToFraction(DragImageRef, float)
+{
+ return nullptr;
+}
+
+DragImageRef createDragImageFromImage(Image*, ImageOrientationDescription)
+{
+ notImplemented();
+ return nullptr;
+}
+
+DragImageRef createDragImageIconForCachedImageFilename(const String&)
+{
+ notImplemented();
+ return nullptr;
+}
+
+DragImageRef createDragImageForLink(Element&, URL&, const String&, TextIndicatorData&, FontRenderingMode, float)
+{
+ notImplemented();
+ return nullptr;
+}
+
+}
