70440 2011-10-19 14:20:30 -0700 [Chromium] Export missing symbols from Web*Layer 2011-10-20 16:19:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 piman webkit-unassigned darin fishd jamesr webkit.review.bot oldest_to_newest 487002 0 piman 2011-10-19 14:20:30 -0700 Export missing symbols from Web*Layer 487003 1 111673 piman 2011-10-19 14:20:53 -0700 Created attachment 111673 Patch 487054 2 webkit.review.bot 2011-10-19 15:31:02 -0700 Please wait for approval from fishd@chromium.org before submitting because this patch contains changes to the Chromium public API. 487293 3 111673 fishd 2011-10-19 21:03:58 -0700 Comment on attachment 111673 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111673&action=review > Source/WebKit/chromium/public/WebContentLayer.h:38 > +class WEBKIT_EXPORT WebContentLayer : public WebLayer { we don't normally export entire classes. see other header files. we just export the non-inline methods (ignore pure virtual methods of course). 487330 4 piman 2011-10-19 22:17:59 -0700 (In reply to comment #3) > (From update of attachment 111673 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=111673&action=review > > > Source/WebKit/chromium/public/WebContentLayer.h:38 > > +class WEBKIT_EXPORT WebContentLayer : public WebLayer { > > we don't normally export entire classes. see other header files. we just export the non-inline methods (ignore pure virtual methods of course). That was necessary, otherwise I was getting undefined symbols for the vtable - it's defined with the first virtual method definition (in this case the destructor, inside of the .so), but is needed in the constructor (inlined in the calling code). If we're adamant on that, we could try inlining the virtual destructor, or un-inlining the constructors and moving them into the .cpp. I'll see if either one works. 487352 5 fishd 2011-10-19 23:34:32 -0700 (In reply to comment #4) ... > That was necessary, otherwise I was getting undefined symbols for the vtable - it's defined with the first virtual method definition (in this case the destructor, inside of the .so), but is needed in the constructor (inlined in the calling code). > If we're adamant on that, we could try inlining the virtual destructor, or un-inlining the constructors and moving them into the .cpp. I'll see if either one works. We haven't had to export classes before. Something must be unconventional here that can be avoided. 487354 6 fishd 2011-10-19 23:36:08 -0700 (In reply to comment #5) > (In reply to comment #4) > ... > > That was necessary, otherwise I was getting undefined symbols for the vtable - it's defined with the first virtual method definition (in this case the destructor, inside of the .so), but is needed in the constructor (inlined in the calling code). > > If we're adamant on that, we could try inlining the virtual destructor, or un-inlining the constructors and moving them into the .cpp. I'll see if either one works. > > We haven't had to export classes before. Something must be unconventional here that can be avoided. perhaps you should inline the WebLayer destructor. that would probably do the trick. we normally do not export constructors and destructors. 487838 7 111839 piman 2011-10-20 13:39:15 -0700 Created attachment 111839 Patch 487839 8 piman 2011-10-20 13:40:07 -0700 New patch does that. 487973 9 111839 webkit.review.bot 2011-10-20 16:19:01 -0700 Comment on attachment 111839 Patch Clearing flags on attachment: 111839 Committed r98035: <http://trac.webkit.org/changeset/98035> 487974 10 webkit.review.bot 2011-10-20 16:19:08 -0700 All reviewed patches have been landed. Closing bug. 111673 2011-10-19 14:20:53 -0700 2011-10-20 13:39:10 -0700 Patch bug-70440-20111019142052.patch text/plain 3962 piman U3VidmVyc2lvbiBSZXZpc2lvbjogOTc4NzAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg ZGMzOWU1ODcyMmE4MGFlZjBjOGNhZGZiMWUzYTIwNjAyOTJlMzQ2Mi4uYzcwYzljYTQ2MzBmY2Zm NWRiMDA3MDZlYjJkZDQ1MTUyYzFhYmQyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNSBAQAorMjAxMS0xMC0xOSAgQW50b2luZSBMYWJvdXIgIDxwaW1hbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgRXhwb3J0IG1pc3Npbmcgc3ltYm9scyBmcm9tIFdlYipMYXllcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA0NDAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHB1YmxpYy9X ZWJDb250ZW50TGF5ZXIuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViRXh0ZXJuYWxUZXh0dXJlTGF5 ZXIuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViTGF5ZXIuaDoKKyAgICAgICAgKiBwdWJsaWMvV2Vi TGF5ZXJUcmVlVmlldy5oOgorCiAyMDExLTEwLTE5ICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogbWFrZSBleHRlbnNpb24gdGVz dHMgcGFzcyBvbiBjaHJvbWl1bQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViQ29udGVudExheWVyLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJDb250ZW50TGF5ZXIuaAppbmRleCBiYzU5MjYxOTVkZTc2MTIwODU1ZDViNzFkYTQ1MmE3Mzhk MzJmOTZjLi42Y2M2MTVlYzAwNjNhNTc2NzU5ODJkNTgwM2U4MmRkYzNkM2NmZGIwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDb250ZW50TGF5ZXIuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDb250ZW50TGF5ZXIuaApAQCAtMzUs OSArMzUsOSBAQCBjbGFzcyBXZWJDb250ZW50TGF5ZXJJbXBsOwogc3RydWN0IFdlYkZsb2F0UmVj dDsKIGNsYXNzIFdlYkxheWVyQ2xpZW50OwogCi1jbGFzcyBXZWJDb250ZW50TGF5ZXIgOiBwdWJs aWMgV2ViTGF5ZXIgeworY2xhc3MgV0VCS0lUX0VYUE9SVCBXZWJDb250ZW50TGF5ZXIgOiBwdWJs aWMgV2ViTGF5ZXIgewogcHVibGljOgotICAgIHN0YXRpYyBXZWJDb250ZW50TGF5ZXIgY3JlYXRl KFdlYkxheWVyQ2xpZW50KiwgV2ViQ29udGVudExheWVyQ2xpZW50Kik7CisgICAgV0VCS0lUX0VY UE9SVCBzdGF0aWMgV2ViQ29udGVudExheWVyIGNyZWF0ZShXZWJMYXllckNsaWVudCosIFdlYkNv bnRlbnRMYXllckNsaWVudCopOwogCiAgICAgV2ViQ29udGVudExheWVyKCkgeyB9CiAgICAgV2Vi Q29udGVudExheWVyKGNvbnN0IFdlYkNvbnRlbnRMYXllciYgbGF5ZXIpIDogV2ViTGF5ZXIobGF5 ZXIpIHsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRXh0 ZXJuYWxUZXh0dXJlTGF5ZXIuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkV4 dGVybmFsVGV4dHVyZUxheWVyLmgKaW5kZXggNTNkZGQ4NWMzODA2Zjc0MDZhYmVlZmUyOWNmNzdj MmJlZDk1MWExZi4uZWY0NWQ1NmVlMDRhYTFiYzdmZTM4ZDBjMzdhZGJiZTJjYTU4ZTcxZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRXh0ZXJuYWxUZXh0dXJl TGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJFeHRlcm5hbFRl eHR1cmVMYXllci5oCkBAIC0zOSw5ICszOSw5IEBAIGNsYXNzIFdlYkxheWVyQ2xpZW50OwogLy8g V2hlbiBpbiBzaW5nbGUtdGhyZWFkIG1vZGUsIHRoaXMgbWVhbnMgZHVyaW5nIFdlYkxheWVyVHJl ZVZpZXc6OmNvbXBvc2l0ZSgpLgogLy8gV2hlbiB1c2luZyB0aGUgdGhyZWFkZWQgY29tcG9zaXRv ciwgdGhpcyBjYW4gbWVhbiBhdCBhbiBhcmJpdHJhcnkgdGltZSB1bnRpbAogLy8gdGhlIFdlYkxh eWVyVHJlZVZpZXcgaXMgZGVzdHJveWVkLgotY2xhc3MgV2ViRXh0ZXJuYWxUZXh0dXJlTGF5ZXIg OiBwdWJsaWMgV2ViTGF5ZXIgeworY2xhc3MgV0VCS0lUX0VYUE9SVCBXZWJFeHRlcm5hbFRleHR1 cmVMYXllciA6IHB1YmxpYyBXZWJMYXllciB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFdlYkV4dGVy bmFsVGV4dHVyZUxheWVyIGNyZWF0ZShXZWJMYXllckNsaWVudCopOworICAgIFdFQktJVF9FWFBP UlQgc3RhdGljIFdlYkV4dGVybmFsVGV4dHVyZUxheWVyIGNyZWF0ZShXZWJMYXllckNsaWVudCop OwogCiAgICAgV2ViRXh0ZXJuYWxUZXh0dXJlTGF5ZXIoKSB7IH0KICAgICBXZWJFeHRlcm5hbFRl eHR1cmVMYXllcihjb25zdCBXZWJFeHRlcm5hbFRleHR1cmVMYXllciYgbGF5ZXIpIDogV2ViTGF5 ZXIobGF5ZXIpIHsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViTGF5ZXIuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkxheWVyLmgKaW5k ZXggNDRiNmE0Mzk3YmU5ZmFhYjRkZWM3YTU2MWRmOTQ1NDgwODRkOGU1My4uNmE0ZDhlNTcyNWMy YTNjZDQ1NGI0ZmQzOTA2NWFjNjY0ODFlOTU4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJMYXllci5oCkBAIC0zOCwxMyArMzgsMTMgQEAgc3RydWN0IFdlYkZsb2F0UG9pbnQ7 CiBjbGFzcyBXZWJMYXllckNsaWVudDsKIHN0cnVjdCBXZWJTaXplOwogCi1jbGFzcyBXZWJMYXll ciB7CitjbGFzcyBXRUJLSVRfRVhQT1JUIFdlYkxheWVyIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMg V2ViTGF5ZXIgY3JlYXRlKFdlYkxheWVyQ2xpZW50Kik7CisgICAgV0VCS0lUX0VYUE9SVCBzdGF0 aWMgV2ViTGF5ZXIgY3JlYXRlKFdlYkxheWVyQ2xpZW50Kik7CiAKICAgICBXZWJMYXllcigpIHsg fQogICAgIFdlYkxheWVyKGNvbnN0IFdlYkxheWVyJiBsYXllcikgeyBhc3NpZ24obGF5ZXIpOyB9 Ci0gICAgdmlydHVhbCB+V2ViTGF5ZXIoKTsKKyAgICBXRUJLSVRfRVhQT1JUIHZpcnR1YWwgfldl YkxheWVyKCk7CiAgICAgV2ViTGF5ZXImIG9wZXJhdG9yPShjb25zdCBXZWJMYXllciYgbGF5ZXIp CiAgICAgewogICAgICAgICBhc3NpZ24obGF5ZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVlVmlldy5oIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVlVmlldy5oCmluZGV4IDZiODYyMTNlM2JiZmIxNmZmZTVl NDhkYmU4MDdkM2ZjODk1ZmI2OTUuLmFhOGIyMTM5MGUwZTk5NTNiZTE4NjRkMjAwMjQzYjRiNWIw NDM5NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkxheWVy VHJlZVZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJMYXllclRy ZWVWaWV3LmgKQEAgLTU1LDcgKzU1LDcgQEAgcHVibGljOgogI2VuZGlmCiAgICAgfTsKIAotICAg IHN0YXRpYyBXZWJMYXllclRyZWVWaWV3IGNyZWF0ZShXZWJMYXllclRyZWVWaWV3Q2xpZW50Kiwg Y29uc3QgV2ViTGF5ZXImIHJvb3QsIGNvbnN0IFNldHRpbmdzJik7CisgICAgV0VCS0lUX0VYUE9S VCBzdGF0aWMgV2ViTGF5ZXJUcmVlVmlldyBjcmVhdGUoV2ViTGF5ZXJUcmVlVmlld0NsaWVudCos IGNvbnN0IFdlYkxheWVyJiByb290LCBjb25zdCBTZXR0aW5ncyYpOwogCiAgICAgV2ViTGF5ZXJU cmVlVmlldygpIHsgfQogICAgIFdlYkxheWVyVHJlZVZpZXcoY29uc3QgV2ViTGF5ZXJUcmVlVmll dyYgbGF5ZXIpIHsgYXNzaWduKGxheWVyKTsgfQo= 111839 2011-10-20 13:39:15 -0700 2011-10-20 16:19:01 -0700 Patch bug-70440-20111020133914.patch text/plain 4053 piman U3VidmVyc2lvbiBSZXZpc2lvbjogOTc4NzAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg ZGMzOWU1ODcyMmE4MGFlZjBjOGNhZGZiMWUzYTIwNjAyOTJlMzQ2Mi4uYzcwYzljYTQ2MzBmY2Zm NWRiMDA3MDZlYjJkZDQ1MTUyYzFhYmQyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNSBAQAorMjAxMS0xMC0xOSAgQW50b2luZSBMYWJvdXIgIDxwaW1hbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgRXhwb3J0IG1pc3Npbmcgc3ltYm9scyBmcm9tIFdlYipMYXllcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA0NDAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHB1YmxpYy9X ZWJDb250ZW50TGF5ZXIuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViRXh0ZXJuYWxUZXh0dXJlTGF5 ZXIuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViTGF5ZXIuaDoKKyAgICAgICAgKiBwdWJsaWMvV2Vi TGF5ZXJUcmVlVmlldy5oOgorCiAyMDExLTEwLTE5ICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogbWFrZSBleHRlbnNpb24gdGVz dHMgcGFzcyBvbiBjaHJvbWl1bQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViQ29udGVudExheWVyLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJDb250ZW50TGF5ZXIuaAppbmRleCBiYzU5MjYxOTVkZTc2MTIwODU1ZDViNzFkYTQ1MmE3Mzhk MzJmOTZjLi41MzBhNWU5YWZiNjMxYmY5ODZiNTIyYTFjNGY2MDNhYTBhMDQ1ZmQxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDb250ZW50TGF5ZXIuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDb250ZW50TGF5ZXIuaApAQCAtMzcs NyArMzcsNyBAQCBjbGFzcyBXZWJMYXllckNsaWVudDsKIAogY2xhc3MgV2ViQ29udGVudExheWVy IDogcHVibGljIFdlYkxheWVyIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgV2ViQ29udGVudExheWVy IGNyZWF0ZShXZWJMYXllckNsaWVudCosIFdlYkNvbnRlbnRMYXllckNsaWVudCopOworICAgIFdF QktJVF9FWFBPUlQgc3RhdGljIFdlYkNvbnRlbnRMYXllciBjcmVhdGUoV2ViTGF5ZXJDbGllbnQq LCBXZWJDb250ZW50TGF5ZXJDbGllbnQqKTsKIAogICAgIFdlYkNvbnRlbnRMYXllcigpIHsgfQog ICAgIFdlYkNvbnRlbnRMYXllcihjb25zdCBXZWJDb250ZW50TGF5ZXImIGxheWVyKSA6IFdlYkxh eWVyKGxheWVyKSB7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYkV4dGVybmFsVGV4dHVyZUxheWVyLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJFeHRlcm5hbFRleHR1cmVMYXllci5oCmluZGV4IDUzZGRkODVjMzgwNmY3NDA2YWJlZWZl MjljZjc3YzJiZWQ5NTFhMWYuLjc4OWQ2ZWFkZWY1ZTMwOGJlY2Q4OWRlY2FmYzBlMzQxNDA5ZDUw MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkV4dGVybmFs VGV4dHVyZUxheWVyLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRXh0 ZXJuYWxUZXh0dXJlTGF5ZXIuaApAQCAtNDEsNyArNDEsNyBAQCBjbGFzcyBXZWJMYXllckNsaWVu dDsKIC8vIHRoZSBXZWJMYXllclRyZWVWaWV3IGlzIGRlc3Ryb3llZC4KIGNsYXNzIFdlYkV4dGVy bmFsVGV4dHVyZUxheWVyIDogcHVibGljIFdlYkxheWVyIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMg V2ViRXh0ZXJuYWxUZXh0dXJlTGF5ZXIgY3JlYXRlKFdlYkxheWVyQ2xpZW50Kik7CisgICAgV0VC S0lUX0VYUE9SVCBzdGF0aWMgV2ViRXh0ZXJuYWxUZXh0dXJlTGF5ZXIgY3JlYXRlKFdlYkxheWVy Q2xpZW50Kik7CiAKICAgICBXZWJFeHRlcm5hbFRleHR1cmVMYXllcigpIHsgfQogICAgIFdlYkV4 dGVybmFsVGV4dHVyZUxheWVyKGNvbnN0IFdlYkV4dGVybmFsVGV4dHVyZUxheWVyJiBsYXllcikg OiBXZWJMYXllcihsYXllcikgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJMYXllci5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTGF5 ZXIuaAppbmRleCA0NGI2YTQzOTdiZTlmYWFiNGRlYzdhNTYxZGY5NDU0ODA4NGQ4ZTUzLi41NjU2 NzFjM2JjOTMwMmY3MGM0OWE1MjU1Y2ExZTAzMzRjMjgxNjgzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJMYXllci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYkxheWVyLmgKQEAgLTQwLDExICs0MCwxMSBAQCBzdHJ1Y3QgV2ViU2l6 ZTsKIAogY2xhc3MgV2ViTGF5ZXIgewogcHVibGljOgotICAgIHN0YXRpYyBXZWJMYXllciBjcmVh dGUoV2ViTGF5ZXJDbGllbnQqKTsKKyAgICBXRUJLSVRfRVhQT1JUIHN0YXRpYyBXZWJMYXllciBj cmVhdGUoV2ViTGF5ZXJDbGllbnQqKTsKIAogICAgIFdlYkxheWVyKCkgeyB9CiAgICAgV2ViTGF5 ZXIoY29uc3QgV2ViTGF5ZXImIGxheWVyKSB7IGFzc2lnbihsYXllcik7IH0KLSAgICB2aXJ0dWFs IH5XZWJMYXllcigpOworICAgIHZpcnR1YWwgfldlYkxheWVyKCkgeyByZXNldCgpOyB9CiAgICAg V2ViTGF5ZXImIG9wZXJhdG9yPShjb25zdCBXZWJMYXllciYgbGF5ZXIpCiAgICAgewogICAgICAg ICBhc3NpZ24obGF5ZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViTGF5ZXJUcmVlVmlldy5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi TGF5ZXJUcmVlVmlldy5oCmluZGV4IDZiODYyMTNlM2JiZmIxNmZmZTVlNDhkYmU4MDdkM2ZjODk1 ZmI2OTUuLmFhOGIyMTM5MGUwZTk5NTNiZTE4NjRkMjAwMjQzYjRiNWIwNDM5NTMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkxheWVyVHJlZVZpZXcuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJMYXllclRyZWVWaWV3LmgKQEAgLTU1 LDcgKzU1LDcgQEAgcHVibGljOgogI2VuZGlmCiAgICAgfTsKIAotICAgIHN0YXRpYyBXZWJMYXll clRyZWVWaWV3IGNyZWF0ZShXZWJMYXllclRyZWVWaWV3Q2xpZW50KiwgY29uc3QgV2ViTGF5ZXIm IHJvb3QsIGNvbnN0IFNldHRpbmdzJik7CisgICAgV0VCS0lUX0VYUE9SVCBzdGF0aWMgV2ViTGF5 ZXJUcmVlVmlldyBjcmVhdGUoV2ViTGF5ZXJUcmVlVmlld0NsaWVudCosIGNvbnN0IFdlYkxheWVy JiByb290LCBjb25zdCBTZXR0aW5ncyYpOwogCiAgICAgV2ViTGF5ZXJUcmVlVmlldygpIHsgfQog ICAgIFdlYkxheWVyVHJlZVZpZXcoY29uc3QgV2ViTGF5ZXJUcmVlVmlldyYgbGF5ZXIpIHsgYXNz aWduKGxheWVyKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi TGF5ZXIuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTGF5ZXIuY3BwCmluZGV4 IDFkOTY4YzliYThiOTllMjA4NGQxNmNmNmY5YWI0M2FiMDRiY2Y3MGUuLmQzYWYzYjY1NTNlNjVm NDg1ZWM5M2U1NDMxZDRlZjFmYzI4NTI0ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYkxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJMYXllci5jcHAKQEAgLTc5LDExICs3OSw2IEBAIFdlYkxheWVyIFdlYkxheWVyOjpjcmVhdGUo V2ViTGF5ZXJDbGllbnQqIGNsaWVudCkKICAgICByZXR1cm4gV2ViTGF5ZXIoV2ViTGF5ZXJJbXBs OjpjcmVhdGUoY2xpZW50KSk7CiB9CiAKLVdlYkxheWVyOjp+V2ViTGF5ZXIoKQotewotICAgIHJl c2V0KCk7Ci19Ci0KIHZvaWQgV2ViTGF5ZXI6OnJlc2V0KCkKIHsKICAgICBtX3ByaXZhdGUucmVz ZXQoKTsK