Diff
Modified: trunk/Source/WebCore/ChangeLog (116906 => 116907)
--- trunk/Source/WebCore/ChangeLog 2012-05-13 23:39:53 UTC (rev 116906)
+++ trunk/Source/WebCore/ChangeLog 2012-05-13 23:42:24 UTC (rev 116907)
@@ -1,5 +1,36 @@
2012-05-13 Darin Adler <[email protected]>
+ Image::initPlatformData is always an empty function so we can remove it
+ https://bugs.webkit.org/show_bug.cgi?id=86297
+
+ Reviewed by Dan Bernstein.
+
+ * platform/graphics/BitmapImage.h: Removed declaration of initPlatformData.
+
+ * platform/graphics/BitmapImage.cpp:
+ (WebCore::BitmapImage::BitmapImage): Removed call to initPlatformData.
+ * platform/graphics/cairo/BitmapImageCairo.cpp:
+ (WebCore::BitmapImage::BitmapImage): Ditto.
+ * platform/graphics/cg/ImageCG.cpp:
+ (WebCore::BitmapImage::BitmapImage): Ditto.
+ * platform/graphics/chromium/ImageChromiumMac.mm: Removed empty
+ initPlatformData function.
+ * platform/graphics/efl/ImageEfl.cpp: Ditto.
+ * platform/graphics/gtk/ImageGtk.cpp:
+ * platform/graphics/mac/ImageMac.mm:
+ * platform/graphics/openvg/ImageOpenVG.cpp:
+ (WebCore::BitmapImage::BitmapImage): Removed call to initPlatformData.
+ Removed empty initPlatformData function.
+ * platform/graphics/qt/ImageQt.cpp:
+ (WebCore::BitmapImage::BitmapImage): Removed call to initPlatformData.
+ Removed empty initPlatformData function.
+ * platform/graphics/skia/ImageSkia.cpp: Removed empty initPlatformData function.
+ * platform/graphics/win/ImageWin.cpp: Ditto.
+ * platform/graphics/wx/ImageWx.cpp: Ditto.
+ (WebCore::BitmapImage::BitmapImage): Removed call to initPlatformData.
+
+2012-05-13 Darin Adler <[email protected]>
+
RenderView::selectionBounds and RenderView::setSelection use maps with raw pointers that should be OwnPtr
https://bugs.webkit.org/show_bug.cgi?id=86300
Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.cpp (116906 => 116907)
--- trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2012-05-13 23:39:53 UTC (rev 116906)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2012-05-13 23:42:24 UTC (rev 116907)
@@ -64,7 +64,6 @@
, m_hasUniformFrameSize(true)
, m_haveFrameCount(false)
{
- initPlatformData();
}
BitmapImage::~BitmapImage()
Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.h (116906 => 116907)
--- trunk/Source/WebCore/platform/graphics/BitmapImage.h 2012-05-13 23:39:53 UTC (rev 116906)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.h 2012-05-13 23:42:24 UTC (rev 116907)
@@ -254,7 +254,6 @@
bool internalAdvanceAnimation(bool skippingFrames);
// Handle platform-specific data
- void initPlatformData();
void invalidatePlatformData();
// Checks to see if the image is a 1x1 solid color. We optimize these images and just do a fill rect instead.
Modified: trunk/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp (116906 => 116907)
--- trunk/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp 2012-05-13 23:39:53 UTC (rev 116906)
+++ trunk/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp 2012-05-13 23:42:24 UTC (rev 116907)
@@ -58,8 +58,6 @@
, m_sizeAvailable(true)
, m_haveFrameCount(true)
{
- initPlatformData();
-
cairo_surface_t* surface = nativeImage->surface();
int width = cairo_image_surface_get_width(surface);
int height = cairo_image_surface_get_height(surface);
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp (116906 => 116907)
--- trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2012-05-13 23:39:53 UTC (rev 116906)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2012-05-13 23:42:24 UTC (rev 116907)
@@ -86,8 +86,6 @@
, m_sizeAvailable(true)
, m_haveFrameCount(true)
{
- initPlatformData();
-
CGFloat width = CGImageGetWidth(cgImage);
CGFloat height = CGImageGetHeight(cgImage);
m_decodedSize = width * height * 4;
Modified: trunk/Source/WebCore/platform/graphics/efl/ImageEfl.cpp (116906 => 116907)
--- trunk/Source/WebCore/platform/graphics/efl/ImageEfl.cpp 2012-05-13 23:39:53 UTC (rev 116906)
+++ trunk/Source/WebCore/platform/graphics/efl/ImageEfl.cpp 2012-05-13 23:42:24 UTC (rev 116907)
@@ -37,10 +37,6 @@
namespace WebCore {
-void BitmapImage::initPlatformData()
-{
-}
-
void BitmapImage::invalidatePlatformData()
{
}
Modified: trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp (116906 => 116907)
--- trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp 2012-05-13 23:39:53 UTC (rev 116906)
+++ trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp 2012-05-13 23:42:24 UTC (rev 116907)
@@ -73,10 +73,6 @@
return SharedBuffer::create(content.get(), length);
}
-void BitmapImage::initPlatformData()
-{
-}
-
void BitmapImage::invalidatePlatformData()
{
}
Modified: trunk/Source/WebCore/platform/graphics/mac/ImageMac.mm (116906 => 116907)
--- trunk/Source/WebCore/platform/graphics/mac/ImageMac.mm 2012-05-13 23:39:53 UTC (rev 116906)
+++ trunk/Source/WebCore/platform/graphics/mac/ImageMac.mm 2012-05-13 23:42:24 UTC (rev 116907)
@@ -39,10 +39,6 @@
namespace WebCore {
-void BitmapImage::initPlatformData()
-{
-}
-
void BitmapImage::invalidatePlatformData()
{
if (m_frames.size() != 1)
Modified: trunk/Source/WebCore/platform/graphics/openvg/ImageOpenVG.cpp (116906 => 116907)
--- trunk/Source/WebCore/platform/graphics/openvg/ImageOpenVG.cpp 2012-05-13 23:39:53 UTC (rev 116906)
+++ trunk/Source/WebCore/platform/graphics/openvg/ImageOpenVG.cpp 2012-05-13 23:42:24 UTC (rev 116907)
@@ -70,8 +70,6 @@
, m_hasUniformFrameSize(true)
, m_haveFrameCount(true)
{
- initPlatformData();
-
ASSERT(m_size.width() > 0);
ASSERT(m_size.height() > 0);
@@ -103,10 +101,6 @@
m_checkedForSolidColor = true;
}
-void BitmapImage::initPlatformData()
-{
-}
-
void BitmapImage::invalidatePlatformData()
{
}
Modified: trunk/Source/WebCore/platform/graphics/qt/ImageQt.cpp (116906 => 116907)
--- trunk/Source/WebCore/platform/graphics/qt/ImageQt.cpp 2012-05-13 23:39:53 UTC (rev 116906)
+++ trunk/Source/WebCore/platform/graphics/qt/ImageQt.cpp 2012-05-13 23:42:24 UTC (rev 116907)
@@ -202,8 +202,6 @@
, m_sizeAvailable(true)
, m_haveFrameCount(true)
{
- initPlatformData();
-
int width = pixmap->width();
int height = pixmap->height();
m_decodedSize = width * height * 4;
@@ -216,10 +214,6 @@
checkForSolidColor();
}
-void BitmapImage::initPlatformData()
-{
-}
-
void BitmapImage::invalidatePlatformData()
{
}
Modified: trunk/Source/WebCore/platform/graphics/skia/ImageSkia.cpp (116906 => 116907)
--- trunk/Source/WebCore/platform/graphics/skia/ImageSkia.cpp 2012-05-13 23:39:53 UTC (rev 116906)
+++ trunk/Source/WebCore/platform/graphics/skia/ImageSkia.cpp 2012-05-13 23:42:24 UTC (rev 116907)
@@ -383,17 +383,8 @@
// FIXME: These should go to BitmapImageSkia.cpp
-void BitmapImage::initPlatformData()
-{
- // This is not used. On Mac, the "platform" data is a cache of some OS
- // specific versions of the image that are created is some cases. These
- // aren't normally used, it is equivalent to getHBITMAP on Windows, and
- // the platform data is the cache.
-}
-
void BitmapImage::invalidatePlatformData()
{
- // See initPlatformData above.
}
void BitmapImage::checkForSolidColor()
Modified: trunk/Source/WebCore/platform/graphics/win/ImageWin.cpp (116906 => 116907)
--- trunk/Source/WebCore/platform/graphics/win/ImageWin.cpp 2012-05-13 23:39:53 UTC (rev 116906)
+++ trunk/Source/WebCore/platform/graphics/win/ImageWin.cpp 2012-05-13 23:42:24 UTC (rev 116907)
@@ -34,10 +34,6 @@
namespace WebCore {
-void BitmapImage::initPlatformData()
-{
-}
-
void BitmapImage::invalidatePlatformData()
{
}
Modified: trunk/Source/WebCore/platform/graphics/wx/ImageWx.cpp (116906 => 116907)
--- trunk/Source/WebCore/platform/graphics/wx/ImageWx.cpp 2012-05-13 23:39:53 UTC (rev 116906)
+++ trunk/Source/WebCore/platform/graphics/wx/ImageWx.cpp 2012-05-13 23:42:24 UTC (rev 116907)
@@ -80,11 +80,6 @@
return img.release();
}
-void BitmapImage::initPlatformData()
-{
- // FIXME: NYI
-}
-
BitmapImage::BitmapImage(const wxBitmap& bitmap)
: Image(0)
, m_currentFrame(0)
@@ -103,8 +98,6 @@
, m_haveFrameCount(true)
, m_frameCount(1)
{
- initPlatformData();
-
m_decodedSize = bitmap.GetWidth() * bitmap.GetHeight() * 4;
m_size = IntSize(bitmap.GetWidth(), bitmap.GetHeight());
