Changeset 224339 in webkit

Timestamp:

Nov 2, 2017 10:13:34 AM (6 years ago)

Author:

Michael Catanzaro

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Sources.txt (modified) (1 diff)
• SourcesWPE.txt (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• platform/wpe/DragImageWPE.cpp (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-02  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        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  <eric.carlson@apple.com>
 

trunk/Source/WebCore/Sources.txt

@@ -1378 +1378 @@
 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

trunk/Source/WebCore/SourcesWPE.txt

@@ -66 +66 @@
 
 platform/wpe/CursorWPE.cpp
+platform/wpe/DragImageWPE.cpp
 platform/wpe/LocalizedStringsWPE.cpp
 platform/wpe/PasteboardWPE.cpp

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -4067 +4067 @@
                 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 */; };
@@ -30129 +30128 @@
                                 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 */,