Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (262562 => 262563)
--- trunk/Source/WebCore/CMakeLists.txt 2020-06-04 19:54:17 UTC (rev 262562)
+++ trunk/Source/WebCore/CMakeLists.txt 2020-06-04 19:58:18 UTC (rev 262563)
@@ -762,8 +762,8 @@
fileapi/Blob.idl
fileapi/BlobCallback.idl
- fileapi/BlobLineEndings.idl
fileapi/BlobPropertyBag.idl
+ fileapi/EndingType.idl
fileapi/File.idl
fileapi/FileError.idl
fileapi/FileList.idl
Modified: trunk/Source/WebCore/ChangeLog (262562 => 262563)
--- trunk/Source/WebCore/ChangeLog 2020-06-04 19:54:17 UTC (rev 262562)
+++ trunk/Source/WebCore/ChangeLog 2020-06-04 19:58:18 UTC (rev 262563)
@@ -1,3 +1,29 @@
+2020-06-04 Tetsuharu Ohzeki <[email protected]>
+
+ Rename BlobLineEndings to EndingType to match the latest spec
+ https://bugs.webkit.org/show_bug.cgi?id=212644
+
+ Reviewed by Sam Weinig.
+
+ By the latest File API spec, the role of `BlobLineEndings` is named as `EndingType`.
+ https://w3c.github.io/FileAPI/#enumdef-endingtype
+
+ * CMakeLists.txt:
+ * DerivedSources-input.xcfilelist:
+ * DerivedSources-output.xcfilelist:
+ * DerivedSources.make:
+ * Headers.cmake:
+ * Sources.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * fileapi/BlobBuilder.cpp:
+ (WebCore::BlobBuilder::BlobBuilder):
+ (WebCore::BlobBuilder::append):
+ * fileapi/BlobBuilder.h:
+ * fileapi/BlobPropertyBag.h:
+ * fileapi/BlobPropertyBag.idl:
+ * fileapi/EndingType.h: Renamed from Source/WebCore/fileapi/BlobLineEndings.h.
+ * fileapi/EndingType.idl: Renamed from Source/WebCore/fileapi/BlobLineEndings.idl.
+
2020-06-04 Chris Dumez <[email protected]>
[iOS] Validate index parameter in PlatformPasteboard
Modified: trunk/Source/WebCore/DerivedSources-input.xcfilelist (262562 => 262563)
--- trunk/Source/WebCore/DerivedSources-input.xcfilelist 2020-06-04 19:54:17 UTC (rev 262562)
+++ trunk/Source/WebCore/DerivedSources-input.xcfilelist 2020-06-04 19:58:18 UTC (rev 262563)
@@ -698,8 +698,8 @@
$(PROJECT_DIR)/domjit/generate-abstract-heap.rb
$(PROJECT_DIR)/fileapi/Blob.idl
$(PROJECT_DIR)/fileapi/BlobCallback.idl
-$(PROJECT_DIR)/fileapi/BlobLineEndings.idl
$(PROJECT_DIR)/fileapi/BlobPropertyBag.idl
+$(PROJECT_DIR)/fileapi/EndingType.idl
$(PROJECT_DIR)/fileapi/File.idl
$(PROJECT_DIR)/fileapi/FileError.idl
$(PROJECT_DIR)/fileapi/FileList.idl
Modified: trunk/Source/WebCore/DerivedSources-output.xcfilelist (262562 => 262563)
--- trunk/Source/WebCore/DerivedSources-output.xcfilelist 2020-06-04 19:54:17 UTC (rev 262562)
+++ trunk/Source/WebCore/DerivedSources-output.xcfilelist 2020-06-04 19:58:18 UTC (rev 262563)
@@ -197,8 +197,6 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSBlobCallback.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSBlobEvent.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSBlobEvent.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSBlobLineEndings.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSBlobLineEndings.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSBlobPropertyBag.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSBlobPropertyBag.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSByteLengthQueuingStrategy.cpp
@@ -540,6 +538,8 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSElement.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSElementCSSInlineStyle.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSElementCSSInlineStyle.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSEndingType.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSEndingType.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSEnterPictureInPictureEvent.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSEnterPictureInPictureEvent.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSErrorCallback.cpp
Modified: trunk/Source/WebCore/DerivedSources.make (262562 => 262563)
--- trunk/Source/WebCore/DerivedSources.make 2020-06-04 19:54:17 UTC (rev 262562)
+++ trunk/Source/WebCore/DerivedSources.make 2020-06-04 19:58:18 UTC (rev 262563)
@@ -727,8 +727,8 @@
$(WebCore)/dom/XMLDocument.idl \
$(WebCore)/fileapi/Blob.idl \
$(WebCore)/fileapi/BlobCallback.idl \
- $(WebCore)/fileapi/BlobLineEndings.idl \
$(WebCore)/fileapi/BlobPropertyBag.idl \
+ $(WebCore)/fileapi/EndingType.idl \
$(WebCore)/fileapi/File.idl \
$(WebCore)/fileapi/FileError.idl \
$(WebCore)/fileapi/FileList.idl \
Modified: trunk/Source/WebCore/Headers.cmake (262562 => 262563)
--- trunk/Source/WebCore/Headers.cmake 2020-06-04 19:54:17 UTC (rev 262562)
+++ trunk/Source/WebCore/Headers.cmake 2020-06-04 19:58:18 UTC (rev 262563)
@@ -531,8 +531,8 @@
fileapi/AsyncFileStream.h
fileapi/Blob.h
- fileapi/BlobLineEndings.h
fileapi/BlobPropertyBag.h
+ fileapi/EndingType.h
fileapi/File.h
fileapi/FileError.h
fileapi/FileList.h
Modified: trunk/Source/WebCore/Sources.txt (262562 => 262563)
--- trunk/Source/WebCore/Sources.txt 2020-06-04 19:54:17 UTC (rev 262562)
+++ trunk/Source/WebCore/Sources.txt 2020-06-04 19:58:18 UTC (rev 262563)
@@ -2735,7 +2735,7 @@
JSBlob.cpp
JSBlobCallback.cpp
JSBlobEvent.cpp
-JSBlobLineEndings.cpp
+JSEndingType.cpp
JSBlobPropertyBag.cpp
JSByteLengthQueuingStrategy.cpp
JSCDATASection.cpp
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (262562 => 262563)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-06-04 19:54:17 UTC (rev 262562)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-06-04 19:58:18 UTC (rev 262563)
@@ -2290,8 +2290,8 @@
7C7761AA1F878AA500F869FD /* JSImageBitmapRenderingContextSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C7903B61F86FDE600463A70 /* JSImageBitmapRenderingContextSettings.h */; };
7C77C3D11DEE472400A50BFA /* BlobPropertyBag.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C77C3D01DEE472400A50BFA /* BlobPropertyBag.h */; settings = {ATTRIBUTES = (Private, ); }; };
7C77C3D51DEF178E00A50BFA /* JSBlobPropertyBag.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C77C3D31DEF178E00A50BFA /* JSBlobPropertyBag.h */; };
- 7C77C3D71DEF850A00A50BFA /* BlobLineEndings.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C77C3D61DEF850A00A50BFA /* BlobLineEndings.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 7C77C3DC1DEF86D700A50BFA /* JSBlobLineEndings.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C77C3DA1DEF86D700A50BFA /* JSBlobLineEndings.h */; };
+ 7C77C3D71DEF850A00A50BFA /* EndingType.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C77C3D61DEF850A00A50BFA /* EndingType.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 7C77C3DC1DEF86D700A50BFA /* JSEndingType.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C77C3DA1DEF86D700A50BFA /* JSEndingType.h */; };
7C7903B31F86F95C00463A70 /* ImageBitmapRenderingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C7903B01F86F95C00463A70 /* ImageBitmapRenderingContext.h */; };
7C7941E51C56C29300A4C58E /* DataDetectorsCoreSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C7941E31C56C29300A4C58E /* DataDetectorsCoreSoftLink.h */; };
7C8139A61ED6286A00CE26E8 /* JSDOMAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C8139A31ED6281D00CE26E8 /* JSDOMAttribute.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7617,7 +7617,7 @@
41E59400214865AA00D3CB61 /* RTCRtpHeaderExtensionParameters.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = RTCRtpHeaderExtensionParameters.idl; sourceTree = "<group>"; };
41E59401214865AB00D3CB61 /* RTCRtpFecParameters.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = RTCRtpFecParameters.idl; sourceTree = "<group>"; };
41E9DCE4231973FE00F35949 /* BlobLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlobLoader.h; sourceTree = "<group>"; };
- 41E9DCE62319742300F35949 /* BlobLineEndings.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BlobLineEndings.idl; sourceTree = "<group>"; };
+ 41E9DCE62319742300F35949 /* EndingType.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EndingType.idl; sourceTree = "<group>"; };
41E9DCE82319CA7500F35949 /* NetworkSendQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkSendQueue.h; sourceTree = "<group>"; };
41E9DCEA2319CAE800F35949 /* NetworkSendQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkSendQueue.cpp; sourceTree = "<group>"; };
41F062120F5F192600A07EAC /* InspectorDatabaseResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDatabaseResource.h; sourceTree = "<group>"; };
@@ -10078,9 +10078,9 @@
7C77C3D01DEE472400A50BFA /* BlobPropertyBag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlobPropertyBag.h; sourceTree = "<group>"; };
7C77C3D21DEF178E00A50BFA /* JSBlobPropertyBag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBlobPropertyBag.cpp; sourceTree = "<group>"; };
7C77C3D31DEF178E00A50BFA /* JSBlobPropertyBag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBlobPropertyBag.h; sourceTree = "<group>"; };
- 7C77C3D61DEF850A00A50BFA /* BlobLineEndings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlobLineEndings.h; sourceTree = "<group>"; };
- 7C77C3D91DEF86D700A50BFA /* JSBlobLineEndings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBlobLineEndings.cpp; sourceTree = "<group>"; };
- 7C77C3DA1DEF86D700A50BFA /* JSBlobLineEndings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBlobLineEndings.h; sourceTree = "<group>"; };
+ 7C77C3D61DEF850A00A50BFA /* EndingType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EndingType.h; sourceTree = "<group>"; };
+ 7C77C3D91DEF86D700A50BFA /* JSEndingType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSEndingType.cpp; sourceTree = "<group>"; };
+ 7C77C3DA1DEF86D700A50BFA /* JSEndingType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSEndingType.h; sourceTree = "<group>"; };
7C7903B01F86F95C00463A70 /* ImageBitmapRenderingContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ImageBitmapRenderingContext.h; sourceTree = "<group>"; };
7C7903B11F86F95C00463A70 /* ImageBitmapRenderingContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ImageBitmapRenderingContext.cpp; sourceTree = "<group>"; };
7C7903B21F86F95C00463A70 /* ImageBitmapRenderingContext.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = ImageBitmapRenderingContext.idl; sourceTree = "<group>"; };
@@ -21914,8 +21914,8 @@
2E2D99CC10E2BBDA00496337 /* JSBlob.h */,
A15D75171E68F83600A35FBC /* JSBlobCallback.cpp */,
A15D75181E68F83600A35FBC /* JSBlobCallback.h */,
- 7C77C3D91DEF86D700A50BFA /* JSBlobLineEndings.cpp */,
- 7C77C3DA1DEF86D700A50BFA /* JSBlobLineEndings.h */,
+ 7C77C3D91DEF86D700A50BFA /* JSEndingType.cpp */,
+ 7C77C3DA1DEF86D700A50BFA /* JSEndingType.h */,
7C77C3D21DEF178E00A50BFA /* JSBlobPropertyBag.cpp */,
7C77C3D31DEF178E00A50BFA /* JSBlobPropertyBag.h */,
BC00F0100E0A189500FD04E3 /* JSFile.cpp */,
@@ -22897,8 +22897,8 @@
A15D75121E68F7B100A35FBC /* BlobCallback.cpp */,
A15D75131E68F7B100A35FBC /* BlobCallback.h */,
A15D75141E68F7B100A35FBC /* BlobCallback.idl */,
- 7C77C3D61DEF850A00A50BFA /* BlobLineEndings.h */,
- 41E9DCE62319742300F35949 /* BlobLineEndings.idl */,
+ 7C77C3D61DEF850A00A50BFA /* EndingType.h */,
+ 41E9DCE62319742300F35949 /* EndingType.idl */,
41E9DCE4231973FE00F35949 /* BlobLoader.h */,
7C77C3D01DEE472400A50BFA /* BlobPropertyBag.h */,
7C77C3CF1DEE471800A50BFA /* BlobPropertyBag.idl */,
@@ -29817,7 +29817,7 @@
2EDEF1F4121B0EFC00726DB2 /* BlobData.h in Headers */,
E1D31CDD19196020001005A3 /* BlobDataFileReference.h in Headers */,
4D3B00AF215D6A690076B983 /* BlobEvent.h in Headers */,
- 7C77C3D71DEF850A00A50BFA /* BlobLineEndings.h in Headers */,
+ 7C77C3D71DEF850A00A50BFA /* EndingType.h in Headers */,
41E9DCE7231974BF00F35949 /* BlobLoader.h in Headers */,
E1C94AF9191303F000D5A893 /* BlobPart.h in Headers */,
7C77C3D11DEE472400A50BFA /* BlobPropertyBag.h in Headers */,
@@ -31169,7 +31169,7 @@
FDF09DC91399B62200688E5B /* JSBiquadFilterNode.h in Headers */,
2E2D99CE10E2BBDA00496337 /* JSBlob.h in Headers */,
A15D751B1E68F8A300A35FBC /* JSBlobCallback.h in Headers */,
- 7C77C3DC1DEF86D700A50BFA /* JSBlobLineEndings.h in Headers */,
+ 7C77C3DC1DEF86D700A50BFA /* JSEndingType.h in Headers */,
7C77C3D51DEF178E00A50BFA /* JSBlobPropertyBag.h in Headers */,
14DCF3B31B6BE2080062D4C3 /* JSByteLengthQueuingStrategy.h in Headers */,
1449E24C107D4A8400B5793F /* JSCallbackData.h in Headers */,
Modified: trunk/Source/WebCore/fileapi/BlobBuilder.cpp (262562 => 262563)
--- trunk/Source/WebCore/fileapi/BlobBuilder.cpp 2020-06-04 19:54:17 UTC (rev 262562)
+++ trunk/Source/WebCore/fileapi/BlobBuilder.cpp 2020-06-04 19:58:18 UTC (rev 262563)
@@ -30,6 +30,7 @@
#include "config.h"
#include "BlobBuilder.h"
+#include "EndingType.h"
#include "Blob.h"
#include "TextEncoding.h"
@@ -40,7 +41,7 @@
namespace WebCore {
-BlobBuilder::BlobBuilder(BlobLineEndings endings)
+BlobBuilder::BlobBuilder(EndingType endings)
: m_endings(endings)
{
}
@@ -72,7 +73,7 @@
{
auto bytes = UTF8Encoding().encode(text, UnencodableHandling::Entities);
- if (m_endings == BlobLineEndings::Native)
+ if (m_endings == EndingType::Native)
bytes = normalizeLineEndingsToNative(WTFMove(bytes));
if (m_appendableData.isEmpty())
Modified: trunk/Source/WebCore/fileapi/BlobBuilder.h (262562 => 262563)
--- trunk/Source/WebCore/fileapi/BlobBuilder.h 2020-06-04 19:54:17 UTC (rev 262562)
+++ trunk/Source/WebCore/fileapi/BlobBuilder.h 2020-06-04 19:58:18 UTC (rev 262563)
@@ -30,8 +30,8 @@
#pragma once
-#include "BlobLineEndings.h"
#include "BlobPart.h"
+#include "EndingType.h"
namespace JSC {
class ArrayBuffer;
@@ -44,7 +44,7 @@
class BlobBuilder {
public:
- BlobBuilder(BlobLineEndings);
+ BlobBuilder(EndingType);
void append(RefPtr<JSC::ArrayBuffer>&&);
void append(RefPtr<JSC::ArrayBufferView>&&);
@@ -54,7 +54,7 @@
Vector<BlobPart> finalize();
private:
- BlobLineEndings m_endings;
+ EndingType m_endings;
Vector<BlobPart> m_items;
Vector<uint8_t> m_appendableData;
};
Deleted: trunk/Source/WebCore/fileapi/BlobLineEndings.h (262562 => 262563)
--- trunk/Source/WebCore/fileapi/BlobLineEndings.h 2020-06-04 19:54:17 UTC (rev 262562)
+++ trunk/Source/WebCore/fileapi/BlobLineEndings.h 2020-06-04 19:58:18 UTC (rev 262563)
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#pragma once
-
-namespace WebCore {
-
-enum class BlobLineEndings {
- Transparent,
- Native
-};
-
-}
Deleted: trunk/Source/WebCore/fileapi/BlobLineEndings.idl (262562 => 262563)
--- trunk/Source/WebCore/fileapi/BlobLineEndings.idl 2020-06-04 19:54:17 UTC (rev 262562)
+++ trunk/Source/WebCore/fileapi/BlobLineEndings.idl 2020-06-04 19:58:18 UTC (rev 262563)
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-// FIXME: This is no longer in the FileAPI spec.
-enum BlobLineEndings { "transparent", "native" };
Modified: trunk/Source/WebCore/fileapi/BlobPropertyBag.h (262562 => 262563)
--- trunk/Source/WebCore/fileapi/BlobPropertyBag.h 2020-06-04 19:54:17 UTC (rev 262562)
+++ trunk/Source/WebCore/fileapi/BlobPropertyBag.h 2020-06-04 19:58:18 UTC (rev 262563)
@@ -25,7 +25,7 @@
#pragma once
-#include "BlobLineEndings.h"
+#include "EndingType.h"
#include <wtf/text/WTFString.h>
namespace WebCore {
@@ -32,7 +32,7 @@
struct BlobPropertyBag {
String type;
- BlobLineEndings endings = BlobLineEndings::Transparent;
+ EndingType endings = EndingType::Transparent;
};
}
Modified: trunk/Source/WebCore/fileapi/BlobPropertyBag.idl (262562 => 262563)
--- trunk/Source/WebCore/fileapi/BlobPropertyBag.idl 2020-06-04 19:54:17 UTC (rev 262562)
+++ trunk/Source/WebCore/fileapi/BlobPropertyBag.idl 2020-06-04 19:58:18 UTC (rev 262563)
@@ -26,6 +26,5 @@
dictionary BlobPropertyBag {
DOMString type = "";
- // FIXME: This is no longer in the FileAPI spec.
- BlobLineEndings endings = "transparent";
+ EndingType endings = "transparent";
};
Copied: trunk/Source/WebCore/fileapi/EndingType.h (from rev 262562, trunk/Source/WebCore/fileapi/BlobLineEndings.h) (0 => 262563)
--- trunk/Source/WebCore/fileapi/EndingType.h (rev 0)
+++ trunk/Source/WebCore/fileapi/EndingType.h 2020-06-04 19:58:18 UTC (rev 262563)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+#pragma once
+
+namespace WebCore {
+
+enum class EndingType {
+ Transparent,
+ Native
+};
+
+}
Copied: trunk/Source/WebCore/fileapi/EndingType.idl (from rev 262562, trunk/Source/WebCore/fileapi/BlobLineEndings.idl) (0 => 262563)
--- trunk/Source/WebCore/fileapi/EndingType.idl (rev 0)
+++ trunk/Source/WebCore/fileapi/EndingType.idl 2020-06-04 19:58:18 UTC (rev 262563)
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+enum EndingType { "transparent", "native" };
