[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
andersca at apple.com
andersca at apple.com
Wed Dec 22 18:20:26 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5d63bc25d220ad6be0315dce020adc6926fe26a3
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 10 01:31:04 2010 +0000
[GTK] Support the Mozilla-style Fullscreen Javascript API
https://bugs.webkit.org/show_bug.cgi?id=50572
Patch by Philippe Normand <pnormand at igalia.com> on 2010-12-06
Reviewed by Martin Robinson.
* configure.ac: new configure flag to disable the new Javascript
Fullscreen API build. It is enabled by default.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73662 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index bb3d394..7b01a13 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,23 @@
+2010-12-09 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Add CoreIPC coders for CF types
+ https://bugs.webkit.org/show_bug.cgi?id=50791
+
+ * Platform/CoreIPC/ArgumentDecoder.h:
+ (CoreIPC::ArgumentDecoder::decodeEnum):
+ * Platform/CoreIPC/ArgumentEncoder.h:
+ (CoreIPC::ArgumentEncoder::encodeEnum):
+ * Shared/cf/ArgumentCodersCF.cpp: Added.
+ (CoreIPC::tokenNullTypeRef):
+ (CoreIPC::typeFromCFTypeRef):
+ (CoreIPC::encode):
+ (CoreIPC::decode):
+ (CoreIPC::sizeForNumberType):
+ * Shared/cf/ArgumentCodersCF.h: Added.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2010-12-09 Brady Eidson <beidson at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/Platform/CoreIPC/ArgumentDecoder.h b/WebKit2/Platform/CoreIPC/ArgumentDecoder.h
index 9283e4f..dcf67ad 100644
--- a/WebKit2/Platform/CoreIPC/ArgumentDecoder.h
+++ b/WebKit2/Platform/CoreIPC/ArgumentDecoder.h
@@ -61,6 +61,18 @@ public:
bool decodeFloat(float&);
bool decodeDouble(double&);
+ template<typename T> bool decodeEnum(T& result)
+ {
+ COMPILE_ASSERT(sizeof(T) <= sizeof(uint64_t), enum_type_must_not_be_larger_than_64_bits);
+
+ uint64_t value;
+ if (!decodeUInt64(value))
+ return false;
+
+ result = static_cast<T>(value);
+ return true;
+ }
+
template<typename T>
bool bufferIsLargeEnoughToContain(size_t numElements) const
{
diff --git a/WebKit2/Platform/CoreIPC/ArgumentEncoder.h b/WebKit2/Platform/CoreIPC/ArgumentEncoder.h
index 3af771f..97f0262 100644
--- a/WebKit2/Platform/CoreIPC/ArgumentEncoder.h
+++ b/WebKit2/Platform/CoreIPC/ArgumentEncoder.h
@@ -51,6 +51,13 @@ public:
void encodeFloat(float);
void encodeDouble(double);
+ template<typename T> void encodeEnum(T t)
+ {
+ COMPILE_ASSERT(sizeof(T) <= sizeof(uint64_t), enum_type_must_not_be_larger_than_64_bits);
+
+ encodeUInt64(static_cast<uint64_t>(t));
+ }
+
// Generic type encode function.
template<typename T> void encode(const T& t)
{
diff --git a/WebKit2/Shared/cf/ArgumentCodersCF.cpp b/WebKit2/Shared/cf/ArgumentCodersCF.cpp
new file mode 100644
index 0000000..ba3addc
--- /dev/null
+++ b/WebKit2/Shared/cf/ArgumentCodersCF.cpp
@@ -0,0 +1,430 @@
+/*
+ * Copyright (C) 2010 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 "ArgumentCodersCF.h"
+
+#include "ArgumentDecoder.h"
+#include "ArgumentEncoder.h"
+#include "DataReference.h"
+#include <wtf/Vector.h>
+
+namespace CoreIPC {
+
+CFTypeRef tokenNullTypeRef()
+{
+ static CFStringRef tokenNullType = CFSTR("WKNull");
+ return tokenNullType;
+}
+
+enum CFType {
+ CFArray,
+ CFBoolean,
+ CFDictionary,
+ CFNull,
+ CFNumber,
+ CFString,
+ CFURL,
+ Null,
+ Unknown,
+};
+
+static CFType typeFromCFTypeRef(CFTypeRef type)
+{
+ ASSERT(type);
+
+ if (type == tokenNullTypeRef())
+ return Null;
+
+ CFTypeID typeID = CFGetTypeID(type);
+ if (typeID == CFArrayGetTypeID())
+ return CFArray;
+ if (typeID == CFBooleanGetTypeID())
+ return CFBoolean;
+ if (typeID == CFDictionaryGetTypeID())
+ return CFDictionary;
+ if (typeID == CFNullGetTypeID())
+ return CFNull;
+ if (typeID == CFNumberGetTypeID())
+ return CFNumber;
+ if (typeID == CFStringGetTypeID())
+ return CFString;
+ if (typeID == CFURLGetTypeID())
+ return CFURL;
+
+ ASSERT_NOT_REACHED();
+ return Unknown;
+}
+
+static void encode(ArgumentEncoder* encoder, CFTypeRef typeRef)
+{
+ CFType type = typeFromCFTypeRef(typeRef);
+ encoder->encodeEnum(type);
+
+ switch (type) {
+ case CFArray:
+ encode(encoder, static_cast<CFArrayRef>(typeRef));
+ return;
+ case CFBoolean:
+ encode(encoder, static_cast<CFBooleanRef>(typeRef));
+ return;
+ case CFDictionary:
+ encode(encoder, static_cast<CFDictionaryRef>(typeRef));
+ return;
+ case CFNull:
+ return;
+ case CFNumber:
+ encode(encoder, static_cast<CFNumberRef>(typeRef));
+ return;
+ case CFString:
+ encode(encoder, static_cast<CFStringRef>(typeRef));
+ return;
+ case CFURL:
+ encode(encoder, static_cast<CFURLRef>(typeRef));
+ return;
+ case Null:
+ return;
+ case Unknown:
+ break;
+ }
+
+ ASSERT_NOT_REACHED();
+}
+
+static bool decode(ArgumentDecoder* decoder, RetainPtr<CFTypeRef>& result)
+{
+ CFType type;
+ if (!decoder->decodeEnum(type))
+ return false;
+
+ switch (type) {
+ case CFArray: {
+ RetainPtr<CFArrayRef> array;
+ if (!decode(decoder, array))
+ return false;
+ result.adoptCF(array.leakRef());
+ return true;
+ }
+ case CFBoolean: {
+ RetainPtr<CFBooleanRef> boolean;
+ if (!decode(decoder, boolean))
+ return false;
+ result.adoptCF(boolean.leakRef());
+ return true;
+ }
+ case CFDictionary: {
+ RetainPtr<CFDictionaryRef> dictionary;
+ if (!decode(decoder, dictionary))
+ return false;
+ result.adoptCF(dictionary.leakRef());
+ return true;
+ }
+ case CFNull:
+ result.adoptCF(kCFNull);
+ return true;
+ case CFNumber: {
+ RetainPtr<CFNumberRef> number;
+ if (!decode(decoder, number))
+ return false;
+ result.adoptCF(number.leakRef());
+ return true;
+ }
+ case CFString: {
+ RetainPtr<CFStringRef> string;
+ if (!decode(decoder, string))
+ return false;
+ result.adoptCF(string.leakRef());
+ return true;
+ }
+ case CFURL: {
+ RetainPtr<CFURLRef> url;
+ if (!decode(decoder, url))
+ return false;
+ result.adoptCF(url.leakRef());
+ return true;
+ }
+ case Null:
+ result = tokenNullTypeRef();
+ return true;
+ case Unknown:
+ ASSERT_NOT_REACHED();
+ return false;
+ }
+
+ return false;
+}
+
+void encode(ArgumentEncoder* encoder, CFArrayRef array)
+{
+ CFIndex size = CFArrayGetCount(array);
+ Vector<CFTypeRef, 32> values(size);
+
+ CFArrayGetValues(array, CFRangeMake(0, size), values.data());
+
+ encoder->encodeUInt64(size);
+ for (CFIndex i = 0; i < size; ++i) {
+ ASSERT(values[i]);
+
+ encode(encoder, values[i]);
+ }
+}
+
+bool decode(ArgumentDecoder* decoder, RetainPtr<CFArrayRef>& result)
+{
+ uint64_t size;
+ if (!decoder->decodeUInt64(size))
+ return false;
+
+ RetainPtr<CFMutableArrayRef> array(AdoptCF, CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));
+
+ for (size_t i = 0; i < size; ++i) {
+ RetainPtr<CFTypeRef> element;
+ if (!decode(decoder, element))
+ return false;
+
+ CFArrayAppendValue(array.get(), element.get());
+ }
+
+ result.adoptCF(array.leakRef());
+ return true;
+}
+
+void encode(ArgumentEncoder* encoder, CFBooleanRef boolean)
+{
+ encoder->encodeBool(CFBooleanGetValue(boolean));
+}
+
+bool decode(ArgumentDecoder* decoder, RetainPtr<CFBooleanRef>& result)
+{
+ bool boolean;
+ if (!decoder->decode(boolean))
+ return false;
+
+ result.adoptCF(boolean ? kCFBooleanTrue : kCFBooleanFalse);
+ return true;
+}
+
+void encode(ArgumentEncoder* encoder, CFDictionaryRef dictionary)
+{
+ CFIndex size = CFDictionaryGetCount(dictionary);
+ Vector<CFTypeRef, 32> keys(size);
+ Vector<CFTypeRef, 32> values(size);
+
+ CFDictionaryGetKeysAndValues(dictionary, keys.data(), values.data());
+
+ encoder->encodeUInt64(size);
+
+ for (CFIndex i = 0; i < size; ++i) {
+ ASSERT(keys[i]);
+ ASSERT(CFGetTypeID(keys[i]) == CFStringGetTypeID());
+ ASSERT(values[i]);
+
+ // Ignore values we don't recognize.
+ if (typeFromCFTypeRef(values[i]) == Unknown)
+ continue;
+
+ encode(encoder, static_cast<CFStringRef>(keys[i]));
+ encode(encoder, values[i]);
+ }
+}
+
+bool decode(ArgumentDecoder* decoder, RetainPtr<CFDictionaryRef>& result)
+{
+ uint64_t size;
+ if (!decoder->decodeUInt64(size))
+ return false;
+
+ RetainPtr<CFMutableDictionaryRef> dictionary(AdoptCF, CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+ for (uint64_t i = 0; i < size; ++i) {
+ // Try to decode the key name.
+ RetainPtr<CFStringRef> key;
+ if (!decode(decoder, key))
+ return false;
+
+ RetainPtr<CFTypeRef> value;
+ if (!decode(decoder, value))
+ return false;
+
+ CFDictionarySetValue(dictionary.get(), key.get(), value.get());
+ }
+
+ result.adoptCF(dictionary.releaseRef());
+ return true;
+}
+
+void encode(ArgumentEncoder* encoder, CFNumberRef number)
+{
+ CFNumberType numberType = CFNumberGetType(number);
+
+ Vector<uint8_t> buffer(CFNumberGetByteSize(number));
+ bool result = CFNumberGetValue(number, numberType, buffer.data());
+ ASSERT_UNUSED(result, result);
+
+ encoder->encodeEnum(numberType);
+ encoder->encodeBytes(buffer.data(), buffer.size());
+}
+
+static size_t sizeForNumberType(CFNumberType numberType)
+{
+ switch (numberType) {
+ case kCFNumberSInt8Type:
+ return sizeof(SInt8);
+ case kCFNumberSInt16Type:
+ return sizeof(SInt16);
+ case kCFNumberSInt32Type:
+ return sizeof(SInt32);
+ case kCFNumberSInt64Type:
+ return sizeof(SInt64);
+ case kCFNumberFloat32Type:
+ return sizeof(Float32);
+ case kCFNumberFloat64Type:
+ return sizeof(Float64);
+ case kCFNumberCharType:
+ return sizeof(char);
+ case kCFNumberShortType:
+ return sizeof(short);
+ case kCFNumberIntType:
+ return sizeof(int);
+ case kCFNumberLongType:
+ return sizeof(long);
+ case kCFNumberLongLongType:
+ return sizeof(long long);
+ case kCFNumberFloatType:
+ return sizeof(float);
+ case kCFNumberDoubleType:
+ return sizeof(double);
+ case kCFNumberCFIndexType:
+ return sizeof(CFIndex);
+ case kCFNumberNSIntegerType:
+#if __LP64__
+ return sizeof(long);
+#else
+ return sizeof(int);
+#endif
+ case kCFNumberCGFloatType:
+#if __LP64__
+ return sizeof(double);
+#else
+ return sizeof(float);
+#endif
+ }
+
+ return 0;
+}
+
+bool decode(ArgumentDecoder* decoder, RetainPtr<CFNumberRef>& result)
+{
+ CFNumberType numberType;
+ if (!decoder->decodeEnum(numberType))
+ return false;
+
+ CoreIPC::DataReference dataReference;
+ if (!decoder->decode(dataReference))
+ return false;
+
+ size_t neededBufferSize = sizeForNumberType(numberType);
+ if (!neededBufferSize || dataReference.size() != neededBufferSize)
+ return false;
+
+ CFNumberRef number = CFNumberCreate(0, numberType, dataReference.data());
+ result.adoptCF(number);
+
+ return true;
+}
+
+void encode(ArgumentEncoder* encoder, CFStringRef string)
+{
+ CFIndex length = CFStringGetLength(string);
+ CFStringEncoding encoding = CFStringGetFastestEncoding(string);
+
+ CFRange range = CFRangeMake(0, length);
+ CFIndex bufferLength = 0;
+
+ CFIndex numConvertedBytes = CFStringGetBytes(string, range, encoding, 0, false, 0, 0, &bufferLength);
+ ASSERT(numConvertedBytes == length);
+
+ Vector<UInt8, 128> buffer(bufferLength);
+ numConvertedBytes = CFStringGetBytes(string, range, encoding, 0, false, buffer.data(), buffer.size(), &bufferLength);
+ ASSERT(numConvertedBytes == length);
+
+ encoder->encodeEnum(encoding);
+ encoder->encodeBytes(buffer.data(), bufferLength);
+}
+
+bool decode(ArgumentDecoder* decoder, RetainPtr<CFStringRef>& result)
+{
+ CFStringEncoding encoding;
+ if (!decoder->decodeEnum(encoding))
+ return false;
+
+ if (!CFStringIsEncodingAvailable(encoding))
+ return false;
+
+ CoreIPC::DataReference dataReference;
+ if (!decoder->decode(dataReference))
+ return false;
+
+ CFStringRef string = CFStringCreateWithBytes(0, dataReference.isEmpty() ? 0 : dataReference.data(), dataReference.size(), encoding, false);
+ if (!string)
+ return false;
+
+ result.adoptCF(string);
+ return true;
+}
+
+void encode(ArgumentEncoder* encoder, CFURLRef url)
+{
+ CFURLRef baseURL = CFURLGetBaseURL(url);
+ encoder->encodeBool(baseURL);
+ if (baseURL)
+ encode(encoder, baseURL);
+
+ encode(encoder, CFURLGetString(url));
+}
+
+bool decode(ArgumentDecoder* decoder, RetainPtr<CFURLRef>& result)
+{
+ RetainPtr<CFURLRef> baseURL;
+ bool hasBaseURL;
+ if (!decoder->decodeBool(hasBaseURL))
+ return false;
+ if (hasBaseURL) {
+ if (!decode(decoder, baseURL))
+ return false;
+ }
+
+ RetainPtr<CFStringRef> string;
+ if (!decode(decoder, string))
+ return false;
+
+ CFURLRef url = CFURLCreateWithString(0, string.get(), baseURL.get());
+ if (!url)
+ return false;
+
+ result.adoptCF(url);
+ return true;
+}
+
+} // namespace CoreIPC
+
diff --git a/WebKit2/Shared/cf/ArgumentCodersCF.h b/WebKit2/Shared/cf/ArgumentCodersCF.h
new file mode 100644
index 0000000..7dbe46c
--- /dev/null
+++ b/WebKit2/Shared/cf/ArgumentCodersCF.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2010 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.
+ */
+
+#ifndef ArgumentCodersCF_h
+#define ArgumentCodersCF_h
+
+#include <wtf/RetainPtr.h>
+
+namespace CoreIPC {
+
+class ArgumentEncoder;
+class ArgumentDecoder;
+
+// CFArrayRef
+void encode(ArgumentEncoder*, CFArrayRef);
+bool decode(ArgumentDecoder*, RetainPtr<CFArrayRef>& result);
+
+// CFBooleanRef
+void encode(ArgumentEncoder*, CFBooleanRef);
+bool decode(ArgumentDecoder*, RetainPtr<CFBooleanRef>& result);
+
+// CFDictionaryRef
+void encode(ArgumentEncoder*, CFDictionaryRef);
+bool decode(ArgumentDecoder*, RetainPtr<CFDictionaryRef>& result);
+
+// CFNumberRef
+void encode(ArgumentEncoder*, CFNumberRef);
+bool decode(ArgumentDecoder*, RetainPtr<CFNumberRef>& result);
+
+// CFStringRef
+void encode(ArgumentEncoder*, CFStringRef);
+bool decode(ArgumentDecoder*, RetainPtr<CFStringRef>& result);
+
+// CFURLRef
+void encode(ArgumentEncoder*, CFURLRef);
+bool decode(ArgumentDecoder*, RetainPtr<CFURLRef>& result);
+
+CFTypeRef tokenNullTypeRef();
+
+} // namespace CoreIPC
+
+#endif // ArgumentCodersCF_h
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 688a9c2..1ffec6d 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -161,6 +161,8 @@
1AADE6FF10D855FC00D3D63D /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AADE6FE10D855FC00D3D63D /* ApplicationServices.framework */; };
1AAF061412B01131008E49E2 /* PDFViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF061212B01131008E49E2 /* PDFViewController.h */; };
1AAF061512B01131008E49E2 /* PDFViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF061312B01131008E49E2 /* PDFViewController.mm */; };
+ 1AAF0C4A12B16334008E49E2 /* ArgumentCodersCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF0C4812B16334008E49E2 /* ArgumentCodersCF.h */; };
+ 1AAF0C4B12B16334008E49E2 /* ArgumentCodersCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF0C4912B16334008E49E2 /* ArgumentCodersCF.cpp */; };
1AB7D4CA1288AAA700CFD08C /* DownloadProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB7D4C81288AAA700CFD08C /* DownloadProxy.h */; };
1AB7D4CB1288AAA700CFD08C /* DownloadProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7D4C91288AAA700CFD08C /* DownloadProxy.cpp */; };
1AB7D6191288B9D900CFD08C /* DownloadProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7D6171288B9D900CFD08C /* DownloadProxyMessageReceiver.cpp */; };
@@ -791,6 +793,8 @@
1AADE6FE10D855FC00D3D63D /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
1AAF061212B01131008E49E2 /* PDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFViewController.h; sourceTree = "<group>"; };
1AAF061312B01131008E49E2 /* PDFViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PDFViewController.mm; sourceTree = "<group>"; };
+ 1AAF0C4812B16334008E49E2 /* ArgumentCodersCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArgumentCodersCF.h; sourceTree = "<group>"; };
+ 1AAF0C4912B16334008E49E2 /* ArgumentCodersCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArgumentCodersCF.cpp; sourceTree = "<group>"; };
1AB7D4C81288AAA700CFD08C /* DownloadProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadProxy.h; sourceTree = "<group>"; };
1AB7D4C91288AAA700CFD08C /* DownloadProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DownloadProxy.cpp; sourceTree = "<group>"; };
1AB7D5E91288B8C000CFD08C /* DownloadProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DownloadProxy.messages.in; sourceTree = "<group>"; };
@@ -1508,6 +1512,7 @@
BCDDB314124EBCEF0048D13C /* API */,
BC111B5F112F635E00337BAB /* CoreIPCSupport */,
1AAE058C1279DCD400852418 /* Plugins */,
+ 1AAF0C4712B16328008E49E2 /* cf */,
C01A25FF12662F2100C9ED55 /* cg */,
BC111B5A112F628200337BAB /* mac */,
1A3DD205125E5A2F004515E6 /* APIClient.h */,
@@ -1604,6 +1609,15 @@
path = Plugins;
sourceTree = "<group>";
};
+ 1AAF0C4712B16328008E49E2 /* cf */ = {
+ isa = PBXGroup;
+ children = (
+ 1AAF0C4912B16334008E49E2 /* ArgumentCodersCF.cpp */,
+ 1AAF0C4812B16334008E49E2 /* ArgumentCodersCF.h */,
+ );
+ path = cf;
+ sourceTree = "<group>";
+ };
1AB5A1BA10E021D30040F6CF /* CoreIPC */ = {
isa = PBXGroup;
children = (
@@ -2655,6 +2669,7 @@
BC2D021912AC426C00E732A3 /* WKPageLoadTypes.h in Headers */,
F6A25FDD12ADC6CC00DC40CC /* WebDatabaseManager.h in Headers */,
1AAF061412B01131008E49E2 /* PDFViewController.h in Headers */,
+ 1AAF0C4A12B16334008E49E2 /* ArgumentCodersCF.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3066,6 +3081,7 @@
F6A25FDC12ADC6CC00DC40CC /* WebDatabaseManager.cpp in Sources */,
51021E9C12B16788005C033C /* WebContextMenuClientMac.mm in Sources */,
1AAF061512B01131008E49E2 /* PDFViewController.mm in Sources */,
+ 1AAF0C4B12B16334008E49E2 /* ArgumentCodersCF.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list