Diff
Modified: trunk/Source/WebKit2/ChangeLog (176351 => 176352)
--- trunk/Source/WebKit2/ChangeLog 2014-11-19 23:00:48 UTC (rev 176351)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-19 23:03:03 UTC (rev 176352)
@@ -1,3 +1,13 @@
+2014-11-19 Anders Carlsson <[email protected]>
+
+ Rename two Cocoa-only .cpp files to .mm.
+
+ Rubber-stamped by Sam Weinig.
+
+ * Shared/APIWebArchive.mm: Renamed from Source/WebKit2/Shared/APIWebArchive.cpp.
+ * Shared/APIWebArchiveResource.mm: Renamed from Source/WebKit2/Shared/APIWebArchiveResource.cpp.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2014-11-19 Beth Dakin <[email protected]>
Data detected results with no menu items should not fall through to regular text
Deleted: trunk/Source/WebKit2/Shared/APIWebArchive.cpp (176351 => 176352)
--- trunk/Source/WebKit2/Shared/APIWebArchive.cpp 2014-11-19 23:00:48 UTC (rev 176351)
+++ trunk/Source/WebKit2/Shared/APIWebArchive.cpp 2014-11-19 23:03:03 UTC (rev 176352)
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2013 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 "APIWebArchive.h"
-
-#if PLATFORM(COCOA)
-
-#include "APIArray.h"
-#include "APIData.h"
-#include "APIWebArchiveResource.h"
-#include <WebCore/LegacyWebArchive.h>
-#include <wtf/RetainPtr.h>
-
-using namespace WebCore;
-
-namespace API {
-
-PassRefPtr<WebArchive> WebArchive::create(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives)
-{
- return adoptRef(new WebArchive(mainResource, subresources, subframeArchives));
-}
-
-PassRefPtr<WebArchive> WebArchive::create(API::Data* data)
-{
- return adoptRef(new WebArchive(data));
-}
-
-PassRefPtr<WebArchive> WebArchive::create(PassRefPtr<LegacyWebArchive> legacyWebArchive)
-{
- return adoptRef(new WebArchive(legacyWebArchive));
-}
-
-PassRefPtr<WebArchive> WebArchive::create(Range* range)
-{
- return adoptRef(new WebArchive(LegacyWebArchive::create(range)));
-}
-
-WebArchive::WebArchive(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives)
- : m_cachedMainResource(mainResource)
- , m_cachedSubresources(subresources)
- , m_cachedSubframeArchives(subframeArchives)
-{
- RefPtr<ArchiveResource> coreMainResource = m_cachedMainResource->coreArchiveResource();
-
- Vector<RefPtr<ArchiveResource>> coreArchiveResources;
- coreArchiveResources.reserveInitialCapacity(m_cachedSubresources->size());
- for (size_t i = 0; i < m_cachedSubresources->size(); ++i) {
- RefPtr<WebArchiveResource> resource = m_cachedSubresources->at<WebArchiveResource>(i);
- ASSERT(resource);
- coreArchiveResources.uncheckedAppend(resource->coreArchiveResource());
- }
-
- Vector<RefPtr<LegacyWebArchive>> coreSubframeLegacyWebArchives;
- coreSubframeLegacyWebArchives.reserveInitialCapacity(m_cachedSubframeArchives->size());
-
- for (size_t i = 0; i < m_cachedSubframeArchives->size(); ++i) {
- RefPtr<WebArchive> subframeWebArchive = m_cachedSubframeArchives->at<WebArchive>(i);
- ASSERT(subframeWebArchive);
- coreSubframeLegacyWebArchives.uncheckedAppend(subframeWebArchive->coreLegacyWebArchive());
- }
-
- m_legacyWebArchive = LegacyWebArchive::create(coreMainResource.release(), WTF::move(coreArchiveResources), WTF::move(coreSubframeLegacyWebArchives));
-}
-
-WebArchive::WebArchive(API::Data* data)
-{
- RefPtr<SharedBuffer> buffer = SharedBuffer::create(data->bytes(), data->size());
- m_legacyWebArchive = LegacyWebArchive::create(buffer.get());
-}
-
-WebArchive::WebArchive(PassRefPtr<LegacyWebArchive> legacyWebArchive)
- : m_legacyWebArchive(legacyWebArchive)
-{
-}
-
-WebArchive::~WebArchive()
-{
-}
-
-WebArchiveResource* WebArchive::mainResource()
-{
- if (!m_cachedMainResource)
- m_cachedMainResource = WebArchiveResource::create(m_legacyWebArchive->mainResource());
- return m_cachedMainResource.get();
-}
-
-API::Array* WebArchive::subresources()
-{
- if (!m_cachedSubresources) {
- Vector<RefPtr<API::Object>> subresources;
- subresources.reserveInitialCapacity(m_legacyWebArchive->subresources().size());
-
- for (const auto& subresource : m_legacyWebArchive->subresources())
- subresources.uncheckedAppend(WebArchiveResource::create(subresource));
-
- m_cachedSubresources = API::Array::create(WTF::move(subresources));
- }
-
- return m_cachedSubresources.get();
-}
-
-API::Array* WebArchive::subframeArchives()
-{
- if (!m_cachedSubframeArchives) {
- Vector<RefPtr<API::Object>> subframeWebArchives;
- subframeWebArchives.reserveInitialCapacity(m_legacyWebArchive->subframeArchives().size());
-
- for (const auto& subframeArchive : m_legacyWebArchive->subframeArchives())
- subframeWebArchives.uncheckedAppend(WebArchive::create(static_cast<LegacyWebArchive*>(subframeArchive.get())));
-
- m_cachedSubframeArchives = API::Array::create(WTF::move(subframeWebArchives));
- }
-
- return m_cachedSubframeArchives.get();
-}
-
-static void releaseCFData(unsigned char*, const void* data)
-{
- // Balanced by CFRetain in WebArchive::data().
- CFRelease(data);
-}
-
-PassRefPtr<API::Data> WebArchive::data()
-{
- RetainPtr<CFDataRef> rawDataRepresentation = m_legacyWebArchive->rawDataRepresentation();
-
- // Balanced by CFRelease in releaseCFData.
- CFRetain(rawDataRepresentation.get());
-
- return API::Data::createWithoutCopying(CFDataGetBytePtr(rawDataRepresentation.get()), CFDataGetLength(rawDataRepresentation.get()), releaseCFData, rawDataRepresentation.get());
-}
-
-LegacyWebArchive* WebArchive::coreLegacyWebArchive()
-{
- return m_legacyWebArchive.get();
-}
-
-} // namespace WebKit
-
-#endif // PLATFORM(COCOA)
Copied: trunk/Source/WebKit2/Shared/APIWebArchive.mm (from rev 176351, trunk/Source/WebKit2/Shared/APIWebArchive.cpp) (0 => 176352)
--- trunk/Source/WebKit2/Shared/APIWebArchive.mm (rev 0)
+++ trunk/Source/WebKit2/Shared/APIWebArchive.mm 2014-11-19 23:03:03 UTC (rev 176352)
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2013 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 "APIWebArchive.h"
+
+#if PLATFORM(COCOA)
+
+#include "APIArray.h"
+#include "APIData.h"
+#include "APIWebArchiveResource.h"
+#include <WebCore/LegacyWebArchive.h>
+#include <wtf/RetainPtr.h>
+
+using namespace WebCore;
+
+namespace API {
+
+PassRefPtr<WebArchive> WebArchive::create(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives)
+{
+ return adoptRef(new WebArchive(mainResource, subresources, subframeArchives));
+}
+
+PassRefPtr<WebArchive> WebArchive::create(API::Data* data)
+{
+ return adoptRef(new WebArchive(data));
+}
+
+PassRefPtr<WebArchive> WebArchive::create(PassRefPtr<LegacyWebArchive> legacyWebArchive)
+{
+ return adoptRef(new WebArchive(legacyWebArchive));
+}
+
+PassRefPtr<WebArchive> WebArchive::create(Range* range)
+{
+ return adoptRef(new WebArchive(LegacyWebArchive::create(range)));
+}
+
+WebArchive::WebArchive(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives)
+ : m_cachedMainResource(mainResource)
+ , m_cachedSubresources(subresources)
+ , m_cachedSubframeArchives(subframeArchives)
+{
+ RefPtr<ArchiveResource> coreMainResource = m_cachedMainResource->coreArchiveResource();
+
+ Vector<RefPtr<ArchiveResource>> coreArchiveResources;
+ coreArchiveResources.reserveInitialCapacity(m_cachedSubresources->size());
+ for (size_t i = 0; i < m_cachedSubresources->size(); ++i) {
+ RefPtr<WebArchiveResource> resource = m_cachedSubresources->at<WebArchiveResource>(i);
+ ASSERT(resource);
+ coreArchiveResources.uncheckedAppend(resource->coreArchiveResource());
+ }
+
+ Vector<RefPtr<LegacyWebArchive>> coreSubframeLegacyWebArchives;
+ coreSubframeLegacyWebArchives.reserveInitialCapacity(m_cachedSubframeArchives->size());
+
+ for (size_t i = 0; i < m_cachedSubframeArchives->size(); ++i) {
+ RefPtr<WebArchive> subframeWebArchive = m_cachedSubframeArchives->at<WebArchive>(i);
+ ASSERT(subframeWebArchive);
+ coreSubframeLegacyWebArchives.uncheckedAppend(subframeWebArchive->coreLegacyWebArchive());
+ }
+
+ m_legacyWebArchive = LegacyWebArchive::create(coreMainResource.release(), WTF::move(coreArchiveResources), WTF::move(coreSubframeLegacyWebArchives));
+}
+
+WebArchive::WebArchive(API::Data* data)
+{
+ RefPtr<SharedBuffer> buffer = SharedBuffer::create(data->bytes(), data->size());
+ m_legacyWebArchive = LegacyWebArchive::create(buffer.get());
+}
+
+WebArchive::WebArchive(PassRefPtr<LegacyWebArchive> legacyWebArchive)
+ : m_legacyWebArchive(legacyWebArchive)
+{
+}
+
+WebArchive::~WebArchive()
+{
+}
+
+WebArchiveResource* WebArchive::mainResource()
+{
+ if (!m_cachedMainResource)
+ m_cachedMainResource = WebArchiveResource::create(m_legacyWebArchive->mainResource());
+ return m_cachedMainResource.get();
+}
+
+API::Array* WebArchive::subresources()
+{
+ if (!m_cachedSubresources) {
+ Vector<RefPtr<API::Object>> subresources;
+ subresources.reserveInitialCapacity(m_legacyWebArchive->subresources().size());
+
+ for (const auto& subresource : m_legacyWebArchive->subresources())
+ subresources.uncheckedAppend(WebArchiveResource::create(subresource));
+
+ m_cachedSubresources = API::Array::create(WTF::move(subresources));
+ }
+
+ return m_cachedSubresources.get();
+}
+
+API::Array* WebArchive::subframeArchives()
+{
+ if (!m_cachedSubframeArchives) {
+ Vector<RefPtr<API::Object>> subframeWebArchives;
+ subframeWebArchives.reserveInitialCapacity(m_legacyWebArchive->subframeArchives().size());
+
+ for (const auto& subframeArchive : m_legacyWebArchive->subframeArchives())
+ subframeWebArchives.uncheckedAppend(WebArchive::create(static_cast<LegacyWebArchive*>(subframeArchive.get())));
+
+ m_cachedSubframeArchives = API::Array::create(WTF::move(subframeWebArchives));
+ }
+
+ return m_cachedSubframeArchives.get();
+}
+
+static void releaseCFData(unsigned char*, const void* data)
+{
+ // Balanced by CFRetain in WebArchive::data().
+ CFRelease(data);
+}
+
+PassRefPtr<API::Data> WebArchive::data()
+{
+ RetainPtr<CFDataRef> rawDataRepresentation = m_legacyWebArchive->rawDataRepresentation();
+
+ // Balanced by CFRelease in releaseCFData.
+ CFRetain(rawDataRepresentation.get());
+
+ return API::Data::createWithoutCopying(CFDataGetBytePtr(rawDataRepresentation.get()), CFDataGetLength(rawDataRepresentation.get()), releaseCFData, rawDataRepresentation.get());
+}
+
+LegacyWebArchive* WebArchive::coreLegacyWebArchive()
+{
+ return m_legacyWebArchive.get();
+}
+
+} // namespace WebKit
+
+#endif // PLATFORM(COCOA)
Deleted: trunk/Source/WebKit2/Shared/APIWebArchiveResource.cpp (176351 => 176352)
--- trunk/Source/WebKit2/Shared/APIWebArchiveResource.cpp 2014-11-19 23:00:48 UTC (rev 176351)
+++ trunk/Source/WebKit2/Shared/APIWebArchiveResource.cpp 2014-11-19 23:03:03 UTC (rev 176352)
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2013 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 "APIWebArchiveResource.h"
-
-#if PLATFORM(COCOA)
-
-#include "APIData.h"
-#include <WebCore/ArchiveResource.h>
-#include <WebCore/URL.h>
-#include <wtf/RetainPtr.h>
-
-using namespace WebCore;
-
-namespace API {
-
-PassRefPtr<WebArchiveResource> WebArchiveResource::create(API::Data* data, const String& URL, const String& MIMEType, const String& textEncoding)
-{
- return adoptRef(new WebArchiveResource(data, URL, MIMEType, textEncoding));
-}
-
-PassRefPtr<WebArchiveResource> WebArchiveResource::create(PassRefPtr<ArchiveResource> archiveResource)
-{
- return adoptRef(new WebArchiveResource(archiveResource));
-}
-
-WebArchiveResource::WebArchiveResource(API::Data* data, const String& URL, const String& MIMEType, const String& textEncoding)
- : m_archiveResource(ArchiveResource::create(SharedBuffer::create(data->bytes(), data->size()), WebCore::URL(WebCore::URL(), URL), MIMEType, textEncoding, String()))
-{
-}
-
-WebArchiveResource::WebArchiveResource(PassRefPtr<ArchiveResource> archiveResource)
- : m_archiveResource(archiveResource)
-{
-}
-
-WebArchiveResource::~WebArchiveResource()
-{
-}
-
-static void releaseCFData(unsigned char*, const void* data)
-{
- // Balanced by CFRetain in WebArchiveResource::data().
- CFRelease(data);
-}
-
-PassRefPtr<API::Data> WebArchiveResource::data()
-{
- RetainPtr<CFDataRef> cfData = m_archiveResource->data()->createCFData();
-
- // Balanced by CFRelease in releaseCFData.
- CFRetain(cfData.get());
-
- return API::Data::createWithoutCopying(CFDataGetBytePtr(cfData.get()), CFDataGetLength(cfData.get()), releaseCFData, cfData.get());
-}
-
-String WebArchiveResource::URL()
-{
- return m_archiveResource->url().string();
-}
-
-String WebArchiveResource::MIMEType()
-{
- return m_archiveResource->mimeType();
-}
-
-String WebArchiveResource::textEncoding()
-{
- return m_archiveResource->textEncoding();
-}
-
-ArchiveResource* WebArchiveResource::coreArchiveResource()
-{
- return m_archiveResource.get();
-}
-
-} // namespace WebKit
-
-#endif // PLATFORM(COCOA)
Copied: trunk/Source/WebKit2/Shared/APIWebArchiveResource.mm (from rev 176351, trunk/Source/WebKit2/Shared/APIWebArchiveResource.cpp) (0 => 176352)
--- trunk/Source/WebKit2/Shared/APIWebArchiveResource.mm (rev 0)
+++ trunk/Source/WebKit2/Shared/APIWebArchiveResource.mm 2014-11-19 23:03:03 UTC (rev 176352)
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2013 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 "APIWebArchiveResource.h"
+
+#if PLATFORM(COCOA)
+
+#include "APIData.h"
+#include <WebCore/ArchiveResource.h>
+#include <WebCore/URL.h>
+#include <wtf/RetainPtr.h>
+
+using namespace WebCore;
+
+namespace API {
+
+PassRefPtr<WebArchiveResource> WebArchiveResource::create(API::Data* data, const String& URL, const String& MIMEType, const String& textEncoding)
+{
+ return adoptRef(new WebArchiveResource(data, URL, MIMEType, textEncoding));
+}
+
+PassRefPtr<WebArchiveResource> WebArchiveResource::create(PassRefPtr<ArchiveResource> archiveResource)
+{
+ return adoptRef(new WebArchiveResource(archiveResource));
+}
+
+WebArchiveResource::WebArchiveResource(API::Data* data, const String& URL, const String& MIMEType, const String& textEncoding)
+ : m_archiveResource(ArchiveResource::create(SharedBuffer::create(data->bytes(), data->size()), WebCore::URL(WebCore::URL(), URL), MIMEType, textEncoding, String()))
+{
+}
+
+WebArchiveResource::WebArchiveResource(PassRefPtr<ArchiveResource> archiveResource)
+ : m_archiveResource(archiveResource)
+{
+}
+
+WebArchiveResource::~WebArchiveResource()
+{
+}
+
+static void releaseCFData(unsigned char*, const void* data)
+{
+ // Balanced by CFRetain in WebArchiveResource::data().
+ CFRelease(data);
+}
+
+PassRefPtr<API::Data> WebArchiveResource::data()
+{
+ RetainPtr<CFDataRef> cfData = m_archiveResource->data()->createCFData();
+
+ // Balanced by CFRelease in releaseCFData.
+ CFRetain(cfData.get());
+
+ return API::Data::createWithoutCopying(CFDataGetBytePtr(cfData.get()), CFDataGetLength(cfData.get()), releaseCFData, cfData.get());
+}
+
+String WebArchiveResource::URL()
+{
+ return m_archiveResource->url().string();
+}
+
+String WebArchiveResource::MIMEType()
+{
+ return m_archiveResource->mimeType();
+}
+
+String WebArchiveResource::textEncoding()
+{
+ return m_archiveResource->textEncoding();
+}
+
+ArchiveResource* WebArchiveResource::coreArchiveResource()
+{
+ return m_archiveResource.get();
+}
+
+} // namespace WebKit
+
+#endif // PLATFORM(COCOA)
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (176351 => 176352)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-11-19 23:00:48 UTC (rev 176351)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-11-19 23:03:03 UTC (rev 176352)
@@ -1575,9 +1575,9 @@
C5E1AFE916B20B75006CC1F2 /* WKWebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329DA616ACE5A900316DE2 /* WKWebArchive.h */; settings = {ATTRIBUTES = (Private, ); }; };
C5E1AFEA16B20B7B006CC1F2 /* WKWebArchiveResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC329DA916ACE5BF00316DE2 /* WKWebArchiveResource.cpp */; };
C5E1AFEB16B20B7E006CC1F2 /* WKWebArchiveResource.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329DAA16ACE5C000316DE2 /* WKWebArchiveResource.h */; settings = {ATTRIBUTES = (Private, ); }; };
- C5E1AFEC16B21012006CC1F2 /* APIWebArchive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC329D9916ACCE9900316DE2 /* APIWebArchive.cpp */; };
+ C5E1AFEC16B21012006CC1F2 /* APIWebArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC329D9916ACCE9900316DE2 /* APIWebArchive.mm */; };
C5E1AFED16B21017006CC1F2 /* APIWebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329D9A16ACCE9900316DE2 /* APIWebArchive.h */; };
- C5E1AFEE16B21025006CC1F2 /* APIWebArchiveResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC329D9E16ACD47800316DE2 /* APIWebArchiveResource.cpp */; };
+ C5E1AFEE16B21025006CC1F2 /* APIWebArchiveResource.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC329D9E16ACD47800316DE2 /* APIWebArchiveResource.mm */; };
C5E1AFEF16B21029006CC1F2 /* APIWebArchiveResource.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329D9F16ACD47800316DE2 /* APIWebArchiveResource.h */; };
C5FA1ED318E1062200B3F402 /* WKAirPlayRoutePicker.h in Headers */ = {isa = PBXBuildFile; fileRef = C5FA1ED118E1062200B3F402 /* WKAirPlayRoutePicker.h */; };
C5FA1ED418E1062200B3F402 /* WKAirPlayRoutePicker.mm in Sources */ = {isa = PBXBuildFile; fileRef = C5FA1ED218E1062200B3F402 /* WKAirPlayRoutePicker.mm */; };
@@ -3326,9 +3326,9 @@
BC3066BD125A442100E71278 /* WebProcessMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProcessMessages.h; sourceTree = "<group>"; };
BC306822125A6B9400E71278 /* WebProcessCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProcessCreationParameters.h; sourceTree = "<group>"; };
BC306823125A6B9400E71278 /* WebProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebProcessCreationParameters.cpp; sourceTree = "<group>"; };
- BC329D9916ACCE9900316DE2 /* APIWebArchive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIWebArchive.cpp; sourceTree = "<group>"; };
+ BC329D9916ACCE9900316DE2 /* APIWebArchive.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = APIWebArchive.mm; sourceTree = "<group>"; };
BC329D9A16ACCE9900316DE2 /* APIWebArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIWebArchive.h; sourceTree = "<group>"; };
- BC329D9E16ACD47800316DE2 /* APIWebArchiveResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIWebArchiveResource.cpp; sourceTree = "<group>"; };
+ BC329D9E16ACD47800316DE2 /* APIWebArchiveResource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = APIWebArchiveResource.mm; sourceTree = "<group>"; };
BC329D9F16ACD47800316DE2 /* APIWebArchiveResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIWebArchiveResource.h; sourceTree = "<group>"; };
BC329DA516ACE5A900316DE2 /* WKWebArchive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKWebArchive.cpp; sourceTree = "<group>"; };
BC329DA616ACE5A900316DE2 /* WKWebArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebArchive.h; sourceTree = "<group>"; };
@@ -4416,10 +4416,10 @@
BCE2315B122C30CA00D5C35A /* APIURLRequest.h */,
BC90A1D1122DD55E00CC8C50 /* APIURLResponse.cpp */,
BC90A1D0122DD55E00CC8C50 /* APIURLResponse.h */,
- BC329D9916ACCE9900316DE2 /* APIWebArchive.cpp */,
BC329D9A16ACCE9900316DE2 /* APIWebArchive.h */,
- BC329D9E16ACD47800316DE2 /* APIWebArchiveResource.cpp */,
+ BC329D9916ACCE9900316DE2 /* APIWebArchive.mm */,
BC329D9F16ACD47800316DE2 /* APIWebArchiveResource.h */,
+ BC329D9E16ACD47800316DE2 /* APIWebArchiveResource.mm */,
A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */,
A7D792D41767CB0900881CBE /* ActivityAssertion.h */,
C59C4A5618B81174007BDCB6 /* AssistedNodeInformation.cpp */,
@@ -9151,9 +9151,9 @@
512E356A130B57F000ABD19A /* WebApplicationCacheManagerMessageReceiver.cpp in Sources */,
512E3524130B550600ABD19A /* WebApplicationCacheManagerProxy.cpp in Sources */,
512E35F8130B642E00ABD19A /* WebApplicationCacheManagerProxyMessageReceiver.cpp in Sources */,
- C5E1AFEC16B21012006CC1F2 /* APIWebArchive.cpp in Sources */,
+ C5E1AFEC16B21012006CC1F2 /* APIWebArchive.mm in Sources */,
512A9769180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp in Sources */,
- C5E1AFEE16B21025006CC1F2 /* APIWebArchiveResource.cpp in Sources */,
+ C5E1AFEE16B21025006CC1F2 /* APIWebArchiveResource.mm in Sources */,
BC72BA1D11E64907001EB4EA /* WebBackForwardList.cpp in Sources */,
1AC133741857C21E00F3EC05 /* APIGeometry.cpp in Sources */,
518D2CAD12D5153B003BB93B /* WebBackForwardListItem.cpp in Sources */,
