50034 2010-11-24 11:05:22 -0800 [GTK] Make kit() methods return the proper type instead of gpointer 2010-12-14 04:29:59 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 xan.lopez webkit-unassigned eric webkit.review.bot xan.lopez oldest_to_newest 313391 0 xan.lopez 2010-11-24 11:05:22 -0800 Saves us quite a bit of mindless casting. 313397 1 74780 xan.lopez 2010-11-24 11:10:24 -0800 Created attachment 74780 kit.diff 313398 2 74780 mrobinson 2010-11-24 11:12:25 -0800 Comment on attachment 74780 kit.diff Awesome! 313399 3 webkit.review.bot 2010-11-24 11:12:31 -0800 Attachment 74780 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--diff-files', u'WebCore/ChangeLog', u'WebCore/bindings/gobject/WebKitDOMBinding.cpp', u'WebCore/bindings/gobject/WebKitDOMBinding.h', u'WebCore/bindings/scripts/CodeGeneratorGObject.pm', u'WebKit/gtk/ChangeLog', u'WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp', u'WebKit/gtk/webkit/webkitprivate.cpp', u'WebKit/gtk/webkit/webkitwebview.cpp']" exit_code: 1 WebCore/bindings/gobject/WebKitDOMBinding.h:28: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 321786 4 eric 2010-12-14 01:34:02 -0800 Seems like this just needs a small style update and landing. 321888 5 74780 xan.lopez 2010-12-14 04:29:48 -0800 Comment on attachment 74780 kit.diff This landed in r72691, my apologies for not closing the bug. 321889 6 xan.lopez 2010-12-14 04:29:59 -0800 Closing. 74780 2010-11-24 11:10:24 -0800 2010-12-14 04:29:48 -0800 kit.diff kit.diff text/plain 15448 xan.lopez RnJvbSBjZTYxYzJiM2NhMjVjY2RiNDFlNjgwMjU3MjI2Y2Y2ZGZiZjZhYTEyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBX ZWQsIDI0IE5vdiAyMDEwIDIwOjA4OjAwICswMTAwClN1YmplY3Q6IFtQQVRDSF0gV2ViQ29yZToK CjIwMTAtMTEtMjQgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgoKICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgW0dUS10gTWFrZSBraXQoKSBtZXRob2Rz IHJldHVybiB0aGUgcHJvcGVyIHR5cGUgaW5zdGVhZCBvZiBncG9pbnRlcgogICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDAzNAoKICAgICAgICBDaGFuZ2Ug a2l0KCkgbWV0aG9kcyB0byByZXR1cm4gcHJvcGVyIHR5cGUgcG9pbnRlci4KCiAgICAgICAgKiBi aW5kaW5ncy9nb2JqZWN0L1dlYktpdERPTUJpbmRpbmcuY3BwOiBjaGFuZ2UgaW1wbGVtZW50aW9u cyBvZgogICAgICAgIGtpdCBtZXRob2RzLgogICAgICAgICogYmluZGluZ3MvZ29iamVjdC9XZWJL aXRET01CaW5kaW5nLmg6IGNoYW5nZSB0aGVpciBkZWNsYXJhdGlvbnMuCiAgICAgICAgKiBiaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtOiBjaGFuZ2UgdGhlIGdlbmVyYXRl ZAogICAgICAgIGtpdCgpIG1ldGhvZHMuCgpXZWJLaXQvZ3RrOgoKMjAxMC0xMS0yNCAgWGFuIExv cGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgoKICAgICAgICBbR1RLXSBNYWtlIGtpdCgpIG1ldGhvZHMgcmV0dXJuIHRoZSBwcm9wZXIg dHlwZSBpbnN0ZWFkIG9mIGdwb2ludGVyCiAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTUwMDM0CgogICAgICAgICogV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xp ZW50R3RrLmNwcDoKICAgICAgICAoV2ViS2l0OjpFZGl0b3JDbGllbnQ6OnNob3VsZERlbGV0ZVJh bmdlKTogZ2V0IHJpZCBvZiB1bm5lZWRlZCBjYXN0LgogICAgICAgIChXZWJLaXQ6OkVkaXRvckNs aWVudDo6c2hvdWxkU2hvd0RlbGV0ZUludGVyZmFjZSk6IGRpdHRvLgogICAgICAgIChXZWJLaXQ6 OkVkaXRvckNsaWVudDo6c2hvdWxkQmVnaW5FZGl0aW5nKTogZGl0dG8uCiAgICAgICAgKFdlYktp dDo6RWRpdG9yQ2xpZW50OjpzaG91bGRFbmRFZGl0aW5nKTogZGl0dG8uCiAgICAgICAgKFdlYktp dDo6RWRpdG9yQ2xpZW50OjpzaG91bGRJbnNlcnRUZXh0KTogZGl0dG8uCiAgICAgICAgKFdlYktp dDo6RWRpdG9yQ2xpZW50OjpzaG91bGRDaGFuZ2VTZWxlY3RlZFJhbmdlKTogZGl0dG8uCiAgICAg ICAgKFdlYktpdDo6RWRpdG9yQ2xpZW50OjpzaG91bGRBcHBseVN0eWxlKTogZGl0dG8uCiAgICAg ICAgKFdlYktpdDo6RWRpdG9yQ2xpZW50OjpzaG91bGRJbnNlcnROb2RlKTogZGl0dG8uCiAgICAg ICAgKiB3ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHA6CiAgICAgICAgKFdlYktpdDo6a2l0KTogZGl0 dG8uCiAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6CiAgICAgICAgKHdlYmtpdF93 ZWJfdmlld19nZXRfZG9tX2RvY3VtZW50KTogZGl0dG8uCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNSArKysrKysrKysrKysrCiBXZWJD b3JlL2JpbmRpbmdzL2dvYmplY3QvV2ViS2l0RE9NQmluZGluZy5jcHAgICAgfCAgIDI0ICsrKysr KysrKysrLS0tLS0tLS0tLS0KIFdlYkNvcmUvYmluZGluZ3MvZ29iamVjdC9XZWJLaXRET01CaW5k aW5nLmggICAgICB8ICAgIDkgKysrKy0tLQogV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVH ZW5lcmF0b3JHT2JqZWN0LnBtIHwgICAxMiArKysrKy0tLS0tCiBXZWJLaXQvZ3RrL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDIxICsrKysrKysrKysrKysrKysrKysK IFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50R3RrLmNwcCAgICB8ICAgMjIg KysrKysrKysrKy0tLS0tLS0tLS0KIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuY3Bw ICAgICAgICAgICAgICB8ICAgIDIgKy0KIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcu Y3BwICAgICAgICAgICAgICB8ICAgIDIgKy0KIDggZmlsZXMgY2hhbmdlZCwgNzIgaW5zZXJ0aW9u cygrKSwgMzUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9X ZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhM2NmZTU0Li5jYmIyMGMzIDEwMDY0NAotLS0gYS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisy MDEwLTExLTI0ICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RLXSBNYWtlIGtpdCgpIG1ldGhv ZHMgcmV0dXJuIHRoZSBwcm9wZXIgdHlwZSBpbnN0ZWFkIG9mIGdwb2ludGVyCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDAzNAorCisgICAgICAgIENo YW5nZSBraXQoKSBtZXRob2RzIHRvIHJldHVybiBwcm9wZXIgdHlwZSBwb2ludGVyLgorCisgICAg ICAgICogYmluZGluZ3MvZ29iamVjdC9XZWJLaXRET01CaW5kaW5nLmNwcDogY2hhbmdlIGltcGxl bWVudGlvbnMgb2YKKyAgICAgICAga2l0IG1ldGhvZHMuCisgICAgICAgICogYmluZGluZ3MvZ29i amVjdC9XZWJLaXRET01CaW5kaW5nLmg6IGNoYW5nZSB0aGVpciBkZWNsYXJhdGlvbnMuCisgICAg ICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbTogY2hhbmdlIHRo ZSBnZW5lcmF0ZWQKKyAgICAgICAga2l0KCkgbWV0aG9kcy4KKwogMjAxMC0xMS0yNCAgQ3JpcyBO ZWNrYXIgIDxjZG5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFy dGguCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3QvV2ViS2l0RE9NQmluZGlu Zy5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3QvV2ViS2l0RE9NQmluZGluZy5jcHAKaW5k ZXggYThhODk1Ni4uYTliMDg5NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9nb2JqZWN0 L1dlYktpdERPTUJpbmRpbmcuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvZ29iamVjdC9XZWJL aXRET01CaW5kaW5nLmNwcApAQCAtNjksMjYgKzY5LDI2IEBAIHN0YXRpYyBncG9pbnRlciBjcmVh dGVXcmFwcGVyKE5vZGUqIG5vZGUpCiAgICAgcmV0dXJuIERPTU9iamVjdENhY2hlOjpwdXQobm9k ZSwgd3JhcHBlZE5vZGUpOwogfQogCi1ncG9pbnRlciBraXQoTm9kZSogbm9kZSkKK1dlYktpdERP TU5vZGUqIGtpdChOb2RlKiBub2RlKQogewogICAgIGlmICghbm9kZSkKICAgICAgICAgcmV0dXJu IDA7CiAKICAgICBncG9pbnRlciBraXROb2RlID0gRE9NT2JqZWN0Q2FjaGU6OmdldChub2RlKTsK ICAgICBpZiAoa2l0Tm9kZSkKLSAgICAgICAgcmV0dXJuIGtpdE5vZGU7CisgICAgICAgIHJldHVy biBzdGF0aWNfY2FzdDxXZWJLaXRET01Ob2RlKj4oa2l0Tm9kZSk7CiAKLSAgICByZXR1cm4gY3Jl YXRlV3JhcHBlcihub2RlKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8V2ViS2l0RE9NTm9kZSo+ KGNyZWF0ZVdyYXBwZXIobm9kZSkpOwogfQogCi1ncG9pbnRlciBraXQoRWxlbWVudCogZWxlbWVu dCkKK1dlYktpdERPTUVsZW1lbnQqIGtpdChFbGVtZW50KiBlbGVtZW50KQogewogICAgIGlmICgh ZWxlbWVudCkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBncG9pbnRlciBraXRFbGVtZW50ID0g RE9NT2JqZWN0Q2FjaGU6OmdldChlbGVtZW50KTsKICAgICBpZiAoa2l0RWxlbWVudCkKLSAgICAg ICAgcmV0dXJuIGtpdEVsZW1lbnQ7CisgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJLaXRE T01FbGVtZW50Kj4oa2l0RWxlbWVudCk7CiAKICAgICBncG9pbnRlciB3cmFwcGVkRWxlbWVudDsK IApAQCAtOTcsMTcgKzk3LDE3IEBAIGdwb2ludGVyIGtpdChFbGVtZW50KiBlbGVtZW50KQogICAg IGVsc2UKICAgICAgICAgd3JhcHBlZEVsZW1lbnQgPSB3cmFwRWxlbWVudChlbGVtZW50KTsKIAot ICAgIHJldHVybiBET01PYmplY3RDYWNoZTo6cHV0KGVsZW1lbnQsIHdyYXBwZWRFbGVtZW50KTsK KyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8V2ViS2l0RE9NRWxlbWVudCo+KERPTU9iamVjdENhY2hl OjpwdXQoZWxlbWVudCwgd3JhcHBlZEVsZW1lbnQpKTsKIH0KIAotZ3BvaW50ZXIga2l0KEV2ZW50 KiBldmVudCkKK1dlYktpdERPTUV2ZW50KiBraXQoRXZlbnQqIGV2ZW50KQogewogICAgIGlmICgh ZXZlbnQpCiAgICAgICAgIHJldHVybiAwOwogCiAgICAgZ3BvaW50ZXIga2l0RXZlbnQgPSBET01P YmplY3RDYWNoZTo6Z2V0KGV2ZW50KTsKICAgICBpZiAoa2l0RXZlbnQpCi0gICAgICAgIHJldHVy biBraXRFdmVudDsKKyAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFdlYktpdERPTUV2ZW50Kj4o a2l0RXZlbnQpOwogCiAgICAgZ3BvaW50ZXIgd3JhcHBlZEV2ZW50OwogCkBAIC0xMTgsNyArMTE4 LDcgQEAgZ3BvaW50ZXIga2l0KEV2ZW50KiBldmVudCkKICAgICBlbHNlCiAgICAgICAgIHdyYXBw ZWRFdmVudCA9IHdyYXBFdmVudChldmVudCk7CiAKLSAgICByZXR1cm4gRE9NT2JqZWN0Q2FjaGU6 OnB1dChldmVudCwgd3JhcHBlZEV2ZW50KTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8V2ViS2l0 RE9NRXZlbnQqPihET01PYmplY3RDYWNoZTo6cHV0KGV2ZW50LCB3cmFwcGVkRXZlbnQpKTsKIH0K IAogc3RhdGljIGdwb2ludGVyIHdyYXBFdmVudFRhcmdldChFdmVudFRhcmdldCogdGFyZ2V0KQpA QCAtMTM4LDE0ICsxMzgsMTQgQEAgc3RhdGljIGdwb2ludGVyIHdyYXBFdmVudFRhcmdldChFdmVu dFRhcmdldCogdGFyZ2V0KQogICAgIHJldHVybiBET01PYmplY3RDYWNoZTo6cHV0KHRhcmdldCwg d3JhcHBlZFRhcmdldCk7CiB9CiAKLWdwb2ludGVyIGtpdChXZWJDb3JlOjpFdmVudFRhcmdldCog b2JqKQorV2ViS2l0RE9NRXZlbnRUYXJnZXQqIGtpdChXZWJDb3JlOjpFdmVudFRhcmdldCogb2Jq KQogewogICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKG9iaiwgMCk7CiAKICAgICBpZiAoZ3BvaW50 ZXIgcmV0ID0gRE9NT2JqZWN0Q2FjaGU6OmdldChvYmopKQotICAgICAgICByZXR1cm4gcmV0Owor ICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8V2ViS2l0RE9NRXZlbnRUYXJnZXQqPihyZXQpOwog Ci0gICAgcmV0dXJuIERPTU9iamVjdENhY2hlOjpwdXQob2JqLCBXZWJLaXQ6OndyYXBFdmVudFRh cmdldChvYmopKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8V2ViS2l0RE9NRXZlbnRUYXJnZXQq PihET01PYmplY3RDYWNoZTo6cHV0KG9iaiwgV2ViS2l0Ojp3cmFwRXZlbnRUYXJnZXQob2JqKSkp OwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGlu Z3MvZ29iamVjdC9XZWJLaXRET01CaW5kaW5nLmggYi9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3Qv V2ViS2l0RE9NQmluZGluZy5oCmluZGV4IDQ3NTk0YTYuLmZkZTQ3YWYgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvYmluZGluZ3MvZ29iamVjdC9XZWJLaXRET01CaW5kaW5nLmgKKysrIGIvV2ViQ29yZS9i aW5kaW5ncy9nb2JqZWN0L1dlYktpdERPTUJpbmRpbmcuaApAQCAtMjUsNiArMjUsNyBAQAogI2Rl ZmluZSBXZWJLaXRET01CaW5kaW5nX2gKIAogI2luY2x1ZGUgPGdsaWIuaD4KKyNpbmNsdWRlICJ3 ZWJraXQvd2Via2l0ZG9tZGVmaW5lcy5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBO b2RlOwpAQCAtMzQsMTAgKzM1LDEwIEBAIGNsYXNzIEV2ZW50VGFyZ2V0OwogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQogCiBuYW1lc3BhY2UgV2ViS2l0IHsKLWdwb2ludGVyIGtpdChXZWJDb3JlOjpO b2RlKiBub2RlKTsKLWdwb2ludGVyIGtpdChXZWJDb3JlOjpFbGVtZW50KiBlbGVtZW50KTsKLWdw b2ludGVyIGtpdChXZWJDb3JlOjpFdmVudCogZXZlbnQpOwotZ3BvaW50ZXIga2l0KFdlYkNvcmU6 OkV2ZW50VGFyZ2V0KiB0YXJnZXQpOworV2ViS2l0RE9NTm9kZSoga2l0KFdlYkNvcmU6Ok5vZGUq IG5vZGUpOworV2ViS2l0RE9NRWxlbWVudCoga2l0KFdlYkNvcmU6OkVsZW1lbnQqIGVsZW1lbnQp OworV2ViS2l0RE9NRXZlbnQqIGtpdChXZWJDb3JlOjpFdmVudCogZXZlbnQpOworV2ViS2l0RE9N RXZlbnRUYXJnZXQqIGtpdChXZWJDb3JlOjpFdmVudFRhcmdldCogdGFyZ2V0KTsKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gV2ViS2l0RE9NQmluZGluZ19oCmRpZmYgLS1naXQg YS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG0gYi9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG0KaW5kZXggNGM5Mzg5 OS4uZTI3NzNiOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5l cmF0b3JHT2JqZWN0LnBtCisrKyBiL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJh dG9yR09iamVjdC5wbQpAQCAtOTg1LDcgKzk4NSw3IEBAIHN1YiBHZW5lcmF0ZUZ1bmN0aW9uIHsK ICAgICBib29sIG9rID0gaXRlbS0+JHtmdW5jdGlvblNpZ05hbWV9KCR7Y2FsbEltcGxQYXJhbXN9 JHtleGNlcHRpb25zfSk7CiAgICAgaWYgKG9rKQogICAgIHsKLSAgICAgICAgJHtyZXR1cm5UeXBl fSByZXMgPSBzdGF0aWNfY2FzdDwke3JldHVyblR5cGV9PihXZWJLaXQ6OmtpdCgkcmV0dXJuUGFy YW1OYW1lKSk7CisgICAgICAgICR7cmV0dXJuVHlwZX0gcmVzID0gV2ViS2l0OjpraXQoJHJldHVy blBhcmFtTmFtZSk7CiAgICAgICAgIHJldHVybiByZXM7CiAgICAgfQogRU9GCkBAIC0xMDQwLDcg KzEwNDAsNyBAQCBFT0YKICAgICBpZiAoJHJldHVyblR5cGUgbmUgInZvaWQiICYmICEkZnVuY3Rp b25IYXNDdXN0b21SZXR1cm4pIHsKICAgICAgICAgaWYgKCRmdW5jdGlvblNpZ1R5cGUgbmUgIkRP TU9iamVjdCIpIHsKICAgICAgICAgICAgIGlmICgkcmV0dXJuVmFsdWVJc0dET01UeXBlKSB7Ci0g ICAgICAgICAgICAgICAgcHVzaChAY0JvZHksICIgICAgJHtyZXR1cm5UeXBlfSByZXMgPSBzdGF0 aWNfY2FzdDwke3JldHVyblR5cGV9PihXZWJLaXQ6OmtpdChnX3Jlcy5nZXQoKSkpO1xuIik7Cisg ICAgICAgICAgICAgICAgcHVzaChAY0JvZHksICIgICAgJHtyZXR1cm5UeXBlfSByZXMgPSBXZWJL aXQ6OmtpdChnX3Jlcy5nZXQoKSk7XG4iKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAg ICAgICBpZiAoJGZ1bmN0aW9uU2lnVHlwZSBlcSAiRE9NT2JqZWN0IikgewpAQCAtMTI1Miw3ICsx MjUyLDcgQEAgRU9GCiAKICAgICBpZiAoJGNsYXNzTmFtZSBuZSAiV2ViS2l0RE9NTm9kZSIpIHsK ICAgICAgICAgJHRleHQgPSA8PCAiRU9GIjsKLSAgICBncG9pbnRlcgorICAgICR7Y2xhc3NOYW1l fSoKICAgICBraXQoV2ViQ29yZTo6JHtpbnRlcmZhY2VOYW1lfSogbm9kZSk7CiAKIEVPRgpAQCAt MTM1MCwxNCArMTM1MCwxNCBAQCBzdWIgR2VuZXJhdGUgewogICAgICAgICBteSAkY29udmVydGVy ID0gPDwgIkVPRiI7CiBuYW1lc3BhY2UgV2ViS2l0IHsKICAgICAKLWdwb2ludGVyIGtpdChXZWJD b3JlOjokaW50ZXJmYWNlTmFtZSogb2JqKQorJHtjbGFzc05hbWV9KiBraXQoV2ViQ29yZTo6JGlu dGVyZmFjZU5hbWUqIG9iaikKIHsKICAgICBnX3JldHVybl92YWxfaWZfZmFpbChvYmosIDApOwog CiAgICAgaWYgKGdwb2ludGVyIHJldCA9IERPTU9iamVjdENhY2hlOjpnZXQob2JqKSkKLSAgICAg ICAgcmV0dXJuIHJldDsKKyAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PCR7Y2xhc3NOYW1lfSo+ KHJldCk7CiAKLSAgICByZXR1cm4gRE9NT2JqZWN0Q2FjaGU6OnB1dChvYmosIFdlYktpdDo6d3Jh cCR7aW50ZXJmYWNlTmFtZX0ob2JqKSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PCR7Y2xhc3NO YW1lfSo+KERPTU9iamVjdENhY2hlOjpwdXQob2JqLCBXZWJLaXQ6OndyYXAke2ludGVyZmFjZU5h bWV9KG9iaikpKTsKIH0KICAgICAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdCAvLwpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCBiMWQx MTJiLi43ZDJmN2MzIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJL aXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDEwLTExLTI0ICBYYW4gTG9wZXog IDx4bG9wZXpAaWdhbGlhLmNvbT4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbR1RLXSBNYWtlIGtpdCgpIG1ldGhvZHMgcmV0dXJuIHRoZSBwcm9wZXIg dHlwZSBpbnN0ZWFkIG9mIGdwb2ludGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01MDAzNAorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRWRpdG9y Q2xpZW50R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yQ2xpZW50OjpzaG91bGREZWxl dGVSYW5nZSk6IGdldCByaWQgb2YgdW5uZWVkZWQgY2FzdC4KKyAgICAgICAgKFdlYktpdDo6RWRp dG9yQ2xpZW50OjpzaG91bGRTaG93RGVsZXRlSW50ZXJmYWNlKTogZGl0dG8uCisgICAgICAgIChX ZWJLaXQ6OkVkaXRvckNsaWVudDo6c2hvdWxkQmVnaW5FZGl0aW5nKTogZGl0dG8uCisgICAgICAg IChXZWJLaXQ6OkVkaXRvckNsaWVudDo6c2hvdWxkRW5kRWRpdGluZyk6IGRpdHRvLgorICAgICAg ICAoV2ViS2l0OjpFZGl0b3JDbGllbnQ6OnNob3VsZEluc2VydFRleHQpOiBkaXR0by4KKyAgICAg ICAgKFdlYktpdDo6RWRpdG9yQ2xpZW50OjpzaG91bGRDaGFuZ2VTZWxlY3RlZFJhbmdlKTogZGl0 dG8uCisgICAgICAgIChXZWJLaXQ6OkVkaXRvckNsaWVudDo6c2hvdWxkQXBwbHlTdHlsZSk6IGRp dHRvLgorICAgICAgICAoV2ViS2l0OjpFZGl0b3JDbGllbnQ6OnNob3VsZEluc2VydE5vZGUpOiBk aXR0by4KKyAgICAgICAgKiB3ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHA6CisgICAgICAgIChXZWJL aXQ6OmtpdCk6IGRpdHRvLgorICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcDoKKyAg ICAgICAgKHdlYmtpdF93ZWJfdmlld19nZXRfZG9tX2RvY3VtZW50KTogZGl0dG8uCisKKzIwMTAt MTEtMjQgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgorCiAgICAgICAgIFJldmlld2Vk IGJ5IE1hcnRpbiBSb2JpbnNvbi4KIAogICAgICAgICBGaXggY3Jhc2hlcyBpbiBHVEsrIGJvdHMu IFVzZSBraXQoKSBpbnN0ZWFkIG9mIHdyYXBGb28sIG90aGVyd2lzZQpkaWZmIC0tZ2l0IGEvV2Vi S2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRHdGsuY3BwIGIvV2ViS2l0L2d0ay9X ZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRHdGsuY3BwCmluZGV4IDIzNTdjNDQuLmJkODg0ODAg MTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50R3RrLmNw cAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEd0ay5jcHAKQEAg LTI3NSw3ICsyNzUsNyBAQCB2b2lkIEVkaXRvckNsaWVudDo6c2V0SW5wdXRNZXRob2RTdGF0ZShi b29sIGFjdGl2ZSkKIGJvb2wgRWRpdG9yQ2xpZW50OjpzaG91bGREZWxldGVSYW5nZShSYW5nZSog cmFuZ2UpCiB7CiAgICAgZ2Jvb2xlYW4gYWNjZXB0ID0gVFJVRTsKLSAgICBQbGF0Zm9ybVJlZlB0 cjxXZWJLaXRET01SYW5nZT4ga2l0UmFuZ2UoYWRvcHRQbGF0Zm9ybVJlZihzdGF0aWNfY2FzdDxX ZWJLaXRET01SYW5nZSo+KGtpdChyYW5nZSkpKSk7CisgICAgUGxhdGZvcm1SZWZQdHI8V2ViS2l0 RE9NUmFuZ2U+IGtpdFJhbmdlKGFkb3B0UGxhdGZvcm1SZWYoa2l0KHJhbmdlKSkpOwogICAgIGdf c2lnbmFsX2VtaXRfYnlfbmFtZShtX3dlYlZpZXcsICJzaG91bGQtZGVsZXRlLXJhbmdlIiwga2l0 UmFuZ2UuZ2V0KCksICZhY2NlcHQpOwogICAgIHJldHVybiBhY2NlcHQ7CiB9CkBAIC0yODMsNyAr MjgzLDcgQEAgYm9vbCBFZGl0b3JDbGllbnQ6OnNob3VsZERlbGV0ZVJhbmdlKFJhbmdlKiByYW5n ZSkKIGJvb2wgRWRpdG9yQ2xpZW50OjpzaG91bGRTaG93RGVsZXRlSW50ZXJmYWNlKEhUTUxFbGVt ZW50KiBlbGVtZW50KQogewogICAgIGdib29sZWFuIGFjY2VwdCA9IFRSVUU7Ci0gICAgUGxhdGZv cm1SZWZQdHI8V2ViS2l0RE9NSFRNTEVsZW1lbnQ+IGtpdEVsZW1lbnQoYWRvcHRQbGF0Zm9ybVJl ZihzdGF0aWNfY2FzdDxXZWJLaXRET01IVE1MRWxlbWVudCo+KGtpdChlbGVtZW50KSkpKTsKKyAg ICBQbGF0Zm9ybVJlZlB0cjxXZWJLaXRET01IVE1MRWxlbWVudD4ga2l0RWxlbWVudChhZG9wdFBs YXRmb3JtUmVmKGtpdChlbGVtZW50KSkpOwogICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShtX3dl YlZpZXcsICJzaG91bGQtc2hvdy1kZWxldGUtaW50ZXJmYWNlLWZvci1lbGVtZW50Iiwga2l0RWxl bWVudC5nZXQoKSwgJmFjY2VwdCk7CiAgICAgcmV0dXJuIGFjY2VwdDsKIH0KQEAgLTMxNSw3ICsz MTUsNyBAQCBib29sIEVkaXRvckNsaWVudDo6c2hvdWxkQmVnaW5FZGl0aW5nKFdlYkNvcmU6OlJh bmdlKiByYW5nZSkKICAgICBjbGVhclBlbmRpbmdDb21wb3NpdGlvbigpOwogCiAgICAgZ2Jvb2xl YW4gYWNjZXB0ID0gVFJVRTsKLSAgICBQbGF0Zm9ybVJlZlB0cjxXZWJLaXRET01SYW5nZT4ga2l0 UmFuZ2UoYWRvcHRQbGF0Zm9ybVJlZihzdGF0aWNfY2FzdDxXZWJLaXRET01SYW5nZSo+KGtpdChy YW5nZSkpKSk7CisgICAgUGxhdGZvcm1SZWZQdHI8V2ViS2l0RE9NUmFuZ2U+IGtpdFJhbmdlKGFk b3B0UGxhdGZvcm1SZWYoa2l0KHJhbmdlKSkpOwogICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZSht X3dlYlZpZXcsICJzaG91bGQtYmVnaW4tZWRpdGluZyIsIGtpdFJhbmdlLmdldCgpLCAmYWNjZXB0 KTsKICAgICByZXR1cm4gYWNjZXB0OwogfQpAQCAtMzI1LDcgKzMyNSw3IEBAIGJvb2wgRWRpdG9y Q2xpZW50OjpzaG91bGRFbmRFZGl0aW5nKFdlYkNvcmU6OlJhbmdlKiByYW5nZSkKICAgICBjbGVh clBlbmRpbmdDb21wb3NpdGlvbigpOwogCiAgICAgZ2Jvb2xlYW4gYWNjZXB0ID0gVFJVRTsKLSAg ICBQbGF0Zm9ybVJlZlB0cjxXZWJLaXRET01SYW5nZT4ga2l0UmFuZ2UoYWRvcHRQbGF0Zm9ybVJl ZihzdGF0aWNfY2FzdDxXZWJLaXRET01SYW5nZSo+KGtpdChyYW5nZSkpKSk7CisgICAgUGxhdGZv cm1SZWZQdHI8V2ViS2l0RE9NUmFuZ2U+IGtpdFJhbmdlKGFkb3B0UGxhdGZvcm1SZWYoa2l0KHJh bmdlKSkpOwogICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShtX3dlYlZpZXcsICJzaG91bGQtZW5k LWVkaXRpbmciLCBraXRSYW5nZS5nZXQoKSwgJmFjY2VwdCk7CiAgICAgcmV0dXJuIGFjY2VwdDsK IH0KQEAgLTM0Nyw3ICszNDcsNyBAQCBzdGF0aWMgV2ViS2l0SW5zZXJ0QWN0aW9uIGtpdChFZGl0 b3JJbnNlcnRBY3Rpb24gYWN0aW9uKQogYm9vbCBFZGl0b3JDbGllbnQ6OnNob3VsZEluc2VydFRl eHQoY29uc3QgU3RyaW5nJiBzdHJpbmcsIFJhbmdlKiByYW5nZSwgRWRpdG9ySW5zZXJ0QWN0aW9u IGFjdGlvbikKIHsKICAgICBnYm9vbGVhbiBhY2NlcHQgPSBUUlVFOwotICAgIFBsYXRmb3JtUmVm UHRyPFdlYktpdERPTVJhbmdlPiBraXRSYW5nZShhZG9wdFBsYXRmb3JtUmVmKHN0YXRpY19jYXN0 PFdlYktpdERPTVJhbmdlKj4oa2l0KHJhbmdlKSkpKTsKKyAgICBQbGF0Zm9ybVJlZlB0cjxXZWJL aXRET01SYW5nZT4ga2l0UmFuZ2UoYWRvcHRQbGF0Zm9ybVJlZihraXQocmFuZ2UpKSk7CiAgICAg Z19zaWduYWxfZW1pdF9ieV9uYW1lKG1fd2ViVmlldywgInNob3VsZC1pbnNlcnQtdGV4dCIsIHN0 cmluZy51dGY4KCkuZGF0YSgpLCBraXRSYW5nZS5nZXQoKSwga2l0KGFjdGlvbiksICZhY2NlcHQp OwogICAgIHJldHVybiBhY2NlcHQ7CiB9CkBAIC0zNjcsOCArMzY3LDggQEAgc3RhdGljIFdlYktp dFNlbGVjdGlvbkFmZmluaXR5IGtpdChFQWZmaW5pdHkgYWZmaW5pdHkpCiBib29sIEVkaXRvckNs aWVudDo6c2hvdWxkQ2hhbmdlU2VsZWN0ZWRSYW5nZShSYW5nZSogZnJvbVJhbmdlLCBSYW5nZSog dG9SYW5nZSwgRUFmZmluaXR5IGFmZmluaXR5LCBib29sIHN0aWxsU2VsZWN0aW5nKQogewogICAg IGdib29sZWFuIGFjY2VwdCA9IFRSVUU7Ci0gICAgUGxhdGZvcm1SZWZQdHI8V2ViS2l0RE9NUmFu Z2U+IGtpdEZyb21SYW5nZShmcm9tUmFuZ2UgPyBhZG9wdFBsYXRmb3JtUmVmKHN0YXRpY19jYXN0 PFdlYktpdERPTVJhbmdlKj4oa2l0KGZyb21SYW5nZSkpKSA6IDApOwotICAgIFBsYXRmb3JtUmVm UHRyPFdlYktpdERPTVJhbmdlPiBraXRUb1JhbmdlKHRvUmFuZ2UgPyBhZG9wdFBsYXRmb3JtUmVm KHN0YXRpY19jYXN0PFdlYktpdERPTVJhbmdlKj4oa2l0KHRvUmFuZ2UpKSkgOiAwKTsKKyAgICBQ bGF0Zm9ybVJlZlB0cjxXZWJLaXRET01SYW5nZT4ga2l0RnJvbVJhbmdlKGZyb21SYW5nZSA/IGFk b3B0UGxhdGZvcm1SZWYoa2l0KGZyb21SYW5nZSkpIDogMCk7CisgICAgUGxhdGZvcm1SZWZQdHI8 V2ViS2l0RE9NUmFuZ2U+IGtpdFRvUmFuZ2UodG9SYW5nZSA/IGFkb3B0UGxhdGZvcm1SZWYoa2l0 KHRvUmFuZ2UpKSA6IDApOwogICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShtX3dlYlZpZXcsICJz aG91bGQtY2hhbmdlLXNlbGVjdGVkLXJhbmdlIiwga2l0RnJvbVJhbmdlLmdldCgpLCBraXRUb1Jh bmdlLmdldCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICBraXQoYWZmaW5pdHkpLCBzdGls bFNlbGVjdGluZywgJmFjY2VwdCk7CiAgICAgcmV0dXJuIGFjY2VwdDsKQEAgLTM3Nyw4ICszNzcs OCBAQCBib29sIEVkaXRvckNsaWVudDo6c2hvdWxkQ2hhbmdlU2VsZWN0ZWRSYW5nZShSYW5nZSog ZnJvbVJhbmdlLCBSYW5nZSogdG9SYW5nZSwgRQogYm9vbCBFZGl0b3JDbGllbnQ6OnNob3VsZEFw cGx5U3R5bGUoV2ViQ29yZTo6Q1NTU3R5bGVEZWNsYXJhdGlvbiogZGVjbGFyYXRpb24sIFdlYkNv cmU6OlJhbmdlKiByYW5nZSkKIHsKICAgICBnYm9vbGVhbiBhY2NlcHQgPSBUUlVFOwotICAgIFBs YXRmb3JtUmVmUHRyPFdlYktpdERPTUNTU1N0eWxlRGVjbGFyYXRpb24+IGtpdERlY2xhcmF0aW9u KHN0YXRpY19jYXN0PFdlYktpdERPTUNTU1N0eWxlRGVjbGFyYXRpb24qPihzdGF0aWNfY2FzdDxX ZWJLaXRET01DU1NTdHlsZURlY2xhcmF0aW9uKj4oa2l0KGRlY2xhcmF0aW9uKSkpKTsKLSAgICBQ bGF0Zm9ybVJlZlB0cjxXZWJLaXRET01SYW5nZT4ga2l0UmFuZ2UoYWRvcHRQbGF0Zm9ybVJlZihz dGF0aWNfY2FzdDxXZWJLaXRET01SYW5nZSo+KHN0YXRpY19jYXN0PFdlYktpdERPTVJhbmdlKj4o a2l0KHJhbmdlKSkpKSk7CisgICAgUGxhdGZvcm1SZWZQdHI8V2ViS2l0RE9NQ1NTU3R5bGVEZWNs YXJhdGlvbj4ga2l0RGVjbGFyYXRpb24oa2l0KGRlY2xhcmF0aW9uKSk7CisgICAgUGxhdGZvcm1S ZWZQdHI8V2ViS2l0RE9NUmFuZ2U+IGtpdFJhbmdlKGFkb3B0UGxhdGZvcm1SZWYoa2l0KHJhbmdl KSkpOwogICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShtX3dlYlZpZXcsICJzaG91bGQtYXBwbHkt c3R5bGUiLCBraXREZWNsYXJhdGlvbi5nZXQoKSwga2l0UmFuZ2UuZ2V0KCksICZhY2NlcHQpOwog ICAgIHJldHVybiBhY2NlcHQ7CiB9CkBAIC01NDgsOCArNTQ4LDggQEAgdm9pZCBFZGl0b3JDbGll bnQ6OnJlZG8oKQogYm9vbCBFZGl0b3JDbGllbnQ6OnNob3VsZEluc2VydE5vZGUoTm9kZSogbm9k ZSwgUmFuZ2UqIHJhbmdlLCBFZGl0b3JJbnNlcnRBY3Rpb24gYWN0aW9uKQogewogICAgIGdib29s ZWFuIGFjY2VwdCA9IFRSVUU7Ci0gICAgUGxhdGZvcm1SZWZQdHI8V2ViS2l0RE9NUmFuZ2U+IGtp dFJhbmdlKGFkb3B0UGxhdGZvcm1SZWYoc3RhdGljX2Nhc3Q8V2ViS2l0RE9NUmFuZ2UqPihraXQo cmFuZ2UpKSkpOwotICAgIFBsYXRmb3JtUmVmUHRyPFdlYktpdERPTU5vZGU+IGtpdE5vZGUoYWRv cHRQbGF0Zm9ybVJlZihzdGF0aWNfY2FzdDxXZWJLaXRET01Ob2RlKj4oa2l0KG5vZGUpKSkpOwor ICAgIFBsYXRmb3JtUmVmUHRyPFdlYktpdERPTVJhbmdlPiBraXRSYW5nZShhZG9wdFBsYXRmb3Jt UmVmKGtpdChyYW5nZSkpKTsKKyAgICBQbGF0Zm9ybVJlZlB0cjxXZWJLaXRET01Ob2RlPiBraXRO b2RlKGFkb3B0UGxhdGZvcm1SZWYoa2l0KG5vZGUpKSk7CiAgICAgZ19zaWduYWxfZW1pdF9ieV9u YW1lKG1fd2ViVmlldywgInNob3VsZC1pbnNlcnQtbm9kZSIsIGtpdE5vZGUuZ2V0KCksIGtpdFJh bmdlLmdldCgpLCBraXQoYWN0aW9uKSwgJmFjY2VwdCk7CiAgICAgcmV0dXJuIGFjY2VwdDsKIH0K ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuY3BwIGIvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHAKaW5kZXggYWEzZDNkYS4uYjM1OWNiMSAxMDA2 NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHAKKysrIGIvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHAKQEAgLTE3Myw3ICsxNzMsNyBAQCBXZWJLaXRI aXRUZXN0UmVzdWx0KiBraXQoY29uc3QgV2ViQ29yZTo6SGl0VGVzdFJlc3VsdCYgcmVzdWx0KQog ICAgICAgICBjb250ZXh0IHw9IFdFQktJVF9ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9FRElUQUJM RTsKIAogICAgIGlmIChyZXN1bHQuaW5uZXJOb25TaGFyZWROb2RlKCkpCi0gICAgICAgIG5vZGUg PSBzdGF0aWNfY2FzdDxXZWJLaXRET01Ob2RlKj4oa2l0KHJlc3VsdC5pbm5lck5vblNoYXJlZE5v ZGUoKSkpOworICAgICAgICBub2RlID0ga2l0KHJlc3VsdC5pbm5lck5vblNoYXJlZE5vZGUoKSk7 CiAKICAgICByZXR1cm4gV0VCS0lUX0hJVF9URVNUX1JFU1VMVChnX29iamVjdF9uZXcoV0VCS0lU X1RZUEVfSElUX1RFU1RfUkVTVUxULAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAibGluay11cmkiLCBsaW5rVVJJLmdldCgpLApkaWZmIC0tZ2l0IGEvV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXR3ZWJ2aWV3LmNwcAppbmRleCA4ZTRhMjAyLi4wYzZiMjBjIDEwMDY0NAotLS0gYS9XZWJLaXQv Z3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXR3ZWJ2aWV3LmNwcApAQCAtNDg3Nyw3ICs0ODc3LDcgQEAgd2Via2l0X3dlYl92aWV3X2dldF9k b21fZG9jdW1lbnQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICBpZiAoIWRvYykKICAgICAg ICAgcmV0dXJuIDA7CiAKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8V2ViS2l0RE9NRG9jdW1lbnQq PihraXQoZG9jKSk7CisgICAgcmV0dXJuIGtpdChkb2MpOwogfQogCiAvKioKLS0gCjEuNy4yLjMK Cg==