96689 2012-09-13 13:22:45 -0700 [BlackBerry] Rename InspectorOverlay in blackberry/WebKitSupport 2012-09-13 14:13:30 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rwlbuis rwlbuis mifenton tonikitoo webkit.review.bot oldest_to_newest 719857 0 rwlbuis 2012-09-13 13:22:45 -0700 This file is clashing with inspector/InspectorOverlay.h, rename. 719861 1 163949 rwlbuis 2012-09-13 13:24:59 -0700 Created attachment 163949 Patch 719918 2 rwlbuis 2012-09-13 14:13:30 -0700 Committed r128502: <http://trac.webkit.org/changeset/128502> 163949 2012-09-13 13:24:59 -0700 2012-09-13 13:34:40 -0700 Patch bug-96689-20120913162733.patch text/plain 14848 rwlbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NDgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA1YmUzMjc2MTJlMTYxYTk1ODQ0NGNlMGRlYTMzY2JjMDliN2YxMzQ1Li5mMTEyZjMyYjU4 NjI3OGE3Mzg2MDNlN2M1ZTQ2NjUzN2IxMzk5ZmRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAxMi0wOS0xMyAgUm9iIEJ1aXMgIDxyYnVpc0ByaW0u Y29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBSZW5hbWUgSW5zcGVjdG9yT3ZlcmxheSBpbiBi bGFja2JlcnJ5L1dlYktpdFN1cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTk2Njg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVuYW1lIHRvIEluc3BlY3RvckNsaWVudEJsYWNrQmVycnkgdG8gYXZv aWQgaW5jbHVkZSBwcm9ibGVtcy4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0luc3BlY3Rv ckNsaWVudEJsYWNrQmVycnkuaDoKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0luc3BlY3Rvck92 ZXJsYXlCbGFja0JlcnJ5LmNwcDogUmVuYW1lZCBmcm9tIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9XZWJLaXRTdXBwb3J0L0luc3BlY3Rvck92ZXJsYXkuY3BwLgorICAgICAgICAoV2ViS2l0KToK KyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5zcGVjdG9yT3ZlcmxheTo6Y3JlYXRlKToK KyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5zcGVjdG9yT3ZlcmxheTo6SW5zcGVjdG9y T3ZlcmxheSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6Okluc3BlY3Rvck92ZXJsYXk6 Om5vdGlmeVN5bmNSZXF1aXJlZCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6Okluc3Bl Y3Rvck92ZXJsYXk6OnBhaW50Q29udGVudHMpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0 OjpJbnNwZWN0b3JPdmVybGF5OjpzaG93RGVidWdCb3JkZXJzKToKKyAgICAgICAgKEJsYWNrQmVy cnk6OldlYktpdDo6SW5zcGVjdG9yT3ZlcmxheTo6c2hvd1JlcGFpbnRDb3VudGVyKToKKyAgICAg ICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5zcGVjdG9yT3ZlcmxheTo6fkluc3BlY3Rvck92ZXJs YXkpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnNwZWN0b3JPdmVybGF5OjpjbGVh cik6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6Okluc3BlY3Rvck92ZXJsYXk6OnVwZGF0 ZSk6CisgICAgICAgICogV2ViS2l0U3VwcG9ydC9JbnNwZWN0b3JPdmVybGF5QmxhY2tCZXJyeS5o OiBSZW5hbWVkIGZyb20gU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5z cGVjdG9yT3ZlcmxheS5oLgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJLaXQpOgor ICAgICAgICAoSW5zcGVjdG9yT3ZlcmxheSk6CisgICAgICAgIChJbnNwZWN0b3JPdmVybGF5Q2xp ZW50KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5zcGVjdG9yT3ZlcmxheTo6c2V0 Q2xpZW50KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5zcGVjdG9yT3ZlcmxheTo6 bm90aWZ5QW5pbWF0aW9uU3RhcnRlZCk6CisKIDIwMTItMDktMTMgIEdlbmV2aWV2ZSBNYWsgIDxn bWFrQHJpbS5jb20+CiAKICAgICAgICAgQ29udGludWUgdG8gc2VuZCBtb3VzZSBtb3ZlIGV2ZW50 cyB0byBhIG5vbi1zY3JvbGxhYmxlIHBhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRCbGFja0JlcnJ5LmggYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50QmxhY2tC ZXJyeS5oCmluZGV4IDI3NGJjOGNjZTE0ZmY2OGEzZTBiNmIxMDAzYjE1NjM3YjczOWZlMDkuLjM0 YTU1MzY1MGJjMDczMmJlMGYxZjk2M2ZkNDY0MmZkZDM3YmU2ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRCbGFja0Jl cnJ5LmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0luc3Bl Y3RvckNsaWVudEJsYWNrQmVycnkuaApAQCAtMjIsNyArMjIsNyBAQAogCiAjaW5jbHVkZSAiSW5z cGVjdG9yQ2xpZW50LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yRnJvbnRlbmRDaGFubmVsLmgiCi0j aW5jbHVkZSAiSW5zcGVjdG9yT3ZlcmxheS5oIgorI2luY2x1ZGUgIkluc3BlY3Rvck92ZXJsYXlC bGFja0JlcnJ5LmgiCiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvdGV4 dC9XVEZTdHJpbmcuaD4KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dl YktpdFN1cHBvcnQvSW5zcGVjdG9yT3ZlcmxheS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvV2ViS2l0U3VwcG9ydC9JbnNwZWN0b3JPdmVybGF5LmNwcApkZWxldGVkIGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggZWU1ZDMzMzQ2YTMyYzllMzc3NDA0MzJkM2Y3YTJmYjRjZTUwODE0ZS4uMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnNwZWN0b3JPdmVybGF5LmNwcAorKysgL2Rldi9u dWxsCkBAIC0xLDk5ICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTIgUmVzZWFyY2gg SW4gTW90aW9uIExpbWl0ZWQuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKgotICogVGhpcyBsaWJy YXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgotICog bW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1Ymxp YwotICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlv bjsgZWl0aGVyCi0gKiB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlv bikgYW55IGxhdGVyIHZlcnNpb24uCi0gKgotICogVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVk IGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCi0gKiBidXQgV0lUSE9VVCBBTlkg V0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgotICogTUVSQ0hB TlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBH TlUKLSAqIExlc3NlciBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCi0g KgotICogWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExlc3NlciBH ZW5lcmFsIFB1YmxpYwotICogTGljZW5zZSBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsgaWYgbm90 LCB3cml0ZSB0byB0aGUgRnJlZSBTb2Z0d2FyZQotICogRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJh bmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwgQm9zdG9uLCBNQSAgMDIxMTAtMTMwMSAgVVNBCi0g Ki8KLQotI2luY2x1ZGUgImNvbmZpZy5oIgotCi0jaW5jbHVkZSAiSW5zcGVjdG9yT3ZlcmxheS5o IgotCi0jaW5jbHVkZSAiRnJhbWUuaCIKLSNpbmNsdWRlICJGcmFtZVZpZXcuaCIKLSNpbmNsdWRl ICJHcmFwaGljc0NvbnRleHQuaCIKLSNpbmNsdWRlICJHcmFwaGljc0xheWVyLmgiCi0jaW5jbHVk ZSAiV2ViUGFnZV9wLmgiCi0KLQotbmFtZXNwYWNlIEJsYWNrQmVycnkgewotbmFtZXNwYWNlIFdl YktpdCB7Ci0KLVBhc3NPd25QdHI8SW5zcGVjdG9yT3ZlcmxheT4gSW5zcGVjdG9yT3ZlcmxheTo6 Y3JlYXRlKFdlYlBhZ2VQcml2YXRlKiBwYWdlLCBJbnNwZWN0b3JPdmVybGF5Q2xpZW50KiBjbGll bnQpCi17Ci0gICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBJbnNwZWN0b3JPdmVybGF5KHBhZ2UsIGNs aWVudCkpOwotfQotCi1JbnNwZWN0b3JPdmVybGF5OjpJbnNwZWN0b3JPdmVybGF5KFdlYlBhZ2VQ cml2YXRlKiBwYWdlLCBJbnNwZWN0b3JPdmVybGF5Q2xpZW50KiBjbGllbnQpCi0gICAgOiBtX3dl YlBhZ2UocGFnZSkKLSAgICAsIG1fY2xpZW50KGNsaWVudCkKLXsKLX0KLQotI2lmIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKLXZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6bm90aWZ5U3luY1Jl cXVpcmVkKGNvbnN0IFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqIGxheWVyKQotewotICAgIG1fd2Vi UGFnZS0+bm90aWZ5U3luY1JlcXVpcmVkKGxheWVyKTsKLX0KLQotdm9pZCBJbnNwZWN0b3JPdmVy bGF5OjpwYWludENvbnRlbnRzKGNvbnN0IFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqLCBXZWJDb3Jl OjpHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJQYWludGlu Z1BoYXNlLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBpbkNsaXApCi17Ci0gICAgY29udGV4dC5z YXZlKCk7Ci0gICAgV2ViQ29yZTo6SW50UG9pbnQgc2Nyb2xsUG9zaXRpb24gPSBtX3dlYlBhZ2Ut PmZvY3VzZWRPck1haW5GcmFtZSgpLT52aWV3KCktPnNjcm9sbFBvc2l0aW9uKCk7Ci0gICAgY29u dGV4dC50cmFuc2xhdGUoc2Nyb2xsUG9zaXRpb24ueCgpLCBzY3JvbGxQb3NpdGlvbi55KCkpOwot ICAgIG1fY2xpZW50LT5wYWludEluc3BlY3Rvck92ZXJsYXkoY29udGV4dCk7Ci0gICAgY29udGV4 dC5yZXN0b3JlKCk7Ci19Ci0KLWJvb2wgSW5zcGVjdG9yT3ZlcmxheTo6c2hvd0RlYnVnQm9yZGVy cyhjb25zdCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiBsYXllcikgY29uc3QKLXsKLSAgICByZXR1 cm4gbV93ZWJQYWdlLT5zaG93RGVidWdCb3JkZXJzKGxheWVyKTsKLX0KLQotYm9vbCBJbnNwZWN0 b3JPdmVybGF5OjpzaG93UmVwYWludENvdW50ZXIoY29uc3QgV2ViQ29yZTo6R3JhcGhpY3NMYXll ciogbGF5ZXIpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fd2ViUGFnZS0+c2hvd1JlcGFpbnRDb3Vu dGVyKGxheWVyKTsKLX0KLSNlbmRpZgotCi1JbnNwZWN0b3JPdmVybGF5Ojp+SW5zcGVjdG9yT3Zl cmxheSgpIHsgfQotCi12b2lkIEluc3BlY3Rvck92ZXJsYXk6OmNsZWFyKCkKLXsKLSNpZiBVU0Uo QUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgaWYgKG1fb3ZlcmxheSkgewotICAgICAgICBt X292ZXJsYXktPnJlbW92ZUZyb21QYXJlbnQoKTsKLSAgICAgICAgbV9vdmVybGF5ID0gbnVsbHB0 cjsKLSAgICB9Ci0jZW5kaWYKLX0KLQotdm9pZCBJbnNwZWN0b3JPdmVybGF5Ojp1cGRhdGUoKQot ewotI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLSAgICBpZiAoIW1fb3ZlcmxheSkg ewotICAgICAgICBtX292ZXJsYXkgPSBhZG9wdFB0cihuZXcgV2ViT3ZlcmxheSh0aGlzKSk7Ci0g ICAgICAgIGNvbnN0IFdlYkNvcmU6OkludFNpemUgc2l6ZSA9IG1fd2ViUGFnZS0+Y29udGVudHNT aXplKCk7Ci0gICAgICAgIG1fb3ZlcmxheS0+c2V0U2l6ZShXZWJDb3JlOjpGbG9hdFNpemUoc2l6 ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKSk7Ci0gICAgICAgIG1fd2ViUGFnZS0+bV93ZWJQYWdl LT5hZGRPdmVybGF5KG1fb3ZlcmxheS5nZXQoKSk7Ci0gICAgfQotCi0gICAgbV9vdmVybGF5LT5z ZXREcmF3c0NvbnRlbnQodHJ1ZSk7Ci0gICAgbV9vdmVybGF5LT5zZXRPcGFjaXR5KDEuMCk7Ci0g ICAgbV9vdmVybGF5LT5pbnZhbGlkYXRlKCk7Ci0jZW5kaWYKLX0KLQotfQotfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5zcGVjdG9yT3Zlcmxh eS5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5zcGVjdG9yT3Zl cmxheS5oCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBlMzQxZjM2NGZiNzFkMTc5YTBl ZTU3NGNiZTRmMzBmYzQ2MDdlNDAzLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwCi0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0luc3Bl Y3Rvck92ZXJsYXkuaAorKysgL2Rldi9udWxsCkBAIC0xLDczICswLDAgQEAKLS8qCi0gKiBDb3B5 cmlnaHQgKEMpIDIwMTIgUmVzZWFyY2ggSW4gTW90aW9uIExpbWl0ZWQuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCi0gKgotICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVk aXN0cmlidXRlIGl0IGFuZC9vcgotICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUg R05VIExlc3NlciBHZW5lcmFsIFB1YmxpYwotICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhl IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCi0gKiB2ZXJzaW9uIDIgb2YgdGhlIExp Y2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCi0gKgotICogVGhp cyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2Vm dWwsCi0gKiBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGll ZCB3YXJyYW50eSBvZgotICogTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElD VUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKLSAqIExlc3NlciBHZW5lcmFsIFB1YmxpYyBMaWNl bnNlIGZvciBtb3JlIGRldGFpbHMuCi0gKgotICogWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEg Y29weSBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYwotICogTGljZW5zZSBhbG9uZyB3 aXRoIHRoaXMgbGlicmFyeTsgaWYgbm90LCB3cml0ZSB0byB0aGUgRnJlZSBTb2Z0d2FyZQotICog Rm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwgQm9zdG9u LCBNQSAgMDIxMTAtMTMwMSAgVVNBCi0gKi8KLQotI2lmbmRlZiBJbnNwZWN0b3JPdmVybGF5X2gK LSNkZWZpbmUgSW5zcGVjdG9yT3ZlcmxheV9oCi0KLSNpbmNsdWRlICJXZWJPdmVybGF5LmgiCi0j aW5jbHVkZSA8R3JhcGhpY3NMYXllckNsaWVudC5oPgotI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4K LSNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgotCi1uYW1lc3BhY2UgV2ViQ29yZSB7Ci1jbGFz cyBHcmFwaGljc0NvbnRleHQ7Ci1jbGFzcyBHcmFwaGljc0xheWVyOwotfQotCi1uYW1lc3BhY2Ug QmxhY2tCZXJyeSB7Ci1uYW1lc3BhY2UgV2ViS2l0IHsKLWNsYXNzIFdlYlBhZ2VQcml2YXRlOwot Ci1jbGFzcyBJbnNwZWN0b3JPdmVybGF5IDogcHVibGljIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJD bGllbnQgewotcHVibGljOgotICAgIGNsYXNzIEluc3BlY3Rvck92ZXJsYXlDbGllbnQgewotICAg IHB1YmxpYzoKLSAgICAgICAgdmlydHVhbCB2b2lkIHBhaW50SW5zcGVjdG9yT3ZlcmxheShXZWJD b3JlOjpHcmFwaGljc0NvbnRleHQmKSA9IDA7Ci0gICAgfTsKLQotICAgIHN0YXRpYyBQYXNzT3du UHRyPEluc3BlY3Rvck92ZXJsYXk+IGNyZWF0ZShXZWJQYWdlUHJpdmF0ZSosIEluc3BlY3Rvck92 ZXJsYXlDbGllbnQqKTsKLQotICAgIH5JbnNwZWN0b3JPdmVybGF5KCk7Ci0KLSAgICB2b2lkIHNl dENsaWVudChJbnNwZWN0b3JPdmVybGF5Q2xpZW50KiBjbGllbnQpIHsgbV9jbGllbnQgPSBjbGll bnQ7IH0KLQotICAgIHZvaWQgY2xlYXIoKTsKLSAgICB2b2lkIHVwZGF0ZSgpOwotICAgIHZvaWQg cGFpbnRXZWJGcmFtZShXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmKTsKLQotI2lmIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKLSAgICB2aXJ0dWFsIHZvaWQgbm90aWZ5QW5pbWF0aW9uU3Rh cnRlZChjb25zdCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiwgZG91YmxlIHRpbWUpIHsgfQotICAg IHZpcnR1YWwgdm9pZCBub3RpZnlTeW5jUmVxdWlyZWQoY29uc3QgV2ViQ29yZTo6R3JhcGhpY3NM YXllciopOwotICAgIHZpcnR1YWwgdm9pZCBwYWludENvbnRlbnRzKGNvbnN0IFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXIqLCBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmLCBXZWJDb3JlOjpHcmFwaGlj c0xheWVyUGFpbnRpbmdQaGFzZSwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgaW5DbGlwKTsKLSAg ICB2aXJ0dWFsIGJvb2wgc2hvd0RlYnVnQm9yZGVycyhjb25zdCBXZWJDb3JlOjpHcmFwaGljc0xh eWVyKikgY29uc3Q7Ci0gICAgdmlydHVhbCBib29sIHNob3dSZXBhaW50Q291bnRlcihjb25zdCBX ZWJDb3JlOjpHcmFwaGljc0xheWVyKikgY29uc3Q7Ci0jZW5kaWYKLQotcHJpdmF0ZToKLSAgICBJ bnNwZWN0b3JPdmVybGF5KFdlYlBhZ2VQcml2YXRlKiwgSW5zcGVjdG9yT3ZlcmxheUNsaWVudCop OwotICAgIHZvaWQgaW52YWxpZGF0ZVdlYkZyYW1lKCk7Ci0KLSAgICBXZWJQYWdlUHJpdmF0ZSog bV93ZWJQYWdlOwotICAgIEluc3BlY3Rvck92ZXJsYXlDbGllbnQqIG1fY2xpZW50OwotICAgIE93 blB0cjxXZWJPdmVybGF5PiBtX292ZXJsYXk7Ci19OwotCi19IC8vIG5hbWVzcGFjZSBXZWJLaXQK LX0gLy8gbmFtZXNwYWNlIEJsYWNrQmVycnkKLQotI2VuZGlmIC8qIEluc3BlY3Rvck92ZXJsYXlf aCAqLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQv SW5zcGVjdG9yT3ZlcmxheUJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYktpdFN1cHBvcnQvSW5zcGVjdG9yT3ZlcmxheUJsYWNrQmVycnkuY3BwCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LjljZmY1YjIzMDBlZTZkMzQ0OGUwZDljMTYwMjZmYWJhYjEyNTU1YzgKLS0tIC9kZXYvbnVsbAor KysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnNwZWN0b3JPdmVy bGF5QmxhY2tCZXJyeS5jcHAKQEAgLTAsMCArMSw5OSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykg MjAxMiBSZXNlYXJjaCBJbiBNb3Rpb24gTGltaXRlZC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq CisgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUg aXQgYW5kL29yCisgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2Vy IEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0 d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3Ig KGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiBUaGlzIGxpYnJhcnkg aXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAqIGJ1 dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5 IG9mCisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBP U0UuICBTZWUgdGhlIEdOVQorICogTGVzc2VyIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1v cmUgZGV0YWlscy4KKyAqCisgKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRo ZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFsb25nIHdpdGggdGhpcyBs aWJyYXJ5OyBpZiBub3QsIHdyaXRlIHRvIHRoZSBGcmVlIFNvZnR3YXJlCisgKiBGb3VuZGF0aW9u LCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLCBCb3N0b24sIE1BICAwMjEx MC0xMzAxICBVU0EKKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisKKyNpbmNsdWRlICJJbnNw ZWN0b3JPdmVybGF5QmxhY2tCZXJyeS5oIgorCisjaW5jbHVkZSAiRnJhbWUuaCIKKyNpbmNsdWRl ICJGcmFtZVZpZXcuaCIKKyNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKKyNpbmNsdWRlICJH cmFwaGljc0xheWVyLmgiCisjaW5jbHVkZSAiV2ViUGFnZV9wLmgiCisKKworbmFtZXNwYWNlIEJs YWNrQmVycnkgeworbmFtZXNwYWNlIFdlYktpdCB7CisKK1Bhc3NPd25QdHI8SW5zcGVjdG9yT3Zl cmxheT4gSW5zcGVjdG9yT3ZlcmxheTo6Y3JlYXRlKFdlYlBhZ2VQcml2YXRlKiBwYWdlLCBJbnNw ZWN0b3JPdmVybGF5Q2xpZW50KiBjbGllbnQpCit7CisgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBJ bnNwZWN0b3JPdmVybGF5KHBhZ2UsIGNsaWVudCkpOworfQorCitJbnNwZWN0b3JPdmVybGF5OjpJ bnNwZWN0b3JPdmVybGF5KFdlYlBhZ2VQcml2YXRlKiBwYWdlLCBJbnNwZWN0b3JPdmVybGF5Q2xp ZW50KiBjbGllbnQpCisgICAgOiBtX3dlYlBhZ2UocGFnZSkKKyAgICAsIG1fY2xpZW50KGNsaWVu dCkKK3sKK30KKworI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKK3ZvaWQgSW5zcGVj dG9yT3ZlcmxheTo6bm90aWZ5U3luY1JlcXVpcmVkKGNvbnN0IFdlYkNvcmU6OkdyYXBoaWNzTGF5 ZXIqIGxheWVyKQoreworICAgIG1fd2ViUGFnZS0+bm90aWZ5U3luY1JlcXVpcmVkKGxheWVyKTsK K30KKwordm9pZCBJbnNwZWN0b3JPdmVybGF5OjpwYWludENvbnRlbnRzKGNvbnN0IFdlYkNvcmU6 OkdyYXBoaWNzTGF5ZXIqLCBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIFdlYkNv cmU6OkdyYXBoaWNzTGF5ZXJQYWludGluZ1BoYXNlLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBp bkNsaXApCit7CisgICAgY29udGV4dC5zYXZlKCk7CisgICAgV2ViQ29yZTo6SW50UG9pbnQgc2Ny b2xsUG9zaXRpb24gPSBtX3dlYlBhZ2UtPmZvY3VzZWRPck1haW5GcmFtZSgpLT52aWV3KCktPnNj cm9sbFBvc2l0aW9uKCk7CisgICAgY29udGV4dC50cmFuc2xhdGUoc2Nyb2xsUG9zaXRpb24ueCgp LCBzY3JvbGxQb3NpdGlvbi55KCkpOworICAgIG1fY2xpZW50LT5wYWludEluc3BlY3Rvck92ZXJs YXkoY29udGV4dCk7CisgICAgY29udGV4dC5yZXN0b3JlKCk7Cit9CisKK2Jvb2wgSW5zcGVjdG9y T3ZlcmxheTo6c2hvd0RlYnVnQm9yZGVycyhjb25zdCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiBs YXllcikgY29uc3QKK3sKKyAgICByZXR1cm4gbV93ZWJQYWdlLT5zaG93RGVidWdCb3JkZXJzKGxh eWVyKTsKK30KKworYm9vbCBJbnNwZWN0b3JPdmVybGF5OjpzaG93UmVwYWludENvdW50ZXIoY29u c3QgV2ViQ29yZTo6R3JhcGhpY3NMYXllciogbGF5ZXIpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1f d2ViUGFnZS0+c2hvd1JlcGFpbnRDb3VudGVyKGxheWVyKTsKK30KKyNlbmRpZgorCitJbnNwZWN0 b3JPdmVybGF5Ojp+SW5zcGVjdG9yT3ZlcmxheSgpIHsgfQorCit2b2lkIEluc3BlY3Rvck92ZXJs YXk6OmNsZWFyKCkKK3sKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgaWYg KG1fb3ZlcmxheSkgeworICAgICAgICBtX292ZXJsYXktPnJlbW92ZUZyb21QYXJlbnQoKTsKKyAg ICAgICAgbV9vdmVybGF5ID0gbnVsbHB0cjsKKyAgICB9CisjZW5kaWYKK30KKwordm9pZCBJbnNw ZWN0b3JPdmVybGF5Ojp1cGRhdGUoKQoreworI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElO RykKKyAgICBpZiAoIW1fb3ZlcmxheSkgeworICAgICAgICBtX292ZXJsYXkgPSBhZG9wdFB0cihu ZXcgV2ViT3ZlcmxheSh0aGlzKSk7CisgICAgICAgIGNvbnN0IFdlYkNvcmU6OkludFNpemUgc2l6 ZSA9IG1fd2ViUGFnZS0+Y29udGVudHNTaXplKCk7CisgICAgICAgIG1fb3ZlcmxheS0+c2V0U2l6 ZShXZWJDb3JlOjpGbG9hdFNpemUoc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKSk7CisgICAg ICAgIG1fd2ViUGFnZS0+bV93ZWJQYWdlLT5hZGRPdmVybGF5KG1fb3ZlcmxheS5nZXQoKSk7Cisg ICAgfQorCisgICAgbV9vdmVybGF5LT5zZXREcmF3c0NvbnRlbnQodHJ1ZSk7CisgICAgbV9vdmVy bGF5LT5zZXRPcGFjaXR5KDEuMCk7CisgICAgbV9vdmVybGF5LT5pbnZhbGlkYXRlKCk7CisjZW5k aWYKK30KKworfQorfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktp dFN1cHBvcnQvSW5zcGVjdG9yT3ZlcmxheUJsYWNrQmVycnkuaCBiL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9XZWJLaXRTdXBwb3J0L0luc3BlY3Rvck92ZXJsYXlCbGFja0JlcnJ5LmgKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uZGU2ZjUxZmYzMzI0ZmZlMDdmMzkzMTNiZmMwM2JkN2Y4NThhZjUyNgotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0luc3BlY3Rv ck92ZXJsYXlCbGFja0JlcnJ5LmgKQEAgLTAsMCArMSw3MyBAQAorLyoKKyAqIENvcHlyaWdodCAo QykgMjAxMiBSZXNlYXJjaCBJbiBNb3Rpb24gTGltaXRlZC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyAqCisgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1 dGUgaXQgYW5kL29yCisgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVz c2VyIEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBT b2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwg b3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiBUaGlzIGxpYnJh cnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAq IGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJh bnR5IG9mCisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBV UlBPU0UuICBTZWUgdGhlIEdOVQorICogTGVzc2VyIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9y IG1vcmUgZGV0YWlscy4KKyAqCisgKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9m IHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFsb25nIHdpdGggdGhp cyBsaWJyYXJ5OyBpZiBub3QsIHdyaXRlIHRvIHRoZSBGcmVlIFNvZnR3YXJlCisgKiBGb3VuZGF0 aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLCBCb3N0b24sIE1BICAw MjExMC0xMzAxICBVU0EKKyAqLworCisjaWZuZGVmIEluc3BlY3Rvck92ZXJsYXlCbGFja0JlcnJ5 X2gKKyNkZWZpbmUgSW5zcGVjdG9yT3ZlcmxheUJsYWNrQmVycnlfaAorCisjaW5jbHVkZSAiV2Vi T3ZlcmxheS5oIgorI2luY2x1ZGUgPEdyYXBoaWNzTGF5ZXJDbGllbnQuaD4KKyNpbmNsdWRlIDx3 dGYvT3duUHRyLmg+CisjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KKworbmFtZXNwYWNlIFdl YkNvcmUgeworY2xhc3MgR3JhcGhpY3NDb250ZXh0OworY2xhc3MgR3JhcGhpY3NMYXllcjsKK30K KworbmFtZXNwYWNlIEJsYWNrQmVycnkgeworbmFtZXNwYWNlIFdlYktpdCB7CitjbGFzcyBXZWJQ YWdlUHJpdmF0ZTsKKworY2xhc3MgSW5zcGVjdG9yT3ZlcmxheSA6IHB1YmxpYyBXZWJDb3JlOjpH cmFwaGljc0xheWVyQ2xpZW50IHsKK3B1YmxpYzoKKyAgICBjbGFzcyBJbnNwZWN0b3JPdmVybGF5 Q2xpZW50IHsKKyAgICBwdWJsaWM6CisgICAgICAgIHZpcnR1YWwgdm9pZCBwYWludEluc3BlY3Rv ck92ZXJsYXkoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JikgPSAwOworICAgIH07CisKKyAgICBz dGF0aWMgUGFzc093blB0cjxJbnNwZWN0b3JPdmVybGF5PiBjcmVhdGUoV2ViUGFnZVByaXZhdGUq LCBJbnNwZWN0b3JPdmVybGF5Q2xpZW50Kik7CisKKyAgICB+SW5zcGVjdG9yT3ZlcmxheSgpOwor CisgICAgdm9pZCBzZXRDbGllbnQoSW5zcGVjdG9yT3ZlcmxheUNsaWVudCogY2xpZW50KSB7IG1f Y2xpZW50ID0gY2xpZW50OyB9CisKKyAgICB2b2lkIGNsZWFyKCk7CisgICAgdm9pZCB1cGRhdGUo KTsKKyAgICB2b2lkIHBhaW50V2ViRnJhbWUoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0Jik7CisK KyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgdmlydHVhbCB2b2lkIG5vdGlm eUFuaW1hdGlvblN0YXJ0ZWQoY29uc3QgV2ViQ29yZTo6R3JhcGhpY3NMYXllciosIGRvdWJsZSB0 aW1lKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgbm90aWZ5U3luY1JlcXVpcmVkKGNvbnN0IFdlYkNv cmU6OkdyYXBoaWNzTGF5ZXIqKTsKKyAgICB2aXJ0dWFsIHZvaWQgcGFpbnRDb250ZW50cyhjb25z dCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiwgV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JiwgV2Vi Q29yZTo6R3JhcGhpY3NMYXllclBhaW50aW5nUGhhc2UsIGNvbnN0IFdlYkNvcmU6OkludFJlY3Qm IGluQ2xpcCk7CisgICAgdmlydHVhbCBib29sIHNob3dEZWJ1Z0JvcmRlcnMoY29uc3QgV2ViQ29y ZTo6R3JhcGhpY3NMYXllciopIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBzaG93UmVwYWludENv dW50ZXIoY29uc3QgV2ViQ29yZTo6R3JhcGhpY3NMYXllciopIGNvbnN0OworI2VuZGlmCisKK3By aXZhdGU6CisgICAgSW5zcGVjdG9yT3ZlcmxheShXZWJQYWdlUHJpdmF0ZSosIEluc3BlY3Rvck92 ZXJsYXlDbGllbnQqKTsKKyAgICB2b2lkIGludmFsaWRhdGVXZWJGcmFtZSgpOworCisgICAgV2Vi UGFnZVByaXZhdGUqIG1fd2ViUGFnZTsKKyAgICBJbnNwZWN0b3JPdmVybGF5Q2xpZW50KiBtX2Ns aWVudDsKKyAgICBPd25QdHI8V2ViT3ZlcmxheT4gbV9vdmVybGF5OworfTsKKworfSAvLyBuYW1l c3BhY2UgV2ViS2l0Cit9IC8vIG5hbWVzcGFjZSBCbGFja0JlcnJ5CisKKyNlbmRpZiAvKiBJbnNw ZWN0b3JPdmVybGF5QmxhY2tCZXJyeV9oICovCg==