Title: [285240] branches/safari-613.1.7-branch/Source
- Revision
- 285240
- Author
- [email protected]
- Date
- 2021-11-03 16:29:26 -0700 (Wed, 03 Nov 2021)
Log Message
Cherry-pick r285110. rdar://problem/84994696
Unreviewed, reverting r285055.
Reverting because this commit may have caused
webgl/1.0.x/conformance/textures/misc/texture-corner-case-
videos.html and webgl/2.0.y/conformance/textures/misc/texture-
corner-case-videos.html to time out
Reverted changeset:
"Avoid sending video data to Web process for
canvas.drawImage(video)"
https://bugs.webkit.org/show_bug.cgi?id=230766
https://commits.webkit.org/r285055
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285110 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613.1.7-branch/Source/WebCore/ChangeLog (285239 => 285240)
--- branches/safari-613.1.7-branch/Source/WebCore/ChangeLog 2021-11-03 22:52:31 UTC (rev 285239)
+++ branches/safari-613.1.7-branch/Source/WebCore/ChangeLog 2021-11-03 23:29:26 UTC (rev 285240)
@@ -1,3 +1,39 @@
+2021-11-03 Alan Coon <[email protected]>
+
+ Cherry-pick r285110. rdar://problem/84994696
+
+ Unreviewed, reverting r285055.
+
+ Reverting because this commit may have caused
+ webgl/1.0.x/conformance/textures/misc/texture-corner-case-
+ videos.html and webgl/2.0.y/conformance/textures/misc/texture-
+ corner-case-videos.html to time out
+
+ Reverted changeset:
+
+ "Avoid sending video data to Web process for
+ canvas.drawImage(video)"
+ https://bugs.webkit.org/show_bug.cgi?id=230766
+ https://commits.webkit.org/r285055
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285110 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-11-01 Ayumi Kojima <[email protected]>
+
+ Unreviewed, reverting r285055.
+
+ Reverting because this commit may have caused
+ webgl/1.0.x/conformance/textures/misc/texture-corner-case-
+ videos.html and webgl/2.0.y/conformance/textures/misc/texture-
+ corner-case-videos.html to time out
+
+ Reverted changeset:
+
+ "Avoid sending video data to Web process for
+ canvas.drawImage(video)"
+ https://bugs.webkit.org/show_bug.cgi?id=230766
+ https://commits.webkit.org/r285055
+
2021-11-01 Daniel Kolesa <[email protected]>
Fix build with GCC 8.4 on Ubuntu 18.04
Modified: branches/safari-613.1.7-branch/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp (285239 => 285240)
--- branches/safari-613.1.7-branch/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2021-11-03 22:52:31 UTC (rev 285239)
+++ branches/safari-613.1.7-branch/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2021-11-03 23:29:26 UTC (rev 285240)
@@ -1677,19 +1677,17 @@
checkOrigin(&video);
#if USE(CG)
- if (!canvasBase().buffer()->isRemote()) {
- if (auto image = video.nativeImageForCurrentTime()) {
- c->drawNativeImage(*image, FloatSize(video.videoWidth(), video.videoHeight()), dstRect, srcRect);
+ if (auto image = video.nativeImageForCurrentTime()) {
+ c->drawNativeImage(*image, FloatSize(video.videoWidth(), video.videoHeight()), dstRect, srcRect);
- if (isEntireBackingStoreDirty())
- didDraw(std::nullopt);
- else if (rectContainsCanvas(dstRect))
- didDrawEntireCanvas();
- else
- didDraw(dstRect);
+ if (isEntireBackingStoreDirty())
+ didDraw(std::nullopt);
+ else if (rectContainsCanvas(dstRect))
+ didDrawEntireCanvas();
+ else
+ didDraw(dstRect);
- return { };
- }
+ return { };
}
#endif
Modified: branches/safari-613.1.7-branch/Source/WebCore/platform/graphics/ImageBuffer.h (285239 => 285240)
--- branches/safari-613.1.7-branch/Source/WebCore/platform/graphics/ImageBuffer.h 2021-11-03 22:52:31 UTC (rev 285239)
+++ branches/safari-613.1.7-branch/Source/WebCore/platform/graphics/ImageBuffer.h 2021-11-03 23:29:26 UTC (rev 285240)
@@ -71,7 +71,6 @@
virtual RenderingMode renderingMode() const = 0;
virtual bool canMapBackingStore() const = 0;
- virtual bool isRemote() const { return false; }
virtual RenderingResourceIdentifier renderingResourceIdentifier() const { return { }; }
virtual GraphicsContext& context() const = 0;
Modified: branches/safari-613.1.7-branch/Source/WebKit/ChangeLog (285239 => 285240)
--- branches/safari-613.1.7-branch/Source/WebKit/ChangeLog 2021-11-03 22:52:31 UTC (rev 285239)
+++ branches/safari-613.1.7-branch/Source/WebKit/ChangeLog 2021-11-03 23:29:26 UTC (rev 285240)
@@ -1,3 +1,39 @@
+2021-11-03 Alan Coon <[email protected]>
+
+ Cherry-pick r285110. rdar://problem/84994696
+
+ Unreviewed, reverting r285055.
+
+ Reverting because this commit may have caused
+ webgl/1.0.x/conformance/textures/misc/texture-corner-case-
+ videos.html and webgl/2.0.y/conformance/textures/misc/texture-
+ corner-case-videos.html to time out
+
+ Reverted changeset:
+
+ "Avoid sending video data to Web process for
+ canvas.drawImage(video)"
+ https://bugs.webkit.org/show_bug.cgi?id=230766
+ https://commits.webkit.org/r285055
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285110 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-11-01 Ayumi Kojima <[email protected]>
+
+ Unreviewed, reverting r285055.
+
+ Reverting because this commit may have caused
+ webgl/1.0.x/conformance/textures/misc/texture-corner-case-
+ videos.html and webgl/2.0.y/conformance/textures/misc/texture-
+ corner-case-videos.html to time out
+
+ Reverted changeset:
+
+ "Avoid sending video data to Web process for
+ canvas.drawImage(video)"
+ https://bugs.webkit.org/show_bug.cgi?id=230766
+ https://commits.webkit.org/r285055
+
2021-11-01 Daniel Kolesa <[email protected]>
Fix build with GCC 8.4 on Ubuntu 18.04
Modified: branches/safari-613.1.7-branch/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h (285239 => 285240)
--- branches/safari-613.1.7-branch/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h 2021-11-03 22:52:31 UTC (rev 285239)
+++ branches/safari-613.1.7-branch/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h 2021-11-03 23:29:26 UTC (rev 285240)
@@ -96,8 +96,6 @@
ASSERT(m_sentFlushIdentifier == targetFlushIdentifier);
}
- bool isRemote() const final { return true; }
-
protected:
RemoteImageBufferProxy(const WebCore::ImageBufferBackend::Parameters& parameters, RemoteRenderingBackendProxy& remoteRenderingBackendProxy)
: BaseConcreteImageBuffer(parameters)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
