56965 2011-03-23 15:13:17 -0700 [chromium] Add traceEvents to compositor 2011-03-24 12:02:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 nduca nduca commit-queue kbr nduca webkit.review.bot oldest_to_newest 372474 0 nduca 2011-03-23 15:13:17 -0700 [chromium] Add traceEvents to compositor 372480 1 86705 nduca 2011-03-23 15:18:05 -0700 Created attachment 86705 Patch 372572 2 86705 kbr 2011-03-23 17:46:07 -0700 Comment on attachment 86705 Patch I think it would be better to add a helper class in WebCore/platform/chromium/ which calls PlatformBridge's traceEventBegin in its constructor and traceEventEnd in its destructor, and stack allocate it where desired. This patch seems too brittle. 372612 3 86732 nduca 2011-03-23 19:07:43 -0700 Created attachment 86732 Patch 372613 4 nduca 2011-03-23 19:08:35 -0700 Not sure how to address the style bot warning about MAKE_UNIQUE_IDENTIFIER. 372615 5 webkit.review.bot 2011-03-23 19:10:09 -0700 Attachment 86732 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/platform/chromium/TraceEvent.h:39: TRACE_EVENT_MAKE_UNIQUE_IDENTIFIER is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 372624 6 86732 kbr 2011-03-23 19:40:23 -0700 Comment on attachment 86732 Patch You should feel free to file a bug against check-webkit-style, but it looks like it doesn't handle multi-line #defines correctly. If you just make the TRACE_EVENT macro a single line it will clean up the style error. This is worth doing. 372898 7 86792 nduca 2011-03-24 10:25:52 -0700 Created attachment 86792 Patch 372905 8 86792 kbr 2011-03-24 10:30:14 -0700 Comment on attachment 86792 Patch Looks great. 372977 9 86792 commit-queue 2011-03-24 12:02:48 -0700 Comment on attachment 86792 Patch Clearing flags on attachment: 86792 Committed r81881: <http://trac.webkit.org/changeset/81881> 372978 10 commit-queue 2011-03-24 12:02:52 -0700 All reviewed patches have been landed. Closing bug. 86705 2011-03-23 15:18:05 -0700 2011-03-23 19:07:41 -0700 Patch bug-56965-20110323151804.patch text/plain 8199 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogODE3OTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiZjNjYmRmZjRjM2Q1NWVi NDYwMDdjOGE0YTE1ZWRkNjk3NzMyOWJjLi40MmJhMDljMjBhMDRiYmYzN2EzZjY2MTk3NWU1MjUx ZWMzZDZkZTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDMtMjMgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRkIHRyYWNlRXZlbnRzIHRvIHRoZSBjb21w b3NpdG9yCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU2OTY1CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRl cmVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVt Ojp1cGRhdGVSb290TGF5ZXJDb250ZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRl cmVyQ2hyb21pdW06OnVwZGF0ZVJvb3RMYXllclNjcm9sbGJhcnMpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjp1cGRhdGVMYXllcnMpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6 OkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZmluaXNoKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVy UmVuZGVyZXJDaHJvbWl1bTo6cHJlc2VudCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vTGF5ZXJUaWxlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVy VGlsZXJDaHJvbWl1bTo6dXBkYXRlKToKKwogMjAxMS0wMy0yMyAgVHlsZXIgQ2xvc2UgIDx0amNs b3NlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBKZXJlbXkgT3Jsb3cuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXll clJlbmRlcmVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAppbmRleCAzZTM5ZDg3YjZlYTQzMzJm ZDk4NmYwYzBkOWMyNzRlMzhmZWQwZTM0Li45ZDIwOTBhMTc3ZTE5YTJlM2FkZmFlMWQ2Zjg5ZTFl YzJjOWYyZDA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKQEAgLTQy LDYgKzQyLDcgQEAKICNpbmNsdWRlICJMYXllckNocm9taXVtLmgiCiAjaW5jbHVkZSAiTGF5ZXJU ZXh0dXJlLmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKKyNpbmNsdWRlICJQbGF0Zm9y bUJyaWRnZS5oIgogI2luY2x1ZGUgIlRleHRTdHJlYW0uaCIKICNpbmNsdWRlICJUZXh0dXJlTWFu YWdlci5oIgogI2luY2x1ZGUgIldlYkdMTGF5ZXJDaHJvbWl1bS5oIgpAQCAtMTg3LDExICsxODgs MTQgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmludmFsaWRhdGVSb290TGF5ZXJSZWN0 KGNvbnN0IEludFJlY3QmIGRpcnR5UmVjdCkKIAogdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06 OnVwZGF0ZVJvb3RMYXllckNvbnRlbnRzKCkKIHsKKyAgICBQbGF0Zm9ybUJyaWRnZTo6dHJhY2VF dmVudEJlZ2luKCJMYXllclJlbmRlcmVyQ2hyb21pdW06OnVwZGF0ZVJvb3RMYXllckNvbnRlbnRz IiwgdGhpcywgMCk7CiAgICAgbV9yb290TGF5ZXJDb250ZW50VGlsZXItPnVwZGF0ZSgqbV9yb290 TGF5ZXJDb250ZW50UGFpbnQsIG1fdmlld3BvcnRWaXNpYmxlUmVjdCk7CisgICAgUGxhdGZvcm1C cmlkZ2U6OnRyYWNlRXZlbnRFbmQoIkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBkYXRlUm9vdExh eWVyQ29udGVudHMiLCB0aGlzLCAwKTsKIH0KIAogdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06 OnVwZGF0ZVJvb3RMYXllclNjcm9sbGJhcnMoKQogeworICAgIFBsYXRmb3JtQnJpZGdlOjp0cmFj ZUV2ZW50QmVnaW4oIkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBkYXRlUm9vdExheWVyU2Nyb2xs YmFycyIsIHRoaXMsIDApOwogICAgIGlmIChtX3ZpZXdwb3J0VmlzaWJsZVJlY3Qud2lkdGgoKSA+ IG1fdmlld3BvcnRDb250ZW50UmVjdC53aWR0aCgpKSB7CiAgICAgICAgIEludFJlY3QgdmVydGlj YWxTY3JvbGxiYXIgPSB2ZXJ0aWNhbFNjcm9sbGJhclJlY3QoKTsKICAgICAgICAgSW50U2l6ZSB0 aWxlU2l6ZSA9IHZlcnRpY2FsU2Nyb2xsYmFyLnNpemUoKS5zaHJ1bmtUbyhJbnRTaXplKG1fbWF4 VGV4dHVyZVNpemUsIG1fbWF4VGV4dHVyZVNpemUpKTsKQEAgLTIxNSw2ICsyMTksNyBAQCB2b2lk IExheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBkYXRlUm9vdExheWVyU2Nyb2xsYmFycygpCiAgICAg ICAgIG1faG9yaXpvbnRhbFNjcm9sbGJhclRpbGVyLT51cGRhdGUoKm1fcm9vdExheWVyU2Nyb2xs YmFyUGFpbnQsIG1fdmlld3BvcnRWaXNpYmxlUmVjdCk7CiAgICAgfSBlbHNlCiAgICAgICAgIG1f aG9yaXpvbnRhbFNjcm9sbGJhclRpbGVyLmNsZWFyKCk7CisgICAgUGxhdGZvcm1CcmlkZ2U6OnRy YWNlRXZlbnRFbmQoIkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBkYXRlUm9vdExheWVyU2Nyb2xs YmFycyIsIHRoaXMsIDApOwogfQogCiB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd1Jv b3RMYXllcigpCkBAIC0yNzYsNiArMjgxLDcgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06 OnVwZGF0ZUFuZERyYXdMYXllcnMoKQogCiB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBk YXRlTGF5ZXJzKFZlY3RvcjxDQ0xheWVySW1wbCo+JiByZW5kZXJTdXJmYWNlTGF5ZXJMaXN0KQog eworICAgIFBsYXRmb3JtQnJpZGdlOjp0cmFjZUV2ZW50QmVnaW4oIkxheWVyUmVuZGVyZXJDaHJv bWl1bTo6dXBkYXRlTGF5ZXJzIiwgdGhpcywgMCk7CiAgICAgQ0NMYXllckltcGwqIHJvb3REcmF3 TGF5ZXIgPSBtX3Jvb3RMYXllci0+Y2NMYXllckltcGwoKTsKIAogICAgIGlmICghcm9vdERyYXdM YXllci0+cmVuZGVyU3VyZmFjZSgpKQpAQCAtMzAzLDEwICszMDksMTIgQEAgdm9pZCBMYXllclJl bmRlcmVyQ2hyb21pdW06OnVwZGF0ZUxheWVycyhWZWN0b3I8Q0NMYXllckltcGwqPiYgcmVuZGVy U3VyZmFjZUxheWUKICAgICB1cGRhdGVQcm9wZXJ0aWVzQW5kUmVuZGVyU3VyZmFjZXMobV9yb290 TGF5ZXIuZ2V0KCksIGlkZW50aXR5TWF0cml4LCByZW5kZXJTdXJmYWNlTGF5ZXJMaXN0LCBtX2Rl ZmF1bHRSZW5kZXJTdXJmYWNlLT5tX2xheWVyTGlzdCk7CiAKICAgICB1cGRhdGVDb250ZW50c1Jl Y3Vyc2l2ZShtX3Jvb3RMYXllci5nZXQoKSk7CisgICAgUGxhdGZvcm1CcmlkZ2U6OnRyYWNlRXZl bnRFbmQoIkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBkYXRlTGF5ZXJzIiwgdGhpcywgMCk7CiB9 CiAKIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXJzKGNvbnN0IFZlY3RvcjxD Q0xheWVySW1wbCo+JiByZW5kZXJTdXJmYWNlTGF5ZXJMaXN0KQogeworICAgIFBsYXRmb3JtQnJp ZGdlOjp0cmFjZUV2ZW50QmVnaW4oIkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0xheWVycyIs IHRoaXMsIDApOwogICAgIENDTGF5ZXJJbXBsKiByb290RHJhd0xheWVyID0gbV9yb290TGF5ZXIt PmNjTGF5ZXJJbXBsKCk7CiAgICAgbWFrZUNvbnRleHRDdXJyZW50KCk7CiAKQEAgLTM3OCwxNSAr Mzg2LDE5IEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXJzKGNvbnN0IFZl Y3RvcjxDQ0xheWVySW1wbCo+JiByZW5kZXJTdXJmYWNlCiAKICAgICBHTEMobV9jb250ZXh0Lmdl dCgpLCBtX2NvbnRleHQtPmRpc2FibGUoR3JhcGhpY3NDb250ZXh0M0Q6OlNDSVNTT1JfVEVTVCkp OwogICAgIEdMQyhtX2NvbnRleHQuZ2V0KCksIG1fY29udGV4dC0+ZGlzYWJsZShHcmFwaGljc0Nv bnRleHQzRDo6QkxFTkQpKTsKKyAgICBQbGF0Zm9ybUJyaWRnZTo6dHJhY2VFdmVudEVuZCgiTGF5 ZXJSZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXJzIiwgdGhpcywgMCk7CiB9CiAKIHZvaWQgTGF5 ZXJSZW5kZXJlckNocm9taXVtOjpmaW5pc2goKQogeworICAgIFBsYXRmb3JtQnJpZGdlOjp0cmFj ZUV2ZW50QmVnaW4oIkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZmluaXNoIiwgdGhpcywgMCk7CiAg ICAgbV9jb250ZXh0LT5maW5pc2goKTsKKyAgICBQbGF0Zm9ybUJyaWRnZTo6dHJhY2VFdmVudEVu ZCgiTGF5ZXJSZW5kZXJlckNocm9taXVtOjpmaW5pc2giLCB0aGlzLCAwKTsKIH0KIAogdm9pZCBM YXllclJlbmRlcmVyQ2hyb21pdW06OnByZXNlbnQoKQogeworICAgIFBsYXRmb3JtQnJpZGdlOjp0 cmFjZUV2ZW50QmVnaW4oIkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6cHJlc2VudCIsIHRoaXMsIDAp OwogICAgIC8vIFdlJ3JlIGRvbmUhIFRpbWUgdG8gc3dhcGJ1ZmZlcnMhCiAKICAgICAvLyBOb3Rl IHRoYXQgY3VycmVudGx5IHRoaXMgaGFzIHRoZSBzYW1lIGVmZmVjdCBhcyBzd2FwQnVmZmVyczsg d2Ugc2hvdWxkCkBAIC0zOTQsNiArNDA2LDcgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06 OnByZXNlbnQoKQogICAgIG1fY29udGV4dC0+cHJlcGFyZVRleHR1cmUoKTsKIAogICAgIG1faGVh ZHNVcERpc3BsYXktPm9uUHJlc2VudCgpOworICAgIFBsYXRmb3JtQnJpZGdlOjp0cmFjZUV2ZW50 RW5kKCJMYXllclJlbmRlcmVyQ2hyb21pdW06OnByZXNlbnQiLCB0aGlzLCAwKTsKIH0KIAogdm9p ZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OnNldFJvb3RMYXllcihQYXNzUmVmUHRyPExheWVyQ2hy b21pdW0+IGxheWVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF5ZXJUaWxlckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyVGlsZXJDaHJvbWl1bS5jcHAKaW5kZXggZWRlMGQx ZjBiMzQxZTcyMjY1YjcyYjFlYTQyNDA0ZWNhNjQwZWU5Zi4uOGE5YTFhNjJkN2ViNDVmN2I3YTVh N2U3ZDllODIwYjkzZGMzNDdmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUaWxlckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRpbGVyQ2hyb21pdW0uY3BwCkBA IC0zNCw2ICszNCw3IEBACiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0M0QuaCIKICNpbmNsdWRl ICJMYXllclJlbmRlcmVyQ2hyb21pdW0uaCIKICNpbmNsdWRlICJMYXllclRleHR1cmUuaCIKKyNp bmNsdWRlICJQbGF0Zm9ybUJyaWRnZS5oIgogCiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25BcnJheVB0 ci5oPgogCkBAIC0yNDcsMTAgKzI0OCwxNCBAQCB2b2lkIExheWVyVGlsZXJDaHJvbWl1bTo6dXBk YXRlKFRpbGVQYWludEludGVyZmFjZSYgcGFpbnRlciwgY29uc3QgSW50UmVjdCYgY29udAogICAg IG1fY2FudmFzLnJlc2l6ZShwYWludFJlY3Quc2l6ZSgpKTsKICAgICBQbGF0Zm9ybUNhbnZhczo6 UGFpbnRlciBjYW52YXNQYWludGVyKCZtX2NhbnZhcyk7CiAgICAgY2FudmFzUGFpbnRlci5jb250 ZXh0KCktPnRyYW5zbGF0ZSgtcGFpbnRSZWN0LngoKSwgLXBhaW50UmVjdC55KCkpOworICAgIFBs YXRmb3JtQnJpZGdlOjp0cmFjZUV2ZW50QmVnaW4oIkxheWVyVGlsZXJDaHJvbWl1bTo6dXBkYXRl OjpwYWludCIsIHRoaXMsIDApOwogICAgIHBhaW50ZXIucGFpbnQoKmNhbnZhc1BhaW50ZXIuY29u dGV4dCgpLCBwYWludFJlY3QpOworICAgIFBsYXRmb3JtQnJpZGdlOjp0cmFjZUV2ZW50RW5kKCJM YXllclRpbGVyQ2hyb21pdW06OnVwZGF0ZTo6cGFpbnQiLCB0aGlzLCAwKTsKIAogICAgIFBsYXRm b3JtQ2FudmFzOjpBdXRvTG9ja2VyIGxvY2tlcigmbV9jYW52YXMpOworICAgIFBsYXRmb3JtQnJp ZGdlOjp0cmFjZUV2ZW50QmVnaW4oIkxheWVyVGlsZXJDaHJvbWl1bTo6dXBkYXRlRnJvbVBpeGVs cyIsIHRoaXMsIDApOwogICAgIHVwZGF0ZUZyb21QaXhlbHMocGFpbnRSZWN0LCBsb2NrZXIucGl4 ZWxzKCkpOworICAgIFBsYXRmb3JtQnJpZGdlOjp0cmFjZUV2ZW50RW5kKCJMYXllclRpbGVyQ2hy b21pdW06OnVwZGF0ZUZyb21QaXhlbHMiLCB0aGlzLCAwKTsKIH0KIAogdm9pZCBMYXllclRpbGVy Q2hyb21pdW06OnVwZGF0ZUZyb21QaXhlbHMoY29uc3QgSW50UmVjdCYgcGFpbnRSZWN0LCBjb25z dCB1aW50OF90KiBwYWludFBpeGVscykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNDhl NDFlZWI5MDZjODhkZDk2MzAzMjU4ZGE4Njg5ZTJiN2Q0MDgxNC4uZDEyZjIwMmY2NWU5MjQ0NmQ1 YzhlOWZjZWVkMWVjODRjZTkxZWM4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxMS0wMy0yMyAgTmF0IER1Y2EgIDxuZHVjYUBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVt XSBBZGQgdHJhY2VFdmVudHMgdG8gdGhlIGNvbXBvc2l0b3IKKworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY5NjUKKworICAgICAgICAqIHNyYy9XZWJW aWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpjb21wb3NpdGUpOgor CiAyMDExLTAzLTIzICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggMTVkNWFlMDUxOWYwYThhNDkyMWUzYWVkZDIyMzQ2 MTY5ZDIxYThkYy4uNDg2YzJhZWUxY2FmY2IwZGI1N2Y4NWVjN2U5ZGJmNDA2MWUzYWRhOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMTA4NiwxMSAr MTA4NiwxMyBAQCB2b2lkIFdlYlZpZXdJbXBsOjp0aGVtZUNoYW5nZWQoKQogdm9pZCBXZWJWaWV3 SW1wbDo6Y29tcG9zaXRlKGJvb2wgZmluaXNoKQogewogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKKyAgICBQbGF0Zm9ybUJyaWRnZTo6dHJhY2VFdmVudEJlZ2luKCJXZWJWaWV3SW1w bDo6Y29tcG9zaXRlIiwgdGhpcywgMCk7CiAgICAgaWYgKG1fcmVjcmVhdGluZ0dyYXBoaWNzQ29u dGV4dCkgewogICAgICAgICAvLyByZWFsbG9jYXRlUmVuZGVyZXIgd2lsbCByZXF1ZXN0IGEgcmVw YWludCB3aGV0aGVyIG9yIG5vdCBpdCBzdWNjZWVkZWQKICAgICAgICAgLy8gaW4gY3JlYXRpbmcg YSBuZXcgY29udGV4dC4KICAgICAgICAgcmVhbGxvY2F0ZVJlbmRlcmVyKCk7CiAgICAgICAgIG1f cmVjcmVhdGluZ0dyYXBoaWNzQ29udGV4dCA9IGZhbHNlOworICAgICAgICBQbGF0Zm9ybUJyaWRn ZTo6dHJhY2VFdmVudEVuZCgiV2ViVmlld0ltcGw6OmNvbXBvc2l0ZSIsIHRoaXMsIDApOwogICAg ICAgICByZXR1cm47CiAgICAgfQogICAgIGRvQ29tcG9zaXRlKCk7CkBAIC0xMTEzLDYgKzExMTUs NyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpjb21wb3NpdGUoYm9vbCBmaW5pc2gpCiAgICAgICAgIG1f cmVjcmVhdGluZ0dyYXBoaWNzQ29udGV4dCA9IHRydWU7CiAgICAgICAgIHNldFJvb3RMYXllck5l ZWRzRGlzcGxheSgpOwogICAgIH0KKyAgICBQbGF0Zm9ybUJyaWRnZTo6dHJhY2VFdmVudEVuZCgi V2ViVmlld0ltcGw6OmNvbXBvc2l0ZSIsIHRoaXMsIDApOwogI2VuZGlmCiB9CiAK 86732 2011-03-23 19:07:43 -0700 2011-03-24 10:25:50 -0700 Patch bug-56965-20110323190742.patch text/plain 10645 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogODE3OTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiZjNjYmRmZjRjM2Q1NWVi NDYwMDdjOGE0YTE1ZWRkNjk3NzMyOWJjLi4yMjNlNGQ2OTA5ODlhYTIxNmUxMDMzNjYwYzFkY2U5 OTUzZmNlYTZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDMtMjMgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRkIHRyYWNlRXZlbnRzIHRvIGNvbXBvc2l0 b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2OTY1 CisKKyAgICAgICAgKiBXZWJDb3JlLmd5cGk6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0v VHJhY2VFdmVudC5oOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmludGVybmFsOjpTY29wZVRy YWNlcjo6U2NvcGVUcmFjZXIpOgorICAgICAgICAoV2ViQ29yZTo6aW50ZXJuYWw6OlNjb3BlVHJh Y2VyOjp+U2NvcGVUcmFjZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRl cmVyQ2hyb21pdW06OnVwZGF0ZVJvb3RMYXllckNvbnRlbnRzKToKKyAgICAgICAgKFdlYkNvcmU6 OkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBkYXRlUm9vdExheWVyU2Nyb2xsYmFycyk6CisgICAg ICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW06OnVwZGF0ZUxheWVycyk6CisgICAg ICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW06OmRyYXdMYXllcnMpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjpmaW5pc2gpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjpwcmVzZW50KToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRpbGVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5ZXJUaWxlckNocm9taXVtOjp1cGRhdGUpOgorCiAyMDExLTAzLTIzICBUeWxlciBD bG9zZSAgPHRqY2xvc2VAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEplcmVt eSBPcmxvdy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaSBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQppbmRleCA5YmY1N2IxNDdjMmRhZDU0NzNiNTg0YWM4Y2Qy NTc2NmJmYzE2OTFlLi5jNWI1MTU0MmM5N2RjMTM1OWQ2NjIyYWRmNWM5MTViNTZkNGU1ZjI2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5neXBpCkBAIC0zNzM3LDYgKzM3MzcsNyBAQAogICAgICAgICAgICAgJ3BsYXRm b3JtL2Nocm9taXVtL1RlbXBvcmFyeUxpbmtTdHVicy5jcHAnLAogICAgICAgICAgICAgJ3BsYXRm b3JtL2Nocm9taXVtL1RoZW1lQ2hyb21pdW1NYWMuaCcsCiAgICAgICAgICAgICAncGxhdGZvcm0v Y2hyb21pdW0vVGhlbWVDaHJvbWl1bU1hYy5tbScsCisgICAgICAgICAgICAncGxhdGZvcm0vY2hy b21pdW0vVHJhY2VFdmVudC5oJywKICAgICAgICAgICAgICdwbGF0Zm9ybS9jaHJvbWl1bS9XaWRn ZXRDaHJvbWl1bS5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2Nocm9taXVtL1dyaXRhYmxl RGF0YU9iamVjdC5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2Nocm9taXVtL1dyaXRhYmxl RGF0YU9iamVjdC5oJywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL1RyYWNlRXZlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1RyYWNl RXZlbnQuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi45OWZlZWZmMWE3ZWM2ZTAwNGQ3ZGYxOGFkZGE2NjE2ZWU3OWZl MjdmCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0v VHJhY2VFdmVudC5oCkBAIC0wLDAgKzEsNzUgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEg R29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucworICogYXJlIG1ldDoKKyAqCisgKiAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAy LiAgUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92 ZSBjb3B5cmlnaHQKKyAqICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICAgZG9jdW1lbnRhdGlvbiBhbmQv b3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisg KiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIEFORCBJVFMgQ09OVFJJQlVUT1JT ICJBUyBJUyIgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorICogV0FSUkFOVElFUyBPRiBN RVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQor ICogRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgT1IgSVRTIENPTlRSSUJVVE9S UyBCRSBMSUFCTEUgRk9SIEFOWQorICogRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BF Q0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMKKyAqIChJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsKKyAqIExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORAorICogT04gQU5ZIFRIRU9SWSBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAq IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRSBPRgorICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworI2lmbmRlZiBUcmFjZUV2ZW50X2gK KyNkZWZpbmUgVHJhY2VFdmVudF9oCisKKyNpbmNsdWRlICJQbGF0Zm9ybUJyaWRnZS5oIgorCisv LyBJbXBsZW1lbnRhdGlvbiBkZXRhaWw6IHRyYWNlIGV2ZW50IG1hY3JvcyBjcmVhdGUgdGVtcG9y YXJ5IHZhcmlhYmxlcworLy8gdG8ga2VlcCBpbnN0cnVtZW50YXRpb24gb3ZlcmhlYWQgbG93LiBU aGVzZSBtYWNyb3MgZ2l2ZSBlYWNoIHRlbXBvcmFyeQorLy8gdmFyaWFibGUgYSB1bmlxdWUgbmFt ZSBiYXNlZCBvbiB0aGUgbGluZSBudW1iZXIgdG8gcHJldmVudCBuYW1lIGNvbGxpc3Npb25zLgor I2RlZmluZSBUUkFDRV9FVkVOVF9NQUtFX1VOSVFVRV9JREVOVElGSUVSMyhhLCBiKSBhIyNiCisj ZGVmaW5lIFRSQUNFX0VWRU5UX01BS0VfVU5JUVVFX0lERU5USUZJRVIyKGEsIGIpIFRSQUNFX0VW RU5UX01BS0VfVU5JUVVFX0lERU5USUZJRVIzKGEsIGIpCisjZGVmaW5lIFRSQUNFX0VWRU5UX01B S0VfVU5JUVVFX0lERU5USUZJRVIobmFtZV9wcmVmaXgpIFRSQUNFX0VWRU5UX01BS0VfVU5JUVVF X0lERU5USUZJRVIyKG5hbWVfcHJlZml4LCBfX0xJTkVfXykKKworLy8gSXNzdWVzIFBsYXRmb3Jt QnJpZGdlOjp0cmFjZUV2ZW50QmVnaW4gYW5kIHRyYWNlRXZlbnRFbmQgY2FsbHMgZm9yIHRoZSBl bmNsb3Npbmcgc2NvcGUKKyNkZWZpbmUgVFJBQ0VfRVZFTlQobmFtZSwgaWQsIGV4dHJhKSBcCisg ICAgV2ViQ29yZTo6aW50ZXJuYWw6OlNjb3BlVHJhY2VyIFRSQUNFX0VWRU5UX01BS0VfVU5JUVVF X0lERU5USUZJRVIoX190cmFjZUV2ZW50U2NvcGUpKG5hbWUsIGlkLCBleHRyYSk7CisKK25hbWVz cGFjZSBXZWJDb3JlIHsKKworbmFtZXNwYWNlIGludGVybmFsIHsKKworLy8gVXNlZCBieSBUUkFD RV9FVkVOVCBtYWNyby4gRG8gbm90IHVzZSBkaXJlY3RseS4KK2NsYXNzIFNjb3BlVHJhY2VyIHsK K3B1YmxpYzoKKyAgICBTY29wZVRyYWNlcihjb25zdCBjaGFyKiBuYW1lLCB2b2lkKiwgY29uc3Qg Y2hhciogZXh0cmEpOworICAgIH5TY29wZVRyYWNlcigpOworCitwcml2YXRlOgorICAgIGNvbnN0 IGNoYXIqIG1fbmFtZTsKKyAgICB2b2lkKiBtX2lkOworICAgIE93blB0cjxjaGFyKj4gbV9leHRy YTsKK307CisKK2lubGluZSBTY29wZVRyYWNlcjo6U2NvcGVUcmFjZXIoY29uc3QgY2hhciogbmFt ZSwgdm9pZCogaWQsIGNvbnN0IGNoYXIqIGV4dHJhKQorICAgIDogbV9uYW1lKG5hbWUpCisgICAg LCBtX2lkKGlkKQoreworICAgIFBsYXRmb3JtQnJpZGdlOjp0cmFjZUV2ZW50QmVnaW4obmFtZSwg aWQsIGV4dHJhKTsgXAorICAgIGlmIChleHRyYSkKKyAgICAgICAgbV9leHRyYSA9IGFkb3B0UHRy KHN0cmR1cChleHRyYSkpOworfQorCitpbmxpbmUgU2NvcGVUcmFjZXI6On5TY29wZVRyYWNlcigp Cit7CisgICAgUGxhdGZvcm1CcmlkZ2U6OnRyYWNlRXZlbnRFbmQobV9uYW1lLCBtX2lkLCBtX2V4 dHJhLmdldCgpKTsKK30KKworfSAvLyBuYW1lc3BhY2UgaW50ZXJuYWwKKworfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQorCisjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3Bw CmluZGV4IDNlMzlkODdiNmVhNDMzMmZkOTg2ZjBjMGQ5YzI3NGUzOGZlZDBlMzQuLjdkNzVlMzRm OGE5ODUyODMwMjRkNjkzNjk3ZDJiOTIwYjBlNjhjYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5k ZXJlckNocm9taXVtLmNwcApAQCAtNDQsNiArNDQsNyBAQAogI2luY2x1ZGUgIk5vdEltcGxlbWVu dGVkLmgiCiAjaW5jbHVkZSAiVGV4dFN0cmVhbS5oIgogI2luY2x1ZGUgIlRleHR1cmVNYW5hZ2Vy LmgiCisjaW5jbHVkZSAiVHJhY2VFdmVudC5oIgogI2luY2x1ZGUgIldlYkdMTGF5ZXJDaHJvbWl1 bS5oIgogI2luY2x1ZGUgImNjL0NDTGF5ZXJJbXBsLmgiCiAjaWYgVVNFKFNLSUEpCkBAIC0xODcs MTEgKzE4OCwxMyBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6aW52YWxpZGF0ZVJvb3RM YXllclJlY3QoY29uc3QgSW50UmVjdCYgZGlydHlSZWN0KQogCiB2b2lkIExheWVyUmVuZGVyZXJD aHJvbWl1bTo6dXBkYXRlUm9vdExheWVyQ29udGVudHMoKQogeworICAgIFRSQUNFX0VWRU5UKCJM YXllclJlbmRlcmVyQ2hyb21pdW06OnVwZGF0ZVJvb3RMYXllckNvbnRlbnRzIiwgdGhpcywgMCk7 CiAgICAgbV9yb290TGF5ZXJDb250ZW50VGlsZXItPnVwZGF0ZSgqbV9yb290TGF5ZXJDb250ZW50 UGFpbnQsIG1fdmlld3BvcnRWaXNpYmxlUmVjdCk7CiB9CiAKIHZvaWQgTGF5ZXJSZW5kZXJlckNo cm9taXVtOjp1cGRhdGVSb290TGF5ZXJTY3JvbGxiYXJzKCkKIHsKKyAgICBUUkFDRV9FVkVOVCgi TGF5ZXJSZW5kZXJlckNocm9taXVtOjp1cGRhdGVSb290TGF5ZXJTY3JvbGxiYXJzIiwgdGhpcywg MCk7CiAgICAgaWYgKG1fdmlld3BvcnRWaXNpYmxlUmVjdC53aWR0aCgpID4gbV92aWV3cG9ydENv bnRlbnRSZWN0LndpZHRoKCkpIHsKICAgICAgICAgSW50UmVjdCB2ZXJ0aWNhbFNjcm9sbGJhciA9 IHZlcnRpY2FsU2Nyb2xsYmFyUmVjdCgpOwogICAgICAgICBJbnRTaXplIHRpbGVTaXplID0gdmVy dGljYWxTY3JvbGxiYXIuc2l6ZSgpLnNocnVua1RvKEludFNpemUobV9tYXhUZXh0dXJlU2l6ZSwg bV9tYXhUZXh0dXJlU2l6ZSkpOwpAQCAtMjc2LDYgKzI3OSw3IEBAIHZvaWQgTGF5ZXJSZW5kZXJl ckNocm9taXVtOjp1cGRhdGVBbmREcmF3TGF5ZXJzKCkKIAogdm9pZCBMYXllclJlbmRlcmVyQ2hy b21pdW06OnVwZGF0ZUxheWVycyhWZWN0b3I8Q0NMYXllckltcGwqPiYgcmVuZGVyU3VyZmFjZUxh eWVyTGlzdCkKIHsKKyAgICBUUkFDRV9FVkVOVCgiTGF5ZXJSZW5kZXJlckNocm9taXVtOjp1cGRh dGVMYXllcnMiLCB0aGlzLCAwKTsKICAgICBDQ0xheWVySW1wbCogcm9vdERyYXdMYXllciA9IG1f cm9vdExheWVyLT5jY0xheWVySW1wbCgpOwogCiAgICAgaWYgKCFyb290RHJhd0xheWVyLT5yZW5k ZXJTdXJmYWNlKCkpCkBAIC0zMDcsNiArMzExLDcgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21p dW06OnVwZGF0ZUxheWVycyhWZWN0b3I8Q0NMYXllckltcGwqPiYgcmVuZGVyU3VyZmFjZUxheWUK IAogdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmRyYXdMYXllcnMoY29uc3QgVmVjdG9yPEND TGF5ZXJJbXBsKj4mIHJlbmRlclN1cmZhY2VMYXllckxpc3QpCiB7CisgICAgVFJBQ0VfRVZFTlQo IkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0xheWVycyIsIHRoaXMsIDApOwogICAgIENDTGF5 ZXJJbXBsKiByb290RHJhd0xheWVyID0gbV9yb290TGF5ZXItPmNjTGF5ZXJJbXBsKCk7CiAgICAg bWFrZUNvbnRleHRDdXJyZW50KCk7CiAKQEAgLTM4MiwxMSArMzg3LDEzIEBAIHZvaWQgTGF5ZXJS ZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXJzKGNvbnN0IFZlY3RvcjxDQ0xheWVySW1wbCo+JiBy ZW5kZXJTdXJmYWNlCiAKIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpmaW5pc2goKQogewor ICAgIFRSQUNFX0VWRU5UKCJMYXllclJlbmRlcmVyQ2hyb21pdW06OmZpbmlzaCIsIHRoaXMsIDAp OwogICAgIG1fY29udGV4dC0+ZmluaXNoKCk7CiB9CiAKIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9t aXVtOjpwcmVzZW50KCkKIHsKKyAgICBUUkFDRV9FVkVOVCgiTGF5ZXJSZW5kZXJlckNocm9taXVt OjpwcmVzZW50IiwgdGhpcywgMCk7CiAgICAgLy8gV2UncmUgZG9uZSEgVGltZSB0byBzd2FwYnVm ZmVycyEKIAogICAgIC8vIE5vdGUgdGhhdCBjdXJyZW50bHkgdGhpcyBoYXMgdGhlIHNhbWUgZWZm ZWN0IGFzIHN3YXBCdWZmZXJzOyB3ZSBzaG91bGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyVGlsZXJDaHJvbWl1bS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRpbGVyQ2hyb21pdW0u Y3BwCmluZGV4IGVkZTBkMWYwYjM0MWU3MjI2NWI3MmIxZWE0MjQwNGVjYTY0MGVlOWYuLmJjMzcy MDEwZWUwNTE1M2QyNjNlNDU4ZjhhOThiNDExNjBlNTc1NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyVGlsZXJDaHJvbWl1bS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUaWxl ckNocm9taXVtLmNwcApAQCAtMzQsNiArMzQsNyBAQAogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4 dDNELmgiCiAjaW5jbHVkZSAiTGF5ZXJSZW5kZXJlckNocm9taXVtLmgiCiAjaW5jbHVkZSAiTGF5 ZXJUZXh0dXJlLmgiCisjaW5jbHVkZSAiVHJhY2VFdmVudC5oIgogCiAjaW5jbHVkZSA8d3RmL1Bh c3NPd25BcnJheVB0ci5oPgogCkBAIC0yNDcsMTAgKzI0OCwxNiBAQCB2b2lkIExheWVyVGlsZXJD aHJvbWl1bTo6dXBkYXRlKFRpbGVQYWludEludGVyZmFjZSYgcGFpbnRlciwgY29uc3QgSW50UmVj dCYgY29udAogICAgIG1fY2FudmFzLnJlc2l6ZShwYWludFJlY3Quc2l6ZSgpKTsKICAgICBQbGF0 Zm9ybUNhbnZhczo6UGFpbnRlciBjYW52YXNQYWludGVyKCZtX2NhbnZhcyk7CiAgICAgY2FudmFz UGFpbnRlci5jb250ZXh0KCktPnRyYW5zbGF0ZSgtcGFpbnRSZWN0LngoKSwgLXBhaW50UmVjdC55 KCkpOwotICAgIHBhaW50ZXIucGFpbnQoKmNhbnZhc1BhaW50ZXIuY29udGV4dCgpLCBwYWludFJl Y3QpOworICAgIHsKKyAgICAgICAgVFJBQ0VfRVZFTlQoIkxheWVyVGlsZXJDaHJvbWl1bTo6dXBk YXRlOjpwYWludCIsIHRoaXMsIDApOworICAgICAgICBwYWludGVyLnBhaW50KCpjYW52YXNQYWlu dGVyLmNvbnRleHQoKSwgcGFpbnRSZWN0KTsKKyAgICB9CiAKICAgICBQbGF0Zm9ybUNhbnZhczo6 QXV0b0xvY2tlciBsb2NrZXIoJm1fY2FudmFzKTsKLSAgICB1cGRhdGVGcm9tUGl4ZWxzKHBhaW50 UmVjdCwgbG9ja2VyLnBpeGVscygpKTsKKyAgICB7CisgICAgICAgIFRSQUNFX0VWRU5UKCJMYXll clRpbGVyQ2hyb21pdW06OnVwZGF0ZUZyb21QaXhlbHMiLCB0aGlzLCAwKTsKKyAgICAgICAgdXBk YXRlRnJvbVBpeGVscyhwYWludFJlY3QsIGxvY2tlci5waXhlbHMoKSk7CisgICAgfQogfQogCiB2 b2lkIExheWVyVGlsZXJDaHJvbWl1bTo6dXBkYXRlRnJvbVBpeGVscyhjb25zdCBJbnRSZWN0JiBw YWludFJlY3QsIGNvbnN0IHVpbnQ4X3QqIHBhaW50UGl4ZWxzKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwppbmRleCA0OGU0MWVlYjkwNmM4OGRkOTYzMDMyNThkYTg2ODllMmI3ZDQwODE0Li42Yzk1 OGE0ZjZmNmY3ZmRlMmJjN2MzMzY2MTY4MTQ1MTY3ZTQ2YTk0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTAzLTIzICBOYXQgRHVjYSAgPG5kdWNhQGNo cm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbY2hyb21pdW1dIEFkZCB0cmFjZUV2ZW50cyB0byBjb21wb3NpdG9yCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Njk2NQorCisgICAgICAgICog c3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmNvbXBv c2l0ZSk6CisKIDIwMTEtMDMtMjMgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCAxNWQ1YWUwNTE5ZjBhOGE0OTIxZTNh ZWRkMjIzNDYxNjlkMjFhOGRjLi40NmE1NDhkNjI3ZjZiZDA3MzE3YzZlY2Y5NGU1YmYwNjQ3OWFm MTFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC03 Nyw3ICs3Nyw2IEBACiAjaW5jbHVkZSAiUGFnZUdyb3VwLmgiCiAjaW5jbHVkZSAiUGFnZUdyb3Vw TG9hZERlZmVycmVyLmgiCiAjaW5jbHVkZSAiUGFzdGVib2FyZC5oIgotI2luY2x1ZGUgIlBsYXRm b3JtQnJpZGdlLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1Db250ZXh0U2tpYS5oIgogI2luY2x1ZGUg IlBsYXRmb3JtS2V5Ym9hcmRFdmVudC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtTW91c2VFdmVudC5o IgpAQCAtOTMsNiArOTIsNyBAQAogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiU3Bl ZWNoSW5wdXRDbGllbnRJbXBsLmgiCiAjaW5jbHVkZSAiVGltZXIuaCIKKyNpbmNsdWRlICJUcmFj ZUV2ZW50LmgiCiAjaW5jbHVkZSAiVHlwaW5nQ29tbWFuZC5oIgogI2luY2x1ZGUgIlVzZXJHZXN0 dXJlSW5kaWNhdG9yLmgiCiAjaW5jbHVkZSAiVmVjdG9yLmgiCkBAIC0xMDg2LDYgKzEwODYsNyBA QCB2b2lkIFdlYlZpZXdJbXBsOjp0aGVtZUNoYW5nZWQoKQogdm9pZCBXZWJWaWV3SW1wbDo6Y29t cG9zaXRlKGJvb2wgZmluaXNoKQogewogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykK KyAgICBUUkFDRV9FVkVOVCgiV2ViVmlld0ltcGw6OmNvbXBvc2l0ZSIsIHRoaXMsIDApOwogICAg IGlmIChtX3JlY3JlYXRpbmdHcmFwaGljc0NvbnRleHQpIHsKICAgICAgICAgLy8gcmVhbGxvY2F0 ZVJlbmRlcmVyIHdpbGwgcmVxdWVzdCBhIHJlcGFpbnQgd2hldGhlciBvciBub3QgaXQgc3VjY2Vl ZGVkCiAgICAgICAgIC8vIGluIGNyZWF0aW5nIGEgbmV3IGNvbnRleHQuCg== 86792 2011-03-24 10:25:52 -0700 2011-03-24 12:02:48 -0700 Patch bug-56965-20110324102551.patch text/plain 10638 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogODE3OTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiZjNjYmRmZjRjM2Q1NWVi NDYwMDdjOGE0YTE1ZWRkNjk3NzMyOWJjLi4xY2Q3YWYxYzQ1N2NmZDY0MzRhYzA4NWJjZjc2ZjFj MzJjZWZkMTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDMtMjQgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRkIHRyYWNlRXZlbnRzIHRvIGNvbXBvc2l0 b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2OTY1 CisKKyAgICAgICAgKiBXZWJDb3JlLmd5cGk6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0v VHJhY2VFdmVudC5oOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmludGVybmFsOjpTY29wZVRy YWNlcjo6U2NvcGVUcmFjZXIpOgorICAgICAgICAoV2ViQ29yZTo6aW50ZXJuYWw6OlNjb3BlVHJh Y2VyOjp+U2NvcGVUcmFjZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRl cmVyQ2hyb21pdW06OnVwZGF0ZVJvb3RMYXllckNvbnRlbnRzKToKKyAgICAgICAgKFdlYkNvcmU6 OkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBkYXRlUm9vdExheWVyU2Nyb2xsYmFycyk6CisgICAg ICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW06OnVwZGF0ZUxheWVycyk6CisgICAg ICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hyb21pdW06OmRyYXdMYXllcnMpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjpmaW5pc2gpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjpwcmVzZW50KToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRpbGVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5ZXJUaWxlckNocm9taXVtOjp1cGRhdGUpOgorCiAyMDExLTAzLTIzICBUeWxlciBD bG9zZSAgPHRqY2xvc2VAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEplcmVt eSBPcmxvdy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaSBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQppbmRleCA5YmY1N2IxNDdjMmRhZDU0NzNiNTg0YWM4Y2Qy NTc2NmJmYzE2OTFlLi5jNWI1MTU0MmM5N2RjMTM1OWQ2NjIyYWRmNWM5MTViNTZkNGU1ZjI2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5neXBpCkBAIC0zNzM3LDYgKzM3MzcsNyBAQAogICAgICAgICAgICAgJ3BsYXRm b3JtL2Nocm9taXVtL1RlbXBvcmFyeUxpbmtTdHVicy5jcHAnLAogICAgICAgICAgICAgJ3BsYXRm b3JtL2Nocm9taXVtL1RoZW1lQ2hyb21pdW1NYWMuaCcsCiAgICAgICAgICAgICAncGxhdGZvcm0v Y2hyb21pdW0vVGhlbWVDaHJvbWl1bU1hYy5tbScsCisgICAgICAgICAgICAncGxhdGZvcm0vY2hy b21pdW0vVHJhY2VFdmVudC5oJywKICAgICAgICAgICAgICdwbGF0Zm9ybS9jaHJvbWl1bS9XaWRn ZXRDaHJvbWl1bS5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2Nocm9taXVtL1dyaXRhYmxl RGF0YU9iamVjdC5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2Nocm9taXVtL1dyaXRhYmxl RGF0YU9iamVjdC5oJywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9t aXVtL1RyYWNlRXZlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1RyYWNl RXZlbnQuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi45YjkyZDU4ZWMwNzA3Y2UwOTM5ZmQ4MGFhOTRjNDE5OWYxODU5 Yzc0Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0v VHJhY2VFdmVudC5oCkBAIC0wLDAgKzEsNzQgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEg R29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucworICogYXJlIG1ldDoKKyAqCisgKiAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAy LiAgUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92 ZSBjb3B5cmlnaHQKKyAqICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICAgZG9jdW1lbnRhdGlvbiBhbmQv b3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisg KiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIEFORCBJVFMgQ09OVFJJQlVUT1JT ICJBUyBJUyIgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorICogV0FSUkFOVElFUyBPRiBN RVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQor ICogRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgT1IgSVRTIENPTlRSSUJVVE9S UyBCRSBMSUFCTEUgRk9SIEFOWQorICogRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BF Q0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMKKyAqIChJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsKKyAqIExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORAorICogT04gQU5ZIFRIRU9SWSBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAq IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRSBPRgorICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworI2lmbmRlZiBUcmFjZUV2ZW50X2gK KyNkZWZpbmUgVHJhY2VFdmVudF9oCisKKyNpbmNsdWRlICJQbGF0Zm9ybUJyaWRnZS5oIgorCisv LyBJbXBsZW1lbnRhdGlvbiBkZXRhaWw6IHRyYWNlIGV2ZW50IG1hY3JvcyBjcmVhdGUgdGVtcG9y YXJ5IHZhcmlhYmxlcworLy8gdG8ga2VlcCBpbnN0cnVtZW50YXRpb24gb3ZlcmhlYWQgbG93LiBU aGVzZSBtYWNyb3MgZ2l2ZSBlYWNoIHRlbXBvcmFyeQorLy8gdmFyaWFibGUgYSB1bmlxdWUgbmFt ZSBiYXNlZCBvbiB0aGUgbGluZSBudW1iZXIgdG8gcHJldmVudCBuYW1lIGNvbGxpc3Npb25zLgor I2RlZmluZSBUUkFDRV9FVkVOVF9NQUtFX1VOSVFVRV9JREVOVElGSUVSMyhhLCBiKSBhIyNiCisj ZGVmaW5lIFRSQUNFX0VWRU5UX01BS0VfVU5JUVVFX0lERU5USUZJRVIyKGEsIGIpIFRSQUNFX0VW RU5UX01BS0VfVU5JUVVFX0lERU5USUZJRVIzKGEsIGIpCisjZGVmaW5lIFRSQUNFX0VWRU5UX01B S0VfVU5JUVVFX0lERU5USUZJRVIobmFtZV9wcmVmaXgpIFRSQUNFX0VWRU5UX01BS0VfVU5JUVVF X0lERU5USUZJRVIyKG5hbWVfcHJlZml4LCBfX0xJTkVfXykKKworLy8gSXNzdWVzIFBsYXRmb3Jt QnJpZGdlOjp0cmFjZUV2ZW50QmVnaW4gYW5kIHRyYWNlRXZlbnRFbmQgY2FsbHMgZm9yIHRoZSBl bmNsb3Npbmcgc2NvcGUKKyNkZWZpbmUgVFJBQ0VfRVZFTlQobmFtZSwgaWQsIGV4dHJhKSBXZWJD b3JlOjppbnRlcm5hbDo6U2NvcGVUcmFjZXIgVFJBQ0VfRVZFTlRfTUFLRV9VTklRVUVfSURFTlRJ RklFUihfX3RyYWNlRXZlbnRTY29wZSkobmFtZSwgaWQsIGV4dHJhKTsKKworbmFtZXNwYWNlIFdl YkNvcmUgeworCituYW1lc3BhY2UgaW50ZXJuYWwgeworCisvLyBVc2VkIGJ5IFRSQUNFX0VWRU5U IG1hY3JvLiBEbyBub3QgdXNlIGRpcmVjdGx5LgorY2xhc3MgU2NvcGVUcmFjZXIgeworcHVibGlj OgorICAgIFNjb3BlVHJhY2VyKGNvbnN0IGNoYXIqIG5hbWUsIHZvaWQqLCBjb25zdCBjaGFyKiBl eHRyYSk7CisgICAgflNjb3BlVHJhY2VyKCk7CisKK3ByaXZhdGU6CisgICAgY29uc3QgY2hhciog bV9uYW1lOworICAgIHZvaWQqIG1faWQ7CisgICAgT3duUHRyPGNoYXIqPiBtX2V4dHJhOworfTsK KworaW5saW5lIFNjb3BlVHJhY2VyOjpTY29wZVRyYWNlcihjb25zdCBjaGFyKiBuYW1lLCB2b2lk KiBpZCwgY29uc3QgY2hhciogZXh0cmEpCisgICAgOiBtX25hbWUobmFtZSkKKyAgICAsIG1faWQo aWQpCit7CisgICAgUGxhdGZvcm1CcmlkZ2U6OnRyYWNlRXZlbnRCZWdpbihuYW1lLCBpZCwgZXh0 cmEpOyBcCisgICAgaWYgKGV4dHJhKQorICAgICAgICBtX2V4dHJhID0gYWRvcHRQdHIoc3RyZHVw KGV4dHJhKSk7Cit9CisKK2lubGluZSBTY29wZVRyYWNlcjo6flNjb3BlVHJhY2VyKCkKK3sKKyAg ICBQbGF0Zm9ybUJyaWRnZTo6dHJhY2VFdmVudEVuZChtX25hbWUsIG1faWQsIG1fZXh0cmEuZ2V0 KCkpOworfQorCit9IC8vIG5hbWVzcGFjZSBpbnRlcm5hbAorCit9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCisKKyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKaW5kZXgg M2UzOWQ4N2I2ZWE0MzMyZmQ5ODZmMGMwZDljMjc0ZTM4ZmVkMGUzNC4uN2Q3NWUzNGY4YTk4NTI4 MzAyNGQ2OTM2OTdkMmI5MjBiMGU2OGNjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hy b21pdW0uY3BwCkBAIC00NCw2ICs0NCw3IEBACiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIK ICNpbmNsdWRlICJUZXh0U3RyZWFtLmgiCiAjaW5jbHVkZSAiVGV4dHVyZU1hbmFnZXIuaCIKKyNp bmNsdWRlICJUcmFjZUV2ZW50LmgiCiAjaW5jbHVkZSAiV2ViR0xMYXllckNocm9taXVtLmgiCiAj aW5jbHVkZSAiY2MvQ0NMYXllckltcGwuaCIKICNpZiBVU0UoU0tJQSkKQEAgLTE4NywxMSArMTg4 LDEzIEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjppbnZhbGlkYXRlUm9vdExheWVyUmVj dChjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpCiAKIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVt Ojp1cGRhdGVSb290TGF5ZXJDb250ZW50cygpCiB7CisgICAgVFJBQ0VfRVZFTlQoIkxheWVyUmVu ZGVyZXJDaHJvbWl1bTo6dXBkYXRlUm9vdExheWVyQ29udGVudHMiLCB0aGlzLCAwKTsKICAgICBt X3Jvb3RMYXllckNvbnRlbnRUaWxlci0+dXBkYXRlKCptX3Jvb3RMYXllckNvbnRlbnRQYWludCwg bV92aWV3cG9ydFZpc2libGVSZWN0KTsKIH0KIAogdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06 OnVwZGF0ZVJvb3RMYXllclNjcm9sbGJhcnMoKQogeworICAgIFRSQUNFX0VWRU5UKCJMYXllclJl bmRlcmVyQ2hyb21pdW06OnVwZGF0ZVJvb3RMYXllclNjcm9sbGJhcnMiLCB0aGlzLCAwKTsKICAg ICBpZiAobV92aWV3cG9ydFZpc2libGVSZWN0LndpZHRoKCkgPiBtX3ZpZXdwb3J0Q29udGVudFJl Y3Qud2lkdGgoKSkgewogICAgICAgICBJbnRSZWN0IHZlcnRpY2FsU2Nyb2xsYmFyID0gdmVydGlj YWxTY3JvbGxiYXJSZWN0KCk7CiAgICAgICAgIEludFNpemUgdGlsZVNpemUgPSB2ZXJ0aWNhbFNj cm9sbGJhci5zaXplKCkuc2hydW5rVG8oSW50U2l6ZShtX21heFRleHR1cmVTaXplLCBtX21heFRl eHR1cmVTaXplKSk7CkBAIC0yNzYsNiArMjc5LDcgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21p dW06OnVwZGF0ZUFuZERyYXdMYXllcnMoKQogCiB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6 dXBkYXRlTGF5ZXJzKFZlY3RvcjxDQ0xheWVySW1wbCo+JiByZW5kZXJTdXJmYWNlTGF5ZXJMaXN0 KQogeworICAgIFRSQUNFX0VWRU5UKCJMYXllclJlbmRlcmVyQ2hyb21pdW06OnVwZGF0ZUxheWVy cyIsIHRoaXMsIDApOwogICAgIENDTGF5ZXJJbXBsKiByb290RHJhd0xheWVyID0gbV9yb290TGF5 ZXItPmNjTGF5ZXJJbXBsKCk7CiAKICAgICBpZiAoIXJvb3REcmF3TGF5ZXItPnJlbmRlclN1cmZh Y2UoKSkKQEAgLTMwNyw2ICszMTEsNyBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBk YXRlTGF5ZXJzKFZlY3RvcjxDQ0xheWVySW1wbCo+JiByZW5kZXJTdXJmYWNlTGF5ZQogCiB2b2lk IExheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0xheWVycyhjb25zdCBWZWN0b3I8Q0NMYXllcklt cGwqPiYgcmVuZGVyU3VyZmFjZUxheWVyTGlzdCkKIHsKKyAgICBUUkFDRV9FVkVOVCgiTGF5ZXJS ZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXJzIiwgdGhpcywgMCk7CiAgICAgQ0NMYXllckltcGwq IHJvb3REcmF3TGF5ZXIgPSBtX3Jvb3RMYXllci0+Y2NMYXllckltcGwoKTsKICAgICBtYWtlQ29u dGV4dEN1cnJlbnQoKTsKIApAQCAtMzgyLDExICszODcsMTMgQEAgdm9pZCBMYXllclJlbmRlcmVy Q2hyb21pdW06OmRyYXdMYXllcnMoY29uc3QgVmVjdG9yPENDTGF5ZXJJbXBsKj4mIHJlbmRlclN1 cmZhY2UKIAogdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmZpbmlzaCgpCiB7CisgICAgVFJB Q0VfRVZFTlQoIkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZmluaXNoIiwgdGhpcywgMCk7CiAgICAg bV9jb250ZXh0LT5maW5pc2goKTsKIH0KIAogdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OnBy ZXNlbnQoKQogeworICAgIFRSQUNFX0VWRU5UKCJMYXllclJlbmRlcmVyQ2hyb21pdW06OnByZXNl bnQiLCB0aGlzLCAwKTsKICAgICAvLyBXZSdyZSBkb25lISBUaW1lIHRvIHN3YXBidWZmZXJzIQog CiAgICAgLy8gTm90ZSB0aGF0IGN1cnJlbnRseSB0aGlzIGhhcyB0aGUgc2FtZSBlZmZlY3QgYXMg c3dhcEJ1ZmZlcnM7IHdlIHNob3VsZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUaWxlckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyVGlsZXJDaHJvbWl1bS5jcHAKaW5k ZXggZWRlMGQxZjBiMzQxZTcyMjY1YjcyYjFlYTQyNDA0ZWNhNjQwZWU5Zi4uYmMzNzIwMTBlZTA1 MTUzZDI2M2U0NThmOGE5OGI0MTE2MGU1NzU1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUaWxlckNocm9taXVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRpbGVyQ2hyb21p dW0uY3BwCkBAIC0zNCw2ICszNCw3IEBACiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0M0QuaCIK ICNpbmNsdWRlICJMYXllclJlbmRlcmVyQ2hyb21pdW0uaCIKICNpbmNsdWRlICJMYXllclRleHR1 cmUuaCIKKyNpbmNsdWRlICJUcmFjZUV2ZW50LmgiCiAKICNpbmNsdWRlIDx3dGYvUGFzc093bkFy cmF5UHRyLmg+CiAKQEAgLTI0NywxMCArMjQ4LDE2IEBAIHZvaWQgTGF5ZXJUaWxlckNocm9taXVt Ojp1cGRhdGUoVGlsZVBhaW50SW50ZXJmYWNlJiBwYWludGVyLCBjb25zdCBJbnRSZWN0JiBjb250 CiAgICAgbV9jYW52YXMucmVzaXplKHBhaW50UmVjdC5zaXplKCkpOwogICAgIFBsYXRmb3JtQ2Fu dmFzOjpQYWludGVyIGNhbnZhc1BhaW50ZXIoJm1fY2FudmFzKTsKICAgICBjYW52YXNQYWludGVy LmNvbnRleHQoKS0+dHJhbnNsYXRlKC1wYWludFJlY3QueCgpLCAtcGFpbnRSZWN0LnkoKSk7Ci0g ICAgcGFpbnRlci5wYWludCgqY2FudmFzUGFpbnRlci5jb250ZXh0KCksIHBhaW50UmVjdCk7Cisg ICAgeworICAgICAgICBUUkFDRV9FVkVOVCgiTGF5ZXJUaWxlckNocm9taXVtOjp1cGRhdGU6OnBh aW50IiwgdGhpcywgMCk7CisgICAgICAgIHBhaW50ZXIucGFpbnQoKmNhbnZhc1BhaW50ZXIuY29u dGV4dCgpLCBwYWludFJlY3QpOworICAgIH0KIAogICAgIFBsYXRmb3JtQ2FudmFzOjpBdXRvTG9j a2VyIGxvY2tlcigmbV9jYW52YXMpOwotICAgIHVwZGF0ZUZyb21QaXhlbHMocGFpbnRSZWN0LCBs b2NrZXIucGl4ZWxzKCkpOworICAgIHsKKyAgICAgICAgVFJBQ0VfRVZFTlQoIkxheWVyVGlsZXJD aHJvbWl1bTo6dXBkYXRlRnJvbVBpeGVscyIsIHRoaXMsIDApOworICAgICAgICB1cGRhdGVGcm9t UGl4ZWxzKHBhaW50UmVjdCwgbG9ja2VyLnBpeGVscygpKTsKKyAgICB9CiB9CiAKIHZvaWQgTGF5 ZXJUaWxlckNocm9taXVtOjp1cGRhdGVGcm9tUGl4ZWxzKGNvbnN0IEludFJlY3QmIHBhaW50UmVj dCwgY29uc3QgdWludDhfdCogcGFpbnRQaXhlbHMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmlu ZGV4IDQ4ZTQxZWViOTA2Yzg4ZGQ5NjMwMzI1OGRhODY4OWUyYjdkNDA4MTQuLjVhY2MzNjVjNjQ1 ZjY3ZDIzNTczYTE1N2RmYTE4OTQ5NmQ5ZTAxOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDMtMjQgIE5hdCBEdWNhICA8bmR1Y2FAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtj aHJvbWl1bV0gQWRkIHRyYWNlRXZlbnRzIHRvIGNvbXBvc2l0b3IKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2OTY1CisKKyAgICAgICAgKiBzcmMvV2Vi Vmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6Y29tcG9zaXRlKToK KwogMjAxMS0wMy0yMyAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IDE1ZDVhZTA1MTlmMGE4YTQ5MjFlM2FlZGQyMjM0 NjE2OWQyMWE4ZGMuLjQ2YTU0OGQ2MjdmNmJkMDczMTdjNmVjZjk0ZTViZjA2NDc5YWYxMWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTc3LDcgKzc3 LDYgQEAKICNpbmNsdWRlICJQYWdlR3JvdXAuaCIKICNpbmNsdWRlICJQYWdlR3JvdXBMb2FkRGVm ZXJyZXIuaCIKICNpbmNsdWRlICJQYXN0ZWJvYXJkLmgiCi0jaW5jbHVkZSAiUGxhdGZvcm1Ccmlk Z2UuaCIKICNpbmNsdWRlICJQbGF0Zm9ybUNvbnRleHRTa2lhLmgiCiAjaW5jbHVkZSAiUGxhdGZv cm1LZXlib2FyZEV2ZW50LmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1Nb3VzZUV2ZW50LmgiCkBAIC05 Myw2ICs5Miw3IEBACiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNsdWRlICJTcGVlY2hJbnB1 dENsaWVudEltcGwuaCIKICNpbmNsdWRlICJUaW1lci5oIgorI2luY2x1ZGUgIlRyYWNlRXZlbnQu aCIKICNpbmNsdWRlICJUeXBpbmdDb21tYW5kLmgiCiAjaW5jbHVkZSAiVXNlckdlc3R1cmVJbmRp Y2F0b3IuaCIKICNpbmNsdWRlICJWZWN0b3IuaCIKQEAgLTEwODYsNiArMTA4Niw3IEBAIHZvaWQg V2ViVmlld0ltcGw6OnRoZW1lQ2hhbmdlZCgpCiB2b2lkIFdlYlZpZXdJbXBsOjpjb21wb3NpdGUo Ym9vbCBmaW5pc2gpCiB7CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorICAgIFRS QUNFX0VWRU5UKCJXZWJWaWV3SW1wbDo6Y29tcG9zaXRlIiwgdGhpcywgMCk7CiAgICAgaWYgKG1f cmVjcmVhdGluZ0dyYXBoaWNzQ29udGV4dCkgewogICAgICAgICAvLyByZWFsbG9jYXRlUmVuZGVy ZXIgd2lsbCByZXF1ZXN0IGEgcmVwYWludCB3aGV0aGVyIG9yIG5vdCBpdCBzdWNjZWVkZWQKICAg ICAgICAgLy8gaW4gY3JlYXRpbmcgYSBuZXcgY29udGV4dC4K