Diff
Modified: trunk/Source/WebCore/ChangeLog (157927 => 157928)
--- trunk/Source/WebCore/ChangeLog 2013-10-24 14:27:05 UTC (rev 157927)
+++ trunk/Source/WebCore/ChangeLog 2013-10-24 14:32:53 UTC (rev 157928)
@@ -1,3 +1,17 @@
+2013-10-24 Alex Christensen <[email protected]>
+
+ Removed unused ThreadSafeCoordinatedSurface and CertificateInfoCurl files.
+ https://bugs.webkit.org/show_bug.cgi?id=123246
+
+ Reviewed by Noam Rosenthal.
+
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ Removed references to ThreadSafeCoordinatedSurface and CertificateInfoCurl.
+ * platform/graphics/texmap/coordinated/ThreadSafeCoordinatedSurface.cpp: Removed.
+ * platform/graphics/texmap/coordinated/ThreadSafeCoordinatedSurface.h: Removed.
+ * platform/network/curl/CertificateInfoCurl.cpp: Removed.
+
2013-10-24 Peter Molnar <[email protected]>
Removed Qt workaround.
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (157927 => 157928)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-10-24 14:27:05 UTC (rev 157927)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-10-24 14:32:53 UTC (rev 157928)
@@ -7262,7 +7262,6 @@
<ClCompile Include="..\platform\graphics\texmap\coordinated\CoordinatedImageBacking.cpp" />
<ClCompile Include="..\platform\graphics\texmap\coordinated\CoordinatedSurface.cpp" />
<ClCompile Include="..\platform\graphics\texmap\coordinated\CoordinatedTile.cpp" />
- <ClCompile Include="..\platform\graphics\texmap\coordinated\ThreadSafeCoordinatedSurface.cpp" />
<ClCompile Include="..\platform\graphics\texmap\coordinated\UpdateAtlas.cpp" />
<ClCompile Include="..\platform\graphics\texmap\GraphicsLayerTextureMapper.cpp" />
<ClCompile Include="..\platform\graphics\texmap\TextureMapper.cpp" />
@@ -7284,16 +7283,6 @@
</ClCompile>
<ClCompile Include="..\platform\HistogramSupport.cpp" />
<ClCompile Include="..\platform\KillRingNone.cpp" />
- <ClCompile Include="..\platform\network\curl\CertificateInfoCurl.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\platform\URL.cpp" />
<ClCompile Include="..\platform\Language.cpp" />
<ClCompile Include="..\platform\Length.cpp" />
@@ -18831,7 +18820,6 @@
<ClInclude Include="..\platform\graphics\texmap\coordinated\CoordinatedSurface.h" />
<ClInclude Include="..\platform\graphics\texmap\coordinated\CoordinatedTile.h" />
<ClInclude Include="..\platform\graphics\texmap\coordinated\SurfaceUpdateInfo.h" />
- <ClInclude Include="..\platform\graphics\texmap\coordinated\ThreadSafeCoordinatedSurface.h" />
<ClInclude Include="..\platform\graphics\texmap\coordinated\UpdateAtlas.h" />
<ClInclude Include="..\platform\graphics\texmap\GraphicsLayerTextureMapper.h" />
<ClInclude Include="..\platform\graphics\texmap\TextureMapper.h" />
@@ -20767,4 +20755,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (157927 => 157928)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-10-24 14:27:05 UTC (rev 157927)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-10-24 14:32:53 UTC (rev 157928)
@@ -6919,9 +6919,6 @@
<ClCompile Include="..\platform\graphics\ca\PlatformCALayer.cpp">
<Filter>platform\graphics\ca</Filter>
</ClCompile>
- <ClCompile Include="..\platform\network\curl\CertificateInfoCurl.cpp">
- <Filter>platform\network\curl</Filter>
- </ClCompile>
<ClCompile Include="..\rendering\RenderNamedFlowFragment.cpp" />
<ClCompile Include="..\platform\graphics\texmap\GraphicsLayerTextureMapper.cpp">
<Filter>platform\graphics\texmap</Filter>
@@ -6980,9 +6977,6 @@
<ClCompile Include="..\platform\graphics\texmap\coordinated\CoordinatedTile.cpp">
<Filter>platform\graphics\texmap\coordinated</Filter>
</ClCompile>
- <ClCompile Include="..\platform\graphics\texmap\coordinated\ThreadSafeCoordinatedSurface.cpp">
- <Filter>platform\graphics\texmap\coordinated</Filter>
- </ClCompile>
<ClCompile Include="..\platform\graphics\texmap\coordinated\UpdateAtlas.cpp">
<Filter>platform\graphics\texmap\coordinated</Filter>
</ClCompile>
@@ -14732,9 +14726,6 @@
<ClInclude Include="..\platform\graphics\texmap\coordinated\SurfaceUpdateInfo.h">
<Filter>platform\graphics\texmap\coordinated</Filter>
</ClInclude>
- <ClInclude Include="..\platform\graphics\texmap\coordinated\ThreadSafeCoordinatedSurface.h">
- <Filter>platform\graphics\texmap\coordinated</Filter>
- </ClInclude>
<ClInclude Include="..\platform\graphics\texmap\coordinated\UpdateAtlas.h">
<Filter>platform\graphics\texmap\coordinated</Filter>
</ClInclude>
@@ -14990,4 +14981,4 @@
<Filter>platform\win</Filter>
</MASM>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
Deleted: trunk/Source/WebCore/platform/graphics/texmap/coordinated/ThreadSafeCoordinatedSurface.cpp (157927 => 157928)
--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/ThreadSafeCoordinatedSurface.cpp 2013-10-24 14:27:05 UTC (rev 157927)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/ThreadSafeCoordinatedSurface.cpp 2013-10-24 14:32:53 UTC (rev 157928)
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2013 Company 100, 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 "ThreadSafeCoordinatedSurface.h"
-
-#if USE(COORDINATED_GRAPHICS)
-
-#include "TextureMapper.h"
-
-namespace WebCore {
-
-PassRefPtr<ThreadSafeCoordinatedSurface> ThreadSafeCoordinatedSurface::create(const IntSize& size, CoordinatedSurface::Flags flags)
-{
- return adoptRef(new ThreadSafeCoordinatedSurface(size, flags, ImageBuffer::create(size)));
-}
-
-ThreadSafeCoordinatedSurface::ThreadSafeCoordinatedSurface(const IntSize& size, CoordinatedSurface::Flags flags, std::unique_ptr<ImageBuffer> buffer)
- : CoordinatedSurface(size, flags)
- , m_imageBuffer(std::move(buffer))
-{
-}
-
-ThreadSafeCoordinatedSurface::~ThreadSafeCoordinatedSurface()
-{
-}
-
-void ThreadSafeCoordinatedSurface::paintToSurface(const IntRect& rect, CoordinatedSurface::Client* client)
-{
- ASSERT(client);
- ASSERT(m_imageBuffer);
-
- GraphicsContext* context = m_imageBuffer->context();
- context->save();
- context->clip(rect);
- context->translate(rect.x(), rect.y());
-
- client->paintToSurfaceContext(context);
-
- context->restore();
-}
-
-void ThreadSafeCoordinatedSurface::copyToTexture(PassRefPtr<BitmapTexture> passTexture, const IntRect& target, const IntPoint& sourceOffset)
-{
- RefPtr<BitmapTexture> texture(passTexture);
-
- ASSERT(m_imageBuffer);
- RefPtr<Image> image = m_imageBuffer->copyImage(DontCopyBackingStore);
- texture->updateContents(image.get(), target, sourceOffset, BitmapTexture::UpdateCanModifyOriginalImageData);
-}
-
-} // namespace WebCore
-
-#endif // USE(COORDINATED_GRAPHICS)
Deleted: trunk/Source/WebCore/platform/graphics/texmap/coordinated/ThreadSafeCoordinatedSurface.h (157927 => 157928)
--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/ThreadSafeCoordinatedSurface.h 2013-10-24 14:27:05 UTC (rev 157927)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/ThreadSafeCoordinatedSurface.h 2013-10-24 14:32:53 UTC (rev 157928)
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2013 Company 100, 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 ThreadSafeCoordinatedSurface_h
-#define ThreadSafeCoordinatedSurface_h
-
-#if USE(COORDINATED_GRAPHICS)
-#include "CoordinatedSurface.h"
-#include "ImageBuffer.h"
-
-namespace WebCore {
-
-class ThreadSafeCoordinatedSurface : public CoordinatedSurface {
-public:
- virtual ~ThreadSafeCoordinatedSurface();
-
- static PassRefPtr<ThreadSafeCoordinatedSurface> create(const IntSize&, Flags);
-
- virtual void paintToSurface(const IntRect&, CoordinatedSurface::Client*) OVERRIDE;
- virtual void copyToTexture(PassRefPtr<BitmapTexture>, const IntRect& target, const IntPoint& sourceOffset) OVERRIDE;
-
-private:
- ThreadSafeCoordinatedSurface(const IntSize&, Flags, std::unique_ptr<ImageBuffer>);
-
- std::unique_ptr<ImageBuffer> m_imageBuffer;
-};
-
-} // namespace WebCore
-
-#endif // USE(COORDINATED_GRAPHICS)
-
-#endif // ThreadSafeCoordinatedSurface_h
Deleted: trunk/Source/WebCore/platform/network/curl/CertificateInfoCurl.cpp (157927 => 157928)
--- trunk/Source/WebCore/platform/network/curl/CertificateInfoCurl.cpp 2013-10-24 14:27:05 UTC (rev 157927)
+++ trunk/Source/WebCore/platform/network/curl/CertificateInfoCurl.cpp 2013-10-24 14:32:53 UTC (rev 157928)
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2013 Company 100 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 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 "CertificateInfo.h"
-
-namespace WebCore {
-
-CertificateInfo::CertificateInfo()
-{
-}
-
-CertificateInfo::~CertificateInfo()
-{
-}
-
-} // namespace WebCore
