87801 2012-05-29 17:58:59 -0700 [GTK] Remove geoclue dependency from WebKit API Layer 2012-06-04 02:06:42 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 87800 1 mario webkit-unassigned gustavo mrobinson philn webkit.review.bot xan.lopez oldest_to_newest 636654 0 mario 2012-05-29 17:58:59 -0700 Once we have bug 87800 fixed, we should be able to remove the geoclue dependency from the API layer and write GeolocationClientGtk.cpp in terms of a geoclue-based geolocation provider in WebCore. This bug is for that. 636669 1 144665 mario 2012-05-29 18:17:04 -0700 Created attachment 144665 Patch proposal 636676 2 144665 mrobinson 2012-05-29 18:20:15 -0700 Comment on attachment 144665 Patch proposal View in context: https://bugs.webkit.org/attachment.cgi?id=144665&action=review > Source/WebKit/gtk/GNUmakefile.am:-60 > - $(GEOCLUE_CFLAGS) \ I'm pretty certain you need to keep these flags here. Note that libxslt is on the list. > Source/WebKit/gtk/WebCoreSupport/GeolocationClientGtk.h:62 > + RefPtr<WebCore::GeolocationProviderGeoclue> m_provider; Instead of making this reference-counted and a pointer, it makes more sense, I think, to just make it a member, ie WebCore::GeolocationProvider m_provider; You can then initialize it like this , m_provider(this) 636677 3 webkit.review.bot 2012-05-29 18:20:52 -0700 Attachment 144665 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/gtk/ChangeLog', u'Source/Web..." exit_code: 1 Source/WebKit/gtk/ChangeLog:11: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 638164 4 145033 mario 2012-05-31 02:52:38 -0700 Created attachment 145033 Patch proposal New patch, addressing issues raised by Martin 639146 5 mario 2012-06-01 03:07:53 -0700 Thansk for the review, Martin. I will push it as soon as I get the dependencies ready too. Note to myself: fix the following typo in this patch when landing: -void GeolocationClient::notifyErrorOcurred(const char* message) +void GeolocationClient::notifyErrorOccurred(const char* message) 640422 6 mario 2012-06-04 02:06:42 -0700 Committed r119376: <http://trac.webkit.org/changeset/119376> 144665 2012-05-29 18:17:04 -0700 2012-05-31 02:52:38 -0700 Patch proposal 0002-2012-05-29-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 11442 mario RnJvbSA0ZDc3MjMwZGQzYmRhNjgyZDk4MDVkZmZiYmJmMzExNDQ5OWJlNDc4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBXZWQsIDMwIE1heSAyMDEyIDAyOjIzOjM1ICswMjAwClN1YmplY3Q6IFtQQVRD SCAyLzNdIDIwMTItMDUtMjkgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgoKICAgICAgICBbR1RLXSBSZW1vdmUgZ2VvY2x1ZSBkZXBlbmRlbmN5IGZyb20gV2ViS2l0 IEFQSSBMYXllcgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04NzgwMQoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgTWFr ZSBHZW9sb2NhdGlvbkNsaWVudCBmb3IgV2ViS2l0R1RLKyB1c2UgdGhlIG5ldyBHZW9jbHVlLWJh c2VkCiAgICAgICAgZ2VvbG9jYXRpb24gcHJvdmlkZXIgYXZhaWxhYmxlIGluIFdlYkNvcmUuCgog ICAgICAgICogR05VbWFrZWZpbGUuYW0KICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0dlb2xvY2F0 aW9uQ2xpZW50R3RrLmNwcDoKICAgICAgICAoV2ViS2l0KToKICAgICAgICAoV2ViS2l0OjpHZW9s b2NhdGlvbkNsaWVudDo6R2VvbG9jYXRpb25DbGllbnQpOgogICAgICAgIChXZWJLaXQ6Okdlb2xv Y2F0aW9uQ2xpZW50OjpzdGFydFVwZGF0aW5nKToKICAgICAgICAoV2ViS2l0OjpHZW9sb2NhdGlv bkNsaWVudDo6c3RvcFVwZGF0aW5nKToKICAgICAgICAoV2ViS2l0OjpHZW9sb2NhdGlvbkNsaWVu dDo6c2V0RW5hYmxlSGlnaEFjY3VyYWN5KToKICAgICAgICAoV2ViS2l0OjpHZW9sb2NhdGlvbkNs aWVudDo6bm90aWZ5UG9zaXRpb25DaGFuZ2VkKToKICAgICAgICAoV2ViS2l0OjpHZW9sb2NhdGlv bkNsaWVudDo6bm90aWZ5RXJyb3JPY3VycmVkKToKICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0dl b2xvY2F0aW9uQ2xpZW50R3RrLmg6CiAgICAgICAgKEdlb2xvY2F0aW9uQ2xpZW50KToKLS0tCiBT b3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjIg KysrKwogU291cmNlL1dlYktpdC9ndGsvR05VbWFrZWZpbGUuYW0gICAgICAgICAgICAgICAgICAg fCAgICAyIC0KIC4uLi9ndGsvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRHdGsuY3Bw ICAgIHwgIDEwNSArKy0tLS0tLS0tLS0tLS0tLS0tLQogLi4uL2d0ay9XZWJDb3JlU3VwcG9ydC9H ZW9sb2NhdGlvbkNsaWVudEd0ay5oICAgICAgfCAgIDI5ICsrLS0tLQogNCBmaWxlcyBjaGFuZ2Vk LCA0MCBpbnNlcnRpb25zKCspLCAxMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4 IDdlY2Y0ZDAuLmQwOGM3YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAx Mi0wNS0yOSAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CisKKyAg ICAgICAgW0dUS10gUmVtb3ZlIGdlb2NsdWUgZGVwZW5kZW5jeSBmcm9tIFdlYktpdCBBUEkgTGF5 ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3ODAx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBH ZW9sb2NhdGlvbkNsaWVudCBmb3IgV2ViS2l0R1RLKyB1c2UgdGhlIG5ldyBHZW9jbHVlLWJhc2Vk CisgICAgICAgIGdlb2xvY2F0aW9uIHByb3ZpZGVyIGF2YWlsYWJsZSBpbiBXZWJDb3JlLgorCisg ICAgICAgICogR05VbWFrZWZpbGUuYW0KKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9HZW9sb2Nh dGlvbkNsaWVudEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpH ZW9sb2NhdGlvbkNsaWVudDo6R2VvbG9jYXRpb25DbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpH ZW9sb2NhdGlvbkNsaWVudDo6c3RhcnRVcGRhdGluZyk6CisgICAgICAgIChXZWJLaXQ6Okdlb2xv Y2F0aW9uQ2xpZW50OjpzdG9wVXBkYXRpbmcpOgorICAgICAgICAoV2ViS2l0OjpHZW9sb2NhdGlv bkNsaWVudDo6c2V0RW5hYmxlSGlnaEFjY3VyYWN5KToKKyAgICAgICAgKFdlYktpdDo6R2VvbG9j YXRpb25DbGllbnQ6Om5vdGlmeVBvc2l0aW9uQ2hhbmdlZCk6CisgICAgICAgIChXZWJLaXQ6Okdl b2xvY2F0aW9uQ2xpZW50Ojpub3RpZnlFcnJvck9jdXJyZWQpOgorICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50R3RrLmg6CisgICAgICAgIChHZW9sb2NhdGlvbkNsaWVu dCk6CisKIDIwMTItMDUtMjUgIEplc3VzIFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNp YUBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFdlYktpdFRlc3RSdW5uZXIgbmVlZHMgdG8gc3Vw cG9ydCBsYXlvdXRUZXN0Q29udHJvbGxlci5zZXRKYXZhU2NyaXB0UHJvZmlsaW5nRW5hYmxlZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvR05VbWFrZWZpbGUuYW0gYi9Tb3VyY2UvV2Vi S2l0L2d0ay9HTlVtYWtlZmlsZS5hbQppbmRleCAyZDVhZDBhLi5iYmUyMTFkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2d0ay9HTlVtYWtlZmlsZS5hbQorKysgYi9Tb3VyY2UvV2ViS2l0L2d0 ay9HTlVtYWtlZmlsZS5hbQpAQCAtNTcsNyArNTcsNiBAQCBsaWJ3ZWJraXRndGtfQFdFQktJVEdU S19BUElfTUFKT1JfVkVSU0lPTkBfQFdFQktJVEdUS19BUElfTUlOT1JfVkVSU0lPTkBfbGFfQ1BQ RgogCSQoQ09WRVJBR0VfQ0ZMQUdTKSBcCiAJJChFTkNIQU5UX0NGTEFHUykgXAogCSQoR0FJTF9D RkxBR1MpIFwKLQkkKEdFT0NMVUVfQ0ZMQUdTKSBcCiAJJChHTElCX0NGTEFHUykgXAogCSQoR1NU UkVBTUVSX0NGTEFHUykgXAogCSQoR1RLX0NGTEFHUykgXApAQCAtODcsNyArODYsNiBAQCBsaWJ3 ZWJraXRndGtfQFdFQktJVEdUS19BUElfTUFKT1JfVkVSU0lPTkBfQFdFQktJVEdUS19BUElfTUlO T1JfVkVSU0lPTkBfbGFfTElCQQogCSQoRU5DSEFOVF9MSUJTKSBcCiAJJChGUkVFVFlQRV9MSUJT KSBcCiAJJChHQUlMX0xJQlMpIFwKLQkkKEdFT0NMVUVfTElCUykgXAogCSQoR0xJQl9MSUJTKSBc CiAJJChHU1RSRUFNRVJfTElCUykgXAogCSQoR1RLX0xJQlMpIFwKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50R3RrLmNwcCBiL1Nv dXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50R3RrLmNwcApp bmRleCA5ZjY5MTVjLi45Yjg2YjE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJD b3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudEd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9n dGsvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRHdGsuY3BwCkBAIC0zMywzNyArMzMs MTYgQEAKICNpbmNsdWRlICJ3ZWJraXR3ZWJmcmFtZXByaXZhdGUuaCIKICNpbmNsdWRlICJ3ZWJr aXR3ZWJ2aWV3cHJpdmF0ZS5oIgogI2luY2x1ZGUgPGdsaWIvZ2kxOG4tbGliLmg+CisjaW5jbHVk ZSA8d3RmL2dvYmplY3QvR1JlZlB0ci5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotdm9pZCBn ZXRQb3NpdGlvbkNhbGxiYWNrKEdlb2NsdWVQb3NpdGlvbiogcG9zaXRpb24sIEdlb2NsdWVQb3Np dGlvbkZpZWxkcyBmaWVsZHMsIGludCB0aW1lc3RhbXAsIGRvdWJsZSBsYXRpdHVkZSwgZG91Ymxl IGxvbmdpdHVkZSwgZG91YmxlIGFsdGl0dWRlLCBHZW9jbHVlQWNjdXJhY3kqIGFjY3VyYWN5LCBH RXJyb3IqIGVycm9yLCBHZW9sb2NhdGlvbkNsaWVudCogY2xpZW50KQotewotICAgIGlmIChlcnJv cikgewotICAgICAgICBjbGllbnQtPmVycm9yT2NjdXJlZChlcnJvci0+bWVzc2FnZSk7Ci0gICAg ICAgIGdfZXJyb3JfZnJlZShlcnJvcik7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgY2xp ZW50LT5wb3NpdGlvbkNoYW5nZWQocG9zaXRpb24sIGZpZWxkcywgdGltZXN0YW1wLCBsYXRpdHVk ZSwgbG9uZ2l0dWRlLCBhbHRpdHVkZSwgYWNjdXJhY3kpOwotfQotCi12b2lkIHBvc2l0aW9uQ2hh bmdlZENhbGxiYWNrKEdlb2NsdWVQb3NpdGlvbiogcG9zaXRpb24sIEdlb2NsdWVQb3NpdGlvbkZp ZWxkcyBmaWVsZHMsIGludCB0aW1lc3RhbXAsIGRvdWJsZSBsYXRpdHVkZSwgZG91YmxlIGxvbmdp dHVkZSwgZG91YmxlIGFsdGl0dWRlLCBHZW9jbHVlQWNjdXJhY3kqIGFjY3VyYWN5LCBHZW9sb2Nh dGlvbkNsaWVudCogY2xpZW50KQotewotICAgIGNsaWVudC0+cG9zaXRpb25DaGFuZ2VkKHBvc2l0 aW9uLCBmaWVsZHMsIHRpbWVzdGFtcCwgbGF0aXR1ZGUsIGxvbmdpdHVkZSwgYWx0aXR1ZGUsIGFj Y3VyYWN5KTsKLX0KK3VzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBHZW9sb2NhdGlvbkNsaWVu dDo6R2VvbG9jYXRpb25DbGllbnQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICA6IG1fd2Vi Vmlldyh3ZWJWaWV3KQotICAgICwgbV9nZW9jbHVlQ2xpZW50KDApCi0gICAgLCBtX2dlb2NsdWVQ b3NpdGlvbigwKQotICAgICwgbV9sYXRpdHVkZSgwKQotICAgICwgbV9sb25naXR1ZGUoMCkKLSAg ICAsIG1fYWx0aXR1ZGUoMCkKLSAgICAsIG1fYWNjdXJhY3koMCkKLSAgICAsIG1fYWx0aXR1ZGVB Y2N1cmFjeSgwKQotICAgICwgbV90aW1lc3RhbXAoMCkKLSAgICAsIG1fZW5hYmxlSGlnaEFjY3Vy YWN5KGZhbHNlKQotICAgICwgbV9pc1VwZGF0aW5nKGZhbHNlKQogeworICAgIG1fcHJvdmlkZXIg PSBhZG9wdFJlZihuZXcgR2VvbG9jYXRpb25Qcm92aWRlckdlb2NsdWUodGhpcykpOwogfQogCiB2 b2lkIEdlb2xvY2F0aW9uQ2xpZW50OjpnZW9sb2NhdGlvbkRlc3Ryb3llZCgpCkBAIC03Myw2NCAr NTIsMTcgQEAgdm9pZCBHZW9sb2NhdGlvbkNsaWVudDo6Z2VvbG9jYXRpb25EZXN0cm95ZWQoKQog CiB2b2lkIEdlb2xvY2F0aW9uQ2xpZW50OjpzdGFydFVwZGF0aW5nKCkKIHsKLSAgICBBU1NFUlQo IW1fZ2VvY2x1ZUNsaWVudCk7Ci0KLSAgICBHUmVmUHRyPEdlb2NsdWVNYXN0ZXI+IG1hc3RlciA9 IGFkb3B0R1JlZihnZW9jbHVlX21hc3Rlcl9nZXRfZGVmYXVsdCgpKTsKLSAgICBHUmVmUHRyPEdl b2NsdWVNYXN0ZXJDbGllbnQ+IGNsaWVudCA9IGFkb3B0R1JlZihnZW9jbHVlX21hc3Rlcl9jcmVh dGVfY2xpZW50KG1hc3Rlci5nZXQoKSwgMCwgMCkpOwotICAgIGlmICghY2xpZW50KSB7Ci0gICAg ICAgIGVycm9yT2NjdXJlZChfKCJDb3VsZCBub3QgY29ubmVjdCB0byBsb2NhdGlvbiBwcm92aWRl ci4iKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBHT3duUHRyPEdFcnJvcj4gZXJy b3I7Ci0gICAgR2VvY2x1ZUFjY3VyYWN5TGV2ZWwgYWNjdXJhY3lMZXZlbCA9IG1fZW5hYmxlSGln aEFjY3VyYWN5ID8gR0VPQ0xVRV9BQ0NVUkFDWV9MRVZFTF9ERVRBSUxFRCA6IEdFT0NMVUVfQUND VVJBQ1lfTEVWRUxfTE9DQUxJVFk7Ci0gICAgaWYgKCFnZW9jbHVlX21hc3Rlcl9jbGllbnRfc2V0 X3JlcXVpcmVtZW50cyhjbGllbnQuZ2V0KCksIGFjY3VyYWN5TGV2ZWwsIDAsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmYWxzZSwgR0VPQ0xVRV9SRVNP VVJDRV9BTEwsICZlcnJvci5vdXRQdHIoKSkpIHsKLSAgICAgICAgZXJyb3JPY2N1cmVkKGVycm9y LT5tZXNzYWdlKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIG1fZ2VvY2x1ZVBvc2l0 aW9uID0gYWRvcHRHUmVmKGdlb2NsdWVfbWFzdGVyX2NsaWVudF9jcmVhdGVfcG9zaXRpb24oY2xp ZW50LmdldCgpLCAmZXJyb3Iub3V0UHRyKCkpKTsKLSAgICBpZiAoIW1fZ2VvY2x1ZVBvc2l0aW9u KSB7Ci0gICAgICAgIGVycm9yT2NjdXJlZChlcnJvci0+bWVzc2FnZSk7Ci0gICAgICAgIHJldHVy bjsKLSAgICB9Ci0KLSAgICBtX2dlb2NsdWVDbGllbnQgPSBjbGllbnQ7Ci0gICAgZ2VvY2x1ZV9w b3NpdGlvbl9nZXRfcG9zaXRpb25fYXN5bmMobV9nZW9jbHVlUG9zaXRpb24uZ2V0KCksIHJlaW50 ZXJwcmV0X2Nhc3Q8R2VvY2x1ZVBvc2l0aW9uQ2FsbGJhY2s+KGdldFBvc2l0aW9uQ2FsbGJhY2sp LCB0aGlzKTsKLSAgICBnX3NpZ25hbF9jb25uZWN0KEdfT0JKRUNUKG1fZ2VvY2x1ZVBvc2l0aW9u LmdldCgpKSwgInBvc2l0aW9uLWNoYW5nZWQiLAotICAgICAgICAgICAgICAgICAgICAgR19DQUxM QkFDSyhwb3NpdGlvbkNoYW5nZWRDYWxsYmFjayksIHRoaXMpOwotCi0gICAgbV9pc1VwZGF0aW5n ID0gdHJ1ZTsKKyAgICBtX3Byb3ZpZGVyLT5zdGFydFVwZGF0aW5nKCk7CiB9CiAKIHZvaWQgR2Vv bG9jYXRpb25DbGllbnQ6OnN0b3BVcGRhdGluZygpCiB7Ci0gICAgaWYgKCFtX2dlb2NsdWVDbGll bnQpCi0gICAgICAgIHJldHVybjsKLQotICAgIG1fZ2VvY2x1ZVBvc2l0aW9uLmNsZWFyKCk7Ci0g ICAgbV9nZW9jbHVlQ2xpZW50LmNsZWFyKCk7Ci0KLSAgICBtX2lzVXBkYXRpbmcgPSBmYWxzZTsK KyAgICBtX3Byb3ZpZGVyLT5zdG9wVXBkYXRpbmcoKTsKIH0KIAogdm9pZCBHZW9sb2NhdGlvbkNs aWVudDo6c2V0RW5hYmxlSGlnaEFjY3VyYWN5KGJvb2wgZW5hYmxlKQogewotICAgIG1fZW5hYmxl SGlnaEFjY3VyYWN5ID0gZW5hYmxlOwotCi0gICAgLy8gSWYgd2UncmUgYWxyZWFkeSB1cGRhdGlu ZyB3ZSBzaG91bGQgcmVwb3J0IHRoZSBuZXcgcmVxdWlyZW1lbnRzIGluIG9yZGVyCi0gICAgLy8g dG8gY2hhbmdlIHRvIGEgbW9yZSBzdWl0YWJsZSBwcm92aWRlciBpZiBuZWVkZWQuIElmIG5vdCwg cmV0dXJuLgotICAgIGlmICghbV9pc1VwZGF0aW5nKQotICAgICAgICByZXR1cm47Ci0KLSAgICBH T3duUHRyPEdFcnJvcj4gZXJyb3I7Ci0gICAgR2VvY2x1ZUFjY3VyYWN5TGV2ZWwgYWNjdXJhY3lM ZXZlbCA9IG1fZW5hYmxlSGlnaEFjY3VyYWN5ID8gR0VPQ0xVRV9BQ0NVUkFDWV9MRVZFTF9ERVRB SUxFRCA6IEdFT0NMVUVfQUNDVVJBQ1lfTEVWRUxfTE9DQUxJVFk7Ci0gICAgaWYgKCFnZW9jbHVl X21hc3Rlcl9jbGllbnRfc2V0X3JlcXVpcmVtZW50cyhtX2dlb2NsdWVDbGllbnQuZ2V0KCksIGFj Y3VyYWN5TGV2ZWwsIDAsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBmYWxzZSwgR0VPQ0xVRV9SRVNPVVJDRV9BTEwsICZlcnJvci5vdXRQdHIoKSkpIHsK LSAgICAgICAgZXJyb3JPY2N1cmVkKGVycm9yLT5tZXNzYWdlKTsKLSAgICAgICAgc3RvcFVwZGF0 aW5nKCk7Ci0gICAgfQorICAgIG1fcHJvdmlkZXItPnNldEVuYWJsZUhpZ2hBY2N1cmFjeShlbmFi bGUpOwogfQogCiBXZWJDb3JlOjpHZW9sb2NhdGlvblBvc2l0aW9uKiBHZW9sb2NhdGlvbkNsaWVu dDo6bGFzdFBvc2l0aW9uKCkKQEAgLTE1NCwzMSArODYsMTQgQEAgdm9pZCBHZW9sb2NhdGlvbkNs aWVudDo6Y2FuY2VsUGVybWlzc2lvblJlcXVlc3QoV2ViQ29yZTo6R2VvbG9jYXRpb24qIGdlb2xv Y2F0aW8KICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUobV93ZWJWaWV3LCAiZ2VvbG9jYXRpb24t cG9saWN5LWRlY2lzaW9uLWNhbmNlbGxlZCIsIGtpdChnZW9sb2NhdGlvbi0+ZnJhbWUoKSkpOwog fQogCi12b2lkIEdlb2xvY2F0aW9uQ2xpZW50Ojpwb3NpdGlvbkNoYW5nZWQoR2VvY2x1ZVBvc2l0 aW9uKiwgR2VvY2x1ZVBvc2l0aW9uRmllbGRzIGZpZWxkcywgaW50IHRpbWVzdGFtcCwgZG91Ymxl IGxhdGl0dWRlLCBkb3VibGUgbG9uZ2l0dWRlLCBkb3VibGUgYWx0aXR1ZGUsIEdlb2NsdWVBY2N1 cmFjeSogYWNjdXJhY3kpCi17Ci0gICAgaWYgKCEoZmllbGRzICYgR0VPQ0xVRV9QT1NJVElPTl9G SUVMRFNfTEFUSVRVREUgJiYgZmllbGRzICYgR0VPQ0xVRV9QT1NJVElPTl9GSUVMRFNfTE9OR0lU VURFKSkgewotICAgICAgICBlcnJvck9jY3VyZWQoXygiUG9zaXRpb24gY291bGQgbm90IGJlIGRl dGVybWluZWQuIikpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgbV90aW1lc3RhbXAg PSB0aW1lc3RhbXA7Ci0gICAgbV9sYXRpdHVkZSA9IGxhdGl0dWRlOwotICAgIG1fbG9uZ2l0dWRl ID0gbG9uZ2l0dWRlOwotICAgIG1fYWx0aXR1ZGUgPSBhbHRpdHVkZTsKLQotICAgIGdlb2NsdWVf YWNjdXJhY3lfZ2V0X2RldGFpbHMoYWNjdXJhY3ksIDAsICZtX2FjY3VyYWN5LCAmbV9hbHRpdHVk ZUFjY3VyYWN5KTsKLQotICAgIHVwZGF0ZVBvc2l0aW9uKCk7Ci19Ci0KLXZvaWQgR2VvbG9jYXRp b25DbGllbnQ6OnVwZGF0ZVBvc2l0aW9uKCkKK3ZvaWQgR2VvbG9jYXRpb25DbGllbnQ6Om5vdGlm eVBvc2l0aW9uQ2hhbmdlZChpbnQgdGltZXN0YW1wLCBkb3VibGUgbGF0aXR1ZGUsIGRvdWJsZSBs b25naXR1ZGUsIGRvdWJsZSBhbHRpdHVkZSwgZG91YmxlIGFjY3VyYWN5LCBkb3VibGUgYWx0aXR1 ZGVBY2N1cmFjeSkKIHsKLSAgICBtX2xhc3RQb3NpdGlvbiA9IFdlYkNvcmU6Okdlb2xvY2F0aW9u UG9zaXRpb246OmNyZWF0ZShzdGF0aWNfY2FzdDxkb3VibGU+KG1fdGltZXN0YW1wKSwgbV9sYXRp dHVkZSwgbV9sb25naXR1ZGUsIG1fYWNjdXJhY3ksCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHJ1ZSwgbV9hbHRpdHVkZSwgdHJ1ZSwg bV9hbHRpdHVkZUFjY3VyYWN5LCBmYWxzZSwgMCwgZmFsc2UsIDApOworICAgIG1fbGFzdFBvc2l0 aW9uID0gV2ViQ29yZTo6R2VvbG9jYXRpb25Qb3NpdGlvbjo6Y3JlYXRlKHN0YXRpY19jYXN0PGRv dWJsZT4odGltZXN0YW1wKSwgbGF0aXR1ZGUsIGxvbmdpdHVkZSwgYWNjdXJhY3ksCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHJ1ZSwg YWx0aXR1ZGUsIHRydWUsIGFsdGl0dWRlQWNjdXJhY3ksIGZhbHNlLCAwLCBmYWxzZSwgMCk7CiAg ICAgV2ViQ29yZTo6R2VvbG9jYXRpb25Db250cm9sbGVyOjpmcm9tKGNvcmUobV93ZWJWaWV3KSkt PnBvc2l0aW9uQ2hhbmdlZChtX2xhc3RQb3NpdGlvbi5nZXQoKSk7CiB9CiAKLXZvaWQgR2VvbG9j YXRpb25DbGllbnQ6OmVycm9yT2NjdXJlZChjb25zdCBjaGFyKiBtZXNzYWdlKQordm9pZCBHZW9s b2NhdGlvbkNsaWVudDo6bm90aWZ5RXJyb3JPY3VycmVkKGNvbnN0IGNoYXIqIG1lc3NhZ2UpCiB7 CiAgICAgUmVmUHRyPFdlYkNvcmU6Okdlb2xvY2F0aW9uRXJyb3I+IGVycm9yID0gV2ViQ29yZTo6 R2VvbG9jYXRpb25FcnJvcjo6Y3JlYXRlKFdlYkNvcmU6Okdlb2xvY2F0aW9uRXJyb3I6OlBvc2l0 aW9uVW5hdmFpbGFibGUsIG1lc3NhZ2UpOwogICAgIFdlYkNvcmU6Okdlb2xvY2F0aW9uQ29udHJv bGxlcjo6ZnJvbShjb3JlKG1fd2ViVmlldykpLT5lcnJvck9jY3VycmVkKGVycm9yLmdldCgpKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9u Q2xpZW50R3RrLmggYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlv bkNsaWVudEd0ay5oCmluZGV4IDYwMmUwZjIuLmU1OGJmMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50R3RrLmgKKysrIGIvU291 cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRHdGsuaApAQCAt MjUsOSArMjUsOSBAQAogCiAjaW5jbHVkZSAiR2VvbG9jYXRpb25DbGllbnQuaCIKICNpbmNsdWRl ICJHZW9sb2NhdGlvblBvc2l0aW9uLmgiCi0jaW5jbHVkZSA8Z2VvY2x1ZS9nZW9jbHVlLW1hc3Rl ci5oPgotI2luY2x1ZGUgPGdlb2NsdWUvZ2VvY2x1ZS1wb3NpdGlvbi5oPgotI2luY2x1ZGUgPHd0 Zi9nb2JqZWN0L0dSZWZQdHIuaD4KKyNpbmNsdWRlICJHZW9sb2NhdGlvblByb3ZpZGVyR2VvY2x1 ZS5oIgorI2luY2x1ZGUgIkdlb2xvY2F0aW9uUHJvdmlkZXJHZW9jbHVlTGlzdGVuZXIuaCIKKyNp bmNsdWRlIDx3dGYvUmVmUHRyLmg+CiAKIHR5cGVkZWYgc3RydWN0IF9XZWJLaXRXZWJWaWV3IFdl YktpdFdlYlZpZXc7CiAKQEAgLTM3LDcgKzM3LDcgQEAgY2xhc3MgR2VvbG9jYXRpb247CiAKIG5h bWVzcGFjZSBXZWJLaXQgewogCi1jbGFzcyBHZW9sb2NhdGlvbkNsaWVudCA6IHB1YmxpYyBXZWJD b3JlOjpHZW9sb2NhdGlvbkNsaWVudCB7CitjbGFzcyBHZW9sb2NhdGlvbkNsaWVudCA6IHB1Ymxp YyBXZWJDb3JlOjpHZW9sb2NhdGlvbkNsaWVudCwgcHVibGljIFdlYkNvcmU6Okdlb2xvY2F0aW9u UHJvdmlkZXJHZW9jbHVlTGlzdGVuZXIgewogcHVibGljOgogICAgIEdlb2xvY2F0aW9uQ2xpZW50 KFdlYktpdFdlYlZpZXcqKTsKIApAQCAtNTIsMjggKzUyLDE1IEBAIHB1YmxpYzoKICAgICB2b2lk IHJlcXVlc3RQZXJtaXNzaW9uKFdlYkNvcmU6Okdlb2xvY2F0aW9uKik7CiAgICAgdm9pZCBjYW5j ZWxQZXJtaXNzaW9uUmVxdWVzdChXZWJDb3JlOjpHZW9sb2NhdGlvbiopOwogCi0gICAgdm9pZCBw b3NpdGlvbkNoYW5nZWQoR2VvY2x1ZVBvc2l0aW9uKiwgR2VvY2x1ZVBvc2l0aW9uRmllbGRzLCBp bnQsIGRvdWJsZSwgZG91YmxlLCBkb3VibGUsIEdlb2NsdWVBY2N1cmFjeSopOwotICAgIHZvaWQg ZXJyb3JPY2N1cmVkKGNvbnN0IGNoYXIqKTsKLQogcHJpdmF0ZToKLSAgICB2b2lkIHVwZGF0ZVBv c2l0aW9uKCk7CisgICAgLy8gR2VvbG9jYXRpb25Qcm92aWRlckdlb2NsdWVMaXN0ZW5lciBpbnRl cmZhY2UuCisgICAgdmlydHVhbCB2b2lkIG5vdGlmeVBvc2l0aW9uQ2hhbmdlZChpbnQgdGltZXN0 YW1wLCBkb3VibGUgbGF0aXR1ZGUsIGRvdWJsZSBsb25naXR1ZGUsIGRvdWJsZSBhbHRpdHVkZSwg ZG91YmxlIGFjY3VyYWN5LCBkb3VibGUgYWx0aXR1ZGVBY2N1cmFjeSk7CisgICAgdmlydHVhbCB2 b2lkIG5vdGlmeUVycm9yT2N1cnJlZChjb25zdCBjaGFyKiBtZXNzYWdlKTsKIAogICAgIFdlYktp dFdlYlZpZXcqIG1fd2ViVmlldzsKIAorICAgIFJlZlB0cjxXZWJDb3JlOjpHZW9sb2NhdGlvblBy b3ZpZGVyR2VvY2x1ZT4gbV9wcm92aWRlcjsKICAgICBSZWZQdHI8V2ViQ29yZTo6R2VvbG9jYXRp b25Qb3NpdGlvbj4gbV9sYXN0UG9zaXRpb247Ci0KLSAgICBHUmVmUHRyPEdlb2NsdWVNYXN0ZXJD bGllbnQ+IG1fZ2VvY2x1ZUNsaWVudDsKLSAgICBHUmVmUHRyPEdlb2NsdWVQb3NpdGlvbj4gbV9n ZW9jbHVlUG9zaXRpb247Ci0KLSAgICBkb3VibGUgbV9sYXRpdHVkZTsKLSAgICBkb3VibGUgbV9s b25naXR1ZGU7Ci0gICAgZG91YmxlIG1fYWx0aXR1ZGU7Ci0gICAgZG91YmxlIG1fYWNjdXJhY3k7 Ci0gICAgZG91YmxlIG1fYWx0aXR1ZGVBY2N1cmFjeTsKLSAgICBpbnQgbV90aW1lc3RhbXA7Ci0K LSAgICBib29sIG1fZW5hYmxlSGlnaEFjY3VyYWN5OwotICAgIGJvb2wgbV9pc1VwZGF0aW5nOwog fTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Ci0tIAoxLjcuMTAuMgoK 145033 2012-05-31 02:52:38 -0700 2012-05-31 09:46:32 -0700 Patch proposal 0002-2012-05-29-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 10536 mario RnJvbSBhYWJhN2FhMTBjNjViN2JiZDg5NzJmZDEzM2U2MTVmNzgxNWIwNTlmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBXZWQsIDMwIE1heSAyMDEyIDAyOjIzOjM1ICswMjAwClN1YmplY3Q6IFtQQVRD SCAyLzRdIDIwMTItMDUtMjkgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgoKICAgICAgICBbR1RLXSBSZW1vdmUgZ2VvY2x1ZSBkZXBlbmRlbmN5IGZyb20gV2ViS2l0 IEFQSSBMYXllcgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04NzgwMQoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgTWFr ZSBHZW9sb2NhdGlvbkNsaWVudCBmb3IgV2ViS2l0R1RLKyB1c2UgdGhlIG5ldyBHZW9jbHVlLWJh c2VkCiAgICAgICAgZ2VvbG9jYXRpb24gcHJvdmlkZXIgYXZhaWxhYmxlIGluIFdlYkNvcmUuCgog ICAgICAgICogV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRHdGsuY3BwOgogICAgICAg IChXZWJLaXQpOgogICAgICAgIChXZWJLaXQ6Okdlb2xvY2F0aW9uQ2xpZW50OjpHZW9sb2NhdGlv bkNsaWVudCk6CiAgICAgICAgKFdlYktpdDo6R2VvbG9jYXRpb25DbGllbnQ6OnN0YXJ0VXBkYXRp bmcpOgogICAgICAgIChXZWJLaXQ6Okdlb2xvY2F0aW9uQ2xpZW50OjpzdG9wVXBkYXRpbmcpOgog ICAgICAgIChXZWJLaXQ6Okdlb2xvY2F0aW9uQ2xpZW50OjpzZXRFbmFibGVIaWdoQWNjdXJhY3kp OgogICAgICAgIChXZWJLaXQ6Okdlb2xvY2F0aW9uQ2xpZW50Ojpub3RpZnlQb3NpdGlvbkNoYW5n ZWQpOgogICAgICAgIChXZWJLaXQ6Okdlb2xvY2F0aW9uQ2xpZW50Ojpub3RpZnlFcnJvck9jdXJy ZWQpOgogICAgICAgICogV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRHdGsuaDoKICAg ICAgICAoR2VvbG9jYXRpb25DbGllbnQpOgotLS0KIFNvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyMSArKysrCiAuLi4vZ3RrL1dlYkNvcmVTdXBw b3J0L0dlb2xvY2F0aW9uQ2xpZW50R3RrLmNwcCAgICB8ICAxMDUgKystLS0tLS0tLS0tLS0tLS0t LS0KIC4uLi9ndGsvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRHdGsuaCAgICAgIHwg ICAyOSArKy0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgMTE3IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCA3ZWNmNGQwLi40MzUxMGU3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTItMDUtMjkgIE1hcmlvIFNhbmNoZXogUHJhZGEg IDxtc2FuY2hlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFJlbW92ZSBnZW9jbHVlIGRl cGVuZGVuY3kgZnJvbSBXZWJLaXQgQVBJIExheWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzgwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgR2VvbG9jYXRpb25DbGllbnQgZm9yIFdlYktpdEdU SysgdXNlIHRoZSBuZXcgR2VvY2x1ZS1iYXNlZAorICAgICAgICBnZW9sb2NhdGlvbiBwcm92aWRl ciBhdmFpbGFibGUgaW4gV2ViQ29yZS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0dlb2xv Y2F0aW9uQ2xpZW50R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChXZWJLaXQ6 Okdlb2xvY2F0aW9uQ2xpZW50OjpHZW9sb2NhdGlvbkNsaWVudCk6CisgICAgICAgIChXZWJLaXQ6 Okdlb2xvY2F0aW9uQ2xpZW50OjpzdGFydFVwZGF0aW5nKToKKyAgICAgICAgKFdlYktpdDo6R2Vv bG9jYXRpb25DbGllbnQ6OnN0b3BVcGRhdGluZyk6CisgICAgICAgIChXZWJLaXQ6Okdlb2xvY2F0 aW9uQ2xpZW50OjpzZXRFbmFibGVIaWdoQWNjdXJhY3kpOgorICAgICAgICAoV2ViS2l0OjpHZW9s b2NhdGlvbkNsaWVudDo6bm90aWZ5UG9zaXRpb25DaGFuZ2VkKToKKyAgICAgICAgKFdlYktpdDo6 R2VvbG9jYXRpb25DbGllbnQ6Om5vdGlmeUVycm9yT2N1cnJlZCk6CisgICAgICAgICogV2ViQ29y ZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRHdGsuaDoKKyAgICAgICAgKEdlb2xvY2F0aW9uQ2xp ZW50KToKKwogMjAxMi0wNS0yNSAgSmVzdXMgU2FuY2hlei1QYWxlbmNpYSAgPGplc3VzLnBhbGVu Y2lhQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgV2ViS2l0VGVzdFJ1bm5lciBuZWVkcyB0byBz dXBwb3J0IGxheW91dFRlc3RDb250cm9sbGVyLnNldEphdmFTY3JpcHRQcm9maWxpbmdFbmFibGVk CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlv bkNsaWVudEd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9HZW9sb2Nh dGlvbkNsaWVudEd0ay5jcHAKaW5kZXggZDVjZTM0OS4uZjU2Mjk3NSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRHdGsuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50R3Rr LmNwcApAQCAtMzMsMzYgKzMzLDEzIEBACiAjaW5jbHVkZSAid2Via2l0d2ViZnJhbWVwcml2YXRl LmgiCiAjaW5jbHVkZSAid2Via2l0d2Vidmlld3ByaXZhdGUuaCIKICNpbmNsdWRlIDxnbGliL2dp MThuLWxpYi5oPgorI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dSZWZQdHIuaD4KIAogbmFtZXNwYWNl IFdlYktpdCB7CiAKLXZvaWQgZ2V0UG9zaXRpb25DYWxsYmFjayhHZW9jbHVlUG9zaXRpb24qIHBv c2l0aW9uLCBHZW9jbHVlUG9zaXRpb25GaWVsZHMgZmllbGRzLCBpbnQgdGltZXN0YW1wLCBkb3Vi bGUgbGF0aXR1ZGUsIGRvdWJsZSBsb25naXR1ZGUsIGRvdWJsZSBhbHRpdHVkZSwgR2VvY2x1ZUFj Y3VyYWN5KiBhY2N1cmFjeSwgR0Vycm9yKiBlcnJvciwgR2VvbG9jYXRpb25DbGllbnQqIGNsaWVu dCkKLXsKLSAgICBpZiAoZXJyb3IpIHsKLSAgICAgICAgY2xpZW50LT5lcnJvck9jY3VyZWQoZXJy b3ItPm1lc3NhZ2UpOwotICAgICAgICBnX2Vycm9yX2ZyZWUoZXJyb3IpOwotICAgICAgICByZXR1 cm47Ci0gICAgfQotICAgIGNsaWVudC0+cG9zaXRpb25DaGFuZ2VkKHBvc2l0aW9uLCBmaWVsZHMs IHRpbWVzdGFtcCwgbGF0aXR1ZGUsIGxvbmdpdHVkZSwgYWx0aXR1ZGUsIGFjY3VyYWN5KTsKLX0K LQotdm9pZCBwb3NpdGlvbkNoYW5nZWRDYWxsYmFjayhHZW9jbHVlUG9zaXRpb24qIHBvc2l0aW9u LCBHZW9jbHVlUG9zaXRpb25GaWVsZHMgZmllbGRzLCBpbnQgdGltZXN0YW1wLCBkb3VibGUgbGF0 aXR1ZGUsIGRvdWJsZSBsb25naXR1ZGUsIGRvdWJsZSBhbHRpdHVkZSwgR2VvY2x1ZUFjY3VyYWN5 KiBhY2N1cmFjeSwgR2VvbG9jYXRpb25DbGllbnQqIGNsaWVudCkKLXsKLSAgICBjbGllbnQtPnBv c2l0aW9uQ2hhbmdlZChwb3NpdGlvbiwgZmllbGRzLCB0aW1lc3RhbXAsIGxhdGl0dWRlLCBsb25n aXR1ZGUsIGFsdGl0dWRlLCBhY2N1cmFjeSk7Ci19Ci0KIEdlb2xvY2F0aW9uQ2xpZW50OjpHZW9s b2NhdGlvbkNsaWVudChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogICAgIDogbV93ZWJWaWV3KHdl YlZpZXcpCi0gICAgLCBtX2dlb2NsdWVDbGllbnQoMCkKLSAgICAsIG1fZ2VvY2x1ZVBvc2l0aW9u KDApCi0gICAgLCBtX2xhdGl0dWRlKDApCi0gICAgLCBtX2xvbmdpdHVkZSgwKQotICAgICwgbV9h bHRpdHVkZSgwKQotICAgICwgbV9hY2N1cmFjeSgwKQotICAgICwgbV9hbHRpdHVkZUFjY3VyYWN5 KDApCi0gICAgLCBtX3RpbWVzdGFtcCgwKQotICAgICwgbV9lbmFibGVIaWdoQWNjdXJhY3koZmFs c2UpCi0gICAgLCBtX2lzVXBkYXRpbmcoZmFsc2UpCisgICAgLCBtX3Byb3ZpZGVyKHRoaXMpCiB7 CiB9CiAKQEAgLTczLDY0ICs1MCwxNyBAQCB2b2lkIEdlb2xvY2F0aW9uQ2xpZW50OjpnZW9sb2Nh dGlvbkRlc3Ryb3llZCgpCiAKIHZvaWQgR2VvbG9jYXRpb25DbGllbnQ6OnN0YXJ0VXBkYXRpbmco KQogewotICAgIEFTU0VSVCghbV9nZW9jbHVlQ2xpZW50KTsKLQotICAgIEdSZWZQdHI8R2VvY2x1 ZU1hc3Rlcj4gbWFzdGVyID0gYWRvcHRHUmVmKGdlb2NsdWVfbWFzdGVyX2dldF9kZWZhdWx0KCkp OwotICAgIEdSZWZQdHI8R2VvY2x1ZU1hc3RlckNsaWVudD4gY2xpZW50ID0gYWRvcHRHUmVmKGdl b2NsdWVfbWFzdGVyX2NyZWF0ZV9jbGllbnQobWFzdGVyLmdldCgpLCAwLCAwKSk7Ci0gICAgaWYg KCFjbGllbnQpIHsKLSAgICAgICAgZXJyb3JPY2N1cmVkKF8oIkNvdWxkIG5vdCBjb25uZWN0IHRv IGxvY2F0aW9uIHByb3ZpZGVyLiIpKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIEdP d25QdHI8R0Vycm9yPiBlcnJvcjsKLSAgICBHZW9jbHVlQWNjdXJhY3lMZXZlbCBhY2N1cmFjeUxl dmVsID0gbV9lbmFibGVIaWdoQWNjdXJhY3kgPyBHRU9DTFVFX0FDQ1VSQUNZX0xFVkVMX0RFVEFJ TEVEIDogR0VPQ0xVRV9BQ0NVUkFDWV9MRVZFTF9MT0NBTElUWTsKLSAgICBpZiAoIWdlb2NsdWVf bWFzdGVyX2NsaWVudF9zZXRfcmVxdWlyZW1lbnRzKGNsaWVudC5nZXQoKSwgYWNjdXJhY3lMZXZl bCwgMCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZh bHNlLCBHRU9DTFVFX1JFU09VUkNFX0FMTCwgJmVycm9yLm91dFB0cigpKSkgewotICAgICAgICBl cnJvck9jY3VyZWQoZXJyb3ItPm1lc3NhZ2UpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0g ICAgbV9nZW9jbHVlUG9zaXRpb24gPSBhZG9wdEdSZWYoZ2VvY2x1ZV9tYXN0ZXJfY2xpZW50X2Ny ZWF0ZV9wb3NpdGlvbihjbGllbnQuZ2V0KCksICZlcnJvci5vdXRQdHIoKSkpOwotICAgIGlmICgh bV9nZW9jbHVlUG9zaXRpb24pIHsKLSAgICAgICAgZXJyb3JPY2N1cmVkKGVycm9yLT5tZXNzYWdl KTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIG1fZ2VvY2x1ZUNsaWVudCA9IGNsaWVu dDsKLSAgICBnZW9jbHVlX3Bvc2l0aW9uX2dldF9wb3NpdGlvbl9hc3luYyhtX2dlb2NsdWVQb3Np dGlvbi5nZXQoKSwgcmVpbnRlcnByZXRfY2FzdDxHZW9jbHVlUG9zaXRpb25DYWxsYmFjaz4oZ2V0 UG9zaXRpb25DYWxsYmFjayksIHRoaXMpOwotICAgIGdfc2lnbmFsX2Nvbm5lY3QoR19PQkpFQ1Qo bV9nZW9jbHVlUG9zaXRpb24uZ2V0KCkpLCAicG9zaXRpb24tY2hhbmdlZCIsCi0gICAgICAgICAg ICAgICAgICAgICBHX0NBTExCQUNLKHBvc2l0aW9uQ2hhbmdlZENhbGxiYWNrKSwgdGhpcyk7Ci0K LSAgICBtX2lzVXBkYXRpbmcgPSB0cnVlOworICAgIG1fcHJvdmlkZXIuc3RhcnRVcGRhdGluZygp OwogfQogCiB2b2lkIEdlb2xvY2F0aW9uQ2xpZW50OjpzdG9wVXBkYXRpbmcoKQogewotICAgIGlm ICghbV9nZW9jbHVlQ2xpZW50KQotICAgICAgICByZXR1cm47Ci0KLSAgICBtX2dlb2NsdWVQb3Np dGlvbi5jbGVhcigpOwotICAgIG1fZ2VvY2x1ZUNsaWVudC5jbGVhcigpOwotCi0gICAgbV9pc1Vw ZGF0aW5nID0gZmFsc2U7CisgICAgbV9wcm92aWRlci5zdG9wVXBkYXRpbmcoKTsKIH0KIAogdm9p ZCBHZW9sb2NhdGlvbkNsaWVudDo6c2V0RW5hYmxlSGlnaEFjY3VyYWN5KGJvb2wgZW5hYmxlKQog ewotICAgIG1fZW5hYmxlSGlnaEFjY3VyYWN5ID0gZW5hYmxlOwotCi0gICAgLy8gSWYgd2UncmUg YWxyZWFkeSB1cGRhdGluZyB3ZSBzaG91bGQgcmVwb3J0IHRoZSBuZXcgcmVxdWlyZW1lbnRzIGlu IG9yZGVyCi0gICAgLy8gdG8gY2hhbmdlIHRvIGEgbW9yZSBzdWl0YWJsZSBwcm92aWRlciBpZiBu ZWVkZWQuIElmIG5vdCwgcmV0dXJuLgotICAgIGlmICghbV9pc1VwZGF0aW5nKQotICAgICAgICBy ZXR1cm47Ci0KLSAgICBHT3duUHRyPEdFcnJvcj4gZXJyb3I7Ci0gICAgR2VvY2x1ZUFjY3VyYWN5 TGV2ZWwgYWNjdXJhY3lMZXZlbCA9IG1fZW5hYmxlSGlnaEFjY3VyYWN5ID8gR0VPQ0xVRV9BQ0NV UkFDWV9MRVZFTF9ERVRBSUxFRCA6IEdFT0NMVUVfQUNDVVJBQ1lfTEVWRUxfTE9DQUxJVFk7Ci0g ICAgaWYgKCFnZW9jbHVlX21hc3Rlcl9jbGllbnRfc2V0X3JlcXVpcmVtZW50cyhtX2dlb2NsdWVD bGllbnQuZ2V0KCksIGFjY3VyYWN5TGV2ZWwsIDAsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBmYWxzZSwgR0VPQ0xVRV9SRVNPVVJDRV9BTEwsICZlcnJv ci5vdXRQdHIoKSkpIHsKLSAgICAgICAgZXJyb3JPY2N1cmVkKGVycm9yLT5tZXNzYWdlKTsKLSAg ICAgICAgc3RvcFVwZGF0aW5nKCk7Ci0gICAgfQorICAgIG1fcHJvdmlkZXIuc2V0RW5hYmxlSGln aEFjY3VyYWN5KGVuYWJsZSk7CiB9CiAKIFdlYkNvcmU6Okdlb2xvY2F0aW9uUG9zaXRpb24qIEdl b2xvY2F0aW9uQ2xpZW50OjpsYXN0UG9zaXRpb24oKQpAQCAtMTU3LDMxICs4NywxNCBAQCB2b2lk IEdlb2xvY2F0aW9uQ2xpZW50OjpjYW5jZWxQZXJtaXNzaW9uUmVxdWVzdChXZWJDb3JlOjpHZW9s b2NhdGlvbiogZ2VvbG9jYXRpbwogICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShtX3dlYlZpZXcs ICJnZW9sb2NhdGlvbi1wb2xpY3ktZGVjaXNpb24tY2FuY2VsbGVkIiwga2l0KGdlb2xvY2F0aW9u LT5mcmFtZSgpKSk7CiB9CiAKLXZvaWQgR2VvbG9jYXRpb25DbGllbnQ6OnBvc2l0aW9uQ2hhbmdl ZChHZW9jbHVlUG9zaXRpb24qLCBHZW9jbHVlUG9zaXRpb25GaWVsZHMgZmllbGRzLCBpbnQgdGlt ZXN0YW1wLCBkb3VibGUgbGF0aXR1ZGUsIGRvdWJsZSBsb25naXR1ZGUsIGRvdWJsZSBhbHRpdHVk ZSwgR2VvY2x1ZUFjY3VyYWN5KiBhY2N1cmFjeSkKLXsKLSAgICBpZiAoIShmaWVsZHMgJiBHRU9D TFVFX1BPU0lUSU9OX0ZJRUxEU19MQVRJVFVERSAmJiBmaWVsZHMgJiBHRU9DTFVFX1BPU0lUSU9O X0ZJRUxEU19MT05HSVRVREUpKSB7Ci0gICAgICAgIGVycm9yT2NjdXJlZChfKCJQb3NpdGlvbiBj b3VsZCBub3QgYmUgZGV0ZXJtaW5lZC4iKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAg ICBtX3RpbWVzdGFtcCA9IHRpbWVzdGFtcDsKLSAgICBtX2xhdGl0dWRlID0gbGF0aXR1ZGU7Ci0g ICAgbV9sb25naXR1ZGUgPSBsb25naXR1ZGU7Ci0gICAgbV9hbHRpdHVkZSA9IGFsdGl0dWRlOwot Ci0gICAgZ2VvY2x1ZV9hY2N1cmFjeV9nZXRfZGV0YWlscyhhY2N1cmFjeSwgMCwgJm1fYWNjdXJh Y3ksICZtX2FsdGl0dWRlQWNjdXJhY3kpOwotCi0gICAgdXBkYXRlUG9zaXRpb24oKTsKLX0KLQot dm9pZCBHZW9sb2NhdGlvbkNsaWVudDo6dXBkYXRlUG9zaXRpb24oKQordm9pZCBHZW9sb2NhdGlv bkNsaWVudDo6bm90aWZ5UG9zaXRpb25DaGFuZ2VkKGludCB0aW1lc3RhbXAsIGRvdWJsZSBsYXRp dHVkZSwgZG91YmxlIGxvbmdpdHVkZSwgZG91YmxlIGFsdGl0dWRlLCBkb3VibGUgYWNjdXJhY3ks IGRvdWJsZSBhbHRpdHVkZUFjY3VyYWN5KQogewotICAgIG1fbGFzdFBvc2l0aW9uID0gV2ViQ29y ZTo6R2VvbG9jYXRpb25Qb3NpdGlvbjo6Y3JlYXRlKHN0YXRpY19jYXN0PGRvdWJsZT4obV90aW1l c3RhbXApLCBtX2xhdGl0dWRlLCBtX2xvbmdpdHVkZSwgbV9hY2N1cmFjeSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0cnVlLCBtX2Fs dGl0dWRlLCB0cnVlLCBtX2FsdGl0dWRlQWNjdXJhY3ksIGZhbHNlLCAwLCBmYWxzZSwgMCk7Cisg ICAgbV9sYXN0UG9zaXRpb24gPSBXZWJDb3JlOjpHZW9sb2NhdGlvblBvc2l0aW9uOjpjcmVhdGUo c3RhdGljX2Nhc3Q8ZG91YmxlPih0aW1lc3RhbXApLCBsYXRpdHVkZSwgbG9uZ2l0dWRlLCBhY2N1 cmFjeSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB0cnVlLCBhbHRpdHVkZSwgdHJ1ZSwgYWx0aXR1ZGVBY2N1cmFjeSwgZmFsc2UsIDAs IGZhbHNlLCAwKTsKICAgICBXZWJDb3JlOjpHZW9sb2NhdGlvbkNvbnRyb2xsZXI6OmZyb20oY29y ZShtX3dlYlZpZXcpKS0+cG9zaXRpb25DaGFuZ2VkKG1fbGFzdFBvc2l0aW9uLmdldCgpKTsKIH0K IAotdm9pZCBHZW9sb2NhdGlvbkNsaWVudDo6ZXJyb3JPY2N1cmVkKGNvbnN0IGNoYXIqIG1lc3Nh Z2UpCit2b2lkIEdlb2xvY2F0aW9uQ2xpZW50Ojpub3RpZnlFcnJvck9jdXJyZWQoY29uc3QgY2hh ciogbWVzc2FnZSkKIHsKICAgICBSZWZQdHI8V2ViQ29yZTo6R2VvbG9jYXRpb25FcnJvcj4gZXJy b3IgPSBXZWJDb3JlOjpHZW9sb2NhdGlvbkVycm9yOjpjcmVhdGUoV2ViQ29yZTo6R2VvbG9jYXRp b25FcnJvcjo6UG9zaXRpb25VbmF2YWlsYWJsZSwgbWVzc2FnZSk7CiAgICAgV2ViQ29yZTo6R2Vv bG9jYXRpb25Db250cm9sbGVyOjpmcm9tKGNvcmUobV93ZWJWaWV3KSktPmVycm9yT2NjdXJyZWQo ZXJyb3IuZ2V0KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBv cnQvR2VvbG9jYXRpb25DbGllbnRHdGsuaCBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBw b3J0L0dlb2xvY2F0aW9uQ2xpZW50R3RrLmgKaW5kZXggNjAyZTBmMi4uMWFkZjc2ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRH dGsuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNs aWVudEd0ay5oCkBAIC0yNSw5ICsyNSw5IEBACiAKICNpbmNsdWRlICJHZW9sb2NhdGlvbkNsaWVu dC5oIgogI2luY2x1ZGUgIkdlb2xvY2F0aW9uUG9zaXRpb24uaCIKLSNpbmNsdWRlIDxnZW9jbHVl L2dlb2NsdWUtbWFzdGVyLmg+Ci0jaW5jbHVkZSA8Z2VvY2x1ZS9nZW9jbHVlLXBvc2l0aW9uLmg+ Ci0jaW5jbHVkZSA8d3RmL2dvYmplY3QvR1JlZlB0ci5oPgorI2luY2x1ZGUgIkdlb2xvY2F0aW9u UHJvdmlkZXJHZW9jbHVlLmgiCisjaW5jbHVkZSAiR2VvbG9jYXRpb25Qcm92aWRlckdlb2NsdWVM aXN0ZW5lci5oIgorI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KIAogdHlwZWRlZiBzdHJ1Y3QgX1dl YktpdFdlYlZpZXcgV2ViS2l0V2ViVmlldzsKIApAQCAtMzcsNyArMzcsNyBAQCBjbGFzcyBHZW9s b2NhdGlvbjsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLWNsYXNzIEdlb2xvY2F0aW9uQ2xpZW50 IDogcHVibGljIFdlYkNvcmU6Okdlb2xvY2F0aW9uQ2xpZW50IHsKK2NsYXNzIEdlb2xvY2F0aW9u Q2xpZW50IDogcHVibGljIFdlYkNvcmU6Okdlb2xvY2F0aW9uQ2xpZW50LCBwdWJsaWMgV2ViQ29y ZTo6R2VvbG9jYXRpb25Qcm92aWRlckdlb2NsdWVMaXN0ZW5lciB7CiBwdWJsaWM6CiAgICAgR2Vv bG9jYXRpb25DbGllbnQoV2ViS2l0V2ViVmlldyopOwogCkBAIC01MiwyOCArNTIsMTUgQEAgcHVi bGljOgogICAgIHZvaWQgcmVxdWVzdFBlcm1pc3Npb24oV2ViQ29yZTo6R2VvbG9jYXRpb24qKTsK ICAgICB2b2lkIGNhbmNlbFBlcm1pc3Npb25SZXF1ZXN0KFdlYkNvcmU6Okdlb2xvY2F0aW9uKik7 CiAKLSAgICB2b2lkIHBvc2l0aW9uQ2hhbmdlZChHZW9jbHVlUG9zaXRpb24qLCBHZW9jbHVlUG9z aXRpb25GaWVsZHMsIGludCwgZG91YmxlLCBkb3VibGUsIGRvdWJsZSwgR2VvY2x1ZUFjY3VyYWN5 Kik7Ci0gICAgdm9pZCBlcnJvck9jY3VyZWQoY29uc3QgY2hhciopOwotCiBwcml2YXRlOgotICAg IHZvaWQgdXBkYXRlUG9zaXRpb24oKTsKKyAgICAvLyBHZW9sb2NhdGlvblByb3ZpZGVyR2VvY2x1 ZUxpc3RlbmVyIGludGVyZmFjZS4KKyAgICB2aXJ0dWFsIHZvaWQgbm90aWZ5UG9zaXRpb25DaGFu Z2VkKGludCB0aW1lc3RhbXAsIGRvdWJsZSBsYXRpdHVkZSwgZG91YmxlIGxvbmdpdHVkZSwgZG91 YmxlIGFsdGl0dWRlLCBkb3VibGUgYWNjdXJhY3ksIGRvdWJsZSBhbHRpdHVkZUFjY3VyYWN5KTsK KyAgICB2aXJ0dWFsIHZvaWQgbm90aWZ5RXJyb3JPY3VycmVkKGNvbnN0IGNoYXIqIG1lc3NhZ2Up OwogCiAgICAgV2ViS2l0V2ViVmlldyogbV93ZWJWaWV3OwogCisgICAgV2ViQ29yZTo6R2VvbG9j YXRpb25Qcm92aWRlckdlb2NsdWUgbV9wcm92aWRlcjsKICAgICBSZWZQdHI8V2ViQ29yZTo6R2Vv bG9jYXRpb25Qb3NpdGlvbj4gbV9sYXN0UG9zaXRpb247Ci0KLSAgICBHUmVmUHRyPEdlb2NsdWVN YXN0ZXJDbGllbnQ+IG1fZ2VvY2x1ZUNsaWVudDsKLSAgICBHUmVmUHRyPEdlb2NsdWVQb3NpdGlv bj4gbV9nZW9jbHVlUG9zaXRpb247Ci0KLSAgICBkb3VibGUgbV9sYXRpdHVkZTsKLSAgICBkb3Vi bGUgbV9sb25naXR1ZGU7Ci0gICAgZG91YmxlIG1fYWx0aXR1ZGU7Ci0gICAgZG91YmxlIG1fYWNj dXJhY3k7Ci0gICAgZG91YmxlIG1fYWx0aXR1ZGVBY2N1cmFjeTsKLSAgICBpbnQgbV90aW1lc3Rh bXA7Ci0KLSAgICBib29sIG1fZW5hYmxlSGlnaEFjY3VyYWN5OwotICAgIGJvb2wgbV9pc1VwZGF0 aW5nOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Ci0tIAoxLjcuMTAuMgoK