WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
updated patch
100026.patch (text/plain), 25.15 KB, created by
arno.
on 2012-10-30 17:45:17 PDT
(
hide
)
Description:
updated patch
Filename:
MIME Type:
Creator:
arno.
Created:
2012-10-30 17:45:17 PDT
Size:
25.15 KB
patch
obsolete
>commit 5da61a9bff4002ca900937d528a6cffc74e26893 >Author: Arnaud Renevier <a.renevier@sisa.samsung.com> >Date: Wed Oct 24 15:18:28 2012 -0700 > > 100026 > >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 8c97b16..b923764 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,17 @@ >+2012-10-29 Arnaud Renevier <a.renevier@sisa.samsung.com> >+ >+ inconsistency in drawImage with target rect negative dimensions. >+ https://bugs.webkit.org/show_bug.cgi?id=100026 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Add a drawImage check for a destination rectangle with -1px >+ width/height. When drawing to (1, 1, -1, -1) rectangle, first >+ (top-left) pixel should have been and been the only one drawn into. >+ >+ * fast/canvas/drawImage-with-negative-source-destination-expected.txt: >+ * fast/canvas/drawImage-with-negative-source-destination.js: >+ > 2012-10-22 Emil A Eklund <eae@chromium.org> > > Unreviewed gardening, marking fast/sub-pixel/file-upload-control-at-fractional-offset.html as failing on LION for now. >diff --git a/LayoutTests/fast/canvas/drawImage-with-negative-source-destination-expected.txt b/LayoutTests/fast/canvas/drawImage-with-negative-source-destination-expected.txt >index 738568b..f41ac92 100644 >--- a/LayoutTests/fast/canvas/drawImage-with-negative-source-destination-expected.txt >+++ b/LayoutTests/fast/canvas/drawImage-with-negative-source-destination-expected.txt >@@ -6,6 +6,12 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE > PASS imgdata[4] is 0 > PASS imgdata[5] is 255 > PASS imgdata[6] is 0 >+PASS imgdata[0] is 255 >+PASS imgdata[1] is 0 >+PASS imgdata[2] is 0 >+PASS imgdata[4] is 0 >+PASS imgdata[5] is 0 >+PASS imgdata[6] is 0 > PASS successfullyParsed is true > > TEST COMPLETE >diff --git a/LayoutTests/fast/canvas/drawImage-with-negative-source-destination.js b/LayoutTests/fast/canvas/drawImage-with-negative-source-destination.js >index 0a8a09c..671fd73 100644 >--- a/LayoutTests/fast/canvas/drawImage-with-negative-source-destination.js >+++ b/LayoutTests/fast/canvas/drawImage-with-negative-source-destination.js >@@ -19,3 +19,16 @@ var imgdata = imageData.data; > shouldBe("imgdata[4]", "0"); > shouldBe("imgdata[5]", "255"); > shouldBe("imgdata[6]", "0"); >+ >+// test width or height -1 >+canvas.fillStyle = '#000'; >+canvas.fillRect(0, 0, 1, 2); >+canvas.drawImage(canvas2, 0, 0, 1, 1, 1, 1, -1, -1); >+var imageData = canvas.getImageData(0, 0, 1, 2); >+var imgdata = imageData.data; >+shouldBe("imgdata[0]", "255"); >+shouldBe("imgdata[1]", "0"); >+shouldBe("imgdata[2]", "0"); >+shouldBe("imgdata[4]", "0"); >+shouldBe("imgdata[5]", "0"); >+shouldBe("imgdata[6]", "0"); >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index cded235..6a1f07a 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,55 @@ >+2012-10-30 Arnaud Renevier <a.renevier@sisa.samsung.com> >+ >+ inconsistency in drawImage with target rect negative dimensions. >+ https://bugs.webkit.org/show_bug.cgi?id=100026 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Remove -1, -1 special case in drawImage and drawImageBuffer. Replace >+ all -1 -1 arguments calls to with the correct rectangle dimensions. >+ >+ Remove FloatRect(0, 0, -1, -1) default argument for srcRect, and >+ instead, add new overloaded functions to create a FloatRect from image >+ size. >+ >+ Replace -1 -1 arguments calls in FEComposite::platformApplySoftware >+ with correct rectangle dimensions. >+ >+ Replace ImageGStreamer rect method (which may return -1 -1 rectangle) >+ with cropRect method, and make caller check for rectangle emptiness. >+ >+ Replace image pointer check by an assertion in GraphicsContext >+ drawImage and drawImageBuffer methods. Add check to callers to avoid >+ calling those methods with null images. >+ >+ * fast/canvas/drawImage-with-negative-source-destination-expected.txt: >+ * fast/canvas/drawImage-with-negative-source-destination.js: >+ >+ * html/canvas/CanvasRenderingContext2D.cpp: >+ (WebCore::CanvasRenderingContext2D::fullCanvasCompositedDrawImage): >+ * platform/graphics/GraphicsContext.cpp: >+ (WebCore::GraphicsContext::drawImage): >+ (WebCore): >+ (WebCore::GraphicsContext::drawTiledImage): >+ (WebCore::GraphicsContext::drawImageBuffer): >+ * platform/graphics/GraphicsContext.h: >+ (GraphicsContext): >+ * platform/graphics/filters/FEComposite.cpp: >+ (WebCore::FEComposite::platformApplySoftware): >+ * platform/graphics/gstreamer/ImageGStreamer.h: >+ (WebCore::ImageGStreamer::rect): >+ * platform/graphics/qt/ImageBufferQt.cpp: >+ (WebCore::ImageBuffer::draw): >+ * platform/graphics/texmap/TextureMapperImageBuffer.cpp: >+ (WebCore::BitmapTextureImageBuffer::updateContents): >+ (WebCore::TextureMapperImageBuffer::drawTexture): >+ * rendering/FilterEffectRenderer.cpp: >+ (WebCore::FilterEffectRendererHelper::applyFilterEffect): >+ * rendering/RenderBoxModelObject.cpp: >+ (WebCore::RenderBoxModelObject::paintNinePieceImage): >+ * rendering/RenderListMarker.cpp: >+ (WebCore::RenderListMarker::paint): >+ > 2012-10-29 Arnaud Renevier <a.renevier@sisa.samsung.com> > > webview not redrawn as needed when accelerated compositing is enabled. >diff --git a/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp >index ef754f5..248bd7f 100644 >--- a/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp >+++ b/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp >@@ -1660,6 +1660,9 @@ template<class T> void CanvasRenderingContext2D::fullCanvasCompositedDrawImage( > { > ASSERT(isFullCanvasCompositeMode(op)); > >+ if (!image) >+ return; >+ > IntSize croppedOffset; > IntRect bufferRect = calculateCompositingBufferRect(dest, &croppedOffset); > if (bufferRect.isEmpty()) { >diff --git a/Source/WebCore/platform/graphics/GraphicsContext.cpp b/Source/WebCore/platform/graphics/GraphicsContext.cpp >index 2ca0e65..5cb2224 100644 >--- a/Source/WebCore/platform/graphics/GraphicsContext.cpp >+++ b/Source/WebCore/platform/graphics/GraphicsContext.cpp >@@ -439,12 +439,14 @@ void GraphicsContext::drawHighlightForText(const Font& font, const TextRun& run, > > void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const IntPoint& p, CompositeOperator op, RespectImageOrientationEnum shouldRespectImageOrientation) > { >- drawImage(image, styleColorSpace, p, IntRect(0, 0, -1, -1), op, shouldRespectImageOrientation); >+ ASSERT(image); >+ drawImage(image, styleColorSpace, p, IntRect(IntPoint(), image->size()), op, shouldRespectImageOrientation); > } > > void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const IntRect& r, CompositeOperator op, RespectImageOrientationEnum shouldRespectImageOrientation, bool useLowQualityScale) > { >- drawImage(image, styleColorSpace, r, IntRect(0, 0, -1, -1), op, shouldRespectImageOrientation, useLowQualityScale); >+ ASSERT(image); >+ drawImage(image, styleColorSpace, r, IntRect(IntPoint(), image->size()), op, shouldRespectImageOrientation, useLowQualityScale); > } > > void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const IntPoint& dest, const IntRect& srcRect, CompositeOperator op, RespectImageOrientationEnum shouldRespectImageOrientation) >@@ -457,26 +459,18 @@ void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const > drawImage(image, styleColorSpace, FloatRect(dest), srcRect, op, shouldRespectImageOrientation, useLowQualityScale); > } > >+void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const FloatRect& dest) >+{ >+ ASSERT(image); >+ drawImage(image, styleColorSpace, dest, FloatRect(IntRect(IntPoint(), image->size()))); >+} >+ > void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& src, CompositeOperator op, RespectImageOrientationEnum shouldRespectImageOrientation, bool useLowQualityScale) > { >- if (paintingDisabled() || !image) >+ ASSERT(image); >+ if (paintingDisabled()) > return; > >- float tsw = src.width(); >- float tsh = src.height(); >- float tw = dest.width(); >- float th = dest.height(); >- >- if (tsw == -1) >- tsw = image->width(); >- if (tsh == -1) >- tsh = image->height(); >- >- if (tw == -1) >- tw = image->width(); >- if (th == -1) >- th = image->height(); >- > InterpolationQuality previousInterpolationQuality = InterpolationDefault; > > if (useLowQualityScale) { >@@ -489,7 +483,7 @@ void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const > #endif > } > >- image->draw(this, FloatRect(dest.location(), FloatSize(tw, th)), FloatRect(src.location(), FloatSize(tsw, tsh)), styleColorSpace, op, shouldRespectImageOrientation); >+ image->draw(this, dest, src, styleColorSpace, op, shouldRespectImageOrientation); > > if (useLowQualityScale) > setImageInterpolationQuality(previousInterpolationQuality); >@@ -497,7 +491,9 @@ void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const > > void GraphicsContext::drawTiledImage(Image* image, ColorSpace styleColorSpace, const IntRect& destRect, const IntPoint& srcPoint, const IntSize& tileSize, CompositeOperator op, bool useLowQualityScale) > { >- if (paintingDisabled() || !image) >+ if (!image) >+ return; >+ if (paintingDisabled()) > return; > > if (useLowQualityScale) { >@@ -532,12 +528,14 @@ void GraphicsContext::drawTiledImage(Image* image, ColorSpace styleColorSpace, c > > void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace styleColorSpace, const IntPoint& p, CompositeOperator op) > { >- drawImageBuffer(image, styleColorSpace, p, IntRect(0, 0, -1, -1), op); >+ ASSERT(image); >+ drawImageBuffer(image, styleColorSpace, p, IntRect(IntPoint(), image->logicalSize()), op); > } > > void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace styleColorSpace, const IntRect& r, CompositeOperator op, bool useLowQualityScale) > { >- drawImageBuffer(image, styleColorSpace, r, IntRect(0, 0, -1, -1), op, useLowQualityScale); >+ ASSERT(image); >+ drawImageBuffer(image, styleColorSpace, r, IntRect(IntPoint(), image->logicalSize()), op, useLowQualityScale); > } > > void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace styleColorSpace, const IntPoint& dest, const IntRect& srcRect, CompositeOperator op) >@@ -550,25 +548,18 @@ void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace styleColorS > drawImageBuffer(image, styleColorSpace, FloatRect(dest), srcRect, op, useLowQualityScale); > } > >-void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& src, CompositeOperator op, bool useLowQualityScale) >+void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace styleColorSpace, const FloatRect& dest) > { >- if (paintingDisabled() || !image) >- return; >- >- float tsw = src.width(); >- float tsh = src.height(); >- float tw = dest.width(); >- float th = dest.height(); >+ ASSERT(image); >+ drawImageBuffer(image, styleColorSpace, dest, FloatRect(IntRect(IntPoint(), image->logicalSize()))); >+} > >- if (tsw == -1) >- tsw = image->logicalSize().width(); >- if (tsh == -1) >- tsh = image->logicalSize().height(); >+void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& src, CompositeOperator op, bool useLowQualityScale) >+{ >+ ASSERT(image); > >- if (tw == -1) >- tw = image->logicalSize().width(); >- if (th == -1) >- th = image->logicalSize().height(); >+ if (paintingDisabled()) >+ return; > > if (useLowQualityScale) { > InterpolationQuality previousInterpolationQuality = imageInterpolationQuality(); >@@ -578,10 +569,10 @@ void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace styleColorS > // FIXME (49002): Should be InterpolationLow > setImageInterpolationQuality(InterpolationNone); > #endif >- image->draw(this, styleColorSpace, FloatRect(dest.location(), FloatSize(tw, th)), FloatRect(src.location(), FloatSize(tsw, tsh)), op, useLowQualityScale); >+ image->draw(this, styleColorSpace, dest, src, op, useLowQualityScale); > setImageInterpolationQuality(previousInterpolationQuality); > } else >- image->draw(this, styleColorSpace, FloatRect(dest.location(), FloatSize(tw, th)), FloatRect(src.location(), FloatSize(tsw, tsh)), op, useLowQualityScale); >+ image->draw(this, styleColorSpace, dest, src, op, useLowQualityScale); > } > > #if !PLATFORM(QT) >diff --git a/Source/WebCore/platform/graphics/GraphicsContext.h b/Source/WebCore/platform/graphics/GraphicsContext.h >index fe65f88..3a147b4 100644 >--- a/Source/WebCore/platform/graphics/GraphicsContext.h >+++ b/Source/WebCore/platform/graphics/GraphicsContext.h >@@ -313,8 +313,8 @@ namespace WebCore { > void drawImage(Image*, ColorSpace styleColorSpace, const IntRect&, CompositeOperator = CompositeSourceOver, RespectImageOrientationEnum = DoNotRespectImageOrientation, bool useLowQualityScale = false); > void drawImage(Image*, ColorSpace styleColorSpace, const IntPoint& destPoint, const IntRect& srcRect, CompositeOperator = CompositeSourceOver, RespectImageOrientationEnum = DoNotRespectImageOrientation); > void drawImage(Image*, ColorSpace styleColorSpace, const IntRect& destRect, const IntRect& srcRect, CompositeOperator = CompositeSourceOver, RespectImageOrientationEnum = DoNotRespectImageOrientation, bool useLowQualityScale = false); >- void drawImage(Image*, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect = FloatRect(0, 0, -1, -1), >- CompositeOperator = CompositeSourceOver, RespectImageOrientationEnum = DoNotRespectImageOrientation, bool useLowQualityScale = false); >+ void drawImage(Image*, ColorSpace styleColorSpace, const FloatRect& destRect); >+ void drawImage(Image*, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, RespectImageOrientationEnum = DoNotRespectImageOrientation, bool useLowQualityScale = false); > void drawTiledImage(Image*, ColorSpace styleColorSpace, const IntRect& destRect, const IntPoint& srcPoint, const IntSize& tileSize, > CompositeOperator = CompositeSourceOver, bool useLowQualityScale = false); > void drawTiledImage(Image*, ColorSpace styleColorSpace, const IntRect& destRect, const IntRect& srcRect, >@@ -325,8 +325,8 @@ namespace WebCore { > void drawImageBuffer(ImageBuffer*, ColorSpace styleColorSpace, const IntRect&, CompositeOperator = CompositeSourceOver, bool useLowQualityScale = false); > void drawImageBuffer(ImageBuffer*, ColorSpace styleColorSpace, const IntPoint& destPoint, const IntRect& srcRect, CompositeOperator = CompositeSourceOver); > void drawImageBuffer(ImageBuffer*, ColorSpace styleColorSpace, const IntRect& destRect, const IntRect& srcRect, CompositeOperator = CompositeSourceOver, bool useLowQualityScale = false); >- void drawImageBuffer(ImageBuffer*, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect = FloatRect(0, 0, -1, -1), >- CompositeOperator = CompositeSourceOver, bool useLowQualityScale = false); >+ void drawImageBuffer(ImageBuffer*, ColorSpace styleColorSpace, const FloatRect& destRect); >+ void drawImageBuffer(ImageBuffer*, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, bool useLowQualityScale = false); > > void setImageInterpolationQuality(InterpolationQuality); > InterpolationQuality imageInterpolationQuality() const; >diff --git a/Source/WebCore/platform/graphics/filters/FEComposite.cpp b/Source/WebCore/platform/graphics/filters/FEComposite.cpp >index 9d566ed..c1f6443 100644 >--- a/Source/WebCore/platform/graphics/filters/FEComposite.cpp >+++ b/Source/WebCore/platform/graphics/filters/FEComposite.cpp >@@ -274,11 +274,15 @@ void FEComposite::platformApplySoftware() > return; > GraphicsContext* filterContext = resultImage->context(); > >- FloatRect srcRect = FloatRect(0, 0, -1, -1); >+ ImageBuffer* imgBuffer = in->asImageBuffer(); >+ ImageBuffer* imgBuffer2 = in2->asImageBuffer(); >+ ASSERT(imgBuffer); >+ ASSERT(imgBuffer2); >+ > switch (m_type) { > case FECOMPOSITE_OPERATOR_OVER: >- filterContext->drawImageBuffer(in2->asImageBuffer(), ColorSpaceDeviceRGB, drawingRegionOfInputImage(in2->absolutePaintRect())); >- filterContext->drawImageBuffer(in->asImageBuffer(), ColorSpaceDeviceRGB, drawingRegionOfInputImage(in->absolutePaintRect())); >+ filterContext->drawImageBuffer(imgBuffer2, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in2->absolutePaintRect())); >+ filterContext->drawImageBuffer(imgBuffer, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in->absolutePaintRect())); > break; > case FECOMPOSITE_OPERATOR_IN: { > // Applies only to the intersected region. >@@ -292,21 +296,21 @@ void FEComposite::platformApplySoftware() > destinationRect.y() - in->absolutePaintRect().y()), destinationRect.size()); > IntRect source2Rect(IntPoint(destinationRect.x() - in2->absolutePaintRect().x(), > destinationRect.y() - in2->absolutePaintRect().y()), destinationRect.size()); >- filterContext->drawImageBuffer(in2->asImageBuffer(), ColorSpaceDeviceRGB, destinationPoint, source2Rect); >- filterContext->drawImageBuffer(in->asImageBuffer(), ColorSpaceDeviceRGB, destinationPoint, sourceRect, CompositeSourceIn); >+ filterContext->drawImageBuffer(imgBuffer2, ColorSpaceDeviceRGB, destinationPoint, source2Rect); >+ filterContext->drawImageBuffer(imgBuffer, ColorSpaceDeviceRGB, destinationPoint, sourceRect, CompositeSourceIn); > break; > } > case FECOMPOSITE_OPERATOR_OUT: >- filterContext->drawImageBuffer(in->asImageBuffer(), ColorSpaceDeviceRGB, drawingRegionOfInputImage(in->absolutePaintRect())); >- filterContext->drawImageBuffer(in2->asImageBuffer(), ColorSpaceDeviceRGB, drawingRegionOfInputImage(in2->absolutePaintRect()), srcRect, CompositeDestinationOut); >+ filterContext->drawImageBuffer(imgBuffer, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in->absolutePaintRect())); >+ filterContext->drawImageBuffer(imgBuffer2, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in2->absolutePaintRect()), IntRect(IntPoint(), imgBuffer2->logicalSize()), CompositeDestinationOut); > break; > case FECOMPOSITE_OPERATOR_ATOP: >- filterContext->drawImageBuffer(in2->asImageBuffer(), ColorSpaceDeviceRGB, drawingRegionOfInputImage(in2->absolutePaintRect())); >- filterContext->drawImageBuffer(in->asImageBuffer(), ColorSpaceDeviceRGB, drawingRegionOfInputImage(in->absolutePaintRect()), srcRect, CompositeSourceAtop); >+ filterContext->drawImageBuffer(imgBuffer2, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in2->absolutePaintRect())); >+ filterContext->drawImageBuffer(imgBuffer, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in->absolutePaintRect()), IntRect(IntPoint(), imgBuffer->logicalSize()), CompositeSourceAtop); > break; > case FECOMPOSITE_OPERATOR_XOR: >- filterContext->drawImageBuffer(in2->asImageBuffer(), ColorSpaceDeviceRGB, drawingRegionOfInputImage(in2->absolutePaintRect())); >- filterContext->drawImageBuffer(in->asImageBuffer(), ColorSpaceDeviceRGB, drawingRegionOfInputImage(in->absolutePaintRect()), srcRect, CompositeXOR); >+ filterContext->drawImageBuffer(imgBuffer2, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in2->absolutePaintRect())); >+ filterContext->drawImageBuffer(imgBuffer, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in->absolutePaintRect()), IntRect(IntPoint(), imgBuffer->logicalSize()), CompositeXOR); > break; > default: > break; >diff --git a/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h >index 83bdfe2..68f8fa1 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h >+++ b/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h >@@ -51,9 +51,8 @@ class ImageGStreamer : public RefCounted<ImageGStreamer> { > { > if (!m_cropRect.isEmpty()) > return FloatRect(m_cropRect); >- >- // Default rectangle used by GraphicsContext::drawImage(). >- return FloatRect(0, 0, -1, -1); >+ ASSERT(m_image); >+ return FloatRect(0, 0, m_image->size().width(), m_image->size().height()); > } > > private: >diff --git a/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp >index ac27dc2..4182d4a 100644 >--- a/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp >+++ b/Source/WebCore/platform/graphics/qt/ImageBufferQt.cpp >@@ -132,7 +132,7 @@ void ImageBuffer::draw(GraphicsContext* destContext, ColorSpace styleColorSpace, > // We're drawing into our own buffer. In order for this to work, we need to copy the source buffer first. > RefPtr<Image> copy = copyImage(CopyBackingStore); > destContext->drawImage(copy.get(), ColorSpaceDeviceRGB, destRect, srcRect, op, DoNotRespectImageOrientation, useLowQualityScale); >- } else >+ } else if (m_data.m_image.get()) > destContext->drawImage(m_data.m_image.get(), styleColorSpace, destRect, srcRect, op, DoNotRespectImageOrientation, useLowQualityScale); > } > >diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp >index 8434332..b1a0e85 100644 >--- a/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp >+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp >@@ -61,6 +61,8 @@ void BitmapTextureImageBuffer::didReset() > > void BitmapTextureImageBuffer::updateContents(Image* image, const IntRect& targetRect, const IntPoint& offset, UpdateContentsFlag) > { >+ if (!image) >+ return; > m_image->context()->drawImage(image, ColorSpaceDeviceRGB, targetRect, IntRect(offset, targetRect.size()), CompositeCopy); > } > >@@ -110,7 +112,8 @@ void TextureMapperImageBuffer::drawTexture(const BitmapTexture& texture, const F > maskContext->setAlpha(opacity); > opacity = 1; > } >- maskContext->drawImageBuffer(mask->m_image.get(), ColorSpaceDeviceRGB, IntPoint::zero(), CompositeDestinationIn); >+ if (mask->m_image.get()) >+ maskContext->drawImageBuffer(mask->m_image.get(), ColorSpaceDeviceRGB, IntPoint::zero(), CompositeDestinationIn); > image = maskedImage.get(); > } > >diff --git a/Source/WebCore/rendering/FilterEffectRenderer.cpp b/Source/WebCore/rendering/FilterEffectRenderer.cpp >index fd07f4a..9f0efbb 100644 >--- a/Source/WebCore/rendering/FilterEffectRenderer.cpp >+++ b/Source/WebCore/rendering/FilterEffectRenderer.cpp >@@ -510,7 +510,8 @@ GraphicsContext* FilterEffectRendererHelper::applyFilterEffect() > LayoutRect destRect = filter->outputRect(); > destRect.move(m_paintOffset.x(), m_paintOffset.y()); > >- m_savedGraphicsContext->drawImageBuffer(filter->output(), m_renderLayer->renderer()->style()->colorSpace(), pixelSnappedIntRect(destRect), CompositeSourceOver); >+ if (filter->output()) >+ m_savedGraphicsContext->drawImageBuffer(filter->output(), m_renderLayer->renderer()->style()->colorSpace(), pixelSnappedIntRect(destRect), CompositeSourceOver); > > filter->clearIntermediateResults(); > >diff --git a/Source/WebCore/rendering/RenderBoxModelObject.cpp b/Source/WebCore/rendering/RenderBoxModelObject.cpp >index fd6390a..8f18ada 100644 >--- a/Source/WebCore/rendering/RenderBoxModelObject.cpp >+++ b/Source/WebCore/rendering/RenderBoxModelObject.cpp >@@ -1297,6 +1297,8 @@ bool RenderBoxModelObject::paintNinePieceImage(GraphicsContext* graphicsContext, > && (imageHeight - topSlice - bottomSlice) > 0 && (borderImageRect.height() - topWidth - bottomWidth) > 0; > > RefPtr<Image> image = styleImage->image(this, imageSize); >+ if (!image) >+ return true; > ColorSpace colorSpace = style->colorSpace(); > > float destinationWidth = borderImageRect.width() - leftWidth - rightWidth; >diff --git a/Source/WebCore/rendering/RenderListMarker.cpp b/Source/WebCore/rendering/RenderListMarker.cpp >index b7cbaa0..ba8ad4e 100644 >--- a/Source/WebCore/rendering/RenderListMarker.cpp >+++ b/Source/WebCore/rendering/RenderListMarker.cpp >@@ -1130,7 +1130,9 @@ void RenderListMarker::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffse > if (style()->highlight() != nullAtom && !paintInfo.context->paintingDisabled()) > paintCustomHighlight(paintOffset, style()->highlight(), true); > #endif >- context->drawImage(m_image->image(this, marker.size()).get(), style()->colorSpace(), marker); >+ RefPtr<Image> image = m_image->image(this, marker.size()); >+ if (image) >+ context->drawImage(image.get(), style()->colorSpace(), marker); > if (selectionState() != SelectionNone) { > LayoutRect selRect = localSelectionRect(); > selRect.moveBy(boxOrigin);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=171558">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 100026
:
169978
|
170489
|
171001
|
171309
|
171482
|
171558
|
173412
|
174523
|
178893
|
179544
|
179563
|
182865