144732 2015-05-07 01:54:34 -0700 [GTK] RunLoop constructor should properly retrieve or establish the thread-default GMainContext 2015-05-14 02:34:23 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan benjamin cmarcelo commit-queue oldest_to_newest 1092547 0 zan 2015-05-07 01:54:34 -0700 [GTK] RunLoop constructor should properly retrieve or establish the thread-default GMainContext 1092549 1 252581 zan 2015-05-07 02:06:22 -0700 Created attachment 252581 Patch 1092551 2 252581 cgarcia 2015-05-07 02:21:01 -0700 Comment on attachment 252581 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252581&action=review > Source/WTF/wtf/gtk/RunLoopGtk.cpp:40 > + GMainContext* runLoopContext = g_main_context_get_thread_default(); > + if (!runLoopContext) { > + if (!isMainThread()) { > + m_mainContext = adoptGRef(g_main_context_new()); This could be simplified by using g_main_context_ref_thread_default(), because it ensures a main context is returned. > Source/WTF/wtf/gtk/RunLoopGtk.cpp:41 > + g_main_context_push_thread_default(m_mainContext.get()); I'm not sure about doing this here, I think it should be done before running the loop, and pop it after it quits. Doing it here, means that if a thread doesn't use a RunLoop, but something like RunLoop::isMain() is called, RunLoop::current() creates a new RunLoop for the thread and pushes a new main context. 1092555 3 252582 zan 2015-05-07 02:56:58 -0700 Created attachment 252582 Patch 1092623 4 252582 cgarcia 2015-05-07 09:52:12 -0700 Comment on attachment 252582 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252582&action=review > Source/WTF/wtf/gtk/RunLoopGtk.cpp:66 > + g_main_context_push_thread_default(mainContext); So, are we doing this also for the main thread? 1093074 5 252582 zan 2015-05-07 23:54:58 -0700 Comment on attachment 252582 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252582&action=review >> Source/WTF/wtf/gtk/RunLoopGtk.cpp:66 >> + g_main_context_push_thread_default(mainContext); > > So, are we doing this also for the main thread? Yes. g_main_context_push_thread_default() checks if the passed-in context is the global-default one, pushing a null pointer on the top of the stack in that case. That way g_main_context_get_thread_default() still returns a null pointer on the main thread. 1094763 6 253110 zan 2015-05-14 00:52:38 -0700 Created attachment 253110 Patch 1094782 7 253110 zan 2015-05-14 02:34:16 -0700 Comment on attachment 253110 Patch Clearing flags on attachment: 253110 Committed r184333: <http://trac.webkit.org/changeset/184333> 1094783 8 zan 2015-05-14 02:34:23 -0700 All reviewed patches have been landed. Closing bug. 252581 2015-05-07 02:06:22 -0700 2015-05-07 02:56:53 -0700 Patch bug-144732-20150507020858.patch text/plain 2930 zan SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxODM5MjEpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE1LTA1LTA3ICDFvWFuIERvYmVyxaFlayAgPHpk b2JlcnNla0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFJ1bkxvb3AgY29uc3RydWN0b3Ig c2hvdWxkIHByb3Blcmx5IHJldHJpZXZlIG9yIGVzdGFibGlzaCB0aGUgdGhyZWFkLWRlZmF1bHQg R01haW5Db250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDQ3MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBSdW5Mb29wIGNvbnN0cnVjdG9yIGluIHRoZSBHVEsgaW1wbGVtZW50YXRpb24gc2hvdWxk IHByb3Blcmx5CisgICAgICAgIHNldCB1cCB0aGUgdGhyZWFkLWRlZmF1bHQgR01haW5Db250ZXh0 OgorICAgICAgICAtIGlmIHRoZXJlJ3MgYSBjdXJyZW50IHRocmVhZC1kZWZhdWx0IGNvbnRleHQg c2V0LCBSdW5Mb29wCisgICAgICAgIHNob3VsZCB1c2UgdGhhdCwKKyAgICAgICAgLSBpZiB0aGVy ZSBpcyBubyBjdXJyZW50IHRocmVhZC1kZWZhdWx0IGNvbnRleHQgc2V0IGFuZCB3ZSdyZQorICAg ICAgICBvbiB0aGUgbWFpbiB0aHJlYWQsIHRoZSBnbG9iYWwtZGVmYXVsdCBjb250ZXh0IHNob3Vs ZCBiZSB1c2VkLAorICAgICAgICAtIG90aGVyd2lzZSBhIG5ldyBHTWFpbkNvbnRleHQgb2JqZWN0 IHNob3VsZCBiZSBjcmVhdGVkIGFuZAorICAgICAgICBwdXNoZWQgYXMgdGhlIHRocmVhZC1kZWZh dWx0IGNvbnRleHQsIGFuZCBwb3BwZWQgb2ZmIHRoZSBzdGFjaworICAgICAgICBpbiB0aGUgUnVu TG9vcCBkZXN0cnVjdG9yLgorCisgICAgICAgICogd3RmL1J1bkxvb3AuaDoKKyAgICAgICAgKiB3 dGYvZ3RrL1J1bkxvb3BHdGsuY3BwOgorICAgICAgICAoV1RGOjpSdW5Mb29wOjpSdW5Mb29wKToK KyAgICAgICAgKFdURjo6UnVuTG9vcDo6flJ1bkxvb3ApOgorCiAyMDE1LTA1LTA3ICDFvWFuIERv YmVyxaFlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIENsZWFuIHVw IFJ1bkxvb3AgaW1wbGVtZW50YXRpb24KSW5kZXg6IFNvdXJjZS9XVEYvd3RmL1J1bkxvb3AuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9SdW5Mb29wLmgJKHJldmlzaW9uIDE4MzkyMSkK KysrIFNvdXJjZS9XVEYvd3RmL1J1bkxvb3AuaAkod29ya2luZyBjb3B5KQpAQCAtMTU5LDYgKzE1 OSw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgZ2Jvb2xlYW4gcXVldWVXb3JrKFJ1bkxvb3AqKTsK IHByaXZhdGU6CiAgICAgR1JlZlB0cjxHTWFpbkNvbnRleHQ+IG1fbWFpbkNvbnRleHQ7CisgICAg Ym9vbCBtX2NvbnRleHRQdXNoZWRBc1RocmVhZERlZmF1bHQgeyBmYWxzZSB9OwogICAgIFZlY3Rv cjxHUmVmUHRyPEdNYWluTG9vcD4+IG1fbWFpbkxvb3BzOwogI2VuZGlmCiB9OwpJbmRleDogU291 cmNlL1dURi93dGYvZ3RrL1J1bkxvb3BHdGsuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYv d3RmL2d0ay9SdW5Mb29wR3RrLmNwcAkocmV2aXNpb24gMTgzOTIxKQorKysgU291cmNlL1dURi93 dGYvZ3RrL1J1bkxvb3BHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw4ICszNCwxNyBAQCBu YW1lc3BhY2UgV1RGIHsKIAogUnVuTG9vcDo6UnVuTG9vcCgpCiB7Ci0gICAgLy8gZ19tYWluX2Nv bnRleHRfZGVmYXVsdCgpIGRvZXNuJ3QgYWRkIGFuIGV4dHJhIHJlZmVyZW5jZS4KLSAgICBtX21h aW5Db250ZXh0ID0gaXNNYWluVGhyZWFkKCkgPyBnX21haW5fY29udGV4dF9kZWZhdWx0KCkgOiBh ZG9wdEdSZWYoZ19tYWluX2NvbnRleHRfbmV3KCkpOworICAgIEdNYWluQ29udGV4dCogcnVuTG9v cENvbnRleHQgPSBnX21haW5fY29udGV4dF9nZXRfdGhyZWFkX2RlZmF1bHQoKTsKKyAgICBpZiAo IXJ1bkxvb3BDb250ZXh0KSB7CisgICAgICAgIGlmICghaXNNYWluVGhyZWFkKCkpIHsKKyAgICAg ICAgICAgIG1fbWFpbkNvbnRleHQgPSBhZG9wdEdSZWYoZ19tYWluX2NvbnRleHRfbmV3KCkpOwor ICAgICAgICAgICAgZ19tYWluX2NvbnRleHRfcHVzaF90aHJlYWRfZGVmYXVsdChtX21haW5Db250 ZXh0LmdldCgpKTsKKyAgICAgICAgICAgIG1fY29udGV4dFB1c2hlZEFzVGhyZWFkRGVmYXVsdCA9 IHRydWU7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgbV9tYWluQ29udGV4dCA9IGdfbWFp bl9jb250ZXh0X2RlZmF1bHQoKTsKKyAgICB9IGVsc2UKKyAgICAgICAgbV9tYWluQ29udGV4dCA9 IHJ1bkxvb3BDb250ZXh0OworCiAgICAgQVNTRVJUKG1fbWFpbkNvbnRleHQpOwogICAgIEdSZWZQ dHI8R01haW5Mb29wPiBpbm5lcm1vc3RMb29wID0gYWRvcHRHUmVmKGdfbWFpbl9sb29wX25ldyht X21haW5Db250ZXh0LmdldCgpLCBGQUxTRSkpOwogICAgIEFTU0VSVChpbm5lcm1vc3RMb29wKTsK QEAgLTQ5LDYgKzU4LDkgQEAgUnVuTG9vcDo6flJ1bkxvb3AoKQogICAgICAgICAgICAgY29udGlu dWU7CiAgICAgICAgIGdfbWFpbl9sb29wX3F1aXQobV9tYWluTG9vcHNbaV0uZ2V0KCkpOwogICAg IH0KKworICAgIGlmIChtX2NvbnRleHRQdXNoZWRBc1RocmVhZERlZmF1bHQpCisgICAgICAgIGdf bWFpbl9jb250ZXh0X3BvcF90aHJlYWRfZGVmYXVsdChtX21haW5Db250ZXh0LmdldCgpKTsKIH0K IAogdm9pZCBSdW5Mb29wOjpydW4oKQo= 252582 2015-05-07 02:56:58 -0700 2015-05-14 00:52:32 -0700 Patch bug-144732-20150507025935.patch text/plain 2945 zan SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxODM5MjEpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA1LTA3ICDFvWFuIERvYmVyxaFlayAgPHpk b2JlcnNla0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFJ1bkxvb3AgY29uc3RydWN0b3Ig c2hvdWxkIHByb3Blcmx5IHJldHJpZXZlIG9yIGVzdGFibGlzaCB0aGUgdGhyZWFkLWRlZmF1bHQg R01haW5Db250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDQ3MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBSdW5Mb29wIGNvbnN0cnVjdG9yIGluIHRoZSBHVEsgaW1wbGVtZW50YXRpb24gc2hvdWxk IHVzZSB0aGUKKyAgICAgICAgZXhpc3RpbmcgdGhyZWFkLWRlZmF1bHQgY29udGV4dCwgY3JlYXRl IGEgbmV3IG9uZSBpZiBub3Qgb24KKyAgICAgICAgdGhlIG1haW4gdGhyZWFkLCBvciB1c2UgdGhl IGdsb2JhbC1kZWZhdWx0IG9uZSBpZiBvbiB0aGUgbWFpbgorICAgICAgICB0aHJlYWQuCisKKyAg ICAgICAgSW4gUnVuTG9vcDo6cnVuKCksIHRoZSBHTWFpbkNvbnRleHQgc2hvdWxkIHRoZW4gYmUg cHVzaGVkIGFzCisgICAgICAgIHRoZSB0aHJlYWQtZGVmYXVsdCBiZWZvcmUgY2FsbGluZyBnX21h aW5fbG9vcF9ydW4oKSwgYW5kIHBvcHBlZAorICAgICAgICBvZmYgd2hlbiB0aGUgbWFpbiBsb29w IHN0b3BzLgorCisgICAgICAgICogd3RmL2d0ay9SdW5Mb29wR3RrLmNwcDoKKyAgICAgICAgKFdU Rjo6UnVuTG9vcDo6UnVuTG9vcCk6CisgICAgICAgIChXVEY6OlJ1bkxvb3A6OnJ1bik6CisKIDIw MTUtMDUtMDcgIMW9YW4gRG9iZXLFoWVrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dUS10gQ2xlYW4gdXAgUnVuTG9vcCBpbXBsZW1lbnRhdGlvbgpJbmRleDogU291cmNlL1dU Ri93dGYvZ3RrL1J1bkxvb3BHdGsuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL2d0 ay9SdW5Mb29wR3RrLmNwcAkocmV2aXNpb24gMTgzOTIxKQorKysgU291cmNlL1dURi93dGYvZ3Rr L1J1bkxvb3BHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw5ICszNCwxMSBAQCBuYW1lc3Bh Y2UgV1RGIHsKIAogUnVuTG9vcDo6UnVuTG9vcCgpCiB7Ci0gICAgLy8gZ19tYWluX2NvbnRleHRf ZGVmYXVsdCgpIGRvZXNuJ3QgYWRkIGFuIGV4dHJhIHJlZmVyZW5jZS4KLSAgICBtX21haW5Db250 ZXh0ID0gaXNNYWluVGhyZWFkKCkgPyBnX21haW5fY29udGV4dF9kZWZhdWx0KCkgOiBhZG9wdEdS ZWYoZ19tYWluX2NvbnRleHRfbmV3KCkpOworICAgIG1fbWFpbkNvbnRleHQgPSBnX21haW5fY29u dGV4dF9nZXRfdGhyZWFkX2RlZmF1bHQoKTsKKyAgICBpZiAoIW1fbWFpbkNvbnRleHQpCisgICAg ICAgIG1fbWFpbkNvbnRleHQgPSBpc01haW5UaHJlYWQoKSA/IGdfbWFpbl9jb250ZXh0X2RlZmF1 bHQoKSA6IGFkb3B0R1JlZihnX21haW5fY29udGV4dF9uZXcoKSk7CiAgICAgQVNTRVJUKG1fbWFp bkNvbnRleHQpOworCiAgICAgR1JlZlB0cjxHTWFpbkxvb3A+IGlubmVybW9zdExvb3AgPSBhZG9w dEdSZWYoZ19tYWluX2xvb3BfbmV3KG1fbWFpbkNvbnRleHQuZ2V0KCksIEZBTFNFKSk7CiAgICAg QVNTRVJUKGlubmVybW9zdExvb3ApOwogICAgIG1fbWFpbkxvb3BzLmFwcGVuZChpbm5lcm1vc3RM b29wKTsKQEAgLTU0LDIwICs1NiwyNyBAQCBSdW5Mb29wOjp+UnVuTG9vcCgpCiB2b2lkIFJ1bkxv b3A6OnJ1bigpCiB7CiAgICAgUnVuTG9vcCYgcnVuTG9vcCA9IFJ1bkxvb3A6OmN1cnJlbnQoKTsK KyAgICBHTWFpbkNvbnRleHQqIG1haW5Db250ZXh0ID0gcnVuTG9vcC5tX21haW5Db250ZXh0Lmdl dCgpOwogCiAgICAgLy8gVGhlIGlubmVybW9zdCBtYWluIGxvb3Agc2hvdWxkIGFsd2F5cyBiZSB0 aGVyZS4KICAgICBBU1NFUlQoIXJ1bkxvb3AubV9tYWluTG9vcHMuaXNFbXB0eSgpKTsKIAogICAg IEdNYWluTG9vcCogaW5uZXJtb3N0TG9vcCA9IHJ1bkxvb3AubV9tYWluTG9vcHNbMF0uZ2V0KCk7 CiAgICAgaWYgKCFnX21haW5fbG9vcF9pc19ydW5uaW5nKGlubmVybW9zdExvb3ApKSB7CisgICAg ICAgIGdfbWFpbl9jb250ZXh0X3B1c2hfdGhyZWFkX2RlZmF1bHQobWFpbkNvbnRleHQpOwogICAg ICAgICBnX21haW5fbG9vcF9ydW4oaW5uZXJtb3N0TG9vcCk7CisgICAgICAgIGdfbWFpbl9jb250 ZXh0X3BvcF90aHJlYWRfZGVmYXVsdChtYWluQ29udGV4dCk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKICAgICAvLyBDcmVhdGUgYW5kIHJ1biBhIG5lc3RlZCBsb29wIGlmIHRoZSBpbm5lcm1v c3Qgb25lIHdhcyBhbHJlYWR5IHJ1bm5pbmcuCi0gICAgR01haW5Mb29wKiBuZXN0ZWRNYWluTG9v cCA9IGdfbWFpbl9sb29wX25ldyhydW5Mb29wLm1fbWFpbkNvbnRleHQuZ2V0KCksIEZBTFNFKTsK KyAgICBHTWFpbkxvb3AqIG5lc3RlZE1haW5Mb29wID0gZ19tYWluX2xvb3BfbmV3KG1haW5Db250 ZXh0LCBGQUxTRSk7CiAgICAgcnVuTG9vcC5tX21haW5Mb29wcy5hcHBlbmQoYWRvcHRHUmVmKG5l c3RlZE1haW5Mb29wKSk7CisKKyAgICBnX21haW5fY29udGV4dF9wdXNoX3RocmVhZF9kZWZhdWx0 KG1haW5Db250ZXh0KTsKICAgICBnX21haW5fbG9vcF9ydW4obmVzdGVkTWFpbkxvb3ApOworICAg IGdfbWFpbl9jb250ZXh0X3BvcF90aHJlYWRfZGVmYXVsdChtYWluQ29udGV4dCk7CisKICAgICBy dW5Mb29wLm1fbWFpbkxvb3BzLnJlbW92ZUxhc3QoKTsKIH0KIAo= 253110 2015-05-14 00:52:38 -0700 2015-05-14 02:34:16 -0700 Patch bug-144732-20150514095114.patch text/plain 3129 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0MzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGQ5Y2JmZTQxZjAzNGU5MTMyNTQ1OWQ5 ZWNmZjZiZTgzZDdjMzc3N2UuLmIwNTUyZjZjYThkYmJjOWMzYTgwNDBiNDI1MGVjN2M1Mzg5YjVj MTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTUtMDUtMTQgIMW9YW4gRG9iZXLFoWVrICA8emRv YmVyc2VrQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gUnVuTG9vcCBjb25zdHJ1Y3RvciBz aG91bGQgcHJvcGVybHkgcmV0cmlldmUgb3IgZXN0YWJsaXNoIHRoZSB0aHJlYWQtZGVmYXVsdCBH TWFpbkNvbnRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0NDczMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFJ1bkxvb3AgY29uc3RydWN0b3IgaW4gdGhlIEdUSyBpbXBsZW1lbnRhdGlvbiBzaG91bGQg dXNlIHRoZQorICAgICAgICBleGlzdGluZyB0aHJlYWQtZGVmYXVsdCBjb250ZXh0LCBjcmVhdGUg YSBuZXcgb25lIGlmIG5vdCBvbgorICAgICAgICB0aGUgbWFpbiB0aHJlYWQsIG9yIHVzZSB0aGUg Z2xvYmFsLWRlZmF1bHQgb25lIGlmIG9uIHRoZSBtYWluCisgICAgICAgIHRocmVhZC4KKworICAg ICAgICBJbiBSdW5Mb29wOjpydW4oKSwgdGhlIEdNYWluQ29udGV4dCBzaG91bGQgdGhlbiBiZSBw dXNoZWQgYXMKKyAgICAgICAgdGhlIHRocmVhZC1kZWZhdWx0IGJlZm9yZSBjYWxsaW5nIGdfbWFp bl9sb29wX3J1bigpLCBhbmQgcG9wcGVkCisgICAgICAgIG9mZiB3aGVuIHRoZSBtYWluIGxvb3Ag c3RvcHMuCisKKyAgICAgICAgKiB3dGYvZ3RrL1J1bkxvb3BHdGsuY3BwOgorICAgICAgICAoV1RG OjpSdW5Mb29wOjpSdW5Mb29wKToKKyAgICAgICAgKFdURjo6UnVuTG9vcDo6cnVuKToKKwogMjAx NS0wNS0xMyAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogICAgICAgIEVuc3VyZSB0 aGF0IGFsbCB0aGUgc21hcnQgcG9pbnRlciB0eXBlcyBpbiBXVEYgY2xlYXIgdGhlaXIgcG9pbnRl ciBiZWZvcmUgZGVyZWYKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQzNzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9ndGsvUnVuTG9vcEd0ay5j cHAgYi9Tb3VyY2UvV1RGL3d0Zi9ndGsvUnVuTG9vcEd0ay5jcHAKaW5kZXggYTdkNzc4NTZhZTA4 NDY1MDcyZGY1NjQyMGZhNzcxODhiOGU2YWRiNi4uN2RjNDA3NTY2MDgyYTIzOGJhZjk2MTA4NzYy ZWVjMjQyZjZlYjk4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvZ3RrL1J1bkxvb3BHdGsu Y3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL2d0ay9SdW5Mb29wR3RrLmNwcApAQCAtMzQsOSArMzQs MTEgQEAgbmFtZXNwYWNlIFdURiB7CiAKIFJ1bkxvb3A6OlJ1bkxvb3AoKQogewotICAgIC8vIGdf bWFpbl9jb250ZXh0X2RlZmF1bHQoKSBkb2Vzbid0IGFkZCBhbiBleHRyYSByZWZlcmVuY2UuCi0g ICAgbV9tYWluQ29udGV4dCA9IGlzTWFpblRocmVhZCgpID8gZ19tYWluX2NvbnRleHRfZGVmYXVs dCgpIDogYWRvcHRHUmVmKGdfbWFpbl9jb250ZXh0X25ldygpKTsKKyAgICBtX21haW5Db250ZXh0 ID0gZ19tYWluX2NvbnRleHRfZ2V0X3RocmVhZF9kZWZhdWx0KCk7CisgICAgaWYgKCFtX21haW5D b250ZXh0KQorICAgICAgICBtX21haW5Db250ZXh0ID0gaXNNYWluVGhyZWFkKCkgPyBnX21haW5f Y29udGV4dF9kZWZhdWx0KCkgOiBhZG9wdEdSZWYoZ19tYWluX2NvbnRleHRfbmV3KCkpOwogICAg IEFTU0VSVChtX21haW5Db250ZXh0KTsKKwogICAgIEdSZWZQdHI8R01haW5Mb29wPiBpbm5lcm1v c3RMb29wID0gYWRvcHRHUmVmKGdfbWFpbl9sb29wX25ldyhtX21haW5Db250ZXh0LmdldCgpLCBG QUxTRSkpOwogICAgIEFTU0VSVChpbm5lcm1vc3RMb29wKTsKICAgICBtX21haW5Mb29wcy5hcHBl bmQoaW5uZXJtb3N0TG9vcCk7CkBAIC01NCwyMCArNTYsMjcgQEAgUnVuTG9vcDo6flJ1bkxvb3Ao KQogdm9pZCBSdW5Mb29wOjpydW4oKQogewogICAgIFJ1bkxvb3AmIHJ1bkxvb3AgPSBSdW5Mb29w OjpjdXJyZW50KCk7CisgICAgR01haW5Db250ZXh0KiBtYWluQ29udGV4dCA9IHJ1bkxvb3AubV9t YWluQ29udGV4dC5nZXQoKTsKIAogICAgIC8vIFRoZSBpbm5lcm1vc3QgbWFpbiBsb29wIHNob3Vs ZCBhbHdheXMgYmUgdGhlcmUuCiAgICAgQVNTRVJUKCFydW5Mb29wLm1fbWFpbkxvb3BzLmlzRW1w dHkoKSk7CiAKICAgICBHTWFpbkxvb3AqIGlubmVybW9zdExvb3AgPSBydW5Mb29wLm1fbWFpbkxv b3BzWzBdLmdldCgpOwogICAgIGlmICghZ19tYWluX2xvb3BfaXNfcnVubmluZyhpbm5lcm1vc3RM b29wKSkgeworICAgICAgICBnX21haW5fY29udGV4dF9wdXNoX3RocmVhZF9kZWZhdWx0KG1haW5D b250ZXh0KTsKICAgICAgICAgZ19tYWluX2xvb3BfcnVuKGlubmVybW9zdExvb3ApOworICAgICAg ICBnX21haW5fY29udGV4dF9wb3BfdGhyZWFkX2RlZmF1bHQobWFpbkNvbnRleHQpOwogICAgICAg ICByZXR1cm47CiAgICAgfQogCiAgICAgLy8gQ3JlYXRlIGFuZCBydW4gYSBuZXN0ZWQgbG9vcCBp ZiB0aGUgaW5uZXJtb3N0IG9uZSB3YXMgYWxyZWFkeSBydW5uaW5nLgotICAgIEdNYWluTG9vcCog bmVzdGVkTWFpbkxvb3AgPSBnX21haW5fbG9vcF9uZXcocnVuTG9vcC5tX21haW5Db250ZXh0Lmdl dCgpLCBGQUxTRSk7CisgICAgR01haW5Mb29wKiBuZXN0ZWRNYWluTG9vcCA9IGdfbWFpbl9sb29w X25ldyhtYWluQ29udGV4dCwgRkFMU0UpOwogICAgIHJ1bkxvb3AubV9tYWluTG9vcHMuYXBwZW5k KGFkb3B0R1JlZihuZXN0ZWRNYWluTG9vcCkpOworCisgICAgZ19tYWluX2NvbnRleHRfcHVzaF90 aHJlYWRfZGVmYXVsdChtYWluQ29udGV4dCk7CiAgICAgZ19tYWluX2xvb3BfcnVuKG5lc3RlZE1h aW5Mb29wKTsKKyAgICBnX21haW5fY29udGV4dF9wb3BfdGhyZWFkX2RlZmF1bHQobWFpbkNvbnRl eHQpOworCiAgICAgcnVuTG9vcC5tX21haW5Mb29wcy5yZW1vdmVMYXN0KCk7CiB9CiAK