237260 2022-02-27 15:52:36 -0800 [GPU Process] Canvas compositing buffer should be created through its GraphicsContext 2022-03-04 11:41:56 -0800 1 1 1 Unclassified WebKit Canvas WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 236508 1 sabouhallawa sabouhallawa bfulgham cdumez changseok dino esprehn+autocc ews-watchlist gyuyoung.kim jonlee simon.fraser webkit-bug-importer zalan oldest_to_newest 1846497 0 sabouhallawa 2022-02-27 15:52:36 -0800 This will guarantee the newly created ImageBuffer will inherit all the canvas drawing settings: colorSpace, renderingMode and renderingMethod. So if the backend of the underlying ImageBuffer of the canvas is remote the compositing ImageBuffer will also be remote. This will transfer the whole compositing operation to GPUProcess. This bug causes the layout test fast/canvas/canvas-composite-canvas.html to crash with the following call stack: Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.WebKit 0x0000000105ed3ef8 WTFCrashWithInfo(int, char const*, char const*, int) + 20 (Assertions.h:741) 1 com.apple.WebKit 0x00000001065412f8 WebKit::ImageBufferRemoteIOSurfaceBackend::draw(WebCore::GraphicsContext&, WebCore::FloatRect const&, WebCore::FloatRect const&, WebCore::ImagePaintingOptions const&) + 36 (ImageBufferRemoteIOSurfaceBackend.cpp:113) 2 com.apple.WebCore 0x000000011c110440 drawImageToContext + 28 (CanvasRenderingContext2DBase.cpp:1818) [inlined] 3 com.apple.WebCore 0x000000011c110440 void WebCore::CanvasRenderingContext2DBase::fullCanvasCompositedDrawImage<WebCore::ImageBuffer>(WebCore::ImageBuffer&, WebCore::FloatRect const&, WebCore::FloatRect const&, WebCore::CompositeOperator) + 660 (CanvasRenderingContext2DBase.cpp:1847) 4 com.apple.WebCore 0x000000011c10fe80 WebCore::CanvasRenderingContext2DBase::drawImage(WebCore::CanvasBase&, WebCore::FloatRect const&, WebCore::FloatRect const&) + 524 (CanvasRenderingContext2DBase.cpp:1610) 5 com.apple.WebCore 0x000000011c1150ac operator()<WTF::RefPtr<WebCore::HTMLCanvasElement> > + 76 (CanvasRenderingContext2DBase.cpp:1431) [inlined] 6 com.apple.WebCore 0x000000011c1150ac __invoke_constexpr<WTF::Visitor<(lambda at ./html/canvas/CanvasRenderingContext2DBase.cpp:1424:9), (lambda at ./html/canvas/CanvasRenderingContext2DBase.cpp:1429:9)>, WTF::RefPtr<WebCore::HTMLCanvasElement> &> + 76 (type_traits:3700) [inlined] 7 com.apple.WebCore 0x000000011c1150ac operator()<std::__variant_detail::__alt<1, WTF::RefPtr<WebCore::HTMLCanvasElement> > &> + 76 (variant:615) [inlined] 8 com.apple.WebCore 0x000000011c1150ac __invoke_constexpr<std::__variant_detail::__visitation::__variant::__value_visitor<WTF::Visitor<(lambda at ./html/canvas/CanvasRenderingContext2DBase.cpp:1424:9), (lambda at ./html/canvas/CanvasRenderingContext2DBase.cpp:1429:9)> >, std::__variant_detail::__alt<1, WTF::RefPtr<WebCore::HTMLCanvasElement> > &> + 76 (type_traits:3700) [inlined] 9 com.apple.WebCore 0x000000011c1150ac decltype(auto) std::__1::__variant_detail::__visitation::__base::__dispatcher<1ul>::__dispatch<std::__1::__variant_detail::__visitation::__variant::__value_visitor<WTF::Visitor<WebCore::CanvasRenderingContext2DBase::drawImage(std::__1::variant<WTF::RefPtr<WebCore::HTMLImageElement, WTF::RawPtrTraits<WebCore::HTMLImageElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLImageElement> >, WTF::RefPtr<WebCore::HTMLCanvasElement, WTF::RawPtrTraits<WebCore::HTMLCanvasElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLCanvasElement> >, WTF::RefPtr<WebCore::ImageBitmap, WTF::RawPtrTraits<WebCore::ImageBitmap>, WTF::DefaultRefDerefTraits<WebCore::ImageBitmap> >, WTF::RefPtr<WebCore::CSSStyleImageValue, WTF::RawPtrTraits<WebCore::CSSStyleImageValue>, WTF::DefaultRefDerefTraits<WebCore::CSSStyleImageValue> >, WTF::RefPtr<WebCore::HTMLVideoElement, WTF::RawPtrTraits<WebCore::HTMLVideoElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLVideoElement> > >&&, float, float)::$_0, WebCore::CanvasRenderingContext2DBase::drawImage(std::__1::variant<WTF::RefPtr<WebCore::HTMLImageElement, WTF::RawPtrTraits<WebCore::HTMLImageElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLImageElement> >, WTF::RefPtr<WebCore::HTMLCanvasElement, WTF::RawPtrTraits<WebCore::HTMLCanvasElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLCanvasElement> >, WTF::RefPtr<WebCore::ImageBitmap, WTF::RawPtrTraits<WebCore::ImageBitmap>, WTF::DefaultRefDerefTraits<WebCore::ImageBitmap> >, WTF::RefPtr<WebCore::CSSStyleImageValue, WTF::RawPtrTraits<WebCore::CSSStyleImageValue>, WTF::DefaultRefDerefTraits<WebCore::CSSStyleImageValue> >, WTF::RefPtr<WebCore::HTMLVideoElement, WTF::RawPtrTraits<WebCore::HTMLVideoElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLVideoElement> > >&&, float, float)::$_1> >&&, std::__1::__variant_detail::__base<(std::__1::__variant_detail::_Trait)1, WTF::RefPtr<WebCore::HTMLImageElement, WTF::RawPtrTraits<WebCore::HTMLImageElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLImageElement> >, WTF::RefPtr<WebCore::HTMLCanvasElement, WTF::RawPtrTraits<WebCore::HTMLCanvasElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLCanvasElement> >, WTF::RefPtr<WebCore::ImageBitmap, WTF::RawPtrTraits<WebCore::ImageBitmap>, WTF::DefaultRefDerefTraits<WebCore::ImageBitmap> >, WTF::RefPtr<WebCore::CSSStyleImageValue, WTF::RawPtrTraits<WebCore::CSSStyleImageValue>, WTF::DefaultRefDerefTraits<WebCore::CSSStyleImageValue> >, WTF::RefPtr<WebCore::HTMLVideoElement, WTF::RawPtrTraits<WebCore::HTMLVideoElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLVideoElement> > >&>(std::__1::__variant_detail::__visitation::__variant::__value_visitor<WTF::Visitor<WebCore::CanvasRenderingContext2DBase::drawImage(std::__1::variant<WTF::RefPtr<WebCore::HTMLImageElement, WTF::RawPtrTraits<WebCore::HTMLImageElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLImageElement> >, WTF::RefPtr<WebCore::HTMLCanvasElement, WTF::RawPtrTraits<WebCore::HTMLCanvasElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLCanvasElement> >, WTF::RefPtr<WebCore::ImageBitmap, WTF::RawPtrTraits<WebCore::ImageBitmap>, WTF::DefaultRefDerefTraits<WebCore::ImageBitmap> >, WTF::RefPtr<WebCore::CSSStyleImageValue, WTF::RawPtrTraits<WebCore::CSSStyleImageValue>, WTF::DefaultRefDerefTraits<WebCore::CSSStyleImageValue> >, WTF::RefPtr<WebCore::HTMLVideoElement, WTF::RawPtrTraits<WebCore::HTMLVideoElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLVideoElement> > >&&, float, float)::$_0, WebCore::CanvasRenderingContext2DBase::drawImage(std::__1::variant<WTF::RefPtr<WebCore::HTMLImageElement, WTF::RawPtrTraits<WebCore::HTMLImageElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLImageElement> >, WTF::RefPtr<WebCore::HTMLCanvasElement, WTF::RawPtrTraits<WebCore::HTMLCanvasElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLCanvasElement> >, WTF::RefPtr<WebCore::ImageBitmap, WTF::RawPtrTraits<WebCore::ImageBitmap>, WTF::DefaultRefDerefTraits<WebCore::ImageBitmap> >, WTF::RefPtr<WebCore::CSSStyleImageValue, WTF::RawPtrTraits<WebCore::CSSStyleImageValue>, WTF::DefaultRefDerefTraits<WebCore::CSSStyleImageValue> >, WTF::RefPtr<WebCore::HTMLVideoElement, WTF::RawPtrTraits<WebCore::HTMLVideoElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLVideoElement> > >&&, float, float)::$_1> >&&, std::__1::__variant_detail::__base<(std::__1::__variant_detail::_Trait)1, WTF::RefPtr<WebCore::HTMLImageElement, WTF::RawPtrTraits<WebCore::HTMLImageElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLImageElement> >, WTF::RefPtr<WebCore::HTMLCanvasElement, WTF::RawPtrTraits<WebCore::HTMLCanvasElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLCanvasElement> >, WTF::RefPtr<WebCore::ImageBitmap, WTF::RawPtrTraits<WebCore::ImageBitmap>, WTF::DefaultRefDerefTraits<WebCore::ImageBitmap> >, WTF::RefPtr<WebCore::CSSStyleImageValue, WTF::RawPtrTraits<WebCore::CSSStyleImageValue>, WTF::DefaultRefDerefTraits<WebCore::CSSStyleImageValue> >, WTF::RefPtr<WebCore::HTMLVideoElement, WTF::RawPtrTraits<WebCore::HTMLVideoElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLVideoElement> > >&) + 112 (variant:497) 10 com.apple.WebCore 0x000000011c10eda0 __visit_alt<std::__variant_detail::__visitation::__variant::__value_visitor<WTF::Visitor<(lambda at ./html/canvas/CanvasRenderingContext2DBase.cpp:1424:9), (lambda at ./html/canvas/CanvasRenderingContext2DBase.cpp:1429:9)> >, std::__variant_detail::__impl<WTF::RefPtr<WebCore::HTMLImageElement>, WTF::RefPtr<WebCore::HTMLCanvasElement>, WTF::RefPtr<WebCore::ImageBitmap>, WTF::RefPtr<WebCore::CSSStyleImageValue>, WTF::RefPtr<WebCore::HTMLVideoElement> > &> + 20 (variant:460) [inlined] 11 com.apple.WebCore 0x000000011c10eda0 __visit_alt<std::__variant_detail::__visitation::__variant::__value_visitor<WTF::Visitor<(lambda at ./html/canvas/CanvasRenderingContext2DBase.cpp:1424:9), (lambda at ./html/canvas/CanvasRenderingContext2DBase.cpp:1429:9)> >, std::variant<WTF::RefPtr<WebCore::HTMLImageElement>, WTF::RefPtr<WebCore::HTMLCanvasElement>, WTF::RefPtr<WebCore::ImageBitmap>, WTF::RefPtr<WebCore::CSSStyleImageValue>, WTF::RefPtr<WebCore::HTMLVideoElement> > &> + 20 (variant:567) [inlined] 12 com.apple.WebCore 0x000000011c10eda0 __visit_value<WTF::Visitor<(lambda at ./html/canvas/CanvasRenderingContext2DBase.cpp:1424:9), (lambda at ./html/canvas/CanvasRenderingContext2DBase.cpp:1429:9)>, std::variant<WTF::RefPtr<WebCore::HTMLImageElement>, WTF::RefPtr<WebCore::HTMLCanvasElement>, WTF::RefPtr<WebCore::ImageBitmap>, WTF::RefPtr<WebCore::CSSStyleImageValue>, WTF::RefPtr<WebCore::HTMLVideoElement> > &> + 24 (variant:585) [inlined] 13 com.apple.WebCore 0x000000011c10eda0 visit<WTF::Visitor<(lambda at ./html/canvas/CanvasRenderingContext2DBase.cpp:1424:9), (lambda at ./html/canvas/CanvasRenderingContext2DBase.cpp:1429:9)>, std::variant<WTF::RefPtr<WebCore::HTMLImageElement>, WTF::RefPtr<WebCore::HTMLCanvasElement>, WTF::RefPtr<WebCore::ImageBitmap>, WTF::RefPtr<WebCore::CSSStyleImageValue>, WTF::RefPtr<WebCore::HTMLVideoElement> > &> + 40 (variant:1654) [inlined] 14 com.apple.WebCore 0x000000011c10eda0 switchOn<std::variant<WTF::RefPtr<WebCore::HTMLImageElement>, WTF::RefPtr<WebCore::HTMLCanvasElement>, WTF::RefPtr<WebCore::ImageBitmap>, WTF::RefPtr<WebCore::CSSStyleImageValue>, WTF::RefPtr<WebCore::HTMLVideoElement> > &, (lambda at ./html/canvas/CanvasRenderingContext2DBase.cpp:1424:9), (lambda at ./html/canvas/CanvasRenderingContext2DBase.cpp:1429:9)> + 56 (StdLibExtras.h:392) [inlined] 15 com.apple.WebCore 0x000000011c10eda0 WebCore::CanvasRenderingContext2DBase::drawImage(std::__1::variant<WTF::RefPtr<WebCore::HTMLImageElement, WTF::RawPtrTraits<WebCore::HTMLImageElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLImageElement> >, WTF::RefPtr<WebCore::HTMLCanvasElement, WTF::RawPtrTraits<WebCore::HTMLCanvasElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLCanvasElement> >, WTF::RefPtr<WebCore::ImageBitmap, WTF::RawPtrTraits<WebCore::ImageBitmap>, WTF::DefaultRefDerefTraits<WebCore::ImageBitmap> >, WTF::RefPtr<WebCore::CSSStyleImageValue, WTF::RawPtrTraits<WebCore::CSSStyleImageValue>, WTF::DefaultRefDerefTraits<WebCore::CSSStyleImageValue> >, WTF::RefPtr<WebCore::HTMLVideoElement, WTF::RawPtrTraits<WebCore::HTMLVideoElement>, WTF::DefaultRefDerefTraits<WebCore::HTMLVideoElement> > >&&, float, float) + 76 (CanvasRenderingContext2DBase.cpp:1423) 16 com.apple.WebCore 0x000000011b0292b8 operator() + 24 (JSCanvasRenderingContext2D.cpp:1826) [inlined] 17 com.apple.WebCore 0x000000011b0292b8 toJS<WebCore::IDLUndefined, (lambda at /Volumes/Data/worker/ios-simulator-15-release/build/WebKitBuild/Release-iphonesimulator/DerivedSources/WebCore/JSCanvasRenderingContext2D.cpp:1826:5)> + 24 (JSDOMConvertBase.h:168) [inlined] 18 com.apple.WebCore 0x000000011b0292b8 jsCanvasRenderingContext2DPrototypeFunction_drawImage1Body + 72 (JSCanvasRenderingContext2D.cpp:1826) [inlined] 19 com.apple.WebCore 0x000000011b0292b8 jsCanvasRenderingContext2DPrototypeFunction_drawImageOverloadDispatcher + 624 (JSCanvasRenderingContext2D.cpp:1903) [inlined] 20 com.apple.WebCore 0x000000011b0292b8 call<&WebCore::jsCanvasRenderingContext2DPrototypeFunction_drawImageOverloadDispatcher, WebCore::CastedThisErrorBehavior::Throw> + 624 (JSDOMOperation.h:63) [inlined] 21 com.apple.WebCore 0x000000011b0292b8 WebCore::jsCanvasRenderingContext2DPrototypeFunction_drawImage(JSC::JSGlobalObject*, JSC::CallFrame*) + 1036 (JSCanvasRenderingContext2D.cpp:1916) 1846500 1 453357 sabouhallawa 2022-02-27 15:55:19 -0800 Created attachment 453357 Patch 1846687 2 453357 simon.fraser 2022-02-28 10:26:45 -0800 Comment on attachment 453357 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453357&action=review > Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp:1833 > - auto buffer = createCompositingBuffer(bufferRect); > - if (!buffer) > - return; > - > auto* c = drawingContext(); > if (!c) > return; > > + auto buffer = c->createImageBuffer(bufferRect.size()); > + if (!buffer) > + return; I'm confused by this ordering change. Doesn't drawingContext() need to get the context from the image buffer? 1846735 3 453357 sabouhallawa 2022-02-28 13:01:24 -0800 Comment on attachment 453357 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453357&action=review >> Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp:1833 >> + return; > > I'm confused by this ordering change. Doesn't drawingContext() need to get the context from the image buffer? drawingContext() returns the GraphicsContext of CanvasBase::m_imageBuffer which must have been created before entering this function. But 'buffer' is just a scratch ImageBuffer that we need to create for compositing the image to the drawingContext(). The fix just made it compatible with drawingContext(). In fact the reordering should not have any effect even without the new way to create the 'buffer'. 1847559 4 sabouhallawa 2022-03-02 12:08:12 -0800 *** Bug 236929 has been marked as a duplicate of this bug. *** 1847561 5 sabouhallawa 2022-03-02 12:09:30 -0800 rdar://89196918 1847565 6 453647 sabouhallawa 2022-03-02 12:14:27 -0800 Created attachment 453647 Patch 1848360 7 ews-feeder 2022-03-04 11:41:51 -0800 Committed r290839 (248075@main): <https://commits.webkit.org/248075@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453647. 453357 2022-02-27 15:55:19 -0800 2022-03-02 12:14:23 -0800 Patch bug-237260-20220227155518.patch text/plain 3451 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDZmNWEyYjFhNDAzNjU5 ODJiYjVjYmE5ODQ2MzI5ZDIxYWM2ODhlMi4uMWNiNzk3ZDJkYTBkNzEwZmUxZTViNGI4MzM5NTNi MzNiNzA0YTQ0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAyLTI3ICBTYWlk IEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUuY29tPgorCisgICAgICAgIFtHUFUgUHJvY2Vzc10g Q2FudmFzIGNvbXBvc2l0aW5nIGJ1ZmZlciBzaG91bGQgYmUgY3JlYXRlZCB0aHJvdWdoIGl0cyBH cmFwaGljc0NvbnRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzNzI2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIElmIHRoZSBiYWNrZW5kIG9mIHRoZSB1bmRlcmx5aW5nIEltYWdlQnVmZmVyIG9mIHRo ZSBjYW52YXMgaXMgcmVtb3RlIHRoZQorICAgICAgICBjb21wb3NpdGluZyBJbWFnZUJ1ZmZlciB3 aWxsIGFsc28gYmUgcmVtb3RlLiBUaGlzIHdpbGwgdHJhbnNmZXIgdGhlIHdob2xlCisgICAgICAg IGNvbXBvc2l0aW5nIG9wZXJhdGlvbiB0byBHUFVQcm9jZXNzLgorCisgICAgICAgIFRoZSBsYXlv dXQgdGVzdCBmYXN0L2NhbnZhcy9jYW52YXMtY29tcG9zaXRlLWNhbnZhcy5odG1sIGNyYXNoZXMg YmVjYXVzZQorICAgICAgICBvZiB0aGlzIGJ1ZyBvbiB0aGUgR1BVUCBsYXlvdXQgYm90cy4KKwor ICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2UuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZTo6ZnVsbENhbnZh c0NvbXBvc2l0ZWREcmF3SW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzUmVuZGVyaW5n Q29udGV4dDJEQmFzZTo6Y3JlYXRlQ29tcG9zaXRpbmdCdWZmZXIpOiBEZWxldGVkLgorICAgICAg ICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2UuaDoKKwogMjAyMi0w Mi0yNCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbUmVmYWN0 b3JdIEFkb3B0IExvZ2dlckhlbHBlciBpbiBMb2dnaW5nIEVNRSBjbGFzc2VzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQy REJhc2UuY3BwCmluZGV4IGY2MzFlNGY5YTdiMGUxNzIxNGFjNWEwMmEzMDc0Mjg5ZmMwNWY3MjQu LjU1ZjcwNjllOGY2YTA2MGM5ZDYwMGQ4ZTBkNDYyMGExOGIzYzVmNjQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQy REJhc2UuY3BwCkBAIC0xNzgyLDExICsxNzgyLDYgQEAgdGVtcGxhdGU8Y2xhc3MgVD4gSW50UmVj dCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlOjpjYWxjdWxhdGVDb21wb3NpdGluZ0J1ZmYK ICAgICByZXR1cm4gYnVmZmVyUmVjdDsKIH0KIAotUmVmUHRyPEltYWdlQnVmZmVyPiBDYW52YXNS ZW5kZXJpbmdDb250ZXh0MkRCYXNlOjpjcmVhdGVDb21wb3NpdGluZ0J1ZmZlcihjb25zdCBJbnRS ZWN0JiBidWZmZXJSZWN0KQotewotICAgIHJldHVybiBJbWFnZUJ1ZmZlcjo6Y3JlYXRlKGJ1ZmZl clJlY3Quc2l6ZSgpLCBpc0FjY2VsZXJhdGVkKCkgPyBSZW5kZXJpbmdNb2RlOjpBY2NlbGVyYXRl ZCA6IFJlbmRlcmluZ01vZGU6OlVuYWNjZWxlcmF0ZWQsIDEsIGNvbG9yU3BhY2UoKSwgcGl4ZWxG b3JtYXQoKSk7Ci19Ci0KIHZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZTo6Y29tcG9z aXRlQnVmZmVyKEltYWdlQnVmZmVyJiBidWZmZXIsIGNvbnN0IEludFJlY3QmIGJ1ZmZlclJlY3Qs IENvbXBvc2l0ZU9wZXJhdG9yIG9wKQogewogICAgIEludFJlY3QgY2FudmFzUmVjdCgwLCAwLCBj YW52YXNCYXNlKCkud2lkdGgoKSwgY2FudmFzQmFzZSgpLmhlaWdodCgpKTsKQEAgLTE4MjksMTQg KzE4MjQsMTQgQEAgdGVtcGxhdGU8Y2xhc3MgVD4gdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0 MkRCYXNlOjpmdWxsQ2FudmFzQ29tcG9zaXRlZERyYXdJbWEKICAgICAgICAgcmV0dXJuOwogICAg IH0KIAotICAgIGF1dG8gYnVmZmVyID0gY3JlYXRlQ29tcG9zaXRpbmdCdWZmZXIoYnVmZmVyUmVj dCk7Ci0gICAgaWYgKCFidWZmZXIpCi0gICAgICAgIHJldHVybjsKLQogICAgIGF1dG8qIGMgPSBk cmF3aW5nQ29udGV4dCgpOwogICAgIGlmICghYykKICAgICAgICAgcmV0dXJuOwogCisgICAgYXV0 byBidWZmZXIgPSBjLT5jcmVhdGVJbWFnZUJ1ZmZlcihidWZmZXJSZWN0LnNpemUoKSk7CisgICAg aWYgKCFidWZmZXIpCisgICAgICAgIHJldHVybjsKKwogICAgIEZsb2F0UmVjdCBhZGp1c3RlZERl c3QgPSBkZXN0OwogICAgIGFkanVzdGVkRGVzdC5zZXRMb2NhdGlvbihGbG9hdFBvaW50KDAsIDAp KTsKICAgICBBZmZpbmVUcmFuc2Zvcm0gZWZmZWN0aXZlVHJhbnNmb3JtID0gYy0+Z2V0Q1RNKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdD b250ZXh0MkRCYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJp bmdDb250ZXh0MkRCYXNlLmgKaW5kZXggZTk2M2M2NzdjMDhkM2IwOWUwNWExMDY0MjMwZTZjZGEy MjkyYjFkMy4uNGE3YTQzYTdjZmZlODI2YWY4NGI3MDEzMjAyZjJiOTNlNDg2ZGI0YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJE QmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0Nv bnRleHQyREJhc2UuaApAQCAtMzg1LDcgKzM4NSw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCByZWN0 Q29udGFpbnNDYW52YXMoY29uc3QgRmxvYXRSZWN0JikgY29uc3Q7CiAKICAgICB0ZW1wbGF0ZTxj bGFzcyBUPiBJbnRSZWN0IGNhbGN1bGF0ZUNvbXBvc2l0aW5nQnVmZmVyUmVjdChjb25zdCBUJiwg SW50U2l6ZSopOwotICAgIFJlZlB0cjxJbWFnZUJ1ZmZlcj4gY3JlYXRlQ29tcG9zaXRpbmdCdWZm ZXIoY29uc3QgSW50UmVjdCYpOwogICAgIHZvaWQgY29tcG9zaXRlQnVmZmVyKEltYWdlQnVmZmVy JiwgY29uc3QgSW50UmVjdCYsIENvbXBvc2l0ZU9wZXJhdG9yKTsKIAogICAgIHZvaWQgaW5mbGF0 ZVN0cm9rZVJlY3QoRmxvYXRSZWN0JikgY29uc3Q7Cg== 453647 2022-03-02 12:14:27 -0800 2022-03-04 11:41:54 -0800 Patch bug-237260-20220302121426.patch text/plain 5080 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTFmNWYwNGUzZTAyNGUy NzlhNDdhOTcwNWZjOWM5Y2Q4YjYwZWJmNC4uOWZmMzVmNGJmNzYxY2FiMjFjMjNhODJhMjQxNGFl ZGMyZThlZTlhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAzLTAyICBTYWlk IEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUuY29tPgorCisgICAgICAgIFtHUFUgUHJvY2Vzc10g Q2FudmFzIGNvbXBvc2l0aW5nIGJ1ZmZlciBzaG91bGQgYmUgY3JlYXRlZCB0aHJvdWdoIGl0cyBH cmFwaGljc0NvbnRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzNzI2MAorICAgICAgICByZGFyOi8vODkxOTY5MTgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJZiB0aGUgYmFja2VuZCBvZiB0aGUgdW5k ZXJseWluZyBJbWFnZUJ1ZmZlciBvZiB0aGUgY2FudmFzIGlzIHJlbW90ZSB0aGUKKyAgICAgICAg Y29tcG9zaXRpbmcgSW1hZ2VCdWZmZXIgd2lsbCBhbHNvIGJlIHJlbW90ZS4gVGhpcyB3aWxsIHRy YW5zZmVyIHRoZSB3aG9sZQorICAgICAgICBjb21wb3NpdGluZyBvcGVyYXRpb24gdG8gR1BVUHJv Y2Vzcy4KKworICAgICAgICBUaGUgbGF5b3V0IHRlc3QgZmFzdC9jYW52YXMvY2FudmFzLWNvbXBv c2l0ZS1jYW52YXMuaHRtbCBjcmFzaGVzIGJlY2F1c2UKKyAgICAgICAgb2YgdGhpcyBidWcgb24g dGhlIEdQVVAgbGF5b3V0IGJvdHMuCisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNSZW5k ZXJpbmdDb250ZXh0MkRCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc1JlbmRlcmlu Z0NvbnRleHQyREJhc2U6OmZ1bGxDYW52YXNDb21wb3NpdGVkRHJhd0ltYWdlKToKKyAgICAgICAg KFdlYkNvcmU6OkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2U6OmNyZWF0ZUNvbXBvc2l0aW5n QnVmZmVyKTogRGVsZXRlZC4KKyAgICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdD b250ZXh0MkRCYXNlLmg6CisKIDIwMjItMDMtMDIgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQHdl YmtpdC5vcmc+CiAKICAgICAgICAgW3dlYi1hbmltYXRpb25zXSBzZXR0aW5nIHRoZSBjb21wb3Np dGUgcHJvcGVydHkgb24gYSBrZXlmcmFtZSBlZmZlY3Qgc2hvdWxkIGludmFsaWRhdGUgdGhlIHRh cmdldCBzdHlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFz UmVuZGVyaW5nQ29udGV4dDJEQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9D YW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlLmNwcAppbmRleCBjNjc4MDkyMTZiOTRhNTZiZWI4 YjMyYmM5NmY0YmUxZWVjM2I3YTY3Li4wZTc4MDYzZTNhNDFjYmM2OTBmMGQwY2NiNzg4MTE3ZGU2 OTM4YTAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5k ZXJpbmdDb250ZXh0MkRCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9D YW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlLmNwcApAQCAtMTc4MiwxMSArMTc4Miw2IEBAIHRl bXBsYXRlPGNsYXNzIFQ+IEludFJlY3QgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZTo6Y2Fs Y3VsYXRlQ29tcG9zaXRpbmdCdWZmCiAgICAgcmV0dXJuIGJ1ZmZlclJlY3Q7CiB9CiAKLVJlZlB0 cjxJbWFnZUJ1ZmZlcj4gQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZTo6Y3JlYXRlQ29tcG9z aXRpbmdCdWZmZXIoY29uc3QgSW50UmVjdCYgYnVmZmVyUmVjdCkKLXsKLSAgICByZXR1cm4gSW1h Z2VCdWZmZXI6OmNyZWF0ZShidWZmZXJSZWN0LnNpemUoKSwgaXNBY2NlbGVyYXRlZCgpID8gUmVu ZGVyaW5nTW9kZTo6QWNjZWxlcmF0ZWQgOiBSZW5kZXJpbmdNb2RlOjpVbmFjY2VsZXJhdGVkLCAx LCBjb2xvclNwYWNlKCksIHBpeGVsRm9ybWF0KCkpOwotfQotCiB2b2lkIENhbnZhc1JlbmRlcmlu Z0NvbnRleHQyREJhc2U6OmNvbXBvc2l0ZUJ1ZmZlcihJbWFnZUJ1ZmZlciYgYnVmZmVyLCBjb25z dCBJbnRSZWN0JiBidWZmZXJSZWN0LCBDb21wb3NpdGVPcGVyYXRvciBvcCkKIHsKICAgICBJbnRS ZWN0IGNhbnZhc1JlY3QoMCwgMCwgY2FudmFzQmFzZSgpLndpZHRoKCksIGNhbnZhc0Jhc2UoKS5o ZWlnaHQoKSk7CkBAIC0xODI5LDE0ICsxODI0LDE0IEBAIHRlbXBsYXRlPGNsYXNzIFQ+IHZvaWQg Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZTo6ZnVsbENhbnZhc0NvbXBvc2l0ZWREcmF3SW1h CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBhdXRvIGJ1ZmZlciA9IGNyZWF0ZUNvbXBv c2l0aW5nQnVmZmVyKGJ1ZmZlclJlY3QpOwotICAgIGlmICghYnVmZmVyKQotICAgICAgICByZXR1 cm47Ci0KICAgICBhdXRvKiBjID0gZHJhd2luZ0NvbnRleHQoKTsKICAgICBpZiAoIWMpCiAgICAg ICAgIHJldHVybjsKIAorICAgIGF1dG8gYnVmZmVyID0gYy0+Y3JlYXRlSW1hZ2VCdWZmZXIoYnVm ZmVyUmVjdC5zaXplKCkpOworICAgIGlmICghYnVmZmVyKQorICAgICAgICByZXR1cm47CisKICAg ICBGbG9hdFJlY3QgYWRqdXN0ZWREZXN0ID0gZGVzdDsKICAgICBhZGp1c3RlZERlc3Quc2V0TG9j YXRpb24oRmxvYXRQb2ludCgwLCAwKSk7CiAgICAgQWZmaW5lVHJhbnNmb3JtIGVmZmVjdGl2ZVRy YW5zZm9ybSA9IGMtPmdldENUTSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9j YW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZS5oIGIvU291cmNlL1dlYkNvcmUvaHRt bC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZS5oCmluZGV4IGU5NjNjNjc3YzA4 ZDNiMDllMDVhMTA2NDIzMGU2Y2RhMjI5MmIxZDMuLjRhN2E0M2E3Y2ZmZTgyNmFmODRiNzAxMzIw MmYyYjkzZTQ4NmRiNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0Nh bnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2Nh bnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlLmgKQEAgLTM4NSw3ICszODUsNiBAQCBw cml2YXRlOgogICAgIGJvb2wgcmVjdENvbnRhaW5zQ2FudmFzKGNvbnN0IEZsb2F0UmVjdCYpIGNv bnN0OwogCiAgICAgdGVtcGxhdGU8Y2xhc3MgVD4gSW50UmVjdCBjYWxjdWxhdGVDb21wb3NpdGlu Z0J1ZmZlclJlY3QoY29uc3QgVCYsIEludFNpemUqKTsKLSAgICBSZWZQdHI8SW1hZ2VCdWZmZXI+ IGNyZWF0ZUNvbXBvc2l0aW5nQnVmZmVyKGNvbnN0IEludFJlY3QmKTsKICAgICB2b2lkIGNvbXBv c2l0ZUJ1ZmZlcihJbWFnZUJ1ZmZlciYsIGNvbnN0IEludFJlY3QmLCBDb21wb3NpdGVPcGVyYXRv cik7CiAKICAgICB2b2lkIGluZmxhdGVTdHJva2VSZWN0KEZsb2F0UmVjdCYpIGNvbnN0OwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmlu ZGV4IGQ3YWQzNTFkZTJkNWY2MDdiMzQwOThhNTY3ZWY2NDBkZDA3ZTJiZGMuLjhmMjY0Y2ExYzJm MDRlNDRlMmJhZTI1NDNlYzZmMjQ1NjU2ZWE3YzEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0No YW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAy Mi0wMy0wMiAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlkQGFwcGxlLmNvbT4KKworICAgICAgICBb R1BVIFByb2Nlc3NdIENhbnZhcyBjb21wb3NpdGluZyBidWZmZXIgc2hvdWxkIGJlIGNyZWF0ZWQg dGhyb3VnaCBpdHMgR3JhcGhpY3NDb250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzcyNjAKKyAgICAgICAgcmRhcjovLzg5MTk2OTE4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBncHUtcHJvY2Vz cy9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDIyLTAzLTAyICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0 c0B3ZWJraXQub3JnPgogCiAgICAgICAgIE91dGxpbmUtd2lkdGggd2l0aCB0cmFuc2l0aW9uIGRv bid0IGFuaW1hdGUgY29ycmVjdGx5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9ncHUtcHJvY2Vz cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvZ3B1LXByb2Nlc3MvVGVzdEV4cGVjdGF0 aW9ucwppbmRleCBkNzkxZTJkODIwZDk1NDk0ZWQxODgyMTM2NDg1NWE1ZTcyOGJlYzg1Li4yNzRl NzZlZDExZDU1MDA3ZGFkNzc5NzU5NGY1NjFiZDU1OTZjNGRlIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9ncHUtcHJvY2Vzcy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL2dwdS1w cm9jZXNzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTMxMyw5ICszMTMsNiBAQCB3ZWJraXQub3JnL2Iv MjM2OTI3IGZhc3QvZm9ybXMvaW9zL2Nob29zZS1zZWxlY3Qtb3B0aW9uLmh0bWwgWyBUaW1lb3V0 IFBhc3MgXQogd2Via2l0Lm9yZy9iLzIzNjkyNyBmYXN0L2Zvcm1zL2F1dG9mb2N1cy1yZWFkb25s eS1hdHRyaWJ1dGUuaHRtbCBbIEZhaWx1cmUgUGFzcyBdCiB3ZWJraXQub3JnL2IvMjM2OTI3IGZh c3QvZm9ybXMvaW5wdXQtdGV4dC1hdXRvZm9jdXMuaHRtbCBbIFBhc3MgRmFpbHVyZSBdCiAKLSMg Q3Jhc2hlcwotd2Via2l0Lm9yZy9iLzIzNjkyOSBmYXN0L2NhbnZhcy9jYW52YXMtY29tcG9zaXRl LWNhbnZhcy5odG1sIFsgQ3Jhc2ggXQotCiAjIEZsYWt5IHRpbWVvdXQKIHdlYmtpdC5vcmcvYi8y MzY5MzEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nzb20tdmlldy9zY3Jv bGwtYmVoYXZpb3ItbWFpbi1mcmFtZS13aW5kb3cuaHRtbCBbIFRpbWVvdXQgUGFzcyBdCiB3ZWJr aXQub3JnL2IvMjM2OTMxIGNvbXBvc2l0aW5nL2hpZHBpLW5vbi1zaW1wbGUtY29tcG9zaXRpbmct bGF5ZXItd2l0aC1mcmFjdGlvbmFsLXNpemUtYW5kLWJhY2tncm91bmQuaHRtbCBbIFRpbWVvdXQg UGFzcyBdCg==