WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch
bug-218839-20201111200829.patch (text/plain), 47.38 KB, created by
Said Abou-Hallawa
on 2020-11-11 20:08:30 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Said Abou-Hallawa
Created:
2020-11-11 20:08:30 PST
Size:
47.38 KB
patch
obsolete
>Subversion Revision: 269709 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index dd9e92b9955e49ae300158043ef02f8482d7438d..df5d6bc3bab8990b6ffd979c2fec2bdf600d1594 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,82 @@ >+2020-11-11 Said Abou-Hallawa <said@apple.com> >+ >+ [GPU Process] Delete the DisplayList items: DrawImage and DrawTiledImage >+ https://bugs.webkit.org/show_bug.cgi?id=218839 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ This is clean up left from r269708. These DisplayList items are not needed >+ anymore. The default implementation of the recording functions in the super >+ classes of GraphicsContextImpl was to call Image::draw() or Image::drawTiled() >+ which we do right now by not recording in the functions: >+ GraphicsContext::drawImage() and GraphicsContext::drawTiledImage(). >+ >+ * platform/graphics/GraphicsContextImpl.cpp: >+ (WebCore::GraphicsContextImpl::drawImageImpl): Deleted. >+ (WebCore::GraphicsContextImpl::drawTiledImageImpl): Deleted. >+ * platform/graphics/GraphicsContextImpl.h: >+ * platform/graphics/cairo/GraphicsContextImplCairo.cpp: >+ (WebCore::GraphicsContextImplCairo::drawImage): Deleted. >+ (WebCore::GraphicsContextImplCairo::drawTiledImage): Deleted. >+ * platform/graphics/cairo/GraphicsContextImplCairo.h: >+ * platform/graphics/displaylists/DisplayList.cpp: >+ (WebCore::DisplayList::DisplayList::append): >+ * platform/graphics/displaylists/DisplayListDrawGlyphsRecorderCoreText.cpp: >+ (WebCore::DisplayList::DrawGlyphsRecorder::recordDrawImage): >+ * platform/graphics/displaylists/DisplayListItemBuffer.cpp: >+ (WebCore::DisplayList::ItemHandle::apply): >+ (WebCore::DisplayList::ItemHandle::destroy): >+ (WebCore::DisplayList::ItemHandle::copyTo const): >+ * platform/graphics/displaylists/DisplayListItemType.cpp: >+ (WebCore::DisplayList::sizeOfItemInBytes): >+ (WebCore::DisplayList::isDrawingItem): >+ (WebCore::DisplayList::isInlineItem): >+ * platform/graphics/displaylists/DisplayListItemType.h: >+ * platform/graphics/displaylists/DisplayListItems.cpp: >+ (WebCore::DisplayList::operator<<): >+ (WebCore::DisplayList::DrawImage::apply const): Deleted. >+ (WebCore::DisplayList::DrawTiledImage::apply const): Deleted. >+ (WebCore::DisplayList::DrawTiledScaledImage::apply const): Deleted. >+ * platform/graphics/displaylists/DisplayListItems.h: >+ (WebCore::DisplayList::DrawImage::DrawImage): Deleted. >+ (WebCore::DisplayList::DrawImage::image const): Deleted. >+ (WebCore::DisplayList::DrawImage::source const): Deleted. >+ (WebCore::DisplayList::DrawImage::destination const): Deleted. >+ (WebCore::DisplayList::DrawImage::globalBounds const): Deleted. >+ (WebCore::DisplayList::DrawImage::localBounds const): Deleted. >+ (WebCore::DisplayList::DrawImage::encode const): Deleted. >+ (WebCore::DisplayList::DrawImage::decode): Deleted. >+ (WebCore::DisplayList::DrawTiledImage::image const): Deleted. >+ (WebCore::DisplayList::DrawTiledImage::source const): Deleted. >+ (WebCore::DisplayList::DrawTiledImage::destination const): Deleted. >+ (WebCore::DisplayList::DrawTiledImage::tileSize const): Deleted. >+ (WebCore::DisplayList::DrawTiledImage::spacing const): Deleted. >+ (WebCore::DisplayList::DrawTiledImage::DrawTiledImage): Deleted. >+ (WebCore::DisplayList::DrawTiledImage::globalBounds const): Deleted. >+ (WebCore::DisplayList::DrawTiledImage::localBounds const): Deleted. >+ (WebCore::DisplayList::DrawTiledImage::encode const): Deleted. >+ (WebCore::DisplayList::DrawTiledImage::decode): Deleted. >+ (WebCore::DisplayList::DrawTiledScaledImage::DrawTiledScaledImage): Deleted. >+ (WebCore::DisplayList::DrawTiledScaledImage::image const): Deleted. >+ (WebCore::DisplayList::DrawTiledScaledImage::source const): Deleted. >+ (WebCore::DisplayList::DrawTiledScaledImage::destination const): Deleted. >+ (WebCore::DisplayList::DrawTiledScaledImage::globalBounds const): Deleted. >+ (WebCore::DisplayList::DrawTiledScaledImage::localBounds const): Deleted. >+ (WebCore::DisplayList::DrawTiledScaledImage::encode const): Deleted. >+ (WebCore::DisplayList::DrawTiledScaledImage::decode): Deleted. >+ * platform/graphics/displaylists/DisplayListRecorder.cpp: >+ (WebCore::DisplayList::Recorder::drawImage): Deleted. >+ (WebCore::DisplayList::Recorder::drawTiledImage): Deleted. >+ * platform/graphics/displaylists/DisplayListRecorder.h: >+ * platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp: >+ (Nicosia::CairoOperationRecorder::drawImage): Deleted. >+ (Nicosia::CairoOperationRecorder::drawTiledImage): Deleted. >+ * platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h: >+ * platform/graphics/win/GraphicsContextImplDirect2D.cpp: >+ (WebCore::GraphicsContextImplDirect2D::drawImage): Deleted. >+ (WebCore::GraphicsContextImplDirect2D::drawTiledImage): Deleted. >+ * platform/graphics/win/GraphicsContextImplDirect2D.h: >+ > 2020-11-11 Said Abou-Hallawa <said@apple.com> > > [GPU Process] Cache the NativeImage in GPU Process and allow referencing it with its RemoteResourceIdentifier >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 9206d7200c5bda26ffadd72a1bb51a167ba6e623..89ac630c0b67ab288cba4ea5a37b2e54013cfc33 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,14 @@ >+2020-11-11 Said Abou-Hallawa <said@apple.com> >+ >+ [GPU Process] Delete the DisplayList items: DrawImage and DrawTiledImage >+ https://bugs.webkit.org/show_bug.cgi?id=218839 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * GPUProcess/graphics/RemoteRenderingBackend.cpp: >+ (WebKit::RemoteRenderingBackend::decodeItem): >+ * WebProcess/GPU/graphics/RemoteImageBufferProxy.h: >+ > 2020-11-11 Wenson Hsieh <wenson_hsieh@apple.com> > > Add system trace points for the GPU process display list processing loop >diff --git a/Source/WebCore/platform/graphics/GraphicsContextImpl.cpp b/Source/WebCore/platform/graphics/GraphicsContextImpl.cpp >index ce8e172a161ae46aea288279ebc908613e2ccef9..116ecbe487f12730c9332fa11076c2679177fe6b 100644 >--- a/Source/WebCore/platform/graphics/GraphicsContextImpl.cpp >+++ b/Source/WebCore/platform/graphics/GraphicsContextImpl.cpp >@@ -37,27 +37,4 @@ GraphicsContextImpl::~GraphicsContextImpl() > { > } > >-ImageDrawResult GraphicsContextImpl::drawImageImpl(GraphicsContext& context, Image& image, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& options) >-{ >- InterpolationQualityMaintainer interpolationQualityForThisScope(context, options.interpolationQuality()); >- return image.draw(context, destination, source, options); >-} >- >-ImageDrawResult GraphicsContextImpl::drawTiledImageImpl(GraphicsContext& context, Image& image, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize, const FloatSize& spacing, const ImagePaintingOptions& options) >-{ >- InterpolationQualityMaintainer interpolationQualityForThisScope(context, options.interpolationQuality()); >- return image.drawTiled(context, destination, source, tileSize, spacing, options); >-} >- >-ImageDrawResult GraphicsContextImpl::drawTiledImageImpl(GraphicsContext& context, Image& image, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor, Image::TileRule hRule, Image::TileRule vRule, const ImagePaintingOptions& options) >-{ >- if (hRule == Image::StretchTile && vRule == Image::StretchTile) { >- // Just do a scale. >- return drawImageImpl(context, image, destination, source, options); >- } >- >- InterpolationQualityMaintainer interpolationQualityForThisScope(context, options.interpolationQuality()); >- return image.drawTiled(context, destination, source, tileScaleFactor, hRule, vRule, options.compositeOperator()); >-} >- > } // namespace WebCore >diff --git a/Source/WebCore/platform/graphics/GraphicsContextImpl.h b/Source/WebCore/platform/graphics/GraphicsContextImpl.h >index 9d440d053b0780d8d425b66eb9510d61dc8ecd82..8fbc8723e33dfa4365afe37de257daf2518d1be3 100644 >--- a/Source/WebCore/platform/graphics/GraphicsContextImpl.h >+++ b/Source/WebCore/platform/graphics/GraphicsContextImpl.h >@@ -69,10 +69,6 @@ public: > > virtual void drawGlyphs(const Font&, const GlyphBuffer&, unsigned from, unsigned numGlyphs, const FloatPoint& anchorPoint, FontSmoothingMode) = 0; > >- virtual ImageDrawResult drawImage(Image&, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions&) = 0; >- virtual ImageDrawResult drawTiledImage(Image&, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize, const FloatSize& spacing, const ImagePaintingOptions&) = 0; >- virtual ImageDrawResult drawTiledImage(Image&, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor, Image::TileRule hRule, Image::TileRule vRule, const ImagePaintingOptions&) = 0; >- > virtual void drawImageBuffer(ImageBuffer&, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions&) = 0; > virtual void drawNativeImage(NativeImage&, const FloatSize& selfSize, const FloatRect& destRect, const FloatRect& srcRect, const ImagePaintingOptions&) = 0; > virtual void drawPattern(Image&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing, const ImagePaintingOptions&) = 0; >@@ -114,11 +110,6 @@ public: > > virtual FloatRect roundToDevicePixels(const FloatRect&, GraphicsContext::RoundingMode) = 0; > >-protected: >- static ImageDrawResult drawImageImpl(GraphicsContext&, Image&, const FloatRect&, const FloatRect&, const ImagePaintingOptions&); >- static ImageDrawResult drawTiledImageImpl(GraphicsContext&, Image&, const FloatRect&, const FloatPoint&, const FloatSize&, const FloatSize&, const ImagePaintingOptions&); >- static ImageDrawResult drawTiledImageImpl(GraphicsContext&, Image&, const FloatRect&, const FloatRect&, const FloatSize&, Image::TileRule, Image::TileRule, const ImagePaintingOptions&); >- > private: > friend class GraphicsContext; > GraphicsContext& m_graphicsContext; >diff --git a/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.cpp b/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.cpp >index d2cf495ff90aa3618bf2f6c606aafc1f4db9593d..ce857fd2a31706cf4c1ffc8154bc200b00470314 100644 >--- a/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.cpp >+++ b/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.cpp >@@ -264,21 +264,6 @@ void GraphicsContextImplCairo::drawGlyphs(const Font& font, const GlyphBuffer& g > fontSmoothing); > } > >-ImageDrawResult GraphicsContextImplCairo::drawImage(Image& image, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& imagePaintingOptions) >-{ >- return GraphicsContextImpl::drawImageImpl(graphicsContext(), image, destination, source, imagePaintingOptions); >-} >- >-ImageDrawResult GraphicsContextImplCairo::drawTiledImage(Image& image, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize, const FloatSize& spacing, const ImagePaintingOptions& imagePaintingOptions) >-{ >- return GraphicsContextImpl::drawTiledImageImpl(graphicsContext(), image, destination, source, tileSize, spacing, imagePaintingOptions); >-} >- >-ImageDrawResult GraphicsContextImplCairo::drawTiledImage(Image& image, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor, Image::TileRule hRule, Image::TileRule vRule, const ImagePaintingOptions& imagePaintingOptions) >-{ >- return GraphicsContextImpl::drawTiledImageImpl(graphicsContext(), image, destination, source, tileScaleFactor, hRule, vRule, imagePaintingOptions); >-} >- > void GraphicsContextImplCairo::drawImageBuffer(ImageBuffer& image, const FloatRect& destRect, const FloatRect& srcRect, const ImagePaintingOptions& options) > { > image.draw(graphicsContext(), destRect, srcRect, options); >diff --git a/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.h b/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.h >index 31a0f5400ee84e08b0c5dd4f8e52f1973535d6eb..5f4184579dc823b3e65f791d7bf168407678c2ae 100644 >--- a/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.h >+++ b/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.h >@@ -71,10 +71,6 @@ public: > > void drawGlyphs(const Font&, const GlyphBuffer&, unsigned, unsigned, const FloatPoint&, FontSmoothingMode) override; > >- ImageDrawResult drawImage(Image&, const FloatRect&, const FloatRect&, const ImagePaintingOptions&) override; >- ImageDrawResult drawTiledImage(Image&, const FloatRect&, const FloatPoint&, const FloatSize&, const FloatSize&, const ImagePaintingOptions&) override; >- ImageDrawResult drawTiledImage(Image&, const FloatRect&, const FloatRect&, const FloatSize&, Image::TileRule, Image::TileRule, const ImagePaintingOptions&) override; >- > void drawImageBuffer(ImageBuffer&, const FloatRect&, const FloatRect&, const ImagePaintingOptions&) override; > void drawNativeImage(NativeImage&, const FloatSize&, const FloatRect&, const FloatRect&, const ImagePaintingOptions&) override; > void drawPattern(Image&, const FloatRect&, const FloatRect&, const AffineTransform&, const FloatPoint&, const FloatSize&, const ImagePaintingOptions&) override; >diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp b/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp >index 468a3d554562a967635dc1b7699fa2566f4ca87c..55049504971317222217ee2ffd221c33be6d83a2 100644 >--- a/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp >+++ b/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp >@@ -232,12 +232,6 @@ void DisplayList::append(ItemHandle item) > } > case ItemType::DrawGlyphs: > return append<DrawGlyphs>(item.get<DrawGlyphs>()); >- case ItemType::DrawImage: >- return append<DrawImage>(item.get<DrawImage>()); >- case ItemType::DrawTiledImage: >- return append<DrawTiledImage>(item.get<DrawTiledImage>()); >- case ItemType::DrawTiledScaledImage: >- return append<DrawTiledScaledImage>(item.get<DrawTiledScaledImage>()); > case ItemType::DrawImageBuffer: > return append<DrawImageBuffer>(item.get<DrawImageBuffer>()); > case ItemType::DrawNativeImage: >diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayListDrawGlyphsRecorderCoreText.cpp b/Source/WebCore/platform/graphics/displaylists/DisplayListDrawGlyphsRecorderCoreText.cpp >index 4cd02a8e6a8d37a19e40301845308b9de2d46e2c..8bc00142820e973965eba5a93d06a0309b8695d3 100644 >--- a/Source/WebCore/platform/graphics/displaylists/DisplayListDrawGlyphsRecorderCoreText.cpp >+++ b/Source/WebCore/platform/graphics/displaylists/DisplayListDrawGlyphsRecorderCoreText.cpp >@@ -352,8 +352,8 @@ void DrawGlyphsRecorder::recordDrawImage(CGRenderingStateRef, CGGStateRef gstate > m_owner.translate(0, rect.size.height + 2 * rect.origin.y); > m_owner.scale(FloatSize(1, -1)); > >- auto image = BitmapImage::create(cgImage); >- m_owner.append<DrawImage>(image, FloatRect(rect), FloatRect {{ }, image->size()}, ImagePaintingOptions { ImageOrientation::OriginTopLeft }); >+ auto image = NativeImage::create(adoptCF(cgImage)); >+ m_owner.drawNativeImage(*image, image->size(), FloatRect(rect), FloatRect {{ }, image->size()}, ImagePaintingOptions { ImageOrientation::OriginTopLeft }); > > // Undo the above y-flip to restore the context. > m_owner.scale(FloatSize(1, -1)); >diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayListItemBuffer.cpp b/Source/WebCore/platform/graphics/displaylists/DisplayListItemBuffer.cpp >index ec2d6ea5508a22085297a55bc5c173800c5a5c4b..c0ce05e7ae56ebbce17a4a4afdd7896e997cf46c 100644 >--- a/Source/WebCore/platform/graphics/displaylists/DisplayListItemBuffer.cpp >+++ b/Source/WebCore/platform/graphics/displaylists/DisplayListItemBuffer.cpp >@@ -136,18 +136,6 @@ void ItemHandle::apply(GraphicsContext& context) > get<DrawGlyphs>().apply(context); > return; > } >- case ItemType::DrawImage: { >- get<DrawImage>().apply(context); >- return; >- } >- case ItemType::DrawTiledImage: { >- get<DrawTiledImage>().apply(context); >- return; >- } >- case ItemType::DrawTiledScaledImage: { >- get<DrawTiledScaledImage>().apply(context); >- return; >- } > case ItemType::DrawImageBuffer: { > get<DrawImageBuffer>().apply(context); > return; >@@ -322,10 +310,6 @@ void ItemHandle::destroy() > get<DrawGlyphs>().~DrawGlyphs(); > return; > } >- case ItemType::DrawImage: { >- get<DrawImage>().~DrawImage(); >- return; >- } > case ItemType::DrawLinesForText: { > get<DrawLinesForText>().~DrawLinesForText(); > return; >@@ -338,14 +322,6 @@ void ItemHandle::destroy() > get<DrawPattern>().~DrawPattern(); > return; > } >- case ItemType::DrawTiledImage: { >- get<DrawTiledImage>().~DrawTiledImage(); >- return; >- } >- case ItemType::DrawTiledScaledImage: { >- get<DrawTiledScaledImage>().~DrawTiledScaledImage(); >- return; >- } > case ItemType::FillCompositedRect: { > get<FillCompositedRect>().~FillCompositedRect(); > return; >@@ -581,10 +557,6 @@ void ItemHandle::copyTo(ItemHandle destination) const > new (itemOffset) DrawGlyphs(get<DrawGlyphs>()); > return; > } >- case ItemType::DrawImage: { >- new (itemOffset) DrawImage(get<DrawImage>()); >- return; >- } > case ItemType::DrawImageBuffer: { > new (itemOffset) DrawImageBuffer(get<DrawImageBuffer>()); > return; >@@ -605,14 +577,6 @@ void ItemHandle::copyTo(ItemHandle destination) const > new (itemOffset) DrawPattern(get<DrawPattern>()); > return; > } >- case ItemType::DrawTiledImage: { >- new (itemOffset) DrawTiledImage(get<DrawTiledImage>()); >- return; >- } >- case ItemType::DrawTiledScaledImage: { >- new (itemOffset) DrawTiledScaledImage(get<DrawTiledScaledImage>()); >- return; >- } > case ItemType::FillCompositedRect: { > new (itemOffset) FillCompositedRect(get<FillCompositedRect>()); > return; >diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.cpp b/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.cpp >index a1ad4601a6d922dc9780084c83410fd5c5eeaab8..3d7e1875d7da60621817e6017a9c493e143ca174 100644 >--- a/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.cpp >+++ b/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.cpp >@@ -80,12 +80,6 @@ static size_t sizeOfItemInBytes(ItemType type) > return sizeof(ClipToDrawingCommands); > case ItemType::DrawGlyphs: > return sizeof(DrawGlyphs); >- case ItemType::DrawImage: >- return sizeof(DrawImage); >- case ItemType::DrawTiledImage: >- return sizeof(DrawTiledImage); >- case ItemType::DrawTiledScaledImage: >- return sizeof(DrawTiledScaledImage); > case ItemType::DrawImageBuffer: > return sizeof(DrawImageBuffer); > case ItemType::DrawNativeImage: >@@ -207,7 +201,6 @@ bool isDrawingItem(ItemType type) > case ItemType::DrawFocusRingPath: > case ItemType::DrawFocusRingRects: > case ItemType::DrawGlyphs: >- case ItemType::DrawImage: > case ItemType::DrawImageBuffer: > case ItemType::DrawLine: > case ItemType::DrawLinesForText: >@@ -215,8 +208,6 @@ bool isDrawingItem(ItemType type) > case ItemType::DrawPath: > case ItemType::DrawPattern: > case ItemType::DrawRect: >- case ItemType::DrawTiledImage: >- case ItemType::DrawTiledScaledImage: > case ItemType::EndTransparencyLayer: > case ItemType::FillCompositedRect: > case ItemType::FillEllipse: >@@ -258,12 +249,9 @@ bool isInlineItem(ItemType type) > case ItemType::DrawFocusRingPath: > case ItemType::DrawFocusRingRects: > case ItemType::DrawGlyphs: >- case ItemType::DrawImage: > case ItemType::DrawLinesForText: > case ItemType::DrawPath: > case ItemType::DrawPattern: >- case ItemType::DrawTiledImage: >- case ItemType::DrawTiledScaledImage: > case ItemType::FillCompositedRect: > case ItemType::FillPath: > case ItemType::FillRectWithColor: >diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.h b/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.h >index 78c817d0ea1444b869ca278a322ba78ec34853c5..a0e9a739b3a39c3719dd92a245436abab3f06f5e 100644 >--- a/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.h >+++ b/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.h >@@ -52,9 +52,6 @@ enum class ItemType : uint8_t { > ClipPath, > ClipToDrawingCommands, > DrawGlyphs, >- DrawImage, >- DrawTiledImage, >- DrawTiledScaledImage, > DrawImageBuffer, > DrawNativeImage, > DrawPattern, >diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp b/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp >index b5f454315b89f131781c45be0ba5da586323b4ea..68c63d137b802490cb9bd1ef643cc9385dd843cc 100644 >--- a/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp >+++ b/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp >@@ -404,47 +404,6 @@ static TextStream& operator<<(TextStream& ts, const DrawGlyphs& item) > return ts; > } > >-void DrawImage::apply(GraphicsContext& context) const >-{ >- context.drawImage(m_image.get(), m_destination, m_source, m_imagePaintingOptions); >-} >- >-static TextStream& operator<<(TextStream& ts, const DrawImage& item) >-{ >- ts.dumpProperty("image", item.image()); >- ts.dumpProperty("source-rect", item.source()); >- ts.dumpProperty("dest-rect", item.destination()); >- return ts; >-} >- >-void DrawTiledImage::apply(GraphicsContext& context) const >-{ >- context.drawTiledImage(m_image.get(), m_destination, m_source, m_tileSize, m_spacing, m_imagePaintingOptions); >-} >- >-static TextStream& operator<<(TextStream& ts, const DrawTiledImage& item) >-{ >- ts.dumpProperty("image", item.image()); >- ts.dumpProperty("source-point", item.source()); >- ts.dumpProperty("dest-rect", item.destination()); >- ts.dumpProperty("tile-size", item.tileSize()); >- ts.dumpProperty("spacing", item.spacing()); >- return ts; >-} >- >-void DrawTiledScaledImage::apply(GraphicsContext& context) const >-{ >- context.drawTiledImage(m_image.get(), m_destination, m_source, m_tileScaleFactor, m_hRule, m_vRule, m_imagePaintingOptions); >-} >- >-static TextStream& operator<<(TextStream& ts, const DrawTiledScaledImage& item) >-{ >- ts.dumpProperty("image", item.image()); >- ts.dumpProperty("source-rect", item.source()); >- ts.dumpProperty("dest-rect", item.destination()); >- return ts; >-} >- > NO_RETURN_DUE_TO_ASSERT void DrawImageBuffer::apply(GraphicsContext&) const > { > ASSERT_NOT_REACHED(); >@@ -1051,9 +1010,6 @@ static TextStream& operator<<(TextStream& ts, ItemType type) > case ItemType::ClipPath: ts << "clip-path"; break; > case ItemType::ClipToDrawingCommands: ts << "clip-to-image-buffer"; break; > case ItemType::DrawGlyphs: ts << "draw-glyphs"; break; >- case ItemType::DrawImage: ts << "draw-image"; break; >- case ItemType::DrawTiledImage: ts << "draw-tiled-image"; break; >- case ItemType::DrawTiledScaledImage: ts << "draw-tiled-scaled-image"; break; > case ItemType::DrawImageBuffer: ts << "draw-image-buffer"; break; > case ItemType::DrawNativeImage: ts << "draw-native-image"; break; > case ItemType::DrawPattern: ts << "draw-pattern"; break; >@@ -1165,15 +1121,6 @@ TextStream& operator<<(TextStream& ts, ItemHandle item) > case ItemType::DrawGlyphs: > ts << item.get<DrawGlyphs>(); > break; >- case ItemType::DrawImage: >- ts << item.get<DrawImage>(); >- break; >- case ItemType::DrawTiledImage: >- ts << item.get<DrawTiledImage>(); >- break; >- case ItemType::DrawTiledScaledImage: >- ts << item.get<DrawTiledScaledImage>(); >- break; > case ItemType::DrawImageBuffer: > ts << item.get<DrawImageBuffer>(); > break; >diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h b/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h >index d69b6e800af05d0fdae6f8eb36d450478e5c321c..ed79fb20f654e3d9556618b0a8a228700e085a67 100644 >--- a/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h >+++ b/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h >@@ -986,258 +986,6 @@ Optional<DrawGlyphs> DrawGlyphs::decode(Decoder& decoder) > return {{ font->get(), WTFMove(*glyphs), WTFMove(*advances), *localAnchor, *smoothingMode }}; > } > >-class DrawImage { >-public: >- static constexpr ItemType itemType = ItemType::DrawImage; >- static constexpr bool isInlineItem = false; >- static constexpr bool isDrawingItem = true; >- >- DrawImage(Image& image, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& imagePaintingOptions) >- : m_image(image) >- , m_destination(destination) >- , m_source(source) >- , m_imagePaintingOptions(imagePaintingOptions) >- { >- } >- >- const Image& image() const { return m_image.get(); } >- FloatRect source() const { return m_source; } >- FloatRect destination() const { return m_destination; } >- >- template<class Encoder> void encode(Encoder&) const; >- template<class Decoder> static Optional<DrawImage> decode(Decoder&); >- >- void apply(GraphicsContext&) const; >- >- Optional<FloatRect> globalBounds() const { return WTF::nullopt; } >- Optional<FloatRect> localBounds(const GraphicsContext&) const { return m_destination; } >- >-private: >- mutable Ref<Image> m_image; // FIXME: Drawing images can cause their animations to progress. This shouldn't have to be mutable. >- FloatRect m_destination; >- FloatRect m_source; >- ImagePaintingOptions m_imagePaintingOptions; >-}; >- >-template<class Encoder> >-void DrawImage::encode(Encoder& encoder) const >-{ >- ImageHandle imageHandle; >- imageHandle.image = m_image.ptr(); >- >- encoder << imageHandle; >- encoder << m_destination; >- encoder << m_source; >- encoder << m_imagePaintingOptions; >-} >- >-template<class Decoder> >-Optional<DrawImage> DrawImage::decode(Decoder& decoder) >-{ >- Optional<ImageHandle> imageHandle; >- decoder >> imageHandle; >- if (!imageHandle) >- return WTF::nullopt; >- >- Optional<FloatRect> destination; >- decoder >> destination; >- if (!destination) >- return WTF::nullopt; >- >- Optional<FloatRect> source; >- decoder >> source; >- if (!source) >- return WTF::nullopt; >- >- Optional<ImagePaintingOptions> imagePaintingOptions; >- decoder >> imagePaintingOptions; >- if (!imagePaintingOptions) >- return WTF::nullopt; >- >- return {{ *imageHandle->image, *destination, *source, *imagePaintingOptions }}; >-} >- >-class DrawTiledImage { >-public: >- static constexpr ItemType itemType = ItemType::DrawTiledImage; >- static constexpr bool isInlineItem = false; >- static constexpr bool isDrawingItem = true; >- >- const Image& image() const { return m_image.get(); } >- FloatPoint source() const { return m_source; } >- FloatRect destination() const { return m_destination; } >- >- FloatSize tileSize() const { return m_tileSize; } >- FloatSize spacing() const { return m_spacing; } >- >- DrawTiledImage(Image& image, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize, const FloatSize& spacing, const ImagePaintingOptions& imagePaintingOptions) >- : m_image(image) >- , m_destination(destination) >- , m_source(source) >- , m_tileSize(tileSize) >- , m_spacing(spacing) >- , m_imagePaintingOptions(imagePaintingOptions) >- { >- } >- >- void apply(GraphicsContext&) const; >- >- Optional<FloatRect> globalBounds() const { return WTF::nullopt; } >- Optional<FloatRect> localBounds(const GraphicsContext&) const { return m_destination; } >- >- template<class Encoder> void encode(Encoder&) const; >- template<class Decoder> static Optional<DrawTiledImage> decode(Decoder&); >- >-private: >- mutable Ref<Image> m_image; // FIXME: Drawing images can cause their animations to progress. This shouldn't have to be mutable. >- FloatRect m_destination; >- FloatPoint m_source; >- FloatSize m_tileSize; >- FloatSize m_spacing; >- ImagePaintingOptions m_imagePaintingOptions; >-}; >- >-template<class Encoder> >-void DrawTiledImage::encode(Encoder& encoder) const >-{ >- ImageHandle imageHandle; >- imageHandle.image = m_image.ptr(); >- encoder << imageHandle; >- encoder << m_destination; >- encoder << m_source; >- encoder << m_tileSize; >- encoder << m_spacing; >- encoder << m_imagePaintingOptions; >-} >- >-template<class Decoder> >-Optional<DrawTiledImage> DrawTiledImage::decode(Decoder& decoder) >-{ >- Optional<ImageHandle> imageHandle; >- decoder >> imageHandle; >- if (!imageHandle) >- return WTF::nullopt; >- >- Optional<FloatRect> destination; >- decoder >> destination; >- if (!destination) >- return WTF::nullopt; >- >- Optional<FloatPoint> source; >- decoder >> source; >- if (!source) >- return WTF::nullopt; >- >- Optional<FloatSize> tileSize; >- decoder >> tileSize; >- if (!tileSize) >- return WTF::nullopt; >- >- Optional<FloatSize> spacing; >- decoder >> spacing; >- if (!spacing) >- return WTF::nullopt; >- >- Optional<ImagePaintingOptions> imagePaintingOptions; >- decoder >> imagePaintingOptions; >- if (!imagePaintingOptions) >- return WTF::nullopt; >- >- return {{ *imageHandle->image, *destination, *source, *tileSize, *spacing, *imagePaintingOptions }}; >-} >- >-class DrawTiledScaledImage { >-public: >- static constexpr ItemType itemType = ItemType::DrawTiledScaledImage; >- static constexpr bool isInlineItem = false; >- static constexpr bool isDrawingItem = true; >- >- DrawTiledScaledImage(Image& image, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor, Image::TileRule hRule, Image::TileRule vRule, const ImagePaintingOptions& imagePaintingOptions) >- : m_image(image) >- , m_destination(destination) >- , m_source(source) >- , m_tileScaleFactor(tileScaleFactor) >- , m_hRule(hRule) >- , m_vRule(vRule) >- , m_imagePaintingOptions(imagePaintingOptions) >- { >- } >- >- const Image& image() const { return m_image.get(); } >- FloatRect source() const { return m_source; } >- FloatRect destination() const { return m_destination; } >- >- template<class Encoder> void encode(Encoder&) const; >- template<class Decoder> static Optional<DrawTiledScaledImage> decode(Decoder&); >- >- void apply(GraphicsContext&) const; >- >- Optional<FloatRect> globalBounds() const { return WTF::nullopt; } >- Optional<FloatRect> localBounds(const GraphicsContext&) const { return m_destination; } >- >-private: >- mutable Ref<Image> m_image; // FIXME: Drawing images can cause their animations to progress. This shouldn't have to be mutable. >- FloatRect m_destination; >- FloatRect m_source; >- FloatSize m_tileScaleFactor; >- Image::TileRule m_hRule; >- Image::TileRule m_vRule; >- ImagePaintingOptions m_imagePaintingOptions; >-}; >- >-template<class Encoder> >-void DrawTiledScaledImage::encode(Encoder& encoder) const >-{ >- ImageHandle imageHandle; >- imageHandle.image = m_image.ptr(); >- encoder << imageHandle; >- encoder << m_destination; >- encoder << m_source; >- encoder << m_tileScaleFactor; >- encoder << m_hRule; >- encoder << m_vRule; >- encoder << m_imagePaintingOptions; >-} >- >-template<class Decoder> >-Optional<DrawTiledScaledImage> DrawTiledScaledImage::decode(Decoder& decoder) >-{ >- Optional<ImageHandle> imageHandle; >- decoder >> imageHandle; >- if (!imageHandle) >- return WTF::nullopt; >- >- Optional<FloatRect> destination; >- decoder >> destination; >- if (!destination) >- return WTF::nullopt; >- >- Optional<FloatRect> source; >- decoder >> source; >- if (!source) >- return WTF::nullopt; >- >- Optional<FloatSize> tileScaleFactor; >- decoder >> tileScaleFactor; >- if (!tileScaleFactor) >- return WTF::nullopt; >- >- Image::TileRule hRule; >- if (!decoder.decode(hRule)) >- return WTF::nullopt; >- >- Image::TileRule vRule; >- if (!decoder.decode(vRule)) >- return WTF::nullopt; >- >- Optional<ImagePaintingOptions> imagePaintingOptions; >- decoder >> imagePaintingOptions; >- if (!imagePaintingOptions) >- return WTF::nullopt; >- >- return {{ *imageHandle->image, *destination, *source, *tileScaleFactor, hRule, vRule, *imagePaintingOptions }}; >-} >- > class DrawImageBuffer { > public: > static constexpr ItemType itemType = ItemType::DrawImageBuffer; >@@ -2566,9 +2314,6 @@ template<> struct EnumTraits<WebCore::DisplayList::ItemType> { > WebCore::DisplayList::ItemType::ClipPath, > WebCore::DisplayList::ItemType::ClipToDrawingCommands, > WebCore::DisplayList::ItemType::DrawGlyphs, >- WebCore::DisplayList::ItemType::DrawImage, >- WebCore::DisplayList::ItemType::DrawTiledImage, >- WebCore::DisplayList::ItemType::DrawTiledScaledImage, > WebCore::DisplayList::ItemType::DrawImageBuffer, > WebCore::DisplayList::ItemType::DrawNativeImage, > WebCore::DisplayList::ItemType::DrawPattern, >diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp b/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp >index ca73b7ab9ec0f50ddca771028acbc376db928663..34714123733130ec8fae6fa18cb107b892690634 100644 >--- a/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp >+++ b/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp >@@ -167,24 +167,6 @@ void Recorder::drawGlyphs(const Font& font, const GlyphBuffer& glyphBuffer, unsi > m_drawGlyphsRecorder.drawGlyphs(font, glyphBuffer, from, numGlyphs, startPoint, smoothingMode); > } > >-ImageDrawResult Recorder::drawImage(Image& image, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& imagePaintingOptions) >-{ >- append<DrawImage>(image, destination, source, imagePaintingOptions); >- return ImageDrawResult::DidRecord; >-} >- >-ImageDrawResult Recorder::drawTiledImage(Image& image, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize, const FloatSize& spacing, const ImagePaintingOptions& imagePaintingOptions) >-{ >- append<DrawTiledImage>(image, destination, source, tileSize, spacing, imagePaintingOptions); >- return ImageDrawResult::DidRecord; >-} >- >-ImageDrawResult Recorder::drawTiledImage(Image& image, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor, Image::TileRule hRule, Image::TileRule vRule, const ImagePaintingOptions& imagePaintingOptions) >-{ >- append<DrawTiledScaledImage>(image, destination, source, tileScaleFactor, hRule, vRule, imagePaintingOptions); >- return ImageDrawResult::DidRecord; >-} >- > void Recorder::drawImageBuffer(WebCore::ImageBuffer& imageBuffer, const FloatRect& destRect, const FloatRect& srcRect, const ImagePaintingOptions& options) > { > // FIXME: Call imageBuffer.flushDrawingContext() when <https://webkit.org/b/218773> is fixed. >diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h b/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h >index ffa1fe381d6c243d6c3507f2897e139f5f28e726..4aac45d75e0d2d15121c6f96fc8249d15b158c42 100644 >--- a/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h >+++ b/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h >@@ -102,10 +102,6 @@ private: > > void drawGlyphs(const Font&, const GlyphBuffer&, unsigned from, unsigned numGlyphs, const FloatPoint& anchorPoint, FontSmoothingMode) override; > >- ImageDrawResult drawImage(Image&, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions&) override; >- ImageDrawResult drawTiledImage(Image&, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize, const FloatSize& spacing, const ImagePaintingOptions&) override; >- ImageDrawResult drawTiledImage(Image&, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor, Image::TileRule hRule, Image::TileRule vRule, const ImagePaintingOptions&) override; >- > void drawImageBuffer(WebCore::ImageBuffer&, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions&) override; > void drawNativeImage(NativeImage&, const FloatSize& selfSize, const FloatRect& destRect, const FloatRect& srcRect, const ImagePaintingOptions&) override; > void drawPattern(Image&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing, const ImagePaintingOptions&) override; >diff --git a/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp b/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp >index 7b299a5f47197e9b0b0722b6348145bb0a6831c2..d61345573dc99100fb135490a5d2b13a80da3c70 100644 >--- a/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp >+++ b/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp >@@ -534,21 +534,6 @@ void CairoOperationRecorder::drawGlyphs(const Font& font, const GlyphBuffer& gly > state.strokeThickness, state.shadowOffset, state.shadowColor, fontSmoothing)); > } > >-ImageDrawResult CairoOperationRecorder::drawImage(Image& image, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& imagePaintingOptions) >-{ >- return GraphicsContextImpl::drawImageImpl(graphicsContext(), image, destination, source, imagePaintingOptions); >-} >- >-ImageDrawResult CairoOperationRecorder::drawTiledImage(Image& image, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize, const FloatSize& spacing, const ImagePaintingOptions& imagePaintingOptions) >-{ >- return GraphicsContextImpl::drawTiledImageImpl(graphicsContext(), image, destination, source, tileSize, spacing, imagePaintingOptions); >-} >- >-ImageDrawResult CairoOperationRecorder::drawTiledImage(Image& image, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor, Image::TileRule hRule, Image::TileRule vRule, const ImagePaintingOptions& imagePaintingOptions) >-{ >- return GraphicsContextImpl::drawTiledImageImpl(graphicsContext(), image, destination, source, tileScaleFactor, hRule, vRule, imagePaintingOptions); >-} >- > void CairoOperationRecorder::drawImageBuffer(ImageBuffer&, const FloatRect&, const FloatRect&, const ImagePaintingOptions&) > { > // FIXME: Not implemented. >diff --git a/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h b/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h >index 66eade85db1b51813fab3b75663fdaecadf662e0..45b443256fe55dc4d04fe05e25515757af656dcc 100644 >--- a/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h >+++ b/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h >@@ -64,10 +64,6 @@ private: > > void drawGlyphs(const WebCore::Font&, const WebCore::GlyphBuffer&, unsigned, unsigned, const WebCore::FloatPoint&, WebCore::FontSmoothingMode) override; > >- WebCore::ImageDrawResult drawImage(WebCore::Image&, const WebCore::FloatRect&, const WebCore::FloatRect&, const WebCore::ImagePaintingOptions&) override; >- WebCore::ImageDrawResult drawTiledImage(WebCore::Image&, const WebCore::FloatRect&, const WebCore::FloatPoint&, const WebCore::FloatSize&, const WebCore::FloatSize&, const WebCore::ImagePaintingOptions&) override; >- WebCore::ImageDrawResult drawTiledImage(WebCore::Image&, const WebCore::FloatRect&, const WebCore::FloatRect&, const WebCore::FloatSize&, WebCore::Image::TileRule, WebCore::Image::TileRule, const WebCore::ImagePaintingOptions&) override; >- > void drawImageBuffer(WebCore::ImageBuffer&, const WebCore::FloatRect& destination, const WebCore::FloatRect& source, const WebCore::ImagePaintingOptions&) override; > void drawNativeImage(WebCore::NativeImage&, const WebCore::FloatSize&, const WebCore::FloatRect&, const WebCore::FloatRect&, const WebCore::ImagePaintingOptions&) override; > void drawPattern(WebCore::Image&, const WebCore::FloatRect&, const WebCore::FloatRect&, const WebCore::AffineTransform&, const WebCore::FloatPoint&, const WebCore::FloatSize&, const WebCore::ImagePaintingOptions&) override; >diff --git a/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.cpp b/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.cpp >index 88a65f7bbec3ea14e5de4664c48c10061edbe337..1c61e42715719e3534c7a78293da86ed789b722e 100644 >--- a/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.cpp >+++ b/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.cpp >@@ -268,21 +268,6 @@ void GraphicsContextImplDirect2D::drawGlyphs(const Font& font, const GlyphBuffer > state.textDrawingMode, state.strokeThickness, state.shadowOffset, state.shadowColor); > } > >-ImageDrawResult GraphicsContextImplDirect2D::drawImage(Image& image, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& imagePaintingOptions) >-{ >- return GraphicsContextImpl::drawImageImpl(graphicsContext(), image, destination, source, imagePaintingOptions); >-} >- >-ImageDrawResult GraphicsContextImplDirect2D::drawTiledImage(Image& image, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize, const FloatSize& spacing, const ImagePaintingOptions& imagePaintingOptions) >-{ >- return GraphicsContextImpl::drawTiledImageImpl(graphicsContext(), image, destination, source, tileSize, spacing, imagePaintingOptions); >-} >- >-ImageDrawResult GraphicsContextImplDirect2D::drawTiledImage(Image& image, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor, Image::TileRule hRule, Image::TileRule vRule, const ImagePaintingOptions& imagePaintingOptions) >-{ >- return GraphicsContextImpl::drawTiledImageImpl(graphicsContext(), image, destination, source, tileScaleFactor, hRule, vRule, imagePaintingOptions); >-} >- > void GraphicsContextImplDirect2D::drawNativeImage(NativeImage& image, const FloatSize& imageSize, const FloatRect& destRect, const FloatRect& srcRect, const ImagePaintingOptions& options) > { > auto& state = graphicsContext().state(); >diff --git a/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.h b/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.h >index c197b489c2926ca658d735e7e133f92180ffc41b..54f0f8b2ee05def6211bebc640979a4069b9df13 100644 >--- a/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.h >+++ b/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.h >@@ -68,10 +68,6 @@ public: > > void drawGlyphs(const Font&, const GlyphBuffer&, unsigned, unsigned, const FloatPoint&, FontSmoothingMode) override; > >- ImageDrawResult drawImage(Image&, const FloatRect&, const FloatRect&, const ImagePaintingOptions&) override; >- ImageDrawResult drawTiledImage(Image&, const FloatRect&, const FloatPoint&, const FloatSize&, const FloatSize&, const ImagePaintingOptions&) override; >- ImageDrawResult drawTiledImage(Image&, const FloatRect&, const FloatRect&, const FloatSize&, Image::TileRule, Image::TileRule, const ImagePaintingOptions&) override; >- > bool drawImageBuffer(ImageBuffer&, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions&) override; > bool drawNativeImage(NativeImage&, const FloatSize& selfSize, const FloatRect& destRect, const FloatRect& srcRect, const ImagePaintingOptions&) override; > void drawPattern(Image&, const FloatRect&, const FloatRect&, const AffineTransform&, const FloatPoint&, const FloatSize&, const ImagePaintingOptions&) override; >diff --git a/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp b/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp >index afd4e9a1a23f127c2b38315004c22054ea0690e7..3b78b2cd956a282e7a6dfbd12b437fd5ede59297 100644 >--- a/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp >+++ b/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp >@@ -260,18 +260,12 @@ Optional<DisplayList::ItemHandle> WARN_UNUSED_RETURN RemoteRenderingBackend::dec > return decodeAndCreate<DisplayList::DrawFocusRingRects>(data, length, handleLocation); > case DisplayList::ItemType::DrawGlyphs: > return decodeAndCreate<DisplayList::DrawGlyphs>(data, length, handleLocation); >- case DisplayList::ItemType::DrawImage: >- return decodeAndCreate<DisplayList::DrawImage>(data, length, handleLocation); > case DisplayList::ItemType::DrawLinesForText: > return decodeAndCreate<DisplayList::DrawLinesForText>(data, length, handleLocation); > case DisplayList::ItemType::DrawPath: > return decodeAndCreate<DisplayList::DrawPath>(data, length, handleLocation); > case DisplayList::ItemType::DrawPattern: > return decodeAndCreate<DisplayList::DrawPattern>(data, length, handleLocation); >- case DisplayList::ItemType::DrawTiledImage: >- return decodeAndCreate<DisplayList::DrawTiledImage>(data, length, handleLocation); >- case DisplayList::ItemType::DrawTiledScaledImage: >- return decodeAndCreate<DisplayList::DrawTiledScaledImage>(data, length, handleLocation); > case DisplayList::ItemType::FillCompositedRect: > return decodeAndCreate<DisplayList::FillCompositedRect>(data, length, handleLocation); > case DisplayList::ItemType::FillPath: >diff --git a/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h b/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h >index 427cc45163b350669a83e3d78a2f26e2aedab35e..a69b64e3510b623ff7ebb7bb17a6b6bd4df6024f 100644 >--- a/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h >+++ b/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h >@@ -214,18 +214,12 @@ protected: > return IPC::Encoder::encodeSingleObject<WebCore::DisplayList::DrawFocusRingRects>(item.get<WebCore::DisplayList::DrawFocusRingRects>()); > case WebCore::DisplayList::ItemType::DrawGlyphs: > return IPC::Encoder::encodeSingleObject<WebCore::DisplayList::DrawGlyphs>(item.get<WebCore::DisplayList::DrawGlyphs>()); >- case WebCore::DisplayList::ItemType::DrawImage: >- return IPC::Encoder::encodeSingleObject<WebCore::DisplayList::DrawImage>(item.get<WebCore::DisplayList::DrawImage>()); > case WebCore::DisplayList::ItemType::DrawLinesForText: > return IPC::Encoder::encodeSingleObject<WebCore::DisplayList::DrawLinesForText>(item.get<WebCore::DisplayList::DrawLinesForText>()); > case WebCore::DisplayList::ItemType::DrawPath: > return IPC::Encoder::encodeSingleObject<WebCore::DisplayList::DrawPath>(item.get<WebCore::DisplayList::DrawPath>()); > case WebCore::DisplayList::ItemType::DrawPattern: > return IPC::Encoder::encodeSingleObject<WebCore::DisplayList::DrawPattern>(item.get<WebCore::DisplayList::DrawPattern>()); >- case WebCore::DisplayList::ItemType::DrawTiledImage: >- return IPC::Encoder::encodeSingleObject<WebCore::DisplayList::DrawTiledImage>(item.get<WebCore::DisplayList::DrawTiledImage>()); >- case WebCore::DisplayList::ItemType::DrawTiledScaledImage: >- return IPC::Encoder::encodeSingleObject<WebCore::DisplayList::DrawTiledScaledImage>(item.get<WebCore::DisplayList::DrawTiledScaledImage>()); > case WebCore::DisplayList::ItemType::FillCompositedRect: > return IPC::Encoder::encodeSingleObject<WebCore::DisplayList::FillCompositedRect>(item.get<WebCore::DisplayList::FillCompositedRect>()); > case WebCore::DisplayList::ItemType::FillPath:
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=413904">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 218839
: 413904