[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
tonyg at chromium.org
tonyg at chromium.org
Fri Jan 21 14:36:28 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit a143ad5ab1d8e9526f10393eba9f2874a470be2f
Author: tonyg at chromium.org <tonyg at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 23 02:44:16 2010 +0000
2010-12-22 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r74503.
http://trac.webkit.org/changeset/74503
https://bugs.webkit.org/show_bug.cgi?id=51513
breaks chromium mac debug compile (Requested by tonyg-cr on
#webkit).
* platform/graphics/chromium/ImageLayerChromium.cpp:
(WebCore::ImageLayerChromium::updateContentsIfDirty):
* platform/graphics/skia/GraphicsContext3DSkia.cpp:
(WebCore::GraphicsContext3D::getImageData):
2010-12-22 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r74503.
http://trac.webkit.org/changeset/74503
https://bugs.webkit.org/show_bug.cgi?id=51513
breaks chromium mac debug compile (Requested by tonyg-cr on
#webkit).
* src/GraphicsContext3DChromium.cpp:
(WebCore::GraphicsContext3DInternal::paintRenderingResultsToCanvas):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74529 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 31edc74..b80080e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-22 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r74503.
+ http://trac.webkit.org/changeset/74503
+ https://bugs.webkit.org/show_bug.cgi?id=51513
+
+ breaks chromium mac debug compile (Requested by tonyg-cr on
+ #webkit).
+
+ * platform/graphics/chromium/ImageLayerChromium.cpp:
+ (WebCore::ImageLayerChromium::updateContentsIfDirty):
+ * platform/graphics/skia/GraphicsContext3DSkia.cpp:
+ (WebCore::GraphicsContext3D::getImageData):
+
2010-12-22 Dan Bernstein <mitz at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp b/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp
index 5b42826..cd299c1 100644
--- a/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp
@@ -156,13 +156,8 @@ void ImageLayerChromium::updateContentsIfDirty()
#error "Need to implement for your platform."
#endif
- if (pixels) {
- // Since this operation requires contiguous pixels, make sure there's no padding at the
- // end of each line.
- ASSERT(skiaBitmap->rowBytes() == SkBitmap::ComputeRowBytes(skiaConfig, skiaBitmap->width()));
-
+ if (pixels)
updateTextureRect(pixels, bitmapSize, dirtyRect);
- }
}
}
diff --git a/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp b/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp
index 7fd7c70..8b7ac86 100644
--- a/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp
+++ b/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp
@@ -78,8 +78,7 @@ bool GraphicsContext3D::getImageData(Image* image,
return false;
SkBitmap& skiaImageRef = *skiaImage;
SkAutoLockPixels lock(skiaImageRef);
- ASSERT(skiaImage->bytesPerPixel() == 4
- && skiaImage->rowBytes() == SkBitmap::ComputeRowBytes(skiaImage->config(), skiaImage->width()));
+ ASSERT(skiaImage->rowBytes() == skiaImage->width() * 4);
outputVector.resize(skiaImage->rowBytes() * skiaImage->height());
return packPixels(reinterpret_cast<const uint8_t*>(skiaImage->getPixels()),
SourceFormatBGRA8, skiaImage->width(), skiaImage->height(), 0,
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 132ca55..335732a 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-22 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r74503.
+ http://trac.webkit.org/changeset/74503
+ https://bugs.webkit.org/show_bug.cgi?id=51513
+
+ breaks chromium mac debug compile (Requested by tonyg-cr on
+ #webkit).
+
+ * src/GraphicsContext3DChromium.cpp:
+ (WebCore::GraphicsContext3DInternal::paintRenderingResultsToCanvas):
+
2010-12-22 W. James MacLean <wjmaclean at chromium.org>
Reviewed by Kenneth Russell.
diff --git a/WebKit/chromium/src/GraphicsContext3DChromium.cpp b/WebKit/chromium/src/GraphicsContext3DChromium.cpp
index 6a0c672..2dff52b 100644
--- a/WebKit/chromium/src/GraphicsContext3DChromium.cpp
+++ b/WebKit/chromium/src/GraphicsContext3DChromium.cpp
@@ -172,13 +172,9 @@ void GraphicsContext3DInternal::paintRenderingResultsToCanvas(CanvasRenderingCon
const SkBitmap* canvasBitmap = imageBuffer->context()->platformContext()->bitmap();
const SkBitmap* readbackBitmap = 0;
ASSERT(canvasBitmap->config() == SkBitmap::kARGB_8888_Config);
- ASSERT(SkBitmap::ComputeBytesPerPixel(canvasBitmap->config()) == 4);
if (canvasBitmap->width() == m_impl->width() && canvasBitmap->height() == m_impl->height()) {
// This is the fastest and most common case. We read back
// directly into the canvas's backing store.
- // Make sure no extra padding at line ends (e.g. a bitmap extracted subset).
- ASSERT(readbackBitmap->rowBytes() ==
- SkBitmap::ComputeRowBytes(readbackBitmap->config(), readbackBitmap->width()));
readbackBitmap = canvasBitmap;
m_resizingBitmap.reset();
} else {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list