Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (124383 => 124384)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-01 23:27:13 UTC (rev 124383)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-01 23:43:54 UTC (rev 124384)
@@ -1,3 +1,16 @@
+2012-08-01 Nico Weber <[email protected]>
+
+ [chromium/mac] Delete WebImageCG.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=92910
+
+ Reviewed by James Robinson.
+
+ It's been unused since the switch to skia.
+ Also remove now-unneeded *CG.cpp exclusion rule.
+
+ * WebKit.gyp:
+ * src/WebImageCG.cpp: Removed.
+
2012-08-01 Joshua Bell <[email protected]>
[Chromium] IndexedDB: API stubs to simplify WebIDBCursor API
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (124383 => 124384)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-08-01 23:27:13 UTC (rev 124383)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-08-01 23:43:54 UTC (rev 124384)
@@ -574,7 +574,6 @@
'src/WebIDBTransactionCallbacksImpl.cpp',
'src/WebIDBTransactionCallbacksImpl.h',
'src/WebIOSurfaceLayer.cpp',
- 'src/WebImageCG.cpp',
'src/WebImageDecoder.cpp',
'src/WebImageLayer.cpp',
'src/WebImageSkia.cpp',
@@ -826,18 +825,13 @@
['exclude', '/android/'],
],
}],
- # TODO: we exclude CG.cpp on both sides of the below conditional. Move elsewhere?
['OS=="mac"', {
'include_dirs': [
'public/mac',
],
- 'sources/': [
- ['exclude', 'CG\\.cpp$'],
- ],
}, { # else: OS!="mac"
'sources/': [
['exclude', '/mac/'],
- ['exclude', 'CG\\.cpp$'],
],
}],
['OS=="win"', {
Deleted: trunk/Source/WebKit/chromium/src/WebImageCG.cpp (124383 => 124384)
--- trunk/Source/WebKit/chromium/src/WebImageCG.cpp 2012-08-01 23:27:13 UTC (rev 124383)
+++ trunk/Source/WebKit/chromium/src/WebImageCG.cpp 2012-08-01 23:43:54 UTC (rev 124384)
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 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 "config.h"
-
-#include "Image.h"
-#include "ImageSource.h"
-#include "SharedBuffer.h"
-
-#include "platform/WebData.h"
-#include "platform/WebSize.h"
-
-#include <CoreGraphics/CGImage.h>
-
-#include <public/WebImage.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RetainPtr.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-WebImage WebImage::fromData(const WebData& data, const WebSize& desiredSize)
-{
- ImageSource source;
- source.setData(PassRefPtr<SharedBuffer>(data).get(), true);
- if (!source.isSizeAvailable())
- return WebImage();
-
- // Frames are arranged by decreasing size, then decreasing bit depth.
- // Pick the frame closest to |desiredSize|'s area without being smaller,
- // which has the highest bit depth.
- const size_t frameCount = source.frameCount();
- size_t index = 0; // Default to first frame if none are large enough.
- int frameAreaAtIndex = 0;
- for (size_t i = 0; i < frameCount; ++i) {
- const IntSize frameSize = source.frameSizeAtIndex(i);
- if (WebSize(frameSize) == desiredSize) {
- index = i;
- break; // Perfect match.
- }
- const int frameArea = frameSize.width() * frameSize.height();
- if (frameArea < (desiredSize.width * desiredSize.height))
- break; // No more frames that are large enough.
-
- if (!i || (frameArea < frameAreaAtIndex)) {
- index = i; // Closer to desired area than previous best match.
- frameAreaAtIndex = frameArea;
- }
- }
-
- RetainPtr<CGImageRef> frame(AdoptCF, source.createFrameAtIndex(index));
- if (!frame)
- return WebImage();
-
- return WebImage(frame.get());
-}
-
-void WebImage::reset()
-{
- CGImageRelease(m_imageRef);
- m_imageRef = 0;
-}
-
-void WebImage::assign(const WebImage& image)
-{
- assign(image.m_imageRef);
-}
-
-bool WebImage::isNull() const
-{
- return !m_imageRef;
-}
-
-WebSize WebImage::size() const
-{
- return WebSize(CGImageGetWidth(m_imageRef), CGImageGetHeight(m_imageRef));
-}
-
-WebImage::WebImage(const PassRefPtr<Image>& image)
- : m_imageRef(0)
-{
- NativeImagePtr p;
- if (image && (p = image->nativeImageForCurrentFrame()))
- assign(p);
-}
-
-WebImage& WebImage::operator=(const PassRefPtr<Image>& image)
-{
- NativeImagePtr p;
- if (image && (p = image->nativeImageForCurrentFrame()))
- assign(p);
- else
- reset();
- return *this;
-}
-
-void WebImage::assign(CGImageRef imageRef)
-{
- // Make sure to retain the imageRef first incase m_imageRef == imageRef.
- CGImageRetain(imageRef);
- CGImageRelease(m_imageRef);
- m_imageRef = imageRef;
-}
-
-} // namespace WebKit
