72767 2011-11-18 15:28:18 -0800 [chromium] Use correct backing store for ChromiumDataObject in pasteboard writes. 2011-11-18 16:46:54 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dcheng dcheng oldest_to_newest 506130 0 dcheng 2011-11-18 15:28:18 -0800 [chromium] Use correct backing store for ChromiumDataObject in pasteboard writes. 506131 1 115892 dcheng 2011-11-18 15:29:55 -0800 Created attachment 115892 Patch 506141 2 dcheng 2011-11-18 15:35:25 -0800 There are a couple tests for this, but they are currently disabled. I'd prefer to roll Source/WebKit/chromium/DEPS in a separate patch to enable those tests though. 506157 3 115892 tony 2011-11-18 15:53:41 -0800 Comment on attachment 115892 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115892&action=review The change looks fine. Can we roll chromium deps in a separate change than include the test enabling in this change? > Source/WebCore/platform/chromium/ChromiumDataObject.h:102 > + ChromiumDataObject(StorageMode); Nit: explicit 506189 4 115906 dcheng 2011-11-18 16:30:37 -0800 Created attachment 115906 Patch 506191 5 115892 dcheng 2011-11-18 16:31:04 -0800 Comment on attachment 115892 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115892&action=review As it turns out, the chromium revision I need is already rolled into WebKit. I just needed to sync locally. >> Source/WebCore/platform/chromium/ChromiumDataObject.h:102 >> + ChromiumDataObject(StorageMode); > > Nit: explicit Done. 506195 6 115906 tony 2011-11-18 16:31:56 -0800 Comment on attachment 115906 Patch OK! 506207 7 115906 dcheng 2011-11-18 16:46:49 -0800 Comment on attachment 115906 Patch Clearing flags on attachment: 115906 Committed r100828: <http://trac.webkit.org/changeset/100828> 506208 8 dcheng 2011-11-18 16:46:54 -0800 All reviewed patches have been landed. Closing bug. 115892 2011-11-18 15:29:55 -0800 2011-11-18 16:31:04 -0800 Patch bug-72767-20111118152954.patch text/plain 9991 dcheng U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNzgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjdjNDU4YjczMTM0MWI1 MWE0OTZjMzIxOTNiY2UzNTQ3MzUxMTJkZi4uODJhNmY3MWIwMzY4YTM4OTgyMTdlODAzNmQzODgy ZDYyNDIwMzdjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDExLTExLTE4ICBEYW5p ZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gVXNl IGNvcnJlY3QgYmFja2luZyBzdG9yZSBmb3IgQ2hyb21pdW1EYXRhT2JqZWN0IGluIHBhc3RlYm9h cmQgd3JpdGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzI3NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGVkaXRpbmcvY2hyb21pdW0vRWRpdG9yQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RWRpdG9yOjpuZXdHZW5lcmFsQ2xpcGJvYXJkKToKKyAgICAgICAgKiBwYWdlL2Nocm9taXVt L0V2ZW50SGFuZGxlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxl cjo6Y3JlYXRlRHJhZ2dpbmdDbGlwYm9hcmQpOgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVt L0Nocm9taXVtRGF0YU9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWl1bURhdGFP YmplY3Q6OnR5cGVzKToKKyAgICAgICAgKFdlYkNvcmU6OkNocm9taXVtRGF0YU9iamVjdDo6Z2V0 RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWl1bURhdGFPYmplY3Q6OmNvbnRhaW5zRmls ZW5hbWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkNocm9taXVtRGF0YU9iamVjdDo6Q2hyb21pdW1E YXRhT2JqZWN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1bURhdGFPYmpl Y3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9taXVtRGF0YU9iamVjdDo6Y3JlYXRlRnJvbVBh c3RlYm9hcmQpOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21pdW1EYXRhT2JqZWN0OjpjcmVhdGUp OgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21pdW1EYXRhT2JqZWN0OjpzdG9yYWdlTW9kZSk6Cisg ICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vQ2xpcGJvYXJkQ2hyb21pdW0uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q2xpcGJvYXJkQ2hyb21pdW06Omhhc0RhdGEpOgorCiAyMDExLTExLTE4ICBN aWhuZWEgT3ZpZGVuaWUgIDxtaWhuZWFAYWRvYmUuY29tPgogCiAgICAgICAgIEZpeCBjb21waWxh dGlvbiB3YXJuaW5nIGluIENvbXBsZXhUZXh0Q29udHJvbGxlckNvcmVUZXh0Lm1tCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCmluZGV4IDg0ZjNhOWFjYjQyODgxYjI5MGU0YjVlNGIwYmQ2YWJmNTU3 Y2NlYjEuLmJhMjRhNmQyNTI4OTZhYjkyODlmZTE0NjQ2ODhhYmRmMDYxNzJmZGMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMTEtMTggIERhbmllbCBD aGVuZyAgPGRjaGVuZ0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBVc2UgY29y cmVjdCBiYWNraW5nIHN0b3JlIGZvciBDaHJvbWl1bURhdGFPYmplY3QgaW4gcGFzdGVib2FyZCB3 cml0ZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 Mjc2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog c3JjL1dlYkRyYWdEYXRhLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRHJhZ0RhdGE6OmluaXRp YWxpemUpOgorICAgICAgICAoV2ViS2l0OjpXZWJEcmFnRGF0YTo6YXNzaWduKToKKwogMjAxMS0x MS0xNyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogZGlzcGF0Y2ggbWVzc2FnZXMgZnJvbSB0aGUgZnJvbnQtZW5kIHRvIHRoZSBi YWNrZW5kIGFzeW5jaHJvbm91c2x5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9jaHJvbWl1bS9FZGl0b3JDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2No cm9taXVtL0VkaXRvckNocm9taXVtLmNwcAppbmRleCAyYmZiNWFmMDA2MjQyYWU0NGI1ODgxOTFm MjRjODExYWJkMzdjNjZlLi4wYzYzMGEyYjI2NDBmNTI5ZDQ4NzNiN2QxNmViMThhNWNiMDM2OTc2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2Nocm9taXVtL0VkaXRvckNocm9t aXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2Nocm9taXVtL0VkaXRvckNocm9t aXVtLmNwcApAQCAtMzksNyArMzksMTIgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBQYXNzUmVm UHRyPENsaXBib2FyZD4gRWRpdG9yOjpuZXdHZW5lcmFsQ2xpcGJvYXJkKENsaXBib2FyZEFjY2Vz c1BvbGljeSBwb2xpY3ksIEZyYW1lKiBmcmFtZSkKIHsKLSAgICByZXR1cm4gQ2xpcGJvYXJkQ2hy b21pdW06OmNyZWF0ZShDbGlwYm9hcmQ6OkNvcHlBbmRQYXN0ZSwgQ2hyb21pdW1EYXRhT2JqZWN0 OjpjcmVhdGUoQ2xpcGJvYXJkOjpDb3B5QW5kUGFzdGUpLCBwb2xpY3ksIGZyYW1lKTsKKyAgICBy ZXR1cm4gQ2xpcGJvYXJkQ2hyb21pdW06OmNyZWF0ZSgKKyAgICAgICAgQ2xpcGJvYXJkOjpDb3B5 QW5kUGFzdGUsCisgICAgICAgIHBvbGljeSA9PSBDbGlwYm9hcmRXcml0YWJsZSA/IENocm9taXVt RGF0YU9iamVjdDo6Y3JlYXRlKCkgOiBDaHJvbWl1bURhdGFPYmplY3Q6OmNyZWF0ZUZyb21QYXN0 ZWJvYXJkKCksCisgICAgICAgIHBvbGljeSwKKyAgICAgICAgZnJhbWUpOworCiB9CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY2hyb21p dW0vRXZlbnRIYW5kbGVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jaHJvbWl1 bS9FdmVudEhhbmRsZXJDaHJvbWl1bS5jcHAKaW5kZXggNDBhNzFhYjExYTUzMWFiMTUwYzYxODE0 Y2JhNGY2MjhkMzVlYjNjZS4uMTdlNzMzMDIxNWUxYjQwMDcwYjIyMmYwZWJlMmY4NTI4Y2NkYmQ5 MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9jaHJvbWl1bS9FdmVudEhhbmRsZXJD aHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jaHJvbWl1bS9FdmVudEhhbmRs ZXJDaHJvbWl1bS5jcHAKQEAgLTEyOCw3ICsxMjgsNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6ZXZl bnRBY3RpdmF0ZWRWaWV3KGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgZXZlbnQpIGNvbnN0CiAK IFBhc3NSZWZQdHI8Q2xpcGJvYXJkPiBFdmVudEhhbmRsZXI6OmNyZWF0ZURyYWdnaW5nQ2xpcGJv YXJkKCkgY29uc3QKIHsKLSAgICBSZWZQdHI8Q2hyb21pdW1EYXRhT2JqZWN0PiBkYXRhT2JqZWN0 ID0gQ2hyb21pdW1EYXRhT2JqZWN0OjpjcmVhdGUoQ2xpcGJvYXJkOjpEcmFnQW5kRHJvcCk7Cisg ICAgUmVmUHRyPENocm9taXVtRGF0YU9iamVjdD4gZGF0YU9iamVjdCA9IENocm9taXVtRGF0YU9i amVjdDo6Y3JlYXRlKCk7CiAgICAgcmV0dXJuIENsaXBib2FyZENocm9taXVtOjpjcmVhdGUoQ2xp cGJvYXJkOjpEcmFnQW5kRHJvcCwgZGF0YU9iamVjdC5nZXQoKSwgQ2xpcGJvYXJkV3JpdGFibGUs IG1fZnJhbWUpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJv bWl1bS9DaHJvbWl1bURhdGFPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hy b21pdW0vQ2hyb21pdW1EYXRhT2JqZWN0LmNwcAppbmRleCA5MjY1NWQ4YTk5ZGU4MjE0YmYxYjUy ODU5MGNjNWM5NjA2ZDRkODg1Li5mY2Q2N2UzOTkyOThiMjUyOGExZDQwNjcxNTBlOTRlYTYwYTMz YmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1 bURhdGFPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0No cm9taXVtRGF0YU9iamVjdC5jcHAKQEAgLTEwMSw3ICsxMDEsNyBAQCBib29sIENocm9taXVtRGF0 YU9iamVjdDo6aGFzRGF0YSgpIGNvbnN0CiAKIEhhc2hTZXQ8U3RyaW5nPiBDaHJvbWl1bURhdGFP YmplY3Q6OnR5cGVzKCkgY29uc3QKIHsKLSAgICBpZiAobV9jbGlwYm9hcmRUeXBlID09IENsaXBi b2FyZDo6Q29weUFuZFBhc3RlKSB7CisgICAgaWYgKG1fc3RvcmFnZU1vZGUgPT0gUGFzdGVib2Fy ZCkgewogICAgICAgICBib29sIGlnbm9yZWRDb250YWluc0ZpbGVuYW1lczsKICAgICAgICAgcmV0 dXJuIFBsYXRmb3JtU3VwcG9ydDo6Y2xpcGJvYXJkUmVhZEF2YWlsYWJsZVR5cGVzKFBhc3RlYm9h cmRQcml2YXRlOjpTdGFuZGFyZEJ1ZmZlciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmlnbm9yZWRDb250YWluc0ZpbGVuYW1lcyk7 CkBAIC0xMjksNyArMTI5LDcgQEAgSGFzaFNldDxTdHJpbmc+IENocm9taXVtRGF0YU9iamVjdDo6 dHlwZXMoKSBjb25zdAogU3RyaW5nIENocm9taXVtRGF0YU9iamVjdDo6Z2V0RGF0YShjb25zdCBT dHJpbmcmIHR5cGUsIGJvb2wmIHN1Y2Nlc3MpCiB7CiAgICAgaWYgKHR5cGUgPT0gbWltZVR5cGVU ZXh0UGxhaW4pIHsKLSAgICAgICAgaWYgKG1fY2xpcGJvYXJkVHlwZSA9PSBDbGlwYm9hcmQ6OkNv cHlBbmRQYXN0ZSkgeworICAgICAgICBpZiAobV9zdG9yYWdlTW9kZSA9PSBQYXN0ZWJvYXJkKSB7 CiAgICAgICAgICAgICBQYXN0ZWJvYXJkUHJpdmF0ZTo6Q2xpcGJvYXJkQnVmZmVyIGJ1ZmZlciA9 CiAgICAgICAgICAgICAgICAgUGFzdGVib2FyZDo6Z2VuZXJhbFBhc3RlYm9hcmQoKS0+aXNTZWxl Y3Rpb25Nb2RlKCkgPwogICAgICAgICAgICAgICAgIFBhc3RlYm9hcmRQcml2YXRlOjpTZWxlY3Rp b25CdWZmZXIgOgpAQCAtMTUzLDcgKzE1Myw3IEBAIFN0cmluZyBDaHJvbWl1bURhdGFPYmplY3Q6 OmdldERhdGEoY29uc3QgU3RyaW5nJiB0eXBlLCBib29sJiBzdWNjZXNzKQogICAgIH0KIAogICAg IGlmICh0eXBlID09IG1pbWVUeXBlVGV4dEhUTUwpIHsKLSAgICAgICAgaWYgKG1fY2xpcGJvYXJk VHlwZSA9PSBDbGlwYm9hcmQ6OkNvcHlBbmRQYXN0ZSkgeworICAgICAgICBpZiAobV9zdG9yYWdl TW9kZSA9PSBQYXN0ZWJvYXJkKSB7CiAgICAgICAgICAgICBQYXN0ZWJvYXJkUHJpdmF0ZTo6Q2xp cGJvYXJkQnVmZmVyIGJ1ZmZlciA9CiAgICAgICAgICAgICAgICAgUGFzdGVib2FyZDo6Z2VuZXJh bFBhc3RlYm9hcmQoKS0+aXNTZWxlY3Rpb25Nb2RlKCkgPwogICAgICAgICAgICAgICAgIFBhc3Rl Ym9hcmRQcml2YXRlOjpTZWxlY3Rpb25CdWZmZXIgOgpAQCAtMjM1LDcgKzIzNSw3IEBAIHVpbnQ2 NF90IENocm9taXVtRGF0YU9iamVjdDo6Z2V0U2VxdWVuY2VOdW1iZXIoKQogYm9vbCBDaHJvbWl1 bURhdGFPYmplY3Q6OmNvbnRhaW5zRmlsZW5hbWVzKCkgY29uc3QKIHsKICAgICBib29sIGNvbnRh aW5zRmlsZW5hbWVzOwotICAgIGlmIChtX2NsaXBib2FyZFR5cGUgPT0gQ2xpcGJvYXJkOjpDb3B5 QW5kUGFzdGUpIHsKKyAgICBpZiAobV9zdG9yYWdlTW9kZSA9PSBQYXN0ZWJvYXJkKSB7CiAgICAg ICAgIEhhc2hTZXQ8U3RyaW5nPiBpZ25vcmVkUmVzdWx0cyA9CiAgICAgICAgICAgICBQbGF0Zm9y bVN1cHBvcnQ6OmNsaXBib2FyZFJlYWRBdmFpbGFibGVUeXBlcyhQYXN0ZWJvYXJkUHJpdmF0ZTo6 U3RhbmRhcmRCdWZmZXIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICZjb250YWluc0ZpbGVuYW1lcyk7CkBAIC0yNDQsMTQgKzI0NCwxNCBA QCBib29sIENocm9taXVtRGF0YU9iamVjdDo6Y29udGFpbnNGaWxlbmFtZXMoKSBjb25zdAogICAg IHJldHVybiBjb250YWluc0ZpbGVuYW1lczsKIH0KIAotQ2hyb21pdW1EYXRhT2JqZWN0OjpDaHJv bWl1bURhdGFPYmplY3QoQ2xpcGJvYXJkOjpDbGlwYm9hcmRUeXBlIGNsaXBib2FyZFR5cGUpCi0g ICAgOiBtX2NsaXBib2FyZFR5cGUoY2xpcGJvYXJkVHlwZSkKK0Nocm9taXVtRGF0YU9iamVjdDo6 Q2hyb21pdW1EYXRhT2JqZWN0KFN0b3JhZ2VNb2RlIHN0b3JhZ2VNb2RlKQorICAgIDogbV9zdG9y YWdlTW9kZShzdG9yYWdlTW9kZSkKIHsKIH0KIAogQ2hyb21pdW1EYXRhT2JqZWN0OjpDaHJvbWl1 bURhdGFPYmplY3QoY29uc3QgQ2hyb21pdW1EYXRhT2JqZWN0JiBvdGhlcikKICAgICA6IFJlZkNv dW50ZWQ8Q2hyb21pdW1EYXRhT2JqZWN0PigpCi0gICAgLCBtX2NsaXBib2FyZFR5cGUob3RoZXIu bV9jbGlwYm9hcmRUeXBlKQorICAgICwgbV9zdG9yYWdlTW9kZShvdGhlci5tX3N0b3JhZ2VNb2Rl KQogICAgICwgbV91cmxUaXRsZShvdGhlci5tX3VybFRpdGxlKQogICAgICwgbV9kb3dubG9hZE1l dGFkYXRhKG90aGVyLm1fZG93bmxvYWRNZXRhZGF0YSkKICAgICAsIG1fZmlsZUV4dGVuc2lvbihv dGhlci5tX2ZpbGVFeHRlbnNpb24pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9jaHJvbWl1bS9DaHJvbWl1bURhdGFPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL0Nocm9taXVtRGF0YU9iamVjdC5oCmluZGV4IDhjMmY5YmNkZWQwZjY4YTdiNWU1 OWNhYTc4MzY2NzdjYTliMWQ4YmQuLmM5ZTQ4NjQzMWM3MmMyOGJmYTQyOTRlOTliMjhjNDA0M2Y2 MDQ0NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0Nocm9t aXVtRGF0YU9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0No cm9taXVtRGF0YU9iamVjdC5oCkBAIC0zMSw3ICszMSw2IEBACiAjaWZuZGVmIENocm9taXVtRGF0 YU9iamVjdF9oCiAjZGVmaW5lIENocm9taXVtRGF0YU9iamVjdF9oCiAKLSNpbmNsdWRlICJDbGlw Ym9hcmQuaCIKICNpbmNsdWRlICJLVVJMLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIK ICNpbmNsdWRlICJTaGFyZWRCdWZmZXIuaCIKQEAgLTQ3LDkgKzQ2LDE5IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIC8vIG9mIGFuZCBpcyBub3Qgc3BlY2lmaWMgdG8gYSBwbGF0Zm9ybS4KIGNsYXNz IENocm9taXVtRGF0YU9iamVjdCA6IHB1YmxpYyBSZWZDb3VudGVkPENocm9taXVtRGF0YU9iamVj dD4gewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPENocm9taXVtRGF0YU9iamVjdD4g Y3JlYXRlKENsaXBib2FyZDo6Q2xpcGJvYXJkVHlwZSBjbGlwYm9hcmRUeXBlKQorICAgIGVudW0g U3RvcmFnZU1vZGUgeworICAgICAgICBCdWZmZXJlZCwKKyAgICAgICAgUGFzdGVib2FyZCwKKyAg ICB9OworCisgICAgc3RhdGljIFBhc3NSZWZQdHI8Q2hyb21pdW1EYXRhT2JqZWN0PiBjcmVhdGVG cm9tUGFzdGVib2FyZCgpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IENocm9t aXVtRGF0YU9iamVjdChjbGlwYm9hcmRUeXBlKSk7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihu ZXcgQ2hyb21pdW1EYXRhT2JqZWN0KFBhc3RlYm9hcmQpKTsKKyAgICB9CisKKyAgICBzdGF0aWMg UGFzc1JlZlB0cjxDaHJvbWl1bURhdGFPYmplY3Q+IGNyZWF0ZSgpCisgICAgeworICAgICAgICBy ZXR1cm4gYWRvcHRSZWYobmV3IENocm9taXVtRGF0YU9iamVjdChCdWZmZXJlZCkpOwogICAgIH0K IAogICAgIFBhc3NSZWZQdHI8Q2hyb21pdW1EYXRhT2JqZWN0PiBjb3B5KCkgY29uc3QKQEAgLTU3 LDYgKzY2LDggQEAgcHVibGljOgogICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IENocm9taXVt RGF0YU9iamVjdCgqdGhpcykpOwogICAgIH0KIAorICAgIFN0b3JhZ2VNb2RlIHN0b3JhZ2VNb2Rl KCkgY29uc3QgeyByZXR1cm4gbV9zdG9yYWdlTW9kZTsgfQorCiAgICAgdm9pZCBjbGVhckRhdGEo Y29uc3QgU3RyaW5nJiB0eXBlKTsKICAgICB2b2lkIGNsZWFyQWxsKCk7CiAgICAgdm9pZCBjbGVh ckFsbEV4Y2VwdEZpbGVzKCk7CkBAIC04OCwxMCArOTksMTAgQEAgcHVibGljOgogICAgIHZvaWQg c2V0RmlsZUNvbnRlbnQoUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IGZpbGVDb250ZW50KSB7IG1f ZmlsZUNvbnRlbnQgPSBmaWxlQ29udGVudDsgfQogCiBwcml2YXRlOgotICAgIENocm9taXVtRGF0 YU9iamVjdChDbGlwYm9hcmQ6OkNsaXBib2FyZFR5cGUpOworICAgIENocm9taXVtRGF0YU9iamVj dChTdG9yYWdlTW9kZSk7CiAgICAgQ2hyb21pdW1EYXRhT2JqZWN0KGNvbnN0IENocm9taXVtRGF0 YU9iamVjdCYpOwogCi0gICAgQ2xpcGJvYXJkOjpDbGlwYm9hcmRUeXBlIG1fY2xpcGJvYXJkVHlw ZTsKKyAgICBTdG9yYWdlTW9kZSBtX3N0b3JhZ2VNb2RlOwogCiAgICAgU3RyaW5nIG1fdXJsVGl0 bGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0NsaXBi b2FyZENocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0NsaXBi b2FyZENocm9taXVtLmNwcAppbmRleCAyNTA4MTczYzY4MDI2ZGFlNjE1ODRiMmM2NGJlYTk4MjEx MWJmNjAyLi5hZmNlZTFkZmIwYzQyNzUzMmZkMmIyNjMwM2I3Y2YxYzU3NTY0NjM3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DbGlwYm9hcmRDaHJvbWl1bS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2xpcGJvYXJkQ2hyb21p dW0uY3BwCkBAIC0zMTcsNiArMzE3LDcgQEAgdm9pZCBDbGlwYm9hcmRDaHJvbWl1bTo6d3JpdGVQ bGFpblRleHQoY29uc3QgU3RyaW5nJiB0ZXh0KQogCiBib29sIENsaXBib2FyZENocm9taXVtOjpo YXNEYXRhKCkKIHsKKyAgICBBU1NFUlQoaXNGb3JEcmFnQW5kRHJvcCgpKTsKICAgICBpZiAoIW1f ZGF0YU9iamVjdCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEcmFnRGF0YS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJEcmFnRGF0YS5jcHAKaW5kZXggZDQzMWFkNWQ0OTIyMDlkYmU3YmNkNGU5OThl ZGRkMTk0YjQwNjVjZS4uNjJiM2JjM2RjYzY2ZTA3ODQwNzRjNzFlZDUyYTY2ZGYwZGRkZjlmYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRHJhZ0RhdGEuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRyYWdEYXRhLmNwcApAQCAtNDksNyAr NDksNyBAQCBjbGFzcyBXZWJEcmFnRGF0YVByaXZhdGUgOiBwdWJsaWMgQ2hyb21pdW1EYXRhT2Jq ZWN0IHsKIAogdm9pZCBXZWJEcmFnRGF0YTo6aW5pdGlhbGl6ZSgpCiB7Ci0gICAgYXNzaWduKHN0 YXRpY19jYXN0PFdlYkRyYWdEYXRhUHJpdmF0ZSo+KENocm9taXVtRGF0YU9iamVjdDo6Y3JlYXRl KENsaXBib2FyZDo6RHJhZ0FuZERyb3ApLmxlYWtSZWYoKSkpOworICAgIGFzc2lnbihzdGF0aWNf Y2FzdDxXZWJEcmFnRGF0YVByaXZhdGUqPihDaHJvbWl1bURhdGFPYmplY3Q6OmNyZWF0ZSgpLmxl YWtSZWYoKSkpOwogfQogCiB2b2lkIFdlYkRyYWdEYXRhOjpyZXNldCgpCkBAIC0yMjMsNiArMjIz LDcgQEAgV2ViRHJhZ0RhdGE6Om9wZXJhdG9yIFdURjo6UGFzc1JlZlB0cjxXZWJDb3JlOjpDaHJv bWl1bURhdGFPYmplY3Q+KCkgY29uc3QKIAogdm9pZCBXZWJEcmFnRGF0YTo6YXNzaWduKFdlYkRy YWdEYXRhUHJpdmF0ZSogcCkKIHsKKyAgICBBU1NFUlQoIXAgfHwgcC0+c3RvcmFnZU1vZGUoKSA9 PSBDaHJvbWl1bURhdGFPYmplY3Q6OkJ1ZmZlcmVkKTsKICAgICAvLyBwIGlzIGFscmVhZHkgcmVm J2QgZm9yIHVzIGJ5IHRoZSBjYWxsZXIKICAgICBpZiAobV9wcml2YXRlKQogICAgICAgICBtX3By aXZhdGUtPmRlcmVmKCk7Cg== 115906 2011-11-18 16:30:37 -0800 2011-11-18 16:46:49 -0800 Patch bug-72767-20111118163036.patch text/plain 11720 dcheng U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNzgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjdjNDU4YjczMTM0MWI1 MWE0OTZjMzIxOTNiY2UzNTQ3MzUxMTJkZi4uMzIwYzBhZjk4ZGVjZTQ3YWUxNzY4MWU4YmQ4ZTU2 ZDU4YjZmZDlmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDExLTExLTE4ICBEYW5p ZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gVXNl IGNvcnJlY3QgYmFja2luZyBzdG9yZSBmb3IgQ2hyb21pdW1EYXRhT2JqZWN0IGluIHBhc3RlYm9h cmQgd3JpdGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzI3NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogZWRpdGluZy9jaHJvbWl1 bS9FZGl0b3JDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6Om5ld0dlbmVy YWxDbGlwYm9hcmQpOgorICAgICAgICAqIHBhZ2UvY2hyb21pdW0vRXZlbnRIYW5kbGVyQ2hyb21p dW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpjcmVhdGVEcmFnZ2luZ0Ns aXBib2FyZCk6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1EYXRhT2JqZWN0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9taXVtRGF0YU9iamVjdDo6dHlwZXMpOgorICAg ICAgICAoV2ViQ29yZTo6Q2hyb21pdW1EYXRhT2JqZWN0OjpnZXREYXRhKToKKyAgICAgICAgKFdl YkNvcmU6OkNocm9taXVtRGF0YU9iamVjdDo6Y29udGFpbnNGaWxlbmFtZXMpOgorICAgICAgICAo V2ViQ29yZTo6Q2hyb21pdW1EYXRhT2JqZWN0OjpDaHJvbWl1bURhdGFPYmplY3QpOgorICAgICAg ICAqIHBsYXRmb3JtL2Nocm9taXVtL0Nocm9taXVtRGF0YU9iamVjdC5oOgorICAgICAgICAoV2Vi Q29yZTo6Q2hyb21pdW1EYXRhT2JqZWN0OjpjcmVhdGVGcm9tUGFzdGVib2FyZCk6CisgICAgICAg IChXZWJDb3JlOjpDaHJvbWl1bURhdGFPYmplY3Q6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3Jl OjpDaHJvbWl1bURhdGFPYmplY3Q6OnN0b3JhZ2VNb2RlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9j aHJvbWl1bS9DbGlwYm9hcmRDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDbGlwYm9h cmRDaHJvbWl1bTo6aGFzRGF0YSk6CisKIDIwMTEtMTEtMTggIE1paG5lYSBPdmlkZW5pZSAgPG1p aG5lYUBhZG9iZS5jb20+CiAKICAgICAgICAgRml4IGNvbXBpbGF0aW9uIHdhcm5pbmcgaW4gQ29t cGxleFRleHRDb250cm9sbGVyQ29yZVRleHQubW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5k ZXggODRmM2E5YWNiNDI4ODFiMjkwZTRiNWU0YjBiZDZhYmY1NTdjY2ViMS4uYmEyNGE2ZDI1Mjg5 NmFiOTI4OWZlMTQ2NDY4OGFiZGYwNjE3MmZkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNCBAQAorMjAxMS0xMS0xOCAgRGFuaWVsIENoZW5nICA8ZGNoZW5nQGNocm9t aXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFVzZSBjb3JyZWN0IGJhY2tpbmcgc3RvcmUg Zm9yIENocm9taXVtRGF0YU9iamVjdCBpbiBwYXN0ZWJvYXJkIHdyaXRlcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyNzY3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzcmMvV2ViRHJhZ0RhdGEuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJEcmFnRGF0YTo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYkRyYWdEYXRhOjphc3NpZ24pOgorCiAyMDExLTExLTE3ICBQYXZlbCBGZWxkbWFu ICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBkaXNwYXRj aCBtZXNzYWdlcyBmcm9tIHRoZSBmcm9udC1lbmQgdG8gdGhlIGJhY2tlbmQgYXN5bmNocm9ub3Vz bHkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2Nocm9taXVtL0VkaXRvckNo cm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY2hyb21pdW0vRWRpdG9yQ2hyb21p dW0uY3BwCmluZGV4IDJiZmI1YWYwMDYyNDJhZTQ0YjU4ODE5MWYyNGM4MTFhYmQzN2M2NmUuLjBj NjMwYTJiMjY0MGY1MjlkNDg3M2I3ZDE2ZWIxOGE1Y2IwMzY5NzYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvY2hyb21pdW0vRWRpdG9yQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvY2hyb21pdW0vRWRpdG9yQ2hyb21pdW0uY3BwCkBAIC0zOSw3ICsz OSwxMiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFBhc3NSZWZQdHI8Q2xpcGJvYXJkPiBFZGl0 b3I6Om5ld0dlbmVyYWxDbGlwYm9hcmQoQ2xpcGJvYXJkQWNjZXNzUG9saWN5IHBvbGljeSwgRnJh bWUqIGZyYW1lKQogewotICAgIHJldHVybiBDbGlwYm9hcmRDaHJvbWl1bTo6Y3JlYXRlKENsaXBi b2FyZDo6Q29weUFuZFBhc3RlLCBDaHJvbWl1bURhdGFPYmplY3Q6OmNyZWF0ZShDbGlwYm9hcmQ6 OkNvcHlBbmRQYXN0ZSksIHBvbGljeSwgZnJhbWUpOworICAgIHJldHVybiBDbGlwYm9hcmRDaHJv bWl1bTo6Y3JlYXRlKAorICAgICAgICBDbGlwYm9hcmQ6OkNvcHlBbmRQYXN0ZSwKKyAgICAgICAg cG9saWN5ID09IENsaXBib2FyZFdyaXRhYmxlID8gQ2hyb21pdW1EYXRhT2JqZWN0OjpjcmVhdGUo KSA6IENocm9taXVtRGF0YU9iamVjdDo6Y3JlYXRlRnJvbVBhc3RlYm9hcmQoKSwKKyAgICAgICAg cG9saWN5LAorICAgICAgICBmcmFtZSk7CisKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9jaHJvbWl1bS9FdmVudEhhbmRsZXJDaHJv bWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2Nocm9taXVtL0V2ZW50SGFuZGxlckNocm9t aXVtLmNwcAppbmRleCA0MGE3MWFiMTFhNTMxYWIxNTBjNjE4MTRjYmE0ZjYyOGQzNWViM2NlLi4x N2U3MzMwMjE1ZTFiNDAwNzBiMjIyZjBlYmUyZjg1MjhjY2RiZDkxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL2Nocm9taXVtL0V2ZW50SGFuZGxlckNocm9taXVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL2Nocm9taXVtL0V2ZW50SGFuZGxlckNocm9taXVtLmNwcApAQCAt MTI4LDcgKzEyOCw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpldmVudEFjdGl2YXRlZFZpZXcoY29u c3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBldmVudCkgY29uc3QKIAogUGFzc1JlZlB0cjxDbGlwYm9h cmQ+IEV2ZW50SGFuZGxlcjo6Y3JlYXRlRHJhZ2dpbmdDbGlwYm9hcmQoKSBjb25zdAogewotICAg IFJlZlB0cjxDaHJvbWl1bURhdGFPYmplY3Q+IGRhdGFPYmplY3QgPSBDaHJvbWl1bURhdGFPYmpl Y3Q6OmNyZWF0ZShDbGlwYm9hcmQ6OkRyYWdBbmREcm9wKTsKKyAgICBSZWZQdHI8Q2hyb21pdW1E YXRhT2JqZWN0PiBkYXRhT2JqZWN0ID0gQ2hyb21pdW1EYXRhT2JqZWN0OjpjcmVhdGUoKTsKICAg ICByZXR1cm4gQ2xpcGJvYXJkQ2hyb21pdW06OmNyZWF0ZShDbGlwYm9hcmQ6OkRyYWdBbmREcm9w LCBkYXRhT2JqZWN0LmdldCgpLCBDbGlwYm9hcmRXcml0YWJsZSwgbV9mcmFtZSk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0Nocm9taXVtRGF0YU9i amVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1bURhdGFP YmplY3QuY3BwCmluZGV4IDkyNjU1ZDhhOTlkZTgyMTRiZjFiNTI4NTkwY2M1Yzk2MDZkNGQ4ODUu LmZjZDY3ZTM5OTI5OGIyNTI4YTFkNDA2NzE1MGU5NGVhNjBhMzNiZTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0Nocm9taXVtRGF0YU9iamVjdC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1EYXRhT2JqZWN0LmNw cApAQCAtMTAxLDcgKzEwMSw3IEBAIGJvb2wgQ2hyb21pdW1EYXRhT2JqZWN0OjpoYXNEYXRhKCkg Y29uc3QKIAogSGFzaFNldDxTdHJpbmc+IENocm9taXVtRGF0YU9iamVjdDo6dHlwZXMoKSBjb25z dAogewotICAgIGlmIChtX2NsaXBib2FyZFR5cGUgPT0gQ2xpcGJvYXJkOjpDb3B5QW5kUGFzdGUp IHsKKyAgICBpZiAobV9zdG9yYWdlTW9kZSA9PSBQYXN0ZWJvYXJkKSB7CiAgICAgICAgIGJvb2wg aWdub3JlZENvbnRhaW5zRmlsZW5hbWVzOwogICAgICAgICByZXR1cm4gUGxhdGZvcm1TdXBwb3J0 OjpjbGlwYm9hcmRSZWFkQXZhaWxhYmxlVHlwZXMoUGFzdGVib2FyZFByaXZhdGU6OlN0YW5kYXJk QnVmZmVyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAmaWdub3JlZENvbnRhaW5zRmlsZW5hbWVzKTsKQEAgLTEyOSw3ICsxMjksNyBA QCBIYXNoU2V0PFN0cmluZz4gQ2hyb21pdW1EYXRhT2JqZWN0Ojp0eXBlcygpIGNvbnN0CiBTdHJp bmcgQ2hyb21pdW1EYXRhT2JqZWN0OjpnZXREYXRhKGNvbnN0IFN0cmluZyYgdHlwZSwgYm9vbCYg c3VjY2VzcykKIHsKICAgICBpZiAodHlwZSA9PSBtaW1lVHlwZVRleHRQbGFpbikgewotICAgICAg ICBpZiAobV9jbGlwYm9hcmRUeXBlID09IENsaXBib2FyZDo6Q29weUFuZFBhc3RlKSB7CisgICAg ICAgIGlmIChtX3N0b3JhZ2VNb2RlID09IFBhc3RlYm9hcmQpIHsKICAgICAgICAgICAgIFBhc3Rl Ym9hcmRQcml2YXRlOjpDbGlwYm9hcmRCdWZmZXIgYnVmZmVyID0KICAgICAgICAgICAgICAgICBQ YXN0ZWJvYXJkOjpnZW5lcmFsUGFzdGVib2FyZCgpLT5pc1NlbGVjdGlvbk1vZGUoKSA/CiAgICAg ICAgICAgICAgICAgUGFzdGVib2FyZFByaXZhdGU6OlNlbGVjdGlvbkJ1ZmZlciA6CkBAIC0xNTMs NyArMTUzLDcgQEAgU3RyaW5nIENocm9taXVtRGF0YU9iamVjdDo6Z2V0RGF0YShjb25zdCBTdHJp bmcmIHR5cGUsIGJvb2wmIHN1Y2Nlc3MpCiAgICAgfQogCiAgICAgaWYgKHR5cGUgPT0gbWltZVR5 cGVUZXh0SFRNTCkgewotICAgICAgICBpZiAobV9jbGlwYm9hcmRUeXBlID09IENsaXBib2FyZDo6 Q29weUFuZFBhc3RlKSB7CisgICAgICAgIGlmIChtX3N0b3JhZ2VNb2RlID09IFBhc3RlYm9hcmQp IHsKICAgICAgICAgICAgIFBhc3RlYm9hcmRQcml2YXRlOjpDbGlwYm9hcmRCdWZmZXIgYnVmZmVy ID0KICAgICAgICAgICAgICAgICBQYXN0ZWJvYXJkOjpnZW5lcmFsUGFzdGVib2FyZCgpLT5pc1Nl bGVjdGlvbk1vZGUoKSA/CiAgICAgICAgICAgICAgICAgUGFzdGVib2FyZFByaXZhdGU6OlNlbGVj dGlvbkJ1ZmZlciA6CkBAIC0yMzUsNyArMjM1LDcgQEAgdWludDY0X3QgQ2hyb21pdW1EYXRhT2Jq ZWN0OjpnZXRTZXF1ZW5jZU51bWJlcigpCiBib29sIENocm9taXVtRGF0YU9iamVjdDo6Y29udGFp bnNGaWxlbmFtZXMoKSBjb25zdAogewogICAgIGJvb2wgY29udGFpbnNGaWxlbmFtZXM7Ci0gICAg aWYgKG1fY2xpcGJvYXJkVHlwZSA9PSBDbGlwYm9hcmQ6OkNvcHlBbmRQYXN0ZSkgeworICAgIGlm IChtX3N0b3JhZ2VNb2RlID09IFBhc3RlYm9hcmQpIHsKICAgICAgICAgSGFzaFNldDxTdHJpbmc+ IGlnbm9yZWRSZXN1bHRzID0KICAgICAgICAgICAgIFBsYXRmb3JtU3VwcG9ydDo6Y2xpcGJvYXJk UmVhZEF2YWlsYWJsZVR5cGVzKFBhc3RlYm9hcmRQcml2YXRlOjpTdGFuZGFyZEJ1ZmZlciwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmNv bnRhaW5zRmlsZW5hbWVzKTsKQEAgLTI0NCwxNCArMjQ0LDE0IEBAIGJvb2wgQ2hyb21pdW1EYXRh T2JqZWN0Ojpjb250YWluc0ZpbGVuYW1lcygpIGNvbnN0CiAgICAgcmV0dXJuIGNvbnRhaW5zRmls ZW5hbWVzOwogfQogCi1DaHJvbWl1bURhdGFPYmplY3Q6OkNocm9taXVtRGF0YU9iamVjdChDbGlw Ym9hcmQ6OkNsaXBib2FyZFR5cGUgY2xpcGJvYXJkVHlwZSkKLSAgICA6IG1fY2xpcGJvYXJkVHlw ZShjbGlwYm9hcmRUeXBlKQorQ2hyb21pdW1EYXRhT2JqZWN0OjpDaHJvbWl1bURhdGFPYmplY3Qo U3RvcmFnZU1vZGUgc3RvcmFnZU1vZGUpCisgICAgOiBtX3N0b3JhZ2VNb2RlKHN0b3JhZ2VNb2Rl KQogewogfQogCiBDaHJvbWl1bURhdGFPYmplY3Q6OkNocm9taXVtRGF0YU9iamVjdChjb25zdCBD aHJvbWl1bURhdGFPYmplY3QmIG90aGVyKQogICAgIDogUmVmQ291bnRlZDxDaHJvbWl1bURhdGFP YmplY3Q+KCkKLSAgICAsIG1fY2xpcGJvYXJkVHlwZShvdGhlci5tX2NsaXBib2FyZFR5cGUpCisg ICAgLCBtX3N0b3JhZ2VNb2RlKG90aGVyLm1fc3RvcmFnZU1vZGUpCiAgICAgLCBtX3VybFRpdGxl KG90aGVyLm1fdXJsVGl0bGUpCiAgICAgLCBtX2Rvd25sb2FkTWV0YWRhdGEob3RoZXIubV9kb3du bG9hZE1ldGFkYXRhKQogICAgICwgbV9maWxlRXh0ZW5zaW9uKG90aGVyLm1fZmlsZUV4dGVuc2lv bikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0Nocm9taXVt RGF0YU9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1E YXRhT2JqZWN0LmgKaW5kZXggOGMyZjliY2RlZDBmNjhhN2I1ZTU5Y2FhNzgzNjY3N2NhOWIxZDhi ZC4uOGFhOGJhYzgyOTRlMzM2YTgwM2EzNjc5M2M2MmZiNzQyMjA2NzM3NiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1EYXRhT2JqZWN0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1EYXRhT2JqZWN0LmgK QEAgLTMxLDcgKzMxLDYgQEAKICNpZm5kZWYgQ2hyb21pdW1EYXRhT2JqZWN0X2gKICNkZWZpbmUg Q2hyb21pdW1EYXRhT2JqZWN0X2gKIAotI2luY2x1ZGUgIkNsaXBib2FyZC5oIgogI2luY2x1ZGUg IktVUkwuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1 ZmZlci5oIgpAQCAtNDcsOSArNDYsMTkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogLy8gb2YgYW5k IGlzIG5vdCBzcGVjaWZpYyB0byBhIHBsYXRmb3JtLgogY2xhc3MgQ2hyb21pdW1EYXRhT2JqZWN0 IDogcHVibGljIFJlZkNvdW50ZWQ8Q2hyb21pdW1EYXRhT2JqZWN0PiB7CiBwdWJsaWM6Ci0gICAg c3RhdGljIFBhc3NSZWZQdHI8Q2hyb21pdW1EYXRhT2JqZWN0PiBjcmVhdGUoQ2xpcGJvYXJkOjpD bGlwYm9hcmRUeXBlIGNsaXBib2FyZFR5cGUpCisgICAgZW51bSBTdG9yYWdlTW9kZSB7CisgICAg ICAgIEJ1ZmZlcmVkLAorICAgICAgICBQYXN0ZWJvYXJkLAorICAgIH07CisKKyAgICBzdGF0aWMg UGFzc1JlZlB0cjxDaHJvbWl1bURhdGFPYmplY3Q+IGNyZWF0ZUZyb21QYXN0ZWJvYXJkKCkKICAg ICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgQ2hyb21pdW1EYXRhT2JqZWN0KGNsaXBi b2FyZFR5cGUpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBDaHJvbWl1bURhdGFPYmpl Y3QoUGFzdGVib2FyZCkpOworICAgIH0KKworICAgIHN0YXRpYyBQYXNzUmVmUHRyPENocm9taXVt RGF0YU9iamVjdD4gY3JlYXRlKCkKKyAgICB7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcg Q2hyb21pdW1EYXRhT2JqZWN0KEJ1ZmZlcmVkKSk7CiAgICAgfQogCiAgICAgUGFzc1JlZlB0cjxD aHJvbWl1bURhdGFPYmplY3Q+IGNvcHkoKSBjb25zdApAQCAtNTcsNiArNjYsOCBAQCBwdWJsaWM6 CiAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgQ2hyb21pdW1EYXRhT2JqZWN0KCp0aGlzKSk7 CiAgICAgfQogCisgICAgU3RvcmFnZU1vZGUgc3RvcmFnZU1vZGUoKSBjb25zdCB7IHJldHVybiBt X3N0b3JhZ2VNb2RlOyB9CisKICAgICB2b2lkIGNsZWFyRGF0YShjb25zdCBTdHJpbmcmIHR5cGUp OwogICAgIHZvaWQgY2xlYXJBbGwoKTsKICAgICB2b2lkIGNsZWFyQWxsRXhjZXB0RmlsZXMoKTsK QEAgLTg4LDEwICs5OSwxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRGaWxlQ29udGVudChQYXNz UmVmUHRyPFNoYXJlZEJ1ZmZlcj4gZmlsZUNvbnRlbnQpIHsgbV9maWxlQ29udGVudCA9IGZpbGVD b250ZW50OyB9CiAKIHByaXZhdGU6Ci0gICAgQ2hyb21pdW1EYXRhT2JqZWN0KENsaXBib2FyZDo6 Q2xpcGJvYXJkVHlwZSk7Ci0gICAgQ2hyb21pdW1EYXRhT2JqZWN0KGNvbnN0IENocm9taXVtRGF0 YU9iamVjdCYpOworICAgIGV4cGxpY2l0IENocm9taXVtRGF0YU9iamVjdChTdG9yYWdlTW9kZSk7 CisgICAgZXhwbGljaXQgQ2hyb21pdW1EYXRhT2JqZWN0KGNvbnN0IENocm9taXVtRGF0YU9iamVj dCYpOwogCi0gICAgQ2xpcGJvYXJkOjpDbGlwYm9hcmRUeXBlIG1fY2xpcGJvYXJkVHlwZTsKKyAg ICBTdG9yYWdlTW9kZSBtX3N0b3JhZ2VNb2RlOwogCiAgICAgU3RyaW5nIG1fdXJsVGl0bGU7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0NsaXBib2FyZENo cm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0NsaXBib2FyZENo cm9taXVtLmNwcAppbmRleCAyNTA4MTczYzY4MDI2ZGFlNjE1ODRiMmM2NGJlYTk4MjExMWJmNjAy Li5hZmNlZTFkZmIwYzQyNzUzMmZkMmIyNjMwM2I3Y2YxYzU3NTY0NjM3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DbGlwYm9hcmRDaHJvbWl1bS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2xpcGJvYXJkQ2hyb21pdW0uY3Bw CkBAIC0zMTcsNiArMzE3LDcgQEAgdm9pZCBDbGlwYm9hcmRDaHJvbWl1bTo6d3JpdGVQbGFpblRl eHQoY29uc3QgU3RyaW5nJiB0ZXh0KQogCiBib29sIENsaXBib2FyZENocm9taXVtOjpoYXNEYXRh KCkKIHsKKyAgICBBU1NFUlQoaXNGb3JEcmFnQW5kRHJvcCgpKTsKICAgICBpZiAoIW1fZGF0YU9i amVjdCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJEcmFnRGF0YS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJEcmFnRGF0YS5jcHAKaW5kZXggZDQzMWFkNWQ0OTIyMDlkYmU3YmNkNGU5OThlZGRkMTk0 YjQwNjVjZS4uNjJiM2JjM2RjYzY2ZTA3ODQwNzRjNzFlZDUyYTY2ZGYwZGRkZjlmYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRHJhZ0RhdGEuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRyYWdEYXRhLmNwcApAQCAtNDksNyArNDksNyBA QCBjbGFzcyBXZWJEcmFnRGF0YVByaXZhdGUgOiBwdWJsaWMgQ2hyb21pdW1EYXRhT2JqZWN0IHsK IAogdm9pZCBXZWJEcmFnRGF0YTo6aW5pdGlhbGl6ZSgpCiB7Ci0gICAgYXNzaWduKHN0YXRpY19j YXN0PFdlYkRyYWdEYXRhUHJpdmF0ZSo+KENocm9taXVtRGF0YU9iamVjdDo6Y3JlYXRlKENsaXBi b2FyZDo6RHJhZ0FuZERyb3ApLmxlYWtSZWYoKSkpOworICAgIGFzc2lnbihzdGF0aWNfY2FzdDxX ZWJEcmFnRGF0YVByaXZhdGUqPihDaHJvbWl1bURhdGFPYmplY3Q6OmNyZWF0ZSgpLmxlYWtSZWYo KSkpOwogfQogCiB2b2lkIFdlYkRyYWdEYXRhOjpyZXNldCgpCkBAIC0yMjMsNiArMjIzLDcgQEAg V2ViRHJhZ0RhdGE6Om9wZXJhdG9yIFdURjo6UGFzc1JlZlB0cjxXZWJDb3JlOjpDaHJvbWl1bURh dGFPYmplY3Q+KCkgY29uc3QKIAogdm9pZCBXZWJEcmFnRGF0YTo6YXNzaWduKFdlYkRyYWdEYXRh UHJpdmF0ZSogcCkKIHsKKyAgICBBU1NFUlQoIXAgfHwgcC0+c3RvcmFnZU1vZGUoKSA9PSBDaHJv bWl1bURhdGFPYmplY3Q6OkJ1ZmZlcmVkKTsKICAgICAvLyBwIGlzIGFscmVhZHkgcmVmJ2QgZm9y IHVzIGJ5IHRoZSBjYWxsZXIKICAgICBpZiAobV9wcml2YXRlKQogICAgICAgICBtX3ByaXZhdGUt PmRlcmVmKCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggMTJjZjNjMWFkYThjNmM0ZTlkYjE0OWU3YWEyZjI2MDFhNzRhZmNh YS4uODQzYzJlYjNmNzg3MjI2ZjkwYmM2ZTE1ODdhZGRmZDhmMDcxOTk5NyAxMDA3NTUKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDEwIEBACisyMDExLTExLTE4ICBEYW5pZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFtjaHJvbWl1bV0gVXNlIGNvcnJlY3QgYmFja2luZyBzdG9yZSBmb3IgQ2hy b21pdW1EYXRhT2JqZWN0IGluIHBhc3RlYm9hcmQgd3JpdGVzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzI3NjcKKworICAgICAgICAqIHBsYXRmb3Jt L2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dDoKKwogMjAxMS0xMS0xOCAgU3RldmUgQmxv Y2sgIDxzdGV2ZWJsb2NrQGdvb2dsZS5jb20+CiAKICAgICAgICAgW0Nocm9taXVtXSBmYXN0L2Zp bGVzeXN0ZW0vZmlsZS13cml0ZXItYWJvcnQtZGVwdGguaHRtbCBjcmFzaGVzIG9jY2FzaW9uYWxs eSBvbiBXaW4gZGJnCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90 ZXN0X2V4cGVjdGF0aW9ucy50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0 X2V4cGVjdGF0aW9ucy50eHQKaW5kZXggMDJjMDdkYTFlMWUxNWRmZGJlY2M5OTcwOTAyZmY1NGM2 M2ZjMjE3Yi4uNmVhNzc3MDcwZGJmOTQ1MDgzZDZlMmRlOTg1MDliNGZiMWI3YWM4NiAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0 CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4 dApAQCAtODIsMTEgKzgyLDYgQEAgQlVHQ1IxMDM5NSBTS0lQIDogc3ZnL3dlYmFyY2hpdmUgPSBQ QVNTIEZBSUwKIEJVR0NSMTAzOTUgU0tJUCA6IHN2Zy9jdXN0b20vaW1hZ2Utd2l0aC1wcmVmaXgt aW4td2ViYXJjaGl2ZS5zdmcgPSBQQVNTIEZBSUwKIEJVR0NSMTAzOTUgU0tJUCA6IGh0dHAvdGVz dHMvd2ViYXJjaGl2ZSA9IFBBU1MgRkFJTAogCi0vLyBBY2NvcmRpbmcgdG8gdGhlIENocm9taXVt IGJ1Zywgd2UgbmVlZCB0byB3cml0ZSBzb21lIHNvcnQgb2Ygd29ya2Fyb3VuZCBmb3IKLS8vIGhv dyBjbGlwYm9hcmRzIG9uIFdpbmRvd3Mgd29yaywgb3Igc29tZXRoaW5nPyAgVGhhdCBkb2Vzbid0 IGV4cGxhaW4gd2h5IHRoaXMKLS8vIGZhaWxzIGZvciBvdGhlciBwbGF0Zm9ybXMuLi4KLUJVR0NS MjA0MDQgOiBlZGl0aW5nL2V4ZWNDb21tYW5kL2NvcHktd2l0aG91dC1zZWxlY3Rpb24uaHRtbCA9 IFRFWFQKLQogLy8gVGhpcyB3aWxsIHNvb24gYmUgZml4ZWQgYWZ0ZXIgaW1wbGVtZW50aW5nIHdl YmtpdExpbmVEYXNoIGZvciBWOC4KIEJVR1dLNjM5MzMgOiBmYXN0L2NhbnZhcy9jYW52YXMtd2Vi a2l0TGluZURhc2guaHRtbCA9IEZBSUwKIEJVR1dLNjM5MzMgOiBmYXN0L2NhbnZhcy9jYW52YXMt d2Via2l0TGluZURhc2gtaW52YWxpZC5odG1sID0gRkFJTAo=