185216 2018-05-02 14:17:40 -0700 Hiding then showing an <object> of type image makes the underlaying image disappear 2018-05-02 18:18:02 -0700 1 1 1 Unclassified WebKit Images WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sabouhallawa sabouhallawa cdumez commit-queue dbates esprehn+autocc ews-watchlist gyuyoung.kim japhet simon.fraser thorton webkit-bug-importer youennf oldest_to_newest 1419849 0 339339 sabouhallawa 2018-05-02 14:17:40 -0700 Created attachment 339339 test case Open the attached test case. The test case contains an <object> element of type image. The script hides the <object> then it shows the <object> again. Result: An outline rectangle is drawn. Expected: The underlaying image of the <object> element is shown. The reason for this bug is the following: -- The ImageLoader and the <object> element stay alive but the RenderImage is destroyed when the element is made hidden. -- When the <object> element is shown again, a new RenderImage is created. -- ImageLoader::updateFromElement() does not call updateRenderer() or dispatchPendingBeforeLoadEvent() because the image is already loaded i.e. (newImage == oldImage). -- Therefore we do not set the CachedImage of the RenderImageResource of the RenderImage. -- When RenderImage::paintReplaced() is called after the image is made visible again, it does not find a CachedImage for its RenderImageResource. -- So RenderImage::paintReplaced() draws an outline rectangle instead. 1419852 1 sabouhallawa 2018-05-02 14:18:41 -0700 <rdar://problem/39055630> 1419868 2 339343 sabouhallawa 2018-05-02 14:41:36 -0700 Created attachment 339343 Patch 1419906 3 339361 sabouhallawa 2018-05-02 15:54:54 -0700 Created attachment 339361 Patch 1419918 4 339361 youennf 2018-05-02 16:11:38 -0700 Comment on attachment 339361 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=339361&action=review > Source/WebCore/html/HTMLPlugInImageElement.cpp:235 > + RenderImageResource& renderImageResource = renderImage.imageResource(); auto&, maybe no need for renderImage variable also. 1419927 5 339364 sabouhallawa 2018-05-02 16:58:38 -0700 Created attachment 339364 Patch 1419974 6 339364 commit-queue 2018-05-02 18:18:01 -0700 Comment on attachment 339364 Patch Clearing flags on attachment: 339364 Committed r231292: <https://trac.webkit.org/changeset/231292> 1419975 7 commit-queue 2018-05-02 18:18:02 -0700 All reviewed patches have been landed. Closing bug. 339339 2018-05-02 14:17:40 -0700 2018-05-02 14:17:40 -0700 test case object-image-hide-show.html text/html 861 sabouhallawa PHN0eWxlPgogICAgb2JqZWN0IHsKICAgICAgICB3aWR0aDogMTAwcHg7CiAgICAgICAgaGVpZ2h0 OiAxMDBweDsgIAogICAgfQo8L3N0eWxlPgo8Ym9keT4KICAgIDxvYmplY3QgZGF0YT0iZGF0YTpp bWFnZS9wbmc7YmFzZTY0LGlWQk9SdzBLR2dvQUFBQU5TVWhFVWdBQUFBRUFBQUFCQ0FJQUFBQ1Fk MVBlQUFBQURFbEVRVlFJSFdOZytNOEFBQUlDQVFEcExPclRBQUFBQUVsRlRrU3VRbUNDIiB0eXBl PSJpbWFnZS9wbmciIC8+CiAgICA8c2NyaXB0PgogICAgICAgIGZ1bmN0aW9uIHRvZ2dsZVZpc2li bGl0eShlbGVtZW50LCBhZnRlcikgewogICAgICAgICAgICByZXR1cm4gbmV3IFByb21pc2UoKHJl c29sdmUpID0+IHsKICAgICAgICAgICAgICAgIHNldFRpbWVvdXQoKCkgPT4gewogICAgICAgICAg ICAgICAgICAgIGlmIChlbGVtZW50LnN0eWxlLmRpc3BsYXkgPT09ICJub25lIikKICAgICAgICAg ICAgICAgICAgICAgICAgZWxlbWVudC5zdHlsZS5kaXNwbGF5ID0gImJsb2NrIjsKICAgICAgICAg ICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgICAgIGVsZW1lbnQuc3R5bGUuZGlz cGxheSA9ICJub25lIjsKICAgICAgICAgICAgICAgICAgICByZXNvbHZlKCk7CiAgICAgICAgICAg ICAgICB9LCBhZnRlcik7CiAgICAgICAgICAgIH0pOwogICAgICAgIH0KCiAgICAgICAgdmFyIGVs ZW1lbnQgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCJvYmplY3QiKTsKICAgICAgICB0b2dnbGVW aXNpYmxpdHkoZWxlbWVudCwgMTAwKS50aGVuKCgpID0+IHsKICAgICAgICAgICAgcmV0dXJuIHRv Z2dsZVZpc2libGl0eShlbGVtZW50LCAxMDApOwogICAgICAgIH0pOwogICAgPC9zY3JpcHQ+Cjwv Ym9keT4K 339343 2018-05-02 14:41:36 -0700 2018-05-02 15:08:06 -0700 Patch bug-185216-20180502144136.patch text/plain 4876 sabouhallawa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMTI2NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE4LTA1LTAyICBTYWlkIEFi b3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgSGlkaW5nIHRo ZW4gc2hvd2luZyBhbiA8b2JqZWN0PiBvZiB0eXBlIGltYWdlIG1ha2VzIHRoZSB1bmRlcmxheWlu ZyBpbWFnZSBkaXNhcHBlYXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4NTIxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEltYWdlTG9hZGVyOjp1cGRhdGVGcm9tRWxlbWVudCgpIGhhcyB0byBjYWxsIElt YWdlTG9hZGVyOjp1cGRhdGVSZW5kZXJlcigpCisgICAgICAgIGFsd2F5cyBiZWNhdXNlIGl0IGVu c3VyZXMgdGhlIENhY2hlZEltYWdlIG9mIEltYWdlTG9hZGVyIGlzIHNldCB0byB0aGUKKyAgICAg ICAgQ2FjaGVkSW1hZ2Ugb2YgdGhlIFJlbmRlckltYWdlUmVzb3VjZSBvZiB0aGUgUmVuZGVySW1h Z2UuIFRoZSBjb25kaXRpb24KKyAgICAgICAgKG5ld0ltYWdlICE9IG9sZEltYWdlKSBpbiBJbWFn ZUxvYWRlcjo6dXBkYXRlRnJvbUVsZW1lbnQoKSBpcyB0cnVlIG9ubHkKKyAgICAgICAgaWYgdGhl IGltYWdlIGlzIGJlaW5nIGxvYWRlZC4gSWYgdGhlIGltYWdlIGlzIGxvYWRlZCBhbmQgdGhlIFJl bmRlckltYWdlCisgICAgICAgIGlzIGRlc3Ryb3llZCBhbmQgdGhlbiByZWNyZWF0ZWQsIHRoZSBJ bWFnZUxvYWRlcjo6dXBkYXRlUmVuZGVyZXIoKSB3aWxsIAorICAgICAgICBuZXZlciBiZSBjYWxs ZWQuCisKKyAgICAgICAgVGVzdDogZmFzdC9pbWFnZXMvb2JqZWN0LWltYWdlLWhpZGUtc2hvdy5o dG1sCisKKyAgICAgICAgKiBsb2FkZXIvSW1hZ2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KToKKwogMjAxOC0wNS0wMiAgWW91ZW5u IEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIE5ldHdvcmtMb2FkQ2hl Y2tlciBmb3IgbmF2aWdhdGlvbiBsb2FkcwpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0lt YWdlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VM b2FkZXIuY3BwCShyZXZpc2lvbiAyMzA5NTkpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1h Z2VMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDMsMTkgKzI0MywxOSBAQCB2b2lkIElt YWdlTG9hZGVyOjp1cGRhdGVGcm9tRWxlbWVudCgpCiAgICAgICAgICAgICAgICAgICAgIGRpc3Bh dGNoUGVuZGluZ0JlZm9yZUxvYWRFdmVudCgpOwogICAgICAgICAgICAgICAgIGVsc2UKICAgICAg ICAgICAgICAgICAgICAgYmVmb3JlTG9hZEV2ZW50U2VuZGVyKCkuZGlzcGF0Y2hFdmVudFNvb24o KnRoaXMpOwotICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgdXBkYXRlUmVuZGVy ZXIoKTsKKyAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgLy8gSWYgbmV3SW1hZ2UgaXMgY2Fj aGVkLCBhZGRDbGllbnQoKSB3aWxsIHJlc3VsdCBpbiB0aGUgbG9hZCBldmVudAogICAgICAgICAg ICAgLy8gYmVpbmcgcXVldWVkIHRvIGZpcmUuIEVuc3VyZSB0aGlzIGhhcHBlbnMgYWZ0ZXIgYmVm b3JlbG9hZCBpcwogICAgICAgICAgICAgLy8gZGlzcGF0Y2hlZC4KICAgICAgICAgICAgIG5ld0lt YWdlLT5hZGRDbGllbnQoKnRoaXMpOwogICAgICAgICB9Ci0gICAgICAgIGlmIChvbGRJbWFnZSkg eworICAgICAgICBpZiAob2xkSW1hZ2UpCiAgICAgICAgICAgICBvbGRJbWFnZS0+cmVtb3ZlQ2xp ZW50KCp0aGlzKTsKLSAgICAgICAgICAgIHVwZGF0ZVJlbmRlcmVyKCk7Ci0gICAgICAgIH0KICAg ICB9CisgICAgCisgICAgaWYgKG1faW1hZ2UpCisgICAgICAgIHVwZGF0ZVJlbmRlcmVyKCk7CiAK ICAgICBpZiAoUmVuZGVySW1hZ2VSZXNvdXJjZSogaW1hZ2VSZXNvdXJjZSA9IHJlbmRlckltYWdl UmVzb3VyY2UoKSkKICAgICAgICAgaW1hZ2VSZXNvdXJjZS0+cmVzZXRBbmltYXRpb24oKTsKSW5k ZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJKHJldmlzaW9uIDIzMDk1OSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE4LTA1LTAyICBTYWlkIEFib3UtSGFsbGF3YSAg PHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgSGlkaW5nIHRoZW4gc2hvd2luZyBh biA8b2JqZWN0PiBvZiB0eXBlIGltYWdlIG1ha2VzIHRoZSB1bmRlcmxheWluZyBpbWFnZSBkaXNh cHBlYXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 NTIxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVu c3VyZSB0aGUgSW1hZ2VMb2FkZXIgYWx3YXlzIHVwZGF0ZXMgdGhlIFJlbmRlckltYWdlIG9mIGl0 cyBlbGVtZW50IHdoZW4KKyAgICAgICAgdGhlIFJlbmRlckltYWdlIGlzIHJlY3JlYXRlZC4KKwor ICAgICAgICAqIGZhc3QvaW1hZ2VzL29iamVjdC1pbWFnZS1oaWRlLXNob3ctZXhwZWN0ZWQuaHRt bDogQWRkZWQuCisgICAgICAgICogZmFzdC9pbWFnZXMvb2JqZWN0LWltYWdlLWhpZGUtc2hvdy5o dG1sOiBBZGRlZC4KKwogMjAxOC0wNC0yMyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5j b20+CiAKICAgICAgICAgSW1wbGVtZW50IFNhbWUtU2l0ZSBjb29raWVzCkluZGV4OiBMYXlvdXRU ZXN0cy9mYXN0L2ltYWdlcy9vYmplY3QtaW1hZ2UtaGlkZS1zaG93LWV4cGVjdGVkLmh0bWwKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9pbWFnZXMvb2JqZWN0LWltYWdlLWhpZGUtc2hv dy1leHBlY3RlZC5odG1sCShub25leGlzdGVudCkKKysrIExheW91dFRlc3RzL2Zhc3QvaW1hZ2Vz L29iamVjdC1pbWFnZS1oaWRlLXNob3ctZXhwZWN0ZWQuaHRtbAkod29ya2luZyBjb3B5KQpAQCAt MCwwICsxLDEwIEBACis8c3R5bGU+CisgICAgZGl2IHsKKyAgICAgICAgd2lkdGg6IDEwMHB4Owor ICAgICAgICBoZWlnaHQ6IDEwMHB4OworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBsaW1lOwor ICAgIH0KKzwvc3R5bGU+Cis8Ym9keT4KKyAgICA8ZGl2PjwvZGl2PgorPC9ib2R5PgpJbmRleDog TGF5b3V0VGVzdHMvZmFzdC9pbWFnZXMvb2JqZWN0LWltYWdlLWhpZGUtc2hvdy5odG1sCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL29iamVjdC1pbWFnZS1oaWRlLXNob3cu aHRtbAkobm9uZXhpc3RlbnQpCisrKyBMYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy9vYmplY3QtaW1h Z2UtaGlkZS1zaG93Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwzMyBAQAorPHN0eWxl PgorICAgIG9iamVjdCB7CisgICAgICAgIHdpZHRoOiAxMDBweDsKKyAgICAgICAgaGVpZ2h0OiAx MDBweDsgIAorICAgIH0KKzwvc3R5bGU+Cis8Ym9keT4KKyAgICA8b2JqZWN0IGRhdGE9ImRhdGE6 aW1hZ2UvcG5nO2Jhc2U2NCxpVkJPUncwS0dnb0FBQUFOU1VoRVVnQUFBQUVBQUFBQkNBSUFBQUNR ZDFQZUFBQUFERWxFUVZRSUhXTmcrTThBQUFJQ0FRRHBMT3JUQUFBQUFFbEZUa1N1UW1DQyIgdHlw ZT0iaW1hZ2UvcG5nIiAvPgorICAgIDxzY3JpcHQ+CisgICAgICAgIGZ1bmN0aW9uIHRvZ2dsZVZp c2libGl0eShlbGVtZW50LCBhZnRlcikgeworICAgICAgICAgICAgcmV0dXJuIG5ldyBQcm9taXNl KChyZXNvbHZlKSA9PiB7CisgICAgICAgICAgICAgICAgc2V0VGltZW91dCgoKSA9PiB7CisgICAg ICAgICAgICAgICAgICAgIGlmIChlbGVtZW50LnN0eWxlLmRpc3BsYXkgPT09ICJub25lIikKKyAg ICAgICAgICAgICAgICAgICAgICAgIGVsZW1lbnQuc3R5bGUuZGlzcGxheSA9ICJibG9jayI7Cisg ICAgICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgICAgIGVsZW1lbnQu c3R5bGUuZGlzcGxheSA9ICJub25lIjsKKyAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOwor ICAgICAgICAgICAgICAgIH0sIGFmdGVyKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9CisK KyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICAgICAgdGVzdFJ1bm5lci53 YWl0VW50aWxEb25lKCk7CisKKyAgICAgICAgdmFyIGVsZW1lbnQgPSBkb2N1bWVudC5xdWVyeVNl bGVjdG9yKCJvYmplY3QiKTsKKyAgICAgICAgdG9nZ2xlVmlzaWJsaXR5KGVsZW1lbnQsIDUwKS50 aGVuKCgpID0+IHsKKyAgICAgICAgICAgIHJldHVybiB0b2dnbGVWaXNpYmxpdHkoZWxlbWVudCwg NTApOworICAgICAgICB9KS50aGVuKCgpID0+IHsKKyAgICAgICAgICAgIGlmICh3aW5kb3cudGVz dFJ1bm5lcikKKyAgICAgICAgICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAg ICAgfSk7CisgICAgPC9zY3JpcHQ+Cis8L2JvZHk+Cg== 339361 2018-05-02 15:54:54 -0700 2018-05-02 16:58:37 -0700 Patch bug-185216-20180502155454.patch text/plain 4458 sabouhallawa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMTI3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE4LTA1LTAyICBTYWlkIEFi b3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgSGlkaW5nIHRo ZW4gc2hvd2luZyBhbiA8b2JqZWN0PiBvZiB0eXBlIGltYWdlIG1ha2VzIHRoZSB1bmRlcmxheWlu ZyBpbWFnZSBkaXNhcHBlYXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4NTIxNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzkwNTU2MzA+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5zdXJlIHRoZSBI VE1MUGx1Z0luSW1hZ2VFbGVtZW50IHVwZGF0ZXMgdGhlIFJlbmRlckltYWdlUmVzb3VyY2Ugb2Yg aXRzCisgICAgICAgIFJlbmRlckltYWdlIHdpdGggdGhlIENhY2hlZEltYWdlIG9mIGl0cyBJbWFn ZUxvYWRlciB3aGVuIHRoZSBSZW5kZXJJbWFnZQorICAgICAgICBpcyByZWNyZWF0ZWQuCisKKyAg ICAgICAgVGVzdDogZmFzdC9pbWFnZXMvb2JqZWN0LWltYWdlLWhpZGUtc2hvdy5odG1sCisKKyAg ICAgICAgKiBodG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SFRNTFBsdWdJbkltYWdlRWxlbWVudDo6ZGlkQXR0YWNoUmVuZGVyZXJzKToKKyAgICAgICAg VGhpcyBpcyB2ZXJ5IHNpbWlsYXIgdG8gd2hhdCB3ZSBkbyBpbiBIVE1MSW1hZ2VFbGVtZW50Ojpk aWRBdHRhY2hSZW5kZXJlcnMoKS4KKworCiAyMDE4LTA1LTAxICBSeW9zdWtlIE5pd2EgIDxybml3 YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjIyNTg2OCk6IFJlbGVhc2UgYXNz ZXJ0IHdoZW4gcmVtb3ZpbmcgYW4gU1ZHVXNlRWxlbWVudCBmcm9tIERvY3VtZW50OjptX3N2Z1Vz ZUVsZW1lbnRzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1l bnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdl RWxlbWVudC5jcHAJKHJldmlzaW9uIDIzMDk1OSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TFBsdWdJbkltYWdlRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyOSw2ICsyMjksMTQg QEAgdm9pZCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50OjpkaWRBdHRhY2hSZQogICAgIG1fbmVlZHNX aWRnZXRVcGRhdGUgPSB0cnVlOwogICAgIHNjaGVkdWxlVXBkYXRlRm9yQWZ0ZXJTdHlsZVJlc29s dXRpb24oKTsKIAorICAgIC8vIFVwZGF0ZSB0aGUgUmVuZGVySW1hZ2VSZXNvdXJjZSBvZiB0aGUg YXNzb2NpYXRlZCBSZW5kZXJJbWFnZS4KKyAgICBpZiAobV9pbWFnZUxvYWRlciAmJiBpczxSZW5k ZXJJbWFnZT4ocmVuZGVyZXIoKSkpIHsKKyAgICAgICAgYXV0byYgcmVuZGVySW1hZ2UgPSBkb3du Y2FzdDxSZW5kZXJJbWFnZT4oKnJlbmRlcmVyKCkpOworICAgICAgICBSZW5kZXJJbWFnZVJlc291 cmNlJiByZW5kZXJJbWFnZVJlc291cmNlID0gcmVuZGVySW1hZ2UuaW1hZ2VSZXNvdXJjZSgpOwor ICAgICAgICBpZiAoIXJlbmRlckltYWdlUmVzb3VyY2UuY2FjaGVkSW1hZ2UoKSkKKyAgICAgICAg ICAgIHJlbmRlckltYWdlUmVzb3VyY2Uuc2V0Q2FjaGVkSW1hZ2UobV9pbWFnZUxvYWRlci0+aW1h Z2UoKSk7CisgICAgfQorCiAgICAgSFRNTFBsdWdJbkVsZW1lbnQ6OmRpZEF0dGFjaFJlbmRlcmVy cygpOwogfQogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzA5NTkpCisrKyBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxOC0wNS0wMiAgU2FpZCBB Ym91LUhhbGxhd2EgIDxzYWJvdWhhbGxhd2FAYXBwbGUuY29tPgorCisgICAgICAgIEhpZGluZyB0 aGVuIHNob3dpbmcgYW4gPG9iamVjdD4gb2YgdHlwZSBpbWFnZSBtYWtlcyB0aGUgdW5kZXJsYXlp bmcgaW1hZ2UgZGlzYXBwZWFyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xODUyMTYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM5MDU1NjMwPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9pbWFn ZXMvb2JqZWN0LWltYWdlLWhpZGUtc2hvdy1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAg KiBmYXN0L2ltYWdlcy9vYmplY3QtaW1hZ2UtaGlkZS1zaG93Lmh0bWw6IEFkZGVkLgorCiAyMDE4 LTA0LTIzICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBs ZW1lbnQgU2FtZS1TaXRlIGNvb2tpZXMKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL29i amVjdC1pbWFnZS1oaWRlLXNob3ctZXhwZWN0ZWQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU ZXN0cy9mYXN0L2ltYWdlcy9vYmplY3QtaW1hZ2UtaGlkZS1zaG93LWV4cGVjdGVkLmh0bWwJKG5v bmV4aXN0ZW50KQorKysgTGF5b3V0VGVzdHMvZmFzdC9pbWFnZXMvb2JqZWN0LWltYWdlLWhpZGUt c2hvdy1leHBlY3RlZC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMTAgQEAKKzxzdHls ZT4KKyAgICBkaXYgeworICAgICAgICB3aWR0aDogMTAwcHg7CisgICAgICAgIGhlaWdodDogMTAw cHg7CisgICAgICAgIGJhY2tncm91bmQtY29sb3I6IGxpbWU7CisgICAgfQorPC9zdHlsZT4KKzxi b2R5PgorICAgIDxkaXY+PC9kaXY+Cis8L2JvZHk+CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2lt YWdlcy9vYmplY3QtaW1hZ2UtaGlkZS1zaG93Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvZmFzdC9pbWFnZXMvb2JqZWN0LWltYWdlLWhpZGUtc2hvdy5odG1sCShub25leGlzdGVudCkK KysrIExheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL29iamVjdC1pbWFnZS1oaWRlLXNob3cuaHRtbAko d29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDMzIEBACis8c3R5bGU+CisgICAgb2JqZWN0IHsKKyAg ICAgICAgd2lkdGg6IDEwMHB4OworICAgICAgICBoZWlnaHQ6IDEwMHB4OyAgCisgICAgfQorPC9z dHlsZT4KKzxib2R5PgorICAgIDxvYmplY3QgZGF0YT0iZGF0YTppbWFnZS9wbmc7YmFzZTY0LGlW Qk9SdzBLR2dvQUFBQU5TVWhFVWdBQUFBRUFBQUFCQ0FJQUFBQ1FkMVBlQUFBQURFbEVRVlFJSFdO ZytNOEFBQUlDQVFEcExPclRBQUFBQUVsRlRrU3VRbUNDIiB0eXBlPSJpbWFnZS9wbmciIC8+Cisg ICAgPHNjcmlwdD4KKyAgICAgICAgZnVuY3Rpb24gdG9nZ2xlVmlzaWJsaXR5KGVsZW1lbnQsIGFm dGVyKSB7CisgICAgICAgICAgICByZXR1cm4gbmV3IFByb21pc2UoKHJlc29sdmUpID0+IHsKKyAg ICAgICAgICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHsKKyAgICAgICAgICAgICAgICAgICAgaWYg KGVsZW1lbnQuc3R5bGUuZGlzcGxheSA9PT0gIm5vbmUiKQorICAgICAgICAgICAgICAgICAgICAg ICAgZWxlbWVudC5zdHlsZS5kaXNwbGF5ID0gImJsb2NrIjsKKyAgICAgICAgICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgICAgICAgICAgZWxlbWVudC5zdHlsZS5kaXNwbGF5ID0gIm5v bmUiOworICAgICAgICAgICAgICAgICAgICByZXNvbHZlKCk7CisgICAgICAgICAgICAgICAgfSwg YWZ0ZXIpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKworICAgICAgICBpZiAod2luZG93 LnRlc3RSdW5uZXIpCisgICAgICAgICAgICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKKwor ICAgICAgICB2YXIgZWxlbWVudCA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoIm9iamVjdCIpOwor ICAgICAgICB0b2dnbGVWaXNpYmxpdHkoZWxlbWVudCwgNTApLnRoZW4oKCkgPT4geworICAgICAg ICAgICAgcmV0dXJuIHRvZ2dsZVZpc2libGl0eShlbGVtZW50LCA1MCk7CisgICAgICAgIH0pLnRo ZW4oKCkgPT4geworICAgICAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICAg ICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgICAgICB9KTsKKyAgICA8L3Njcmlw dD4KKzwvYm9keT4K 339364 2018-05-02 16:58:38 -0700 2018-05-02 18:18:01 -0700 Patch bug-185216-20180502165838.patch text/plain 4399 sabouhallawa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMTI3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE4LTA1LTAyICBTYWlkIEFi b3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgSGlkaW5nIHRo ZW4gc2hvd2luZyBhbiA8b2JqZWN0PiBvZiB0eXBlIGltYWdlIG1ha2VzIHRoZSB1bmRlcmxheWlu ZyBpbWFnZSBkaXNhcHBlYXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4NTIxNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzkwNTU2MzA+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICBFbnN1cmUgdGhlIEhU TUxQbHVnSW5JbWFnZUVsZW1lbnQgdXBkYXRlcyB0aGUgUmVuZGVySW1hZ2VSZXNvdXJjZSBvZiBp dHMKKyAgICAgICAgUmVuZGVySW1hZ2Ugd2l0aCB0aGUgQ2FjaGVkSW1hZ2Ugb2YgaXRzIEltYWdl TG9hZGVyIHdoZW4gdGhlIFJlbmRlckltYWdlCisgICAgICAgIGlzIHJlY3JlYXRlZC4KKworICAg ICAgICBUZXN0OiBmYXN0L2ltYWdlcy9vYmplY3QtaW1hZ2UtaGlkZS1zaG93Lmh0bWwKKworICAg ICAgICAqIGh0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MUGx1Z0luSW1hZ2VFbGVtZW50OjpkaWRBdHRhY2hSZW5kZXJlcnMpOgorICAgICAgICBU aGlzIGlzIHZlcnkgc2ltaWxhciB0byB3aGF0IHdlIGRvIGluIEhUTUxJbWFnZUVsZW1lbnQ6OmRp ZEF0dGFjaFJlbmRlcmVycygpLgorCisKIDIwMTgtMDUtMDEgIFJ5b3N1a2UgTml3YSAgPHJuaXdh QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjI1ODY4KTogUmVsZWFzZSBhc3Nl cnQgd2hlbiByZW1vdmluZyBhbiBTVkdVc2VFbGVtZW50IGZyb20gRG9jdW1lbnQ6Om1fc3ZnVXNl RWxlbWVudHMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVu dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VF bGVtZW50LmNwcAkocmV2aXNpb24gMjMwOTU5KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M UGx1Z0luSW1hZ2VFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI5LDYgKzIyOSwxMyBA QCB2b2lkIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OmRpZEF0dGFjaFJlCiAgICAgbV9uZWVkc1dp ZGdldFVwZGF0ZSA9IHRydWU7CiAgICAgc2NoZWR1bGVVcGRhdGVGb3JBZnRlclN0eWxlUmVzb2x1 dGlvbigpOwogCisgICAgLy8gVXBkYXRlIHRoZSBSZW5kZXJJbWFnZVJlc291cmNlIG9mIHRoZSBh c3NvY2lhdGVkIFJlbmRlckltYWdlLgorICAgIGlmIChtX2ltYWdlTG9hZGVyICYmIGlzPFJlbmRl ckltYWdlPihyZW5kZXJlcigpKSkgeworICAgICAgICBhdXRvJiByZW5kZXJJbWFnZVJlc291cmNl ID0gZG93bmNhc3Q8UmVuZGVySW1hZ2U+KCpyZW5kZXJlcigpKS5pbWFnZVJlc291cmNlKCk7Cisg ICAgICAgIGlmICghcmVuZGVySW1hZ2VSZXNvdXJjZS5jYWNoZWRJbWFnZSgpKQorICAgICAgICAg ICAgcmVuZGVySW1hZ2VSZXNvdXJjZS5zZXRDYWNoZWRJbWFnZShtX2ltYWdlTG9hZGVyLT5pbWFn ZSgpKTsKKyAgICB9CisKICAgICBIVE1MUGx1Z0luRWxlbWVudDo6ZGlkQXR0YWNoUmVuZGVyZXJz KCk7CiB9CiAKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMDk1OSkKKysrIExheW91dFRlc3RzL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE4LTA1LTAyICBTYWlkIEFi b3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgSGlkaW5nIHRo ZW4gc2hvd2luZyBhbiA8b2JqZWN0PiBvZiB0eXBlIGltYWdlIG1ha2VzIHRoZSB1bmRlcmxheWlu ZyBpbWFnZSBkaXNhcHBlYXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4NTIxNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzkwNTU2MzA+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICAqIGZhc3QvaW1hZ2Vz L29iamVjdC1pbWFnZS1oaWRlLXNob3ctZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICog ZmFzdC9pbWFnZXMvb2JqZWN0LWltYWdlLWhpZGUtc2hvdy5odG1sOiBBZGRlZC4KKwogMjAxOC0w NC0yMyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVt ZW50IFNhbWUtU2l0ZSBjb29raWVzCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy9vYmpl Y3QtaW1hZ2UtaGlkZS1zaG93LWV4cGVjdGVkLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvZmFzdC9pbWFnZXMvb2JqZWN0LWltYWdlLWhpZGUtc2hvdy1leHBlY3RlZC5odG1sCShub25l eGlzdGVudCkKKysrIExheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL29iamVjdC1pbWFnZS1oaWRlLXNo b3ctZXhwZWN0ZWQuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDEwIEBACis8c3R5bGU+ CisgICAgZGl2IHsKKyAgICAgICAgd2lkdGg6IDEwMHB4OworICAgICAgICBoZWlnaHQ6IDEwMHB4 OworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBsaW1lOworICAgIH0KKzwvc3R5bGU+Cis8Ym9k eT4KKyAgICA8ZGl2PjwvZGl2PgorPC9ib2R5PgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9pbWFn ZXMvb2JqZWN0LWltYWdlLWhpZGUtc2hvdy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L2Zhc3QvaW1hZ2VzL29iamVjdC1pbWFnZS1oaWRlLXNob3cuaHRtbAkobm9uZXhpc3RlbnQpCisr KyBMYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy9vYmplY3QtaW1hZ2UtaGlkZS1zaG93Lmh0bWwJKHdv cmtpbmcgY29weSkKQEAgLTAsMCArMSwzMyBAQAorPHN0eWxlPgorICAgIG9iamVjdCB7CisgICAg ICAgIHdpZHRoOiAxMDBweDsKKyAgICAgICAgaGVpZ2h0OiAxMDBweDsgIAorICAgIH0KKzwvc3R5 bGU+Cis8Ym9keT4KKyAgICA8b2JqZWN0IGRhdGE9ImRhdGE6aW1hZ2UvcG5nO2Jhc2U2NCxpVkJP UncwS0dnb0FBQUFOU1VoRVVnQUFBQUVBQUFBQkNBSUFBQUNRZDFQZUFBQUFERWxFUVZRSUhXTmcr TThBQUFJQ0FRRHBMT3JUQUFBQUFFbEZUa1N1UW1DQyIgdHlwZT0iaW1hZ2UvcG5nIiAvPgorICAg IDxzY3JpcHQ+CisgICAgICAgIGZ1bmN0aW9uIHRvZ2dsZVZpc2libGl0eShlbGVtZW50LCBhZnRl cikgeworICAgICAgICAgICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlKSA9PiB7CisgICAg ICAgICAgICAgICAgc2V0VGltZW91dCgoKSA9PiB7CisgICAgICAgICAgICAgICAgICAgIGlmIChl bGVtZW50LnN0eWxlLmRpc3BsYXkgPT09ICJub25lIikKKyAgICAgICAgICAgICAgICAgICAgICAg IGVsZW1lbnQuc3R5bGUuZGlzcGxheSA9ICJibG9jayI7CisgICAgICAgICAgICAgICAgICAgIGVs c2UKKyAgICAgICAgICAgICAgICAgICAgICAgIGVsZW1lbnQuc3R5bGUuZGlzcGxheSA9ICJub25l IjsKKyAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOworICAgICAgICAgICAgICAgIH0sIGFm dGVyKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9CisKKyAgICAgICAgaWYgKHdpbmRvdy50 ZXN0UnVubmVyKQorICAgICAgICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisKKyAg ICAgICAgdmFyIGVsZW1lbnQgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCJvYmplY3QiKTsKKyAg ICAgICAgdG9nZ2xlVmlzaWJsaXR5KGVsZW1lbnQsIDUwKS50aGVuKCgpID0+IHsKKyAgICAgICAg ICAgIHJldHVybiB0b2dnbGVWaXNpYmxpdHkoZWxlbWVudCwgNTApOworICAgICAgICB9KS50aGVu KCgpID0+IHsKKyAgICAgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgICAg ICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgfSk7CisgICAgPC9zY3JpcHQ+ Cis8L2JvZHk+Cg==