diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/third_party/WebKit/Source/core/platform/text/cf/AtomicStringCF.cpp | |
parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/platform/text/cf/AtomicStringCF.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/platform/text/cf/AtomicStringCF.cpp | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/chromium/third_party/WebKit/Source/core/platform/text/cf/AtomicStringCF.cpp b/chromium/third_party/WebKit/Source/core/platform/text/cf/AtomicStringCF.cpp deleted file mode 100644 index 2ba3853084e..00000000000 --- a/chromium/third_party/WebKit/Source/core/platform/text/cf/AtomicStringCF.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2012 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. - */ - -#include "config.h" -#include "wtf/text/AtomicString.h" - -#if USE(CF) - -#include <CoreFoundation/CoreFoundation.h> -#include "wtf/text/CString.h" - -namespace WTF { - -PassRefPtr<StringImpl> AtomicString::add(CFStringRef string) -{ - if (!string) - return 0; - - CFIndex length = CFStringGetLength(string); - - if (const LChar* ptr = reinterpret_cast<const LChar*>(CFStringGetCStringPtr(string, kCFStringEncodingISOLatin1))) - return add(ptr, length); - - if (const UniChar* ptr = CFStringGetCharactersPtr(string)) - return add(reinterpret_cast<const UChar*>(ptr), length); - - Vector<UniChar, 1024> ucharBuffer(length); - CFStringGetCharacters(string, CFRangeMake(0, length), ucharBuffer.data()); - return add(reinterpret_cast<const UChar*>(ucharBuffer.data()), length); -} - -} // namespace WTF - -#endif // USE(CF) |