diff --git a/engine/platform/BUILD.gn b/engine/platform/BUILD.gn index 84b10f818bf2acabe5bb459d7501691121ff6b53..1b838bc821c6e20ad6c502fdd6c46344439f2c9c 100644 --- a/engine/platform/BUILD.gn +++ b/engine/platform/BUILD.gn @@ -165,11 +165,6 @@ source_set("platform") { "animation/TimingFunction.cpp", "animation/TimingFunction.h", "animation/UnitBezier.h", - "clipboard/ClipboardMimeTypes.cpp", - "clipboard/ClipboardMimeTypes.h", - "clipboard/ClipboardUtilities.cpp", - "clipboard/ClipboardUtilities.h", - "clipboard/ClipboardUtilitiesPosix.cpp", "exported/Platform.cpp", "exported/ServiceProvider.cpp", "exported/WebArrayBuffer.cpp", @@ -659,7 +654,6 @@ test("platform_unittests") { "TestingPlatformSupport.h", "animation/TimingFunctionTest.cpp", "animation/UnitBezierTest.cpp", - "clipboard/ClipboardUtilitiesTest.cpp", "fonts/FontCacheTest.cpp", "fonts/FontDescriptionTest.cpp", "fonts/FontTest.cpp", diff --git a/engine/platform/clipboard/ClipboardMimeTypes.cpp b/engine/platform/clipboard/ClipboardMimeTypes.cpp deleted file mode 100644 index b64f806606adabe7a4a77cc6ba86dce14d586a52..0000000000000000000000000000000000000000 --- a/engine/platform/clipboard/ClipboardMimeTypes.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2010 Google 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: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * 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. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT - * OWNER 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 "sky/engine/platform/clipboard/ClipboardMimeTypes.h" - -namespace blink { - -const char mimeTypeText[] = "text"; -const char mimeTypeTextPlain[] = "text/plain"; -const char mimeTypeTextPlainEtc[] = "text/plain;"; -const char mimeTypeTextHTML[] = "text/html"; -const char mimeTypeURL[] = "url"; -const char mimeTypeTextURIList[] = "text/uri-list"; -const char mimeTypeDownloadURL[] = "downloadurl"; -const char mimeTypeFiles[] = "Files"; -const char mimeTypeImagePng[] = "image/png"; - -} // namespace blink diff --git a/engine/platform/clipboard/ClipboardMimeTypes.h b/engine/platform/clipboard/ClipboardMimeTypes.h deleted file mode 100644 index 7e75b818555fd769eddf1d5f1a8ef533a042431b..0000000000000000000000000000000000000000 --- a/engine/platform/clipboard/ClipboardMimeTypes.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2010 Google 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: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * 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. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT - * OWNER 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. - */ - -#ifndef SKY_ENGINE_PLATFORM_CLIPBOARD_CLIPBOARDMIMETYPES_H_ -#define SKY_ENGINE_PLATFORM_CLIPBOARD_CLIPBOARDMIMETYPES_H_ - -#include "sky/engine/platform/PlatformExport.h" - -namespace blink { - -PLATFORM_EXPORT extern const char mimeTypeText[]; -PLATFORM_EXPORT extern const char mimeTypeTextPlain[]; -PLATFORM_EXPORT extern const char mimeTypeTextPlainEtc[]; -PLATFORM_EXPORT extern const char mimeTypeTextHTML[]; -PLATFORM_EXPORT extern const char mimeTypeURL[]; -PLATFORM_EXPORT extern const char mimeTypeTextURIList[]; -PLATFORM_EXPORT extern const char mimeTypeDownloadURL[]; -PLATFORM_EXPORT extern const char mimeTypeFiles[]; -PLATFORM_EXPORT extern const char mimeTypeImagePng[]; - -} // namespace blink - -#endif // SKY_ENGINE_PLATFORM_CLIPBOARD_CLIPBOARDMIMETYPES_H_ diff --git a/engine/platform/clipboard/ClipboardUtilities.cpp b/engine/platform/clipboard/ClipboardUtilities.cpp deleted file mode 100644 index fe41bb9fe3939932de024ed7693896e136a07006..0000000000000000000000000000000000000000 --- a/engine/platform/clipboard/ClipboardUtilities.cpp +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2008, 2009, Google 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: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * 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. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT - * OWNER 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 "sky/engine/platform/clipboard/ClipboardUtilities.h" - -#include "sky/engine/platform/weborigin/KURL.h" -#include "sky/engine/wtf/text/WTFString.h" - -namespace blink { - -void replaceNBSPWithSpace(String& str) -{ - static const UChar NonBreakingSpaceCharacter = 0xA0; - static const UChar SpaceCharacter = ' '; - str.replace(NonBreakingSpaceCharacter, SpaceCharacter); -} - -String convertURIListToURL(const String& uriList) -{ - Vector items; - // Line separator is \r\n per RFC 2483 - however, for compatibility - // reasons we allow just \n here. - uriList.split('\n', items); - // Process the input and return the first valid URL. In case no URLs can - // be found, return an empty string. This is in line with the HTML5 spec. - for (size_t i = 0; i < items.size(); ++i) { - String& line = items[i]; - line = line.stripWhiteSpace(); - if (line.isEmpty()) - continue; - if (line[0] == '#') - continue; - KURL url = KURL(ParsedURLString, line); - if (url.isValid()) - return url; - } - return String(); -} - -} // namespace blink diff --git a/engine/platform/clipboard/ClipboardUtilities.h b/engine/platform/clipboard/ClipboardUtilities.h deleted file mode 100644 index 92542b6bd42f47c17ef125617df3926795ff15da..0000000000000000000000000000000000000000 --- a/engine/platform/clipboard/ClipboardUtilities.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2008, 2009, Google 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: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * 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. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT - * OWNER 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. - */ - -#ifndef SKY_ENGINE_PLATFORM_CLIPBOARD_CLIPBOARDUTILITIES_H_ -#define SKY_ENGINE_PLATFORM_CLIPBOARD_CLIPBOARDUTILITIES_H_ - -#include "sky/engine/platform/PlatformExport.h" -#include "sky/engine/wtf/Forward.h" - -namespace blink { - -PLATFORM_EXPORT void replaceNBSPWithSpace(String&); -PLATFORM_EXPORT String convertURIListToURL(const String& uriList); -// FIXME: This should probably be implemented in the embedder rather than here. -PLATFORM_EXPORT void validateFilename(String& name, String& extension); - -} // namespace blink - -#endif // SKY_ENGINE_PLATFORM_CLIPBOARD_CLIPBOARDUTILITIES_H_ diff --git a/engine/platform/clipboard/ClipboardUtilitiesPosix.cpp b/engine/platform/clipboard/ClipboardUtilitiesPosix.cpp deleted file mode 100644 index 893f02c04d9e46b90bad7acd9462d61c79a8410b..0000000000000000000000000000000000000000 --- a/engine/platform/clipboard/ClipboardUtilitiesPosix.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2009 Apple Inc. All rights reserved. - * Copyright (C) 2009 Google Inc. - * - * 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 COMPUTER, 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 COMPUTER, 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 "sky/engine/platform/clipboard/ClipboardUtilities.h" - -#include "sky/engine/wtf/text/WTFString.h" - -namespace blink { - -// On POSIX systems, the typical filename length limit is 255 character units. HFS+'s limit is -// actually 255 Unicode characters using Apple's modification of Normzliation Form D, but the -// differences aren't really worth dealing with here. -static const unsigned maxFilenameLength = 255; - -static bool isInvalidFileCharacter(UChar c) -{ - // HFS+ disallows '/' and Linux systems also disallow null. For sanity's sake we'll also - // disallow control characters. - return c < ' ' || c == 0x7F || c == '/'; -} - -void validateFilename(String& name, String& extension) -{ - // Remove any invalid file system characters, especially "/". - name = name.removeCharacters(&isInvalidFileCharacter); - extension = extension.removeCharacters(&isInvalidFileCharacter); - - // Remove a ridiculously-long extension. - if (extension.length() >= maxFilenameLength) - extension = String(); - - // Truncate an overly-long filename, reserving one character for a dot. - name.truncate(maxFilenameLength - extension.length() - 1); -} - -} // namespace blink diff --git a/engine/platform/clipboard/ClipboardUtilitiesTest.cpp b/engine/platform/clipboard/ClipboardUtilitiesTest.cpp deleted file mode 100644 index 20d46f9cb0d6854408a45537d0ffd3ab50187988..0000000000000000000000000000000000000000 --- a/engine/platform/clipboard/ClipboardUtilitiesTest.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (C) 2010 Google 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: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * 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. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT - * OWNER 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 "sky/engine/platform/clipboard/ClipboardUtilities.h" - -#include "sky/engine/wtf/StdLibExtras.h" -#include "sky/engine/wtf/text/WTFString.h" - -#include - -using namespace blink; - -namespace { - -const char invalidCharacters[] = - "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" - "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f" - "\x7f/"; -const char longString[] = - "0,1,1,2,3,5,8,13,21,34,55,89,144,233,377,610,987,1597,2584,4181,6765,10946,17711,28657,46368," - "75025,121393,196418,317811,514229,832040,1346269,2178309,3524578,5702887,9227465,14930352"; - -TEST(ClipboardUtilitiesTest, Normal) -{ - String name = "name"; - String extension = "ext"; - validateFilename(name, extension); - EXPECT_EQ("name", name); - EXPECT_EQ("ext", extension); -} - -TEST(ClipboardUtilitiesTest, InvalidCharacters) -{ - String name = "na" + String(invalidCharacters, WTF_ARRAY_LENGTH(invalidCharacters)) + "me"; - String extension = "e" + String(invalidCharacters, WTF_ARRAY_LENGTH(invalidCharacters)) + "xt"; - validateFilename(name, extension); - EXPECT_EQ("name", name); - EXPECT_EQ("ext", extension); -} - -TEST(ClipboardUtilitiesTest, ExtensionTooLong) -{ - String name; - String extension = String(longString) + longString; - validateFilename(name, extension); - EXPECT_EQ(String(), extension); -} - -TEST(ClipboardUtilitiesTest, NamePlusExtensionTooLong) -{ - String name = String(longString) + longString; - String extension = longString; - validateFilename(name, extension); - EXPECT_EQ("0,1,1,2,3,5,8,13,21,34,55,89,144,233,377,610,987,1597,2584,4181,6765,109", name); - EXPECT_EQ(longString, extension); - EXPECT_EQ(254u, name.length() + extension.length()); -} - -} // anonymous namespace