176531 2017-09-07 09:23:33 -0700 [ARM] Building FELightningNEON.cpp fails due to missing {Point,Spot}LightSource declarations 2017-09-27 12:34:14 -0700 1 1 1 Unclassified WebKit WebCore Misc. Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aperez aperez andersca ap commit-queue jamesr jaragunde kling ossy webkit-bug-importer zan oldest_to_newest 1346345 0 aperez 2017-09-07 09:23:33 -0700 SSIA. Compiler output (GCC 6) follows. --- In file included from platform/graphics/filters/FELighting.cpp:30:0: platform/graphics/cpu/arm/filters/FELightingNEON.h: In member function ‘void WebCore::FELighting::platformApplyNeon(WebCore::FELighting::LightingData&, WebCore::LightSource::PaintingData&)’: platform/graphics/cpu/arm/filters/FELightingNEON.h:119:9: error: ‘PointLightSource’ was not declared in this scope PointLightSource* pointLightSource = static_cast<PointLightSource*>(m_lightSource.get()); ^~~~~~~~~~~~~~~~ platform/graphics/cpu/arm/filters/FELightingNEON.h:127:9: error: ‘SpotLightSource’ was not declared in this scope SpotLightSource* spotLightSource = static_cast<SpotLightSource*>(m_lightSource.get()); ^~~~~~~~~~~~~~~ 1346349 1 aperez 2017-09-07 09:28:05 -0700 After adding the needed #include incantations, the compiler keeps complaining (output below). From a cursory glance it looks like some downcasting might be needed, I'm taking a look at the code. --- In file included from platform/graphics/cpu/arm/filters/FELightingNEON.cpp:28:0: platform/graphics/cpu/arm/filters/FELightingNEON.h: In member function ‘void WebCore::FELighting::platformApplyNeon(WebCore::FELighting::LightingData&, WebCore::LightSource::PaintingData&)’: platform/graphics/cpu/arm/filters/FELightingNEON.h:121:96: error: invalid static_cast from type ‘WebCore::LightSource’ to type ‘WebCore::PointLightSource*’ PointLightSource* pointLightSource = static_cast<PointLightSource*>(m_lightSource.get()); ^ platform/graphics/cpu/arm/filters/FELightingNEON.h:128:93: error: invalid static_cast from type ‘WebCore::LightSource’ to type ‘WebCore::SpotLightSource*’ SpotLightSource* spotLightSource = static_cast<SpotLightSource*>(m_lightSource.get()); ^ 1346360 2 aperez 2017-09-07 09:47:37 -0700 (In reply to Adrian Perez from comment #1) > After adding the needed #include incantations, the compiler keeps > complaining (output below). From a cursory glance it looks like some > downcasting might be needed, I'm taking a look at the code. Noup, m_lightSource is a Ref<LightSource>, and the Ref<T>::get() returns a reference. The code has to be updated to make casts to the correct reference types, and member access using the dot operator instead. I'll be submitting a patch momentarily. 1346374 3 320124 aperez 2017-09-07 10:07:05 -0700 Created attachment 320124 Patch 1346399 4 320132 aperez 2017-09-07 10:40:42 -0700 Created attachment 320132 Patch (v2) Now this version does the casts properly O:-) 1346436 5 320132 commit-queue 2017-09-07 11:22:49 -0700 Comment on attachment 320132 Patch (v2) Clearing flags on attachment: 320132 Committed r221742: <http://trac.webkit.org/changeset/221742> 1346437 6 commit-queue 2017-09-07 11:22:50 -0700 All reviewed patches have been landed. Closing bug. 1353484 7 webkit-bug-importer 2017-09-27 12:34:14 -0700 <rdar://problem/34693504> 320124 2017-09-07 10:07:05 -0700 2017-09-07 10:40:18 -0700 Patch bug-176531-20170907200703.patch text/plain 3971 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxNzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQ4NjI1MDY5Y2VjMmMx NmQxMjY4OTdhMzIwNjAxNDY5N2EwMDdkZS4uODZiMjYwOGUzOTUxY2UyZDU3MTcyYmZmMTQ3ZWE0 M2E4NjFhNzIzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE3LTA5LTA3ICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0FSTV0g QnVpbGRpbmcgRkVMaWdodG5pbmdORU9OLmNwcCBmYWlscyBkdWUgdG8gbWlzc2luZyB7UG9pbnQs U3BvdH1MaWdodFNvdXJjZSBkZWNsYXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjUzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoZSBtX2xpZ2h0U291cmNlIG1lbWJlciBpcyBhIFJlZjxM aWdodFNvdXJjZT4sIGFuZCBpdHMgZ2V0KCkgbWV0aG9kIHJldHVybnMKKyAgICAgICAgYSByZWZl cmVuY2UsIHRoZXJlZm9yZSB0aGUgY2FzdHMgaGF2ZSB0byBiZSBkb25lIHRvIHRoZSBjb3JyZXNw b25kaW5nIHJlZmVyZW5jZQorICAgICAgICB0eXBlcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2NwdS9hcm0vZmlsdGVycy9GRUxpZ2h0aW5nTkVPTi5oOgorICAgICAgICAoV2ViQ29y ZTo6RkVMaWdodGluZzo6cGxhdGZvcm1BcHBseU5lb24pOiBBZGp1c3QgY2FzdHMgYW5kIG1lbWJl ciBhY2Nlc3NlcyBhY2NvcmRpbmdseS4KKwogMjAxNy0wOS0wNyAgUnlhbiBIYWRkYWQgIDxyeWFu aGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjIx NzE2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY3B1L2Fy bS9maWx0ZXJzL0ZFTGlnaHRpbmdORU9OLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jcHUvYXJtL2ZpbHRlcnMvRkVMaWdodGluZ05FT04uaAppbmRleCA0MWI2MWUxNGE1MTJi ZDQzODAwOTRmZjI0ZjY4YjEyZGUzZjY5OWFiLi44MTE2MjkxYmFkOTEwOWY5NWRlMzBiMTgwM2Uz NzRkNjkzMmFhYTg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jcHUvYXJtL2ZpbHRlcnMvRkVMaWdodGluZ05FT04uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jcHUvYXJtL2ZpbHRlcnMvRkVMaWdodGluZ05FT04uaApAQCAtMzAs NiArMzAsOCBAQAogI2lmIENQVShBUk1fTkVPTikgJiYgQ1BVKEFSTV9UUkFESVRJT05BTCkgJiYg Q09NUElMRVIoR0NDX09SX0NMQU5HKQogCiAjaW5jbHVkZSAiRkVMaWdodGluZy5oIgorI2luY2x1 ZGUgIlBvaW50TGlnaHRTb3VyY2UuaCIKKyNpbmNsdWRlICJTcG90TGlnaHRTb3VyY2UuaCIKICNp bmNsdWRlIDx3dGYvUGFyYWxsZWxKb2JzLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTEx NiwxNyArMTE4LDE3IEBAIGlubGluZSB2b2lkIEZFTGlnaHRpbmc6OnBsYXRmb3JtQXBwbHlOZW9u KExpZ2h0aW5nRGF0YSYgZGF0YSwgTGlnaHRTb3VyY2U6OlBhaW50CiAKICAgICBpZiAobV9saWdo dFNvdXJjZS0+dHlwZSgpID09IExTX1BPSU5UKSB7CiAgICAgICAgIG5lb25EYXRhLmZsYWdzIHw9 IEZMQUdfUE9JTlRfTElHSFQ7Ci0gICAgICAgIFBvaW50TGlnaHRTb3VyY2UqIHBvaW50TGlnaHRT b3VyY2UgPSBzdGF0aWNfY2FzdDxQb2ludExpZ2h0U291cmNlKj4obV9saWdodFNvdXJjZS5nZXQo KSk7Ci0gICAgICAgIGZsb2F0QXJndW1lbnRzLmxpZ2h0WCA9IHBvaW50TGlnaHRTb3VyY2UtPnBv c2l0aW9uKCkueCgpOwotICAgICAgICBmbG9hdEFyZ3VtZW50cy5saWdodFkgPSBwb2ludExpZ2h0 U291cmNlLT5wb3NpdGlvbigpLnkoKTsKLSAgICAgICAgZmxvYXRBcmd1bWVudHMubGlnaHRaID0g cG9pbnRMaWdodFNvdXJjZS0+cG9zaXRpb24oKS56KCk7CisgICAgICAgIFBvaW50TGlnaHRTb3Vy Y2UmIHBvaW50TGlnaHRTb3VyY2UgPSBzdGF0aWNfY2FzdDxQb2ludExpZ2h0U291cmNlKj4obV9s aWdodFNvdXJjZS5nZXQoKSk7CisgICAgICAgIGZsb2F0QXJndW1lbnRzLmxpZ2h0WCA9IHBvaW50 TGlnaHRTb3VyY2UucG9zaXRpb24oKS54KCk7CisgICAgICAgIGZsb2F0QXJndW1lbnRzLmxpZ2h0 WSA9IHBvaW50TGlnaHRTb3VyY2UucG9zaXRpb24oKS55KCk7CisgICAgICAgIGZsb2F0QXJndW1l bnRzLmxpZ2h0WiA9IHBvaW50TGlnaHRTb3VyY2UucG9zaXRpb24oKS56KCk7CiAgICAgICAgIGZs b2F0QXJndW1lbnRzLnBhZGRpbmcyID0gMDsKICAgICB9IGVsc2UgaWYgKG1fbGlnaHRTb3VyY2Ut PnR5cGUoKSA9PSBMU19TUE9UKSB7CiAgICAgICAgIG5lb25EYXRhLmZsYWdzIHw9IEZMQUdfU1BP VF9MSUdIVDsKLSAgICAgICAgU3BvdExpZ2h0U291cmNlKiBzcG90TGlnaHRTb3VyY2UgPSBzdGF0 aWNfY2FzdDxTcG90TGlnaHRTb3VyY2UqPihtX2xpZ2h0U291cmNlLmdldCgpKTsKLSAgICAgICAg ZmxvYXRBcmd1bWVudHMubGlnaHRYID0gc3BvdExpZ2h0U291cmNlLT5wb3NpdGlvbigpLngoKTsK LSAgICAgICAgZmxvYXRBcmd1bWVudHMubGlnaHRZID0gc3BvdExpZ2h0U291cmNlLT5wb3NpdGlv bigpLnkoKTsKLSAgICAgICAgZmxvYXRBcmd1bWVudHMubGlnaHRaID0gc3BvdExpZ2h0U291cmNl LT5wb3NpdGlvbigpLnooKTsKKyAgICAgICAgU3BvdExpZ2h0U291cmNlJiBzcG90TGlnaHRTb3Vy Y2UgPSBzdGF0aWNfY2FzdDxTcG90TGlnaHRTb3VyY2UqPihtX2xpZ2h0U291cmNlLmdldCgpKTsK KyAgICAgICAgZmxvYXRBcmd1bWVudHMubGlnaHRYID0gc3BvdExpZ2h0U291cmNlLnBvc2l0aW9u KCkueCgpOworICAgICAgICBmbG9hdEFyZ3VtZW50cy5saWdodFkgPSBzcG90TGlnaHRTb3VyY2Uu cG9zaXRpb24oKS55KCk7CisgICAgICAgIGZsb2F0QXJndW1lbnRzLmxpZ2h0WiA9IHNwb3RMaWdo dFNvdXJjZS5wb3NpdGlvbigpLnooKTsKICAgICAgICAgZmxvYXRBcmd1bWVudHMucGFkZGluZzIg PSAwOwogCiAgICAgICAgIGZsb2F0QXJndW1lbnRzLmRpcmVjdGlvblggPSBwYWludGluZ0RhdGEu ZGlyZWN0aW9uVmVjdG9yLngoKTsKQEAgLTEzNyw4ICsxMzksOCBAQCBpbmxpbmUgdm9pZCBGRUxp Z2h0aW5nOjpwbGF0Zm9ybUFwcGx5TmVvbihMaWdodGluZ0RhdGEmIGRhdGEsIExpZ2h0U291cmNl OjpQYWludAogICAgICAgICBmbG9hdEFyZ3VtZW50cy5jb25lQ3V0T2ZmTGltaXQgPSBwYWludGlu Z0RhdGEuY29uZUN1dE9mZkxpbWl0OwogICAgICAgICBmbG9hdEFyZ3VtZW50cy5jb25lRnVsbExp Z2h0ID0gcGFpbnRpbmdEYXRhLmNvbmVGdWxsTGlnaHQ7CiAgICAgICAgIGZsb2F0QXJndW1lbnRz LmNvbmVDdXRPZmZSYW5nZSA9IHBhaW50aW5nRGF0YS5jb25lQ3V0T2ZmTGltaXQgLSBwYWludGlu Z0RhdGEuY29uZUZ1bGxMaWdodDsKLSAgICAgICAgbmVvbkRhdGEuY29uZUV4cG9uZW50ID0gZ2V0 UG93ZXJDb2VmZmljaWVudHMoc3BvdExpZ2h0U291cmNlLT5zcGVjdWxhckV4cG9uZW50KCkpOwot ICAgICAgICBpZiAoc3BvdExpZ2h0U291cmNlLT5zcGVjdWxhckV4cG9uZW50KCkgPT0gMSkKKyAg ICAgICAgbmVvbkRhdGEuY29uZUV4cG9uZW50ID0gZ2V0UG93ZXJDb2VmZmljaWVudHMoc3BvdExp Z2h0U291cmNlLnNwZWN1bGFyRXhwb25lbnQoKSk7CisgICAgICAgIGlmIChzcG90TGlnaHRTb3Vy Y2Uuc3BlY3VsYXJFeHBvbmVudCgpID09IDEpCiAgICAgICAgICAgICBuZW9uRGF0YS5mbGFncyB8 PSBGTEFHX0NPTkVfRVhQT05FTlRfSVNfMTsKICAgICB9IGVsc2UgewogICAgICAgICBBU1NFUlQo bV9saWdodFNvdXJjZS0+dHlwZSgpID09IExTX0RJU1RBTlQpOwo= 320132 2017-09-07 10:40:42 -0700 2017-09-07 11:22:49 -0700 Patch (v2) bug-176531-20170907204040.patch text/plain 3971 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxNzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQ4NjI1MDY5Y2VjMmMx NmQxMjY4OTdhMzIwNjAxNDY5N2EwMDdkZS4uODZiMjYwOGUzOTUxY2UyZDU3MTcyYmZmMTQ3ZWE0 M2E4NjFhNzIzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE3LTA5LTA3ICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0FSTV0g QnVpbGRpbmcgRkVMaWdodG5pbmdORU9OLmNwcCBmYWlscyBkdWUgdG8gbWlzc2luZyB7UG9pbnQs U3BvdH1MaWdodFNvdXJjZSBkZWNsYXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjUzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoZSBtX2xpZ2h0U291cmNlIG1lbWJlciBpcyBhIFJlZjxM aWdodFNvdXJjZT4sIGFuZCBpdHMgZ2V0KCkgbWV0aG9kIHJldHVybnMKKyAgICAgICAgYSByZWZl cmVuY2UsIHRoZXJlZm9yZSB0aGUgY2FzdHMgaGF2ZSB0byBiZSBkb25lIHRvIHRoZSBjb3JyZXNw b25kaW5nIHJlZmVyZW5jZQorICAgICAgICB0eXBlcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2NwdS9hcm0vZmlsdGVycy9GRUxpZ2h0aW5nTkVPTi5oOgorICAgICAgICAoV2ViQ29y ZTo6RkVMaWdodGluZzo6cGxhdGZvcm1BcHBseU5lb24pOiBBZGp1c3QgY2FzdHMgYW5kIG1lbWJl ciBhY2Nlc3NlcyBhY2NvcmRpbmdseS4KKwogMjAxNy0wOS0wNyAgUnlhbiBIYWRkYWQgIDxyeWFu aGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjIx NzE2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY3B1L2Fy bS9maWx0ZXJzL0ZFTGlnaHRpbmdORU9OLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jcHUvYXJtL2ZpbHRlcnMvRkVMaWdodGluZ05FT04uaAppbmRleCA0MWI2MWUxNGE1MTJi ZDQzODAwOTRmZjI0ZjY4YjEyZGUzZjY5OWFiLi41MWRkYTE3ODE3M2M5YWVlNGM1ZWJmNmRjNTFj M2RjNDViY2UwNGQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jcHUvYXJtL2ZpbHRlcnMvRkVMaWdodGluZ05FT04uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jcHUvYXJtL2ZpbHRlcnMvRkVMaWdodGluZ05FT04uaApAQCAtMzAs NiArMzAsOCBAQAogI2lmIENQVShBUk1fTkVPTikgJiYgQ1BVKEFSTV9UUkFESVRJT05BTCkgJiYg Q09NUElMRVIoR0NDX09SX0NMQU5HKQogCiAjaW5jbHVkZSAiRkVMaWdodGluZy5oIgorI2luY2x1 ZGUgIlBvaW50TGlnaHRTb3VyY2UuaCIKKyNpbmNsdWRlICJTcG90TGlnaHRTb3VyY2UuaCIKICNp bmNsdWRlIDx3dGYvUGFyYWxsZWxKb2JzLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTEx NiwxNyArMTE4LDE3IEBAIGlubGluZSB2b2lkIEZFTGlnaHRpbmc6OnBsYXRmb3JtQXBwbHlOZW9u KExpZ2h0aW5nRGF0YSYgZGF0YSwgTGlnaHRTb3VyY2U6OlBhaW50CiAKICAgICBpZiAobV9saWdo dFNvdXJjZS0+dHlwZSgpID09IExTX1BPSU5UKSB7CiAgICAgICAgIG5lb25EYXRhLmZsYWdzIHw9 IEZMQUdfUE9JTlRfTElHSFQ7Ci0gICAgICAgIFBvaW50TGlnaHRTb3VyY2UqIHBvaW50TGlnaHRT b3VyY2UgPSBzdGF0aWNfY2FzdDxQb2ludExpZ2h0U291cmNlKj4obV9saWdodFNvdXJjZS5nZXQo KSk7Ci0gICAgICAgIGZsb2F0QXJndW1lbnRzLmxpZ2h0WCA9IHBvaW50TGlnaHRTb3VyY2UtPnBv c2l0aW9uKCkueCgpOwotICAgICAgICBmbG9hdEFyZ3VtZW50cy5saWdodFkgPSBwb2ludExpZ2h0 U291cmNlLT5wb3NpdGlvbigpLnkoKTsKLSAgICAgICAgZmxvYXRBcmd1bWVudHMubGlnaHRaID0g cG9pbnRMaWdodFNvdXJjZS0+cG9zaXRpb24oKS56KCk7CisgICAgICAgIFBvaW50TGlnaHRTb3Vy Y2UmIHBvaW50TGlnaHRTb3VyY2UgPSBzdGF0aWNfY2FzdDxQb2ludExpZ2h0U291cmNlJj4obV9s aWdodFNvdXJjZS5nZXQoKSk7CisgICAgICAgIGZsb2F0QXJndW1lbnRzLmxpZ2h0WCA9IHBvaW50 TGlnaHRTb3VyY2UucG9zaXRpb24oKS54KCk7CisgICAgICAgIGZsb2F0QXJndW1lbnRzLmxpZ2h0 WSA9IHBvaW50TGlnaHRTb3VyY2UucG9zaXRpb24oKS55KCk7CisgICAgICAgIGZsb2F0QXJndW1l bnRzLmxpZ2h0WiA9IHBvaW50TGlnaHRTb3VyY2UucG9zaXRpb24oKS56KCk7CiAgICAgICAgIGZs b2F0QXJndW1lbnRzLnBhZGRpbmcyID0gMDsKICAgICB9IGVsc2UgaWYgKG1fbGlnaHRTb3VyY2Ut PnR5cGUoKSA9PSBMU19TUE9UKSB7CiAgICAgICAgIG5lb25EYXRhLmZsYWdzIHw9IEZMQUdfU1BP VF9MSUdIVDsKLSAgICAgICAgU3BvdExpZ2h0U291cmNlKiBzcG90TGlnaHRTb3VyY2UgPSBzdGF0 aWNfY2FzdDxTcG90TGlnaHRTb3VyY2UqPihtX2xpZ2h0U291cmNlLmdldCgpKTsKLSAgICAgICAg ZmxvYXRBcmd1bWVudHMubGlnaHRYID0gc3BvdExpZ2h0U291cmNlLT5wb3NpdGlvbigpLngoKTsK LSAgICAgICAgZmxvYXRBcmd1bWVudHMubGlnaHRZID0gc3BvdExpZ2h0U291cmNlLT5wb3NpdGlv bigpLnkoKTsKLSAgICAgICAgZmxvYXRBcmd1bWVudHMubGlnaHRaID0gc3BvdExpZ2h0U291cmNl LT5wb3NpdGlvbigpLnooKTsKKyAgICAgICAgU3BvdExpZ2h0U291cmNlJiBzcG90TGlnaHRTb3Vy Y2UgPSBzdGF0aWNfY2FzdDxTcG90TGlnaHRTb3VyY2UmPihtX2xpZ2h0U291cmNlLmdldCgpKTsK KyAgICAgICAgZmxvYXRBcmd1bWVudHMubGlnaHRYID0gc3BvdExpZ2h0U291cmNlLnBvc2l0aW9u KCkueCgpOworICAgICAgICBmbG9hdEFyZ3VtZW50cy5saWdodFkgPSBzcG90TGlnaHRTb3VyY2Uu cG9zaXRpb24oKS55KCk7CisgICAgICAgIGZsb2F0QXJndW1lbnRzLmxpZ2h0WiA9IHNwb3RMaWdo dFNvdXJjZS5wb3NpdGlvbigpLnooKTsKICAgICAgICAgZmxvYXRBcmd1bWVudHMucGFkZGluZzIg PSAwOwogCiAgICAgICAgIGZsb2F0QXJndW1lbnRzLmRpcmVjdGlvblggPSBwYWludGluZ0RhdGEu ZGlyZWN0aW9uVmVjdG9yLngoKTsKQEAgLTEzNyw4ICsxMzksOCBAQCBpbmxpbmUgdm9pZCBGRUxp Z2h0aW5nOjpwbGF0Zm9ybUFwcGx5TmVvbihMaWdodGluZ0RhdGEmIGRhdGEsIExpZ2h0U291cmNl OjpQYWludAogICAgICAgICBmbG9hdEFyZ3VtZW50cy5jb25lQ3V0T2ZmTGltaXQgPSBwYWludGlu Z0RhdGEuY29uZUN1dE9mZkxpbWl0OwogICAgICAgICBmbG9hdEFyZ3VtZW50cy5jb25lRnVsbExp Z2h0ID0gcGFpbnRpbmdEYXRhLmNvbmVGdWxsTGlnaHQ7CiAgICAgICAgIGZsb2F0QXJndW1lbnRz LmNvbmVDdXRPZmZSYW5nZSA9IHBhaW50aW5nRGF0YS5jb25lQ3V0T2ZmTGltaXQgLSBwYWludGlu Z0RhdGEuY29uZUZ1bGxMaWdodDsKLSAgICAgICAgbmVvbkRhdGEuY29uZUV4cG9uZW50ID0gZ2V0 UG93ZXJDb2VmZmljaWVudHMoc3BvdExpZ2h0U291cmNlLT5zcGVjdWxhckV4cG9uZW50KCkpOwot ICAgICAgICBpZiAoc3BvdExpZ2h0U291cmNlLT5zcGVjdWxhckV4cG9uZW50KCkgPT0gMSkKKyAg ICAgICAgbmVvbkRhdGEuY29uZUV4cG9uZW50ID0gZ2V0UG93ZXJDb2VmZmljaWVudHMoc3BvdExp Z2h0U291cmNlLnNwZWN1bGFyRXhwb25lbnQoKSk7CisgICAgICAgIGlmIChzcG90TGlnaHRTb3Vy Y2Uuc3BlY3VsYXJFeHBvbmVudCgpID09IDEpCiAgICAgICAgICAgICBuZW9uRGF0YS5mbGFncyB8 PSBGTEFHX0NPTkVfRVhQT05FTlRfSVNfMTsKICAgICB9IGVsc2UgewogICAgICAgICBBU1NFUlQo bV9saWdodFNvdXJjZS0+dHlwZSgpID09IExTX0RJU1RBTlQpOwo=