148307 2015-08-21 08:10:48 -0700 Clear cairo-gl surface for initialization 2015-08-24 18:57:06 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hur.ims hur.ims commit-queue gyuyoung.kim mrobinson oldest_to_newest 1119742 0 hur.ims 2015-08-21 08:10:48 -0700 Clear cairo-gl surface for initialization 1119745 1 259615 hur.ims 2015-08-21 08:34:00 -0700 Created attachment 259615 Patch 1119746 2 hur.ims 2015-08-21 08:50:04 -0700 The accelerated canvas backed by cairo-gl has a possible memory initialize problem. A texture memory that is created by calling glTexImage2D with no data, is in undefined status[1] so it can have a garbage data. And also, according to the comments[2] in cairo.h, cairo seems not cleaning the passed texture when it create a surface. So it would be good to clean the just created cairo-gl surface by hand. [1] https://www.opengl.org/sdk/docs/man/html/glTexImage2D.xhtml "The image is undefined if the user tries..." [2] "if the user passes in a reference to some backing storage and asks cairo to wrap that in a #cairo_surface_t, then the contents are not modified. 1119748 3 259616 hur.ims 2015-08-21 08:53:45 -0700 Created attachment 259616 Patch 1120240 4 gyuyoung.kim 2015-08-24 00:12:32 -0700 CC'ing Martin. 1120280 5 259616 mrobinson 2015-08-24 09:43:19 -0700 Comment on attachment 259616 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259616&action=review Looks okay to me, but the code has a few extra steps which I think are unnecessary. > Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp:80 > + cairo_rectangle(cr.get(), 0, 0, size.width(), size.height()); > + cairo_set_operator(cr.get(), CAIRO_OPERATOR_CLEAR); > + cairo_fill(cr.get()); You don't need to use cairo_rectangle + cairo_fill, you can simply do cairo_paint. > Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp:81 > + cairo_restore(cr.get()); No need to save and restore the context state, you are just throwing it away afterward. 1120476 6 259798 hur.ims 2015-08-24 17:41:43 -0700 Created attachment 259798 Patch 1120477 7 hur.ims 2015-08-24 17:43:59 -0700 (In reply to comment #5) > Comment on attachment 259616 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=259616&action=review > > Looks okay to me, but the code has a few extra steps which I think are > unnecessary. > > > Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp:80 > > + cairo_rectangle(cr.get(), 0, 0, size.width(), size.height()); > > + cairo_set_operator(cr.get(), CAIRO_OPERATOR_CLEAR); > > + cairo_fill(cr.get()); > > You don't need to use cairo_rectangle + cairo_fill, you can simply do > cairo_paint. > > > Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp:81 > > + cairo_restore(cr.get()); > > No need to save and restore the context state, you are just throwing it away > afterward. Thank you for a helpful review! I've modified the patch as you said. 1120496 8 259798 commit-queue 2015-08-24 18:57:01 -0700 Comment on attachment 259798 Patch Clearing flags on attachment: 259798 Committed r188902: <http://trac.webkit.org/changeset/188902> 1120497 9 commit-queue 2015-08-24 18:57:06 -0700 All reviewed patches have been landed. Closing bug. 259615 2015-08-21 08:34:00 -0700 2015-08-21 08:53:41 -0700 Patch bug-148307-20150822003354.patch text/plain 2957 hur.ims U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTU3MDFkYWRmMWI1MWMw MmY2ZGE4MWM1ZmY2YTI1MDUwODkwZDZhYy4uNDY4YzU5Yzk5ZTMxMjJiNjhiZWU0ZWM3MzBmNDUx ODI5ZWVjMzdiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA4LTIxICBKaW55 b3VuZyBIdXIgIDxodXIuaW1zQG5hdmVyY29ycC5jb20+CisKKyAgICAgICAgQ2xlYXIgY2Fpcm8t Z2wgc3VyZmFjZSBmb3IgaW5pdGlhbGl6YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODMwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEEgY2Fpcm8tZ2wgc3VyZmFjZSB0aGF0IGlzIGNyZWF0ZWQg ZnJvbSBhbiB1bmluaXRpYWxpemVkIHRleHR1cmUsIHNob3VsZCBiZSBjbGVhcmVkIGJlZm9yZSB1 c2UuCisgICAgICAgIEEgdGV4dHVyZSBtZW1vcnkgY3JlYXRlZCBieSBjYWxsaW5nIGdsVGV4SW1h Z2UyRCB3aXRoIG51bGwgZGF0YSBwYXJhbWV0ZXIsIGlzIHVuaW5pdGlhbGl6ZWQuCisgICAgICAg IEFuZCBjYWlyb19nbF9zdXJmYWNlX2NyZWF0ZV9mb3JfdGV4dHVyZSBkb2Vzbid0IGNsZWFyIHRo ZSBwcm92aWRlZCB0ZXh0dXJlIGZvciBpbml0aWFsaXphdGlvbi4KKyAgICAgICAgU28gaXQgc2Vl bXMgc2FmZSB0byBjbGVhciB0aGUgc3VyZmFjZSBleHBsaWNpdGx5LgorCisgICAgICAgIEl0IGlz IGhhcmQgdG8gdmVyaWZ5IHRoaXMgYmVoYXZpb3IgY2hhbmdlIGJlY2F1c2UgdGhlIHRleHR1cmUg bWVtb3J5IHN0YXR1cyBpcyB1bmRlZmluZWQuIFVuZGVmaW5lZCBtZWFucworICAgICAgICBpdCBj YW4gYmUgZWl0aGVyIGluaXRpYWxpemVkIG9yIG5vdCwgdGhvdWdoIG1vc3RseSBpbml0aWFsaXpl ZCBpbiBteSBleHBlcmllbmNlcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJv L0ltYWdlQnVmZmVyQ2Fpcm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2xlYXJTdXJmYWNlKToK KyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUNhaXJvR0xTdXJmYWNlKToKKwogMjAxNS0wOC0xOCAg TXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtDb2Nv YV0gUHVuY3R1YXRpb24gbmVhciBIaW5kaSB0ZXh0IGlzIGdhcmJsZWQgd2hlbiBzdHlsZWQgd2l0 aCB0aGUgc3lzdGVtIGZvbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL0ltYWdlQnVmZmVyQ2Fpcm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VCdWZmZXJDYWlyby5jcHAKaW5kZXggNjExZjRjZDZlZjBl MWNhMzIxODFmNjA3NGExYmNmYTgzOTIzNzYyNS4uNjZmMGRjMGQ0OGYzNzBlMGYyOTE0ZWQ0N2Q2 MTc0YWMyZmZmY2NhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2Fpcm8vSW1hZ2VCdWZmZXJDYWlyby5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VCdWZmZXJDYWlyby5jcHAKQEAgLTY4LDYgKzY4LDE5IEBA IEltYWdlQnVmZmVyRGF0YTo6SW1hZ2VCdWZmZXJEYXRhKGNvbnN0IEludFNpemUmIHNpemUpCiB9 CiAKICNpZiBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFTKQordm9pZCBjbGVhclN1cmZhY2Uo Y2Fpcm9fc3VyZmFjZV90KiBzdXJmYWNlLCBjb25zdCBGbG9hdFNpemUmIHNpemUpCit7CisgICAg aWYgKGNhaXJvX3N1cmZhY2Vfc3RhdHVzKHN1cmZhY2UpICE9IENBSVJPX1NUQVRVU19TVUNDRVNT KQorICAgICAgICByZXR1cm47CisKKyAgICBSZWZQdHI8Y2Fpcm9fdD4gY3IgPSBhZG9wdFJlZihj YWlyb19jcmVhdGUoc3VyZmFjZSkpOworICAgIGNhaXJvX3NhdmUoY3IuZ2V0KCkpOworICAgIGNh aXJvX3JlY3RhbmdsZShjci5nZXQoKSwgMCwgMCwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgp KTsKKyAgICBjYWlyb19zZXRfb3BlcmF0b3IoY3IuZ2V0KCksIENBSVJPX09QRVJBVE9SX0NMRUFS KTsKKyAgICBjYWlyb19maWxsKGNyLmdldCgpKTsKKyAgICBjYWlyb19yZXN0b3JlKGNyLmdldCgp KTsKK30KKwogUGFzc1JlZlB0cjxjYWlyb19zdXJmYWNlX3Q+IGNyZWF0ZUNhaXJvR0xTdXJmYWNl KGNvbnN0IEZsb2F0U2l6ZSYgc2l6ZSwgdWludDMyX3QmIHRleHR1cmUpCiB7CiAgICAgR0xDb250 ZXh0OjpzaGFyaW5nQ29udGV4dCgpLT5tYWtlQ29udGV4dEN1cnJlbnQoKTsKQEAgLTkxLDcgKzEw NCw5IEBAIFBhc3NSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBjcmVhdGVDYWlyb0dMU3VyZmFjZShj b25zdCBGbG9hdFNpemUmIHNpemUsIHVpbnQzMl90CiAgICAgLy8gVGhyZWFkLWF3YXJlbmVzcyBp cyBhIGh1Z2UgcGVyZm9ybWFuY2UgaGl0IG9uIG5vbi1JbnRlbCBkcml2ZXJzLgogICAgIGNhaXJv X2dsX2RldmljZV9zZXRfdGhyZWFkX2F3YXJlKGRldmljZSwgRkFMU0UpOwogCi0gICAgcmV0dXJu IGFkb3B0UmVmKGNhaXJvX2dsX3N1cmZhY2VfY3JlYXRlX2Zvcl90ZXh0dXJlKGRldmljZSwgQ0FJ Uk9fQ09OVEVOVF9DT0xPUl9BTFBIQSwgdGV4dHVyZSwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdo dCgpKSk7CisgICAgYXV0byBzdXJmYWNlID0gYWRvcHRSZWYoY2Fpcm9fZ2xfc3VyZmFjZV9jcmVh dGVfZm9yX3RleHR1cmUoZGV2aWNlLCBDQUlST19DT05URU5UX0NPTE9SX0FMUEhBLCB0ZXh0dXJl LCBzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkpKTsKKyAgICBjbGVhclN1cmZhY2Uoc3VyZmFj ZS5nZXQoKSwgc2l6ZSk7CisgICAgcmV0dXJuIHN1cmZhY2U7CiB9CiAjZW5kaWYKIAo= 259616 2015-08-21 08:53:45 -0700 2015-08-24 17:41:37 -0700 Patch bug-148307-20150822005339.patch text/plain 2957 hur.ims U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTU3MDFkYWRmMWI1MWMw MmY2ZGE4MWM1ZmY2YTI1MDUwODkwZDZhYy4uNDY4YzU5Yzk5ZTMxMjJiNjhiZWU0ZWM3MzBmNDUx ODI5ZWVjMzdiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA4LTIxICBKaW55 b3VuZyBIdXIgIDxodXIuaW1zQG5hdmVyY29ycC5jb20+CisKKyAgICAgICAgQ2xlYXIgY2Fpcm8t Z2wgc3VyZmFjZSBmb3IgaW5pdGlhbGl6YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODMwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEEgY2Fpcm8tZ2wgc3VyZmFjZSB0aGF0IGlzIGNyZWF0ZWQg ZnJvbSBhbiB1bmluaXRpYWxpemVkIHRleHR1cmUsIHNob3VsZCBiZSBjbGVhcmVkIGJlZm9yZSB1 c2UuCisgICAgICAgIEEgdGV4dHVyZSBtZW1vcnkgY3JlYXRlZCBieSBjYWxsaW5nIGdsVGV4SW1h Z2UyRCB3aXRoIG51bGwgZGF0YSBwYXJhbWV0ZXIsIGlzIHVuaW5pdGlhbGl6ZWQuCisgICAgICAg IEFuZCBjYWlyb19nbF9zdXJmYWNlX2NyZWF0ZV9mb3JfdGV4dHVyZSBkb2Vzbid0IGNsZWFyIHRo ZSBwcm92aWRlZCB0ZXh0dXJlIGZvciBpbml0aWFsaXphdGlvbi4KKyAgICAgICAgU28gaXQgc2Vl bXMgc2FmZSB0byBjbGVhciB0aGUgc3VyZmFjZSBleHBsaWNpdGx5LgorCisgICAgICAgIEl0IGlz IGhhcmQgdG8gdmVyaWZ5IHRoaXMgYmVoYXZpb3IgY2hhbmdlIGJlY2F1c2UgdGhlIHRleHR1cmUg bWVtb3J5IHN0YXR1cyBpcyB1bmRlZmluZWQuIFVuZGVmaW5lZCBtZWFucworICAgICAgICBpdCBj YW4gYmUgZWl0aGVyIGluaXRpYWxpemVkIG9yIG5vdCwgdGhvdWdoIG1vc3RseSBpbml0aWFsaXpl ZCBpbiBteSBleHBlcmllbmNlcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJv L0ltYWdlQnVmZmVyQ2Fpcm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2xlYXJTdXJmYWNlKToK KyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUNhaXJvR0xTdXJmYWNlKToKKwogMjAxNS0wOC0xOCAg TXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtDb2Nv YV0gUHVuY3R1YXRpb24gbmVhciBIaW5kaSB0ZXh0IGlzIGdhcmJsZWQgd2hlbiBzdHlsZWQgd2l0 aCB0aGUgc3lzdGVtIGZvbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL0ltYWdlQnVmZmVyQ2Fpcm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VCdWZmZXJDYWlyby5jcHAKaW5kZXggNjExZjRjZDZlZjBl MWNhMzIxODFmNjA3NGExYmNmYTgzOTIzNzYyNS4uNjZmMGRjMGQ0OGYzNzBlMGYyOTE0ZWQ0N2Q2 MTc0YWMyZmZmY2NhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2Fpcm8vSW1hZ2VCdWZmZXJDYWlyby5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VCdWZmZXJDYWlyby5jcHAKQEAgLTY4LDYgKzY4LDE5IEBA IEltYWdlQnVmZmVyRGF0YTo6SW1hZ2VCdWZmZXJEYXRhKGNvbnN0IEludFNpemUmIHNpemUpCiB9 CiAKICNpZiBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFTKQordm9pZCBjbGVhclN1cmZhY2Uo Y2Fpcm9fc3VyZmFjZV90KiBzdXJmYWNlLCBjb25zdCBGbG9hdFNpemUmIHNpemUpCit7CisgICAg aWYgKGNhaXJvX3N1cmZhY2Vfc3RhdHVzKHN1cmZhY2UpICE9IENBSVJPX1NUQVRVU19TVUNDRVNT KQorICAgICAgICByZXR1cm47CisKKyAgICBSZWZQdHI8Y2Fpcm9fdD4gY3IgPSBhZG9wdFJlZihj YWlyb19jcmVhdGUoc3VyZmFjZSkpOworICAgIGNhaXJvX3NhdmUoY3IuZ2V0KCkpOworICAgIGNh aXJvX3JlY3RhbmdsZShjci5nZXQoKSwgMCwgMCwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgp KTsKKyAgICBjYWlyb19zZXRfb3BlcmF0b3IoY3IuZ2V0KCksIENBSVJPX09QRVJBVE9SX0NMRUFS KTsKKyAgICBjYWlyb19maWxsKGNyLmdldCgpKTsKKyAgICBjYWlyb19yZXN0b3JlKGNyLmdldCgp KTsKK30KKwogUGFzc1JlZlB0cjxjYWlyb19zdXJmYWNlX3Q+IGNyZWF0ZUNhaXJvR0xTdXJmYWNl KGNvbnN0IEZsb2F0U2l6ZSYgc2l6ZSwgdWludDMyX3QmIHRleHR1cmUpCiB7CiAgICAgR0xDb250 ZXh0OjpzaGFyaW5nQ29udGV4dCgpLT5tYWtlQ29udGV4dEN1cnJlbnQoKTsKQEAgLTkxLDcgKzEw NCw5IEBAIFBhc3NSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBjcmVhdGVDYWlyb0dMU3VyZmFjZShj b25zdCBGbG9hdFNpemUmIHNpemUsIHVpbnQzMl90CiAgICAgLy8gVGhyZWFkLWF3YXJlbmVzcyBp cyBhIGh1Z2UgcGVyZm9ybWFuY2UgaGl0IG9uIG5vbi1JbnRlbCBkcml2ZXJzLgogICAgIGNhaXJv X2dsX2RldmljZV9zZXRfdGhyZWFkX2F3YXJlKGRldmljZSwgRkFMU0UpOwogCi0gICAgcmV0dXJu IGFkb3B0UmVmKGNhaXJvX2dsX3N1cmZhY2VfY3JlYXRlX2Zvcl90ZXh0dXJlKGRldmljZSwgQ0FJ Uk9fQ09OVEVOVF9DT0xPUl9BTFBIQSwgdGV4dHVyZSwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdo dCgpKSk7CisgICAgYXV0byBzdXJmYWNlID0gYWRvcHRSZWYoY2Fpcm9fZ2xfc3VyZmFjZV9jcmVh dGVfZm9yX3RleHR1cmUoZGV2aWNlLCBDQUlST19DT05URU5UX0NPTE9SX0FMUEhBLCB0ZXh0dXJl LCBzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkpKTsKKyAgICBjbGVhclN1cmZhY2Uoc3VyZmFj ZS5nZXQoKSwgc2l6ZSk7CisgICAgcmV0dXJuIHN1cmZhY2U7CiB9CiAjZW5kaWYKIAo= 259798 2015-08-24 17:41:43 -0700 2015-08-24 18:57:01 -0700 Patch bug-148307-20150825094133.patch text/plain 2768 hur.ims U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4ODk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTU3YjczOWUzNDY2NWQ2 NTI3OGU4YWJlODg1MzJkZDIwOGE2MmI1My4uNDVlNTNmZmRmMTZhMTk2MjZiOTc2YTc1MWZhOGU3 MjQyM2RhNmFkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA4LTI0ICBKaW55 b3VuZyBIdXIgIDxodXIuaW1zQG5hdmVyY29ycC5jb20+CisKKyAgICAgICAgQ2xlYXIgY2Fpcm8t Z2wgc3VyZmFjZSBmb3IgaW5pdGlhbGl6YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODMwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEEgY2Fpcm8tZ2wgc3VyZmFjZSB0aGF0IGlzIGNyZWF0ZWQg ZnJvbSBhbiB1bmluaXRpYWxpemVkIHRleHR1cmUsIHNob3VsZCBiZSBjbGVhcmVkIGJlZm9yZSB1 c2UuCisgICAgICAgIEEgdGV4dHVyZSBtZW1vcnkgY3JlYXRlZCBieSBjYWxsaW5nIGdsVGV4SW1h Z2UyRCB3aXRoIG51bGwgZGF0YSBwYXJhbWV0ZXIsIGlzIHVuaW5pdGlhbGl6ZWQuCisgICAgICAg IEFuZCBjYWlyb19nbF9zdXJmYWNlX2NyZWF0ZV9mb3JfdGV4dHVyZSBkb2Vzbid0IGNsZWFyIHRo ZSBwcm92aWRlZCB0ZXh0dXJlIGZvciBpbml0aWFsaXphdGlvbi4KKyAgICAgICAgU28gaXQgc2Vl bXMgc2FmZSB0byBjbGVhciB0aGUgc3VyZmFjZSBleHBsaWNpdGx5LgorCisgICAgICAgIEl0IGlz IGhhcmQgdG8gdmVyaWZ5IHRoaXMgYmVoYXZpb3IgY2hhbmdlIGJlY2F1c2UgdGhlIHRleHR1cmUg bWVtb3J5IHN0YXR1cyBpcyB1bmRlZmluZWQuIFVuZGVmaW5lZCBtZWFucworICAgICAgICBpdCBj YW4gYmUgZWl0aGVyIGluaXRpYWxpemVkIG9yIG5vdCwgdGhvdWdoIG1vc3RseSBpbml0aWFsaXpl ZCBpbiBteSBleHBlcmllbmNlcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJv L0ltYWdlQnVmZmVyQ2Fpcm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2xlYXJTdXJmYWNlKToK KyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUNhaXJvR0xTdXJmYWNlKToKKwogMjAxNS0wOC0yNCAg TXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB0 aGUgYnVpbGQgZml4ZXMgaW4gcjE4ODg3NSBhbmQgcjE4ODg3NApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VCdWZmZXJDYWlyby5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZUJ1ZmZlckNhaXJvLmNw cAppbmRleCA2MTFmNGNkNmVmMGUxY2EzMjE4MWY2MDc0YTFiY2ZhODM5MjM3NjI1Li5kNzcxMGEw ZTFkYTg0NzJjNjAyYWVlMzA4YjljNzhkNWJjOTk3M2YxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZUJ1ZmZlckNhaXJvLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZUJ1ZmZlckNhaXJvLmNw cApAQCAtNjgsNiArNjgsMTYgQEAgSW1hZ2VCdWZmZXJEYXRhOjpJbWFnZUJ1ZmZlckRhdGEoY29u c3QgSW50U2l6ZSYgc2l6ZSkKIH0KIAogI2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5WQVMp Cit2b2lkIGNsZWFyU3VyZmFjZShjYWlyb19zdXJmYWNlX3QqIHN1cmZhY2UpCit7CisgICAgaWYg KGNhaXJvX3N1cmZhY2Vfc3RhdHVzKHN1cmZhY2UpICE9IENBSVJPX1NUQVRVU19TVUNDRVNTKQor ICAgICAgICByZXR1cm47CisKKyAgICBSZWZQdHI8Y2Fpcm9fdD4gY3IgPSBhZG9wdFJlZihjYWly b19jcmVhdGUoc3VyZmFjZSkpOworICAgIGNhaXJvX3NldF9vcGVyYXRvcihjci5nZXQoKSwgQ0FJ Uk9fT1BFUkFUT1JfQ0xFQVIpOworICAgIGNhaXJvX3BhaW50KGNyLmdldCgpKTsKK30KKwogUGFz c1JlZlB0cjxjYWlyb19zdXJmYWNlX3Q+IGNyZWF0ZUNhaXJvR0xTdXJmYWNlKGNvbnN0IEZsb2F0 U2l6ZSYgc2l6ZSwgdWludDMyX3QmIHRleHR1cmUpCiB7CiAgICAgR0xDb250ZXh0OjpzaGFyaW5n Q29udGV4dCgpLT5tYWtlQ29udGV4dEN1cnJlbnQoKTsKQEAgLTkxLDcgKzEwMSw5IEBAIFBhc3NS ZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBjcmVhdGVDYWlyb0dMU3VyZmFjZShjb25zdCBGbG9hdFNp emUmIHNpemUsIHVpbnQzMl90CiAgICAgLy8gVGhyZWFkLWF3YXJlbmVzcyBpcyBhIGh1Z2UgcGVy Zm9ybWFuY2UgaGl0IG9uIG5vbi1JbnRlbCBkcml2ZXJzLgogICAgIGNhaXJvX2dsX2RldmljZV9z ZXRfdGhyZWFkX2F3YXJlKGRldmljZSwgRkFMU0UpOwogCi0gICAgcmV0dXJuIGFkb3B0UmVmKGNh aXJvX2dsX3N1cmZhY2VfY3JlYXRlX2Zvcl90ZXh0dXJlKGRldmljZSwgQ0FJUk9fQ09OVEVOVF9D T0xPUl9BTFBIQSwgdGV4dHVyZSwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKSk7CisgICAg YXV0byBzdXJmYWNlID0gYWRvcHRSZWYoY2Fpcm9fZ2xfc3VyZmFjZV9jcmVhdGVfZm9yX3RleHR1 cmUoZGV2aWNlLCBDQUlST19DT05URU5UX0NPTE9SX0FMUEhBLCB0ZXh0dXJlLCBzaXplLndpZHRo KCksIHNpemUuaGVpZ2h0KCkpKTsKKyAgICBjbGVhclN1cmZhY2Uoc3VyZmFjZS5nZXQoKSk7Cisg ICAgcmV0dXJuIHN1cmZhY2U7CiB9CiAjZW5kaWYKIAo=