108548 2013-01-31 16:32:58 -0800 [Qt][WK2] Another attempt to fix build after recent WebKit2 changes 2013-01-31 23:23:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rafael.lobo rafael.lobo abecsi andersca cmarcelo hausmann menard webkit.review.bot oldest_to_newest 822097 0 rafael.lobo 2013-01-31 16:32:58 -0800 [Qt][WK2] Another attempt to fix build after recent WebKit2 changes 822101 1 185892 rafael.lobo 2013-01-31 16:34:54 -0800 Created attachment 185892 Patch 822103 2 rafael.lobo 2013-01-31 16:36:17 -0800 I believe one of the errors came after patch from bug #108407 822135 3 rafael.lobo 2013-01-31 16:55:10 -0800 (In reply to comment #2) > I believe one of the errors came after patch from bug #108407 The problem is getPluginPath was moved to WebPageProxy but it is slightly different. It now uses some PluginModuleInfo attributes that are protected by PLATFORM(MAC) on trunk. What I did was to allow other ports to use it too, but protect only pluginArchitecture (which seems to be included by mach/machine.h). 822136 4 185892 rafael.lobo 2013-01-31 16:57:11 -0800 Comment on attachment 185892 Patch There are now other build failures, I will try to solve them all at once. 822138 5 andersca 2013-01-31 16:58:12 -0800 (In reply to comment #3) > (In reply to comment #2) > > I believe one of the errors came after patch from bug #108407 > > The problem is getPluginPath was moved to WebPageProxy but it is slightly different. It now uses some PluginModuleInfo attributes that are protected by PLATFORM(MAC) on trunk. What I did was to allow other ports to use it too, but protect only pluginArchitecture (which seems to be included by mach/machine.h). Ah, thanks for the explanation! A better fix is to just put these lines in WebPageProxy::getPluginPath inside an #if PLATFORM(MAC) block. pluginLoadPolicy = m_uiClient.shouldInstantiatePlugin(this, plugin.bundleIdentifier, plugin.info.name) ? PluginModuleLoadNormally : PluginModuleBlocked; if (pluginLoadPolicy != PluginModuleLoadNormally) return; 822192 6 185907 rafael.lobo 2013-01-31 17:49:50 -0800 Created attachment 185907 Patch 822201 7 rafael.lobo 2013-01-31 18:01:37 -0800 Anders, please look when you have time. I've put into the ChangeLog the references to the bugs that caused each error and tried to follow those changes to get similar solutions. 822202 8 185907 rafael.lobo 2013-01-31 18:03:17 -0800 Comment on attachment 185907 Patch Also, I need to leave now. Please cq+ if you feel like this is correct. 822252 9 185907 webkit.review.bot 2013-01-31 19:53:46 -0800 Comment on attachment 185907 Patch Clearing flags on attachment: 185907 Committed r141528: <http://trac.webkit.org/changeset/141528> 822253 10 webkit.review.bot 2013-01-31 19:53:50 -0800 All reviewed patches have been landed. Closing bug. 822372 11 hausmann 2013-01-31 23:23:32 -0800 Thanks Rafael 185892 2013-01-31 16:34:54 -0800 2013-01-31 17:49:47 -0800 Patch bug-108548-20130131213138.patch text/plain 2741 rafael.lobo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNDk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWM2NzhjNjA1YzE2ZjZi NWM5YmNiODcyMGRkNTA2NGRiNWIxZTcwMy4uYTZjMGYxZjZlM2VmOWI4OThjZTNjYWZmYTkzY2Rj NzI5OTJmYzRiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDEzLTAxLTMxICBSYWZh ZWwgQnJhbmRhbyAgPHJhZmFlbC5sb2JvQG9wZW5ib3NzYS5vcmc+CiAKKyAgICAgICAgW1F0XVtX SzJdIEFub3RoZXIgYXR0ZW1wdCB0byBmaXggYnVpbGQgYWZ0ZXIgcmVjZW50IFdlYktpdDIgY2hh bmdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4 NTQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBQ bGF0Zm9ybS9Db3JlSVBDL3VuaXgvQ29ubmVjdGlvblVuaXguY3BwOgorICAgICAgICAoQ29yZUlQ Qzo6Q29ubmVjdGlvbjo6cHJvY2Vzc01lc3NhZ2UpOiBDaGFuZ2UgRGVxdWUgdG8gVmVjdG9yIG9u IGF0dGFjaG1lbnRzLgorICAgICAgICAqIFNoYXJlZC9QbHVnaW5zL1BsdWdpbk1vZHVsZUluZm8u aDoKKyAgICAgICAgKFBsdWdpbk1vZHVsZUluZm8pOiBQcm90ZWN0IHBsdWdpbkFyY2hpdGVjdHVy ZSB3aXRoIFBMQVRGT1JNKE1BQykuCisgICAgICAgIChXZWJLaXQ6OlBsdWdpbk1vZHVsZUluZm86 Omlzb2xhdGVkQ29weSk6CisKKzIwMTMtMDEtMzEgIFJhZmFlbCBCcmFuZGFvICA8cmFmYWVsLmxv Ym9Ab3BlbmJvc3NhLm9yZz4KKwogICAgICAgICBbUXRdW1dLMl0gRml4IGJ1aWxkIGFmdGVyIHJl bW92YWwgb2YgTWVzc2FnZUlELmgKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwODUzNAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9y bS9Db3JlSVBDL3VuaXgvQ29ubmVjdGlvblVuaXguY3BwIGIvU291cmNlL1dlYktpdDIvUGxhdGZv cm0vQ29yZUlQQy91bml4L0Nvbm5lY3Rpb25Vbml4LmNwcAppbmRleCA0MzQwMjM3YjRlMDUxNjRk YmUyZGI3Njg0OTJmNGIyNTBmNDc5ZmIzLi4yMGE1N2NlMWZkMmQyMGFiNWQ0MmYwNzUxNWZhNWNm MTFiYzhmYjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3Vu aXgvQ29ubmVjdGlvblVuaXguY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJ UEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHAKQEAgLTIwNyw4ICsyMDcsOCBAQCBib29sIENvbm5l Y3Rpb246OnByb2Nlc3NNZXNzYWdlKCkKICAgICBpZiAobV9yZWFkQnVmZmVyU2l6ZSA8IG1lc3Nh Z2VMZW5ndGgpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIERlcXVlPEF0dGFjaG1lbnQ+ IGF0dGFjaG1lbnRzOwotICAgIEF0dGFjaG1lbnRSZXNvdXJjZUd1YXJkPERlcXVlPEF0dGFjaG1l bnQ+LCBEZXF1ZTxBdHRhY2htZW50Pjo6aXRlcmF0b3I+IGF0dGFjaGVtZW50RGlzcG9zZXIoYXR0 YWNobWVudHMpOworICAgIFZlY3RvcjxBdHRhY2htZW50PiBhdHRhY2htZW50czsKKyAgICBBdHRh Y2htZW50UmVzb3VyY2VHdWFyZDxWZWN0b3I8QXR0YWNobWVudD4sIFZlY3RvcjxBdHRhY2htZW50 Pjo6aXRlcmF0b3I+IGF0dGFjaGVtZW50RGlzcG9zZXIoYXR0YWNobWVudHMpOwogICAgIFJlZlB0 cjxXZWJLaXQ6OlNoYXJlZE1lbW9yeT4gb29sTWVzc2FnZUJvZHk7CiAKICAgICBzaXplX3QgYXR0 YWNobWVudEZpbGVEZXNjcmlwdG9yQ291bnQgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvU2hhcmVkL1BsdWdpbnMvUGx1Z2luTW9kdWxlSW5mby5oIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL1BsdWdpbnMvUGx1Z2luTW9kdWxlSW5mby5oCmluZGV4IGI0OGZmMzRiODIyYmQ1ZWEwNDMz MWViZjRhOWY5ZWM2ZjgwNWMzMjEuLjI5MTFmMjBiZDE4YjcyZGY3ZmQxNTM1NDI5M2QzZTkwMmJk Mjk0MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL1BsdWdpbk1v ZHVsZUluZm8uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9QbHVnaW5Nb2R1 bGVJbmZvLmgKQEAgLTUyLDkgKzUyLDkgQEAgc3RydWN0IFBsdWdpbk1vZHVsZUluZm8gewogCiAj aWYgUExBVEZPUk0oTUFDKQogICAgIGNwdV90eXBlX3QgcGx1Z2luQXJjaGl0ZWN0dXJlOworI2Vu ZGlmCiAgICAgU3RyaW5nIGJ1bmRsZUlkZW50aWZpZXI7CiAgICAgU3RyaW5nIHZlcnNpb25TdHJp bmc7Ci0jZW5kaWYKIAogICAgIFBsdWdpbk1vZHVsZUluZm8gaXNvbGF0ZWRDb3B5KCkgY29uc3QK ICAgICB7CkBAIC02Myw5ICs2Myw5IEBAIHN0cnVjdCBQbHVnaW5Nb2R1bGVJbmZvIHsKICAgICAg ICAgY2xvbmUuaW5mbyA9IGluZm8uaXNvbGF0ZWRDb3B5KCk7CiAjaWYgUExBVEZPUk0oTUFDKQog ICAgICAgICBjbG9uZS5wbHVnaW5BcmNoaXRlY3R1cmUgPSBwbHVnaW5BcmNoaXRlY3R1cmU7Cisj ZW5kaWYKICAgICAgICAgY2xvbmUuYnVuZGxlSWRlbnRpZmllciA9IGJ1bmRsZUlkZW50aWZpZXIu aXNvbGF0ZWRDb3B5KCk7CiAgICAgICAgIGNsb25lLnZlcnNpb25TdHJpbmcgPSB2ZXJzaW9uU3Ry aW5nLmlzb2xhdGVkQ29weSgpOwotI2VuZGlmCiAgICAgICAgIHJldHVybiBjbG9uZTsKICAgICB9 CiB9Owo= 185907 2013-01-31 17:49:50 -0800 2013-01-31 19:53:46 -0800 Patch bug-108548-20130131224635.patch text/plain 9085 rafael.lobo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDczZTJjMmRlYmE3OWY2 NjliNDVhNTA2ZmNkYTQ1OGQ3MmJhNWU2Ny4uMDQ4MjViOWUxMWMyMTI2YWIwOTQyOWU0OTc4ZGU0 N2U3Y2NiM2M4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAxLTMxICBSYWZh ZWwgQnJhbmRhbyAgPHJhZmFlbC5sb2JvQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XVtX SzJdIEFub3RoZXIgYXR0ZW1wdCB0byBmaXggYnVpbGQgYWZ0ZXIgcmVjZW50IFdlYktpdDIgY2hh bmdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4 NTQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBQ bGF0Zm9ybS9Db3JlSVBDL3VuaXgvQ29ubmVjdGlvblVuaXguY3BwOgorICAgICAgICAoQ29yZUlQ Qzo6Q29ubmVjdGlvbjo6cGxhdGZvcm1JbnZhbGlkYXRlKToKKyAgICAgICAgKENvcmVJUEM6OkNv bm5lY3Rpb246OnByb2Nlc3NNZXNzYWdlKTogQ2hhbmdlIERlcXVlIHRvIFZlY3RvciBhbmQgZG8g c2ltaWxhcgorICAgICAgICBsb2dpYyBhcyBvbiBwYXRjaCBmb3IgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODUxNworICAgICAgICAoQ29yZUlQQzo6Q29ubmVjdGlv bjo6b3Blbik6CisgICAgICAgIChDb3JlSVBDOjpDb25uZWN0aW9uOjpzZXRTaG91bGRDbG9zZUNv bm5lY3Rpb25PblByb2Nlc3NUZXJtaW5hdGlvbik6CisgICAgICAgICogUGxhdGZvcm0vcXQvV29y a1F1ZXVlUXQuY3BwOiBSZWZsZWN0IGNoYW5nZXMgb24gUXQgV29ya1F1ZXVlIHRvIGluY3JlYXNl IHJlZgorICAgICAgICBjb3VudCB3aGVuIHRoZSBleGVjdXRpb24gaXMgc3RhcnRlZCBhbmQgZGVj cmVhc2UgaXQgd2hlbiB0aGUgd29yayBpdGVtIGlzIGRlbGV0ZWQsCisgICAgICAgIGZvbGxvd2lu ZyB0aGUgbG9naWMgb24gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEw ODU0NAorICAgICAgICAoV29ya1F1ZXVlOjpXb3JrSXRlbVF0Ojp+V29ya0l0ZW1RdCk6CisgICAg ICAgIChXb3JrUXVldWU6OldvcmtJdGVtUXQ6OmV4ZWN1dGUpOgorICAgICAgICAoV29ya1F1ZXVl OjpkaXNwYXRjaCk6CisgICAgICAgIChXb3JrUXVldWU6OmRpc3BhdGNoQWZ0ZXJEZWxheSk6Cisg ICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6Z2V0UGx1Z2luUGF0aCk6IFRoaXMgZnVuY3Rpb24gd2FzIG1vdmVkIGZyb20g V2ViUHJvY2Vzc1Byb3h5IGJ1dAorICAgICAgICBtYWMgc3BlY2lmaWMgY29kZSB3YXMgbm90IHBy b3RlY3RlZCBwcm9wZXJseTogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwODQwNworCiAyMDEzLTAxLTMxICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5j b20+CiAKICAgICAgICAgV29ya1F1ZXVlIHNob3VsZCBiZSBhIHJlZi1jb3VudGVkIGNsYXNzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3VuaXgvQ29ubmVjdGlv blVuaXguY3BwIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy91bml4L0Nvbm5lY3Rp b25Vbml4LmNwcAppbmRleCA0MzQwMjM3YjRlMDUxNjRkYmUyZGI3Njg0OTJmNGIyNTBmNDc5ZmIz Li5hNGQ2ZmEyYTg2ZmE3OGM1MjJmNjRlNGJlY2JmZWI5Zjc0MDFjYjkwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3VuaXgvQ29ubmVjdGlvblVuaXguY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvdW5peC9Db25uZWN0aW9uVW5peC5j cHAKQEAgLTE0MCw3ICsxNDAsNyBAQCB2b2lkIENvbm5lY3Rpb246OnBsYXRmb3JtSW52YWxpZGF0 ZSgpCiAgICAgICAgIHJldHVybjsKIAogI2lmIFBMQVRGT1JNKEdUSykKLSAgICBtX2Nvbm5lY3Rp b25RdWV1ZS51bnJlZ2lzdGVyRXZlbnRTb3VyY2VIYW5kbGVyKG1fc29ja2V0RGVzY3JpcHRvcik7 CisgICAgbV9jb25uZWN0aW9uUXVldWUtPnVucmVnaXN0ZXJFdmVudFNvdXJjZUhhbmRsZXIobV9z b2NrZXREZXNjcmlwdG9yKTsKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oUVQpCkBAIC0xNDksNyAr MTQ5LDcgQEAgdm9pZCBDb25uZWN0aW9uOjpwbGF0Zm9ybUludmFsaWRhdGUoKQogI2VuZGlmCiAK ICNpZiBQTEFURk9STShFRkwpCi0gICAgbV9jb25uZWN0aW9uUXVldWUudW5yZWdpc3RlclNvY2tl dEV2ZW50SGFuZGxlcihtX3NvY2tldERlc2NyaXB0b3IpOworICAgIG1fY29ubmVjdGlvblF1ZXVl LT51bnJlZ2lzdGVyU29ja2V0RXZlbnRIYW5kbGVyKG1fc29ja2V0RGVzY3JpcHRvcik7CiAjZW5k aWYKIAogICAgIG1fc29ja2V0RGVzY3JpcHRvciA9IC0xOwpAQCAtMjA3LDE0ICsyMDcsMTIgQEAg Ym9vbCBDb25uZWN0aW9uOjpwcm9jZXNzTWVzc2FnZSgpCiAgICAgaWYgKG1fcmVhZEJ1ZmZlclNp emUgPCBtZXNzYWdlTGVuZ3RoKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBEZXF1ZTxB dHRhY2htZW50PiBhdHRhY2htZW50czsKLSAgICBBdHRhY2htZW50UmVzb3VyY2VHdWFyZDxEZXF1 ZTxBdHRhY2htZW50PiwgRGVxdWU8QXR0YWNobWVudD46Oml0ZXJhdG9yPiBhdHRhY2hlbWVudERp c3Bvc2VyKGF0dGFjaG1lbnRzKTsKLSAgICBSZWZQdHI8V2ViS2l0OjpTaGFyZWRNZW1vcnk+IG9v bE1lc3NhZ2VCb2R5OwotCiAgICAgc2l6ZV90IGF0dGFjaG1lbnRGaWxlRGVzY3JpcHRvckNvdW50 ID0gMDsKICAgICBzaXplX3QgYXR0YWNobWVudENvdW50ID0gbWVzc2FnZUluZm8uYXR0YWNobWVu dENvdW50KCk7CisgICAgT3duQXJyYXlQdHI8QXR0YWNobWVudEluZm8+IGF0dGFjaG1lbnRJbmZv OworCiAgICAgaWYgKGF0dGFjaG1lbnRDb3VudCkgewotICAgICAgICBPd25BcnJheVB0cjxBdHRh Y2htZW50SW5mbz4gYXR0YWNobWVudEluZm8gPSBhZG9wdEFycmF5UHRyKG5ldyBBdHRhY2htZW50 SW5mb1thdHRhY2htZW50Q291bnRdKTsKKyAgICAgICAgYXR0YWNobWVudEluZm8gPSBhZG9wdEFy cmF5UHRyKG5ldyBBdHRhY2htZW50SW5mb1thdHRhY2htZW50Q291bnRdKTsKICAgICAgICAgbWVt Y3B5KGF0dGFjaG1lbnRJbmZvLmdldCgpLCBtZXNzYWdlRGF0YSwgc2l6ZW9mKEF0dGFjaG1lbnRJ bmZvKSAqIGF0dGFjaG1lbnRDb3VudCk7CiAgICAgICAgIG1lc3NhZ2VEYXRhICs9IHNpemVvZihB dHRhY2htZW50SW5mbykgKiBhdHRhY2htZW50Q291bnQ7CiAKQEAgLTIyNiwxMyArMjI0LDIwIEBA IGJvb2wgQ29ubmVjdGlvbjo6cHJvY2Vzc01lc3NhZ2UoKQogICAgICAgICAgICAgICAgICAgICBh dHRhY2htZW50RmlsZURlc2NyaXB0b3JDb3VudCsrOwogICAgICAgICAgICAgY2FzZSBBdHRhY2ht ZW50OjpVbmluaXRpYWxpemVkOgogICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAg ICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIGlmIChtZXNzYWdlSW5mby5pc01lc3NhZ2VCb2R5 SXNPdXRPZkxpbmUoKSkKICAgICAgICAgICAgIGF0dGFjaG1lbnRDb3VudC0tOworICAgIH0KIAor ICAgIFZlY3RvcjxBdHRhY2htZW50PiBhdHRhY2htZW50cyhhdHRhY2htZW50Q291bnQpOworICAg IEF0dGFjaG1lbnRSZXNvdXJjZUd1YXJkPFZlY3RvcjxBdHRhY2htZW50PiwgVmVjdG9yPEF0dGFj aG1lbnQ+OjppdGVyYXRvcj4gYXR0YWNoZW1lbnREaXNwb3NlcihhdHRhY2htZW50cyk7CisgICAg UmVmUHRyPFdlYktpdDo6U2hhcmVkTWVtb3J5PiBvb2xNZXNzYWdlQm9keTsKKworICAgIGlmIChh dHRhY2htZW50Q291bnQpIHsKICAgICAgICAgc2l6ZV90IGZkSW5kZXggPSAwOwogICAgICAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IGF0dGFjaG1lbnRDb3VudDsgKytpKSB7CiAgICAgICAgICAg ICBpbnQgZmQgPSAtMTsKQEAgLTI0MCwxNSArMjQ1LDE1IEBAIGJvb2wgQ29ubmVjdGlvbjo6cHJv Y2Vzc01lc3NhZ2UoKQogICAgICAgICAgICAgY2FzZSBBdHRhY2htZW50OjpNYXBwZWRNZW1vcnlU eXBlOgogICAgICAgICAgICAgICAgIGlmICghYXR0YWNobWVudEluZm9baV0uaXNOdWxsKCkpCiAg ICAgICAgICAgICAgICAgICAgIGZkID0gbV9maWxlRGVzY3JpcHRvcnNbZmRJbmRleCsrXTsKLSAg ICAgICAgICAgICAgICBhdHRhY2htZW50cy5hcHBlbmQoQXR0YWNobWVudChmZCwgYXR0YWNobWVu dEluZm9baV0uZ2V0U2l6ZSgpKSk7CisgICAgICAgICAgICAgICAgYXR0YWNobWVudHNbYXR0YWNo bWVudENvdW50IC0gaSAtIDFdID0gQXR0YWNobWVudChmZCwgYXR0YWNobWVudEluZm9baV0uZ2V0 U2l6ZSgpKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgQXR0YWNo bWVudDo6U29ja2V0VHlwZToKICAgICAgICAgICAgICAgICBpZiAoIWF0dGFjaG1lbnRJbmZvW2ld LmlzTnVsbCgpKQogICAgICAgICAgICAgICAgICAgICBmZCA9IG1fZmlsZURlc2NyaXB0b3JzW2Zk SW5kZXgrK107Ci0gICAgICAgICAgICAgICAgYXR0YWNobWVudHMuYXBwZW5kKEF0dGFjaG1lbnQo ZmQpKTsKKyAgICAgICAgICAgICAgICBhdHRhY2htZW50c1thdHRhY2htZW50Q291bnQgLSBpIC0g MV0gPSBBdHRhY2htZW50KGZkKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAg IGNhc2UgQXR0YWNobWVudDo6VW5pbml0aWFsaXplZDoKLSAgICAgICAgICAgICAgICBhdHRhY2ht ZW50cy5hcHBlbmQoQXR0YWNobWVudCgpKTsKKyAgICAgICAgICAgICAgICBhdHRhY2htZW50c1th dHRhY2htZW50Q291bnQgLSBpIC0gMV0gPSBBdHRhY2htZW50KCk7CiAgICAgICAgICAgICBkZWZh dWx0OgogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQpAQCAtNDE4LDE3ICs0 MjMsMTcgQEAgYm9vbCBDb25uZWN0aW9uOjpvcGVuKCkKIAogICAgIG1faXNDb25uZWN0ZWQgPSB0 cnVlOwogI2lmIFBMQVRGT1JNKFFUKQotICAgIG1fc29ja2V0Tm90aWZpZXIgPSBtX2Nvbm5lY3Rp b25RdWV1ZS5yZWdpc3RlclNvY2tldEV2ZW50SGFuZGxlcihtX3NvY2tldERlc2NyaXB0b3IsIFFT b2NrZXROb3RpZmllcjo6UmVhZCwgV1RGOjpiaW5kKCZDb25uZWN0aW9uOjpyZWFkeVJlYWRIYW5k bGVyLCB0aGlzKSk7CisgICAgbV9zb2NrZXROb3RpZmllciA9IG1fY29ubmVjdGlvblF1ZXVlLT5y ZWdpc3RlclNvY2tldEV2ZW50SGFuZGxlcihtX3NvY2tldERlc2NyaXB0b3IsIFFTb2NrZXROb3Rp Zmllcjo6UmVhZCwgV1RGOjpiaW5kKCZDb25uZWN0aW9uOjpyZWFkeVJlYWRIYW5kbGVyLCB0aGlz KSk7CiAjZWxpZiBQTEFURk9STShHVEspCi0gICAgbV9jb25uZWN0aW9uUXVldWUucmVnaXN0ZXJF dmVudFNvdXJjZUhhbmRsZXIobV9zb2NrZXREZXNjcmlwdG9yLCAoR19JT19IVVAgfCBHX0lPX0VS UiksIFdURjo6YmluZCgmQ29ubmVjdGlvbjo6Y29ubmVjdGlvbkRpZENsb3NlLCB0aGlzKSk7Ci0g ICAgbV9jb25uZWN0aW9uUXVldWUucmVnaXN0ZXJFdmVudFNvdXJjZUhhbmRsZXIobV9zb2NrZXRE ZXNjcmlwdG9yLCBHX0lPX0lOLCBXVEY6OmJpbmQoJkNvbm5lY3Rpb246OnJlYWR5UmVhZEhhbmRs ZXIsIHRoaXMpKTsKKyAgICBtX2Nvbm5lY3Rpb25RdWV1ZS0+cmVnaXN0ZXJFdmVudFNvdXJjZUhh bmRsZXIobV9zb2NrZXREZXNjcmlwdG9yLCAoR19JT19IVVAgfCBHX0lPX0VSUiksIFdURjo6Ymlu ZCgmQ29ubmVjdGlvbjo6Y29ubmVjdGlvbkRpZENsb3NlLCB0aGlzKSk7CisgICAgbV9jb25uZWN0 aW9uUXVldWUtPnJlZ2lzdGVyRXZlbnRTb3VyY2VIYW5kbGVyKG1fc29ja2V0RGVzY3JpcHRvciwg R19JT19JTiwgV1RGOjpiaW5kKCZDb25uZWN0aW9uOjpyZWFkeVJlYWRIYW5kbGVyLCB0aGlzKSk7 CiAjZWxpZiBQTEFURk9STShFRkwpCi0gICAgbV9jb25uZWN0aW9uUXVldWUucmVnaXN0ZXJTb2Nr ZXRFdmVudEhhbmRsZXIobV9zb2NrZXREZXNjcmlwdG9yLCBXVEY6OmJpbmQoJkNvbm5lY3Rpb246 OnJlYWR5UmVhZEhhbmRsZXIsIHRoaXMpKTsKKyAgICBtX2Nvbm5lY3Rpb25RdWV1ZS0+cmVnaXN0 ZXJTb2NrZXRFdmVudEhhbmRsZXIobV9zb2NrZXREZXNjcmlwdG9yLCBXVEY6OmJpbmQoJkNvbm5l Y3Rpb246OnJlYWR5UmVhZEhhbmRsZXIsIHRoaXMpKTsKICNlbmRpZgogCiAgICAgLy8gU2NoZWR1 bGUgYSBjYWxsIHRvIHJlYWR5UmVhZEhhbmRsZXIuIERhdGEgbWF5IGhhdmUgYXJyaXZlZCBiZWZv cmUgaW5zdGFsbGF0aW9uIG9mIHRoZSBzaWduYWwKICAgICAvLyBoYW5kbGVyLgotICAgIG1fY29u bmVjdGlvblF1ZXVlLmRpc3BhdGNoKFdURjo6YmluZCgmQ29ubmVjdGlvbjo6cmVhZHlSZWFkSGFu ZGxlciwgdGhpcykpOworICAgIG1fY29ubmVjdGlvblF1ZXVlLT5kaXNwYXRjaChXVEY6OmJpbmQo JkNvbm5lY3Rpb246OnJlYWR5UmVhZEhhbmRsZXIsIHRoaXMpKTsKIAogICAgIHJldHVybiB0cnVl OwogfQpAQCAtNTU2LDcgKzU2MSw3IEBAIGJvb2wgQ29ubmVjdGlvbjo6c2VuZE91dGdvaW5nTWVz c2FnZShQYXNzT3duUHRyPE1lc3NhZ2VFbmNvZGVyPiBlbmNvZGVyKQogI2lmIFBMQVRGT1JNKFFU KQogdm9pZCBDb25uZWN0aW9uOjpzZXRTaG91bGRDbG9zZUNvbm5lY3Rpb25PblByb2Nlc3NUZXJt aW5hdGlvbihXZWJLaXQ6OlBsYXRmb3JtUHJvY2Vzc0lkZW50aWZpZXIgcHJvY2VzcykKIHsKLSAg ICBtX2Nvbm5lY3Rpb25RdWV1ZS5kaXNwYXRjaE9uVGVybWluYXRpb24ocHJvY2VzcywgV1RGOjpi aW5kKCZDb25uZWN0aW9uOjpjb25uZWN0aW9uRGlkQ2xvc2UsIHRoaXMpKTsKKyAgICBtX2Nvbm5l Y3Rpb25RdWV1ZS0+ZGlzcGF0Y2hPblRlcm1pbmF0aW9uKHByb2Nlc3MsIFdURjo6YmluZCgmQ29u bmVjdGlvbjo6Y29ubmVjdGlvbkRpZENsb3NlLCB0aGlzKSk7CiB9CiAjZW5kaWYKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vcXQvV29ya1F1ZXVlUXQuY3BwIGIvU291cmNl L1dlYktpdDIvUGxhdGZvcm0vcXQvV29ya1F1ZXVlUXQuY3BwCmluZGV4IDQwYjFmMTA2NmRmMjUy MDBiZGEwZWVhMTY0MjhjNTI0NWI1NTExYWUuLjViMWVkZWJhODFkNzlhYTBjODU1MDYyZmJjN2Jm MWM0Y2RhYjU4YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL3F0L1dvcmtR dWV1ZVF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9xdC9Xb3JrUXVldWVRdC5j cHAKQEAgLTU1LDEyICs1NSwxMiBAQCBwdWJsaWM6CiAKICAgICB+V29ya0l0ZW1RdCgpCiAgICAg eworICAgICAgICBtX3F1ZXVlLT5kZXJlZigpOwogICAgIH0KIAogICAgIFFfU0xPVCB2b2lkIGV4 ZWN1dGUoKSAKICAgICB7IAotICAgICAgICBpZiAobV9xdWV1ZS0+bV9pc1ZhbGlkKQotICAgICAg ICAgICAgbV9mdW5jdGlvbigpOworICAgICAgICBtX2Z1bmN0aW9uKCk7CiAgICAgfQogCiAgICAg UV9TTE9UIHZvaWQgZXhlY3V0ZUFuZERlbGV0ZSgpCkBAIC0xMDgsNiArMTA4LDcgQEAgdm9pZCBX b3JrUXVldWU6OnBsYXRmb3JtSW52YWxpZGF0ZSgpCiAKIHZvaWQgV29ya1F1ZXVlOjpkaXNwYXRj aChjb25zdCBGdW5jdGlvbjx2b2lkKCk+JiBmdW5jdGlvbikKIHsKKyAgICByZWYoKTsKICAgICBX b3JrUXVldWU6OldvcmtJdGVtUXQqIGl0ZW1RdCA9IG5ldyBXb3JrUXVldWU6OldvcmtJdGVtUXQo dGhpcywgZnVuY3Rpb24pOwogICAgIGl0ZW1RdC0+bW92ZVRvVGhyZWFkKG1fd29ya1RocmVhZCk7 CiAgICAgUU1ldGFPYmplY3Q6Omludm9rZU1ldGhvZChpdGVtUXQsICJleGVjdXRlQW5kRGVsZXRl IiwgUXQ6OlF1ZXVlZENvbm5lY3Rpb24pOwpAQCAtMTE1LDYgKzExNiw3IEBAIHZvaWQgV29ya1F1 ZXVlOjpkaXNwYXRjaChjb25zdCBGdW5jdGlvbjx2b2lkKCk+JiBmdW5jdGlvbikKIAogdm9pZCBX b3JrUXVldWU6OmRpc3BhdGNoQWZ0ZXJEZWxheShjb25zdCBGdW5jdGlvbjx2b2lkKCk+JiBmdW5j dGlvbiwgZG91YmxlIGRlbGF5SW5TZWNvbmQpCiB7CisgICAgcmVmKCk7CiAgICAgV29ya1F1ZXVl OjpXb3JrSXRlbVF0KiBpdGVtUXQgPSBuZXcgV29ya1F1ZXVlOjpXb3JrSXRlbVF0KHRoaXMsIGZ1 bmN0aW9uKTsKICAgICBpdGVtUXQtPnN0YXJ0VGltZXIoc3RhdGljX2Nhc3Q8aW50PihkZWxheUlu U2Vjb25kICogMTAwMCkpOwogICAgIGl0ZW1RdC0+bW92ZVRvVGhyZWFkKG1fd29ya1RocmVhZCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDQwMDBjYTU2 YzBmMjE0YmE5ODhiYTg3MjllY2VlYjVmOWVhYzU4YjMuLjMyMjUxYjBkZWVlMzJhNTE5MWUxOGZj ODc0YTZjZGEwMmZjMzNiYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCkBAIC0xMjM2LDkgKzEyMzYsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmdldFBsdWdp blBhdGgoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcKICAg ICBpZiAocGx1Z2luTG9hZFBvbGljeSAhPSBQbHVnaW5Nb2R1bGVMb2FkTm9ybWFsbHkpCiAgICAg ICAgIHJldHVybjsKIAorI2lmIFBMQVRGT1JNKE1BQykKICAgICBwbHVnaW5Mb2FkUG9saWN5ID0g bV91aUNsaWVudC5zaG91bGRJbnN0YW50aWF0ZVBsdWdpbih0aGlzLCBwbHVnaW4uYnVuZGxlSWRl bnRpZmllciwgcGx1Z2luLmluZm8ubmFtZSkgPyBQbHVnaW5Nb2R1bGVMb2FkTm9ybWFsbHkgOiBQ bHVnaW5Nb2R1bGVCbG9ja2VkOwogICAgIGlmIChwbHVnaW5Mb2FkUG9saWN5ICE9IFBsdWdpbk1v ZHVsZUxvYWROb3JtYWxseSkKICAgICAgICAgcmV0dXJuOworI2VuZGlmCiAKICAgICBwbHVnaW5Q YXRoID0gcGx1Z2luLnBhdGg7CiB9Cg==