72641 2011-11-17 12:11:05 -0800 Appearance of compound transform animations under apps linked on SnowLeopard is incorrect 2011-11-18 16:15:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cmarrin dglazkov dino simon.fraser webkit-bug-importer webkit.review.bot oldest_to_newest 505077 0 simon.fraser 2011-11-17 12:11:05 -0800 Appearance of compound transform animations under apps linked on SnowLeopard is incorrect 505079 1 115650 simon.fraser 2011-11-17 12:14:45 -0800 Created attachment 115650 Patch 505081 2 simon.fraser 2011-11-17 12:15:29 -0800 <rdar://problem/10314267> 505084 3 webkit-bug-importer 2011-11-17 12:15:45 -0800 <rdar://problem/10464304> 505258 4 115650 cmarrin 2011-11-17 15:00:06 -0800 Comment on attachment 115650 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115650&action=review Generally looks good. But it needs at least a test that proves the ordering is right. You should also check to make sure our additive animation tests are sufficient, since you're making substantive changes to how you do additive. > Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp:1746 > +#if !defined(BUILDING_ON_SNOW_LEOPARD) && !PLATFORM(WIN) So this is code is going to compile in on Leopard and then on Lion and above? 505310 5 115650 dino 2011-11-17 15:58:06 -0800 Comment on attachment 115650 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115650&action=review >> Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp:1746 >> +#if !defined(BUILDING_ON_SNOW_LEOPARD) && !PLATFORM(WIN) > > So this is code is going to compile in on Leopard and then on Lion and above? Unless BUILDING_ON_SNOW_LEOPARD includes LION, which would be weird but not completely unexpected. 505389 6 115715 simon.fraser 2011-11-17 17:37:46 -0800 Created attachment 115715 Patch 505395 7 simon.fraser 2011-11-17 17:52:33 -0800 (In reply to comment #5) > (From update of attachment 115650 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=115650&action=review > > >> Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp:1746 > >> +#if !defined(BUILDING_ON_SNOW_LEOPARD) && !PLATFORM(WIN) > > > > So this is code is going to compile in on Leopard and then on Lion and above? We don't care about Leopard. "reverse" defaults to true. On Lion and later, we do the link check, and flip the flag to false. 505416 8 webkit.review.bot 2011-11-17 18:40:01 -0800 Attachment 115715 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Updating OpenSource From git://git.webkit.org/WebKit 64d810f..f0128e0 master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 100705 = e5736d6fce89243607b7cf5020c3bf9a52db4d2f r100704 = 7d7b005933e515a913b90d458ca908b44130576d r100705 = 0921df4d01122e7d31bcbabffb7c4de478c3914a r100706 = 71cc4ad1d79ed791b8f3d640f39ee76cb34bc76d r100707 = 89b4a32720da4e02761395a199d4a75823f8890c r100708 = f0128e0e343dd0913ba23758dc1fb19639b9da9c Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc RA layer request failed: OPTIONS of 'http://svn.webkit.org/repository/webkit': could not connect to server (http://svn.webkit.org) at /usr/lib/git-core/git-svn line 2295 Died at Tools/Scripts/update-webkit line 157. If any of these errors are false positives, please file a bug against check-webkit-style. 505441 9 115715 dino 2011-11-17 20:08:04 -0800 Comment on attachment 115715 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115715&action=review > Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp:1748 > +#if !defined(BUILDING_ON_SNOW_LEOPARD) && !PLATFORM(WIN) > + // Old versions of Core Animation apply animations in reverse order (<rdar://problem/7095638>) so we need to flip the list. > // to be non-additive. For binary compatibility, the current version of Core Animation preserves this behavior for applications linked Unless my diff decoding is faulty, you've got a "to be non-additive" empty sentence there, or an extra period on the line before. 505481 10 115715 webkit.review.bot 2011-11-17 21:43:05 -0800 Comment on attachment 115715 Patch Attachment 115715 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10511522 New failing tests: animations/3d/additive-transform-animations.html 506173 11 simon.fraser 2011-11-18 16:15:32 -0800 http://trac.webkit.org/changeset/100800 115650 2011-11-17 12:14:45 -0800 2011-11-17 17:37:42 -0800 Patch bug-72641-20111117121444.patch text/plain 8234 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWMxNjk3NzM2N2ExNThj MDYwNTI0MWM2ZWE0NmY0YjE2MTMxNDQ4My4uMzM0NjU2MTU2OGNmOWRlMGM4ZTQxYjExOGMyODVi NDQ1YWFkMmYxZCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDExLTExLTE3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFwcGVhcmFuY2Ug b2YgY29tcG91bmQgdHJhbnNmb3JtIGFuaW1hdGlvbnMgdW5kZXIgYXBwcyBsaW5rZWQgb24gU25v d0xlb3BhcmQgaXMgaW5jb3JyZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03MjY0MQorICAgICAgICBhbmQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzEwMzE0MjY3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEdyYXBoaWNzTGF5ZXJDQSBjb250YWlucyBhICJsaW5rZWQgb24gb3IgYWZ0ZXIiIGNoZWNr IHRvIGFjY291bnQgZm9yIGEgYnVnIGluCisgICAgICAgIENvcmUgQW5pbWF0aW9uIG9uIFNub3dM ZW9wYXJkIGFuZCBlYXJsaWVyLCB3aGljaCBpcyB0aGF0IENBIHdvdWxkIGFwcGx5IHRoZSBsaXN0 CisgICAgICAgIG9mIGFuaW1hdGlvbnMgaW4gcmV2ZXJzZSBvcmRlci4KKyAgICAgICAgCisgICAg ICAgIE91ciBwcmV2aW91cyBmaXggd2FzIGluY29ycmVjdCwgYmVjYXVzZSBpdCBvbmx5IGFkanVz dGVkIHRoZSAnYWRkaXRpdmUnIHByb3BlcnR5CisgICAgICAgIG9mIHRoZSBhbmltYXRpb24gbGlz dCBiYXNlZCBvbiBvcmRlcmluZywgcmF0aGVyIHRoYW4gZmxpcHBpbmcgdGhlIGVudGlyZSBsaXN0 LgorICAgICAgICAKKyAgICAgICAgVGhpcyBjaGFuZ2UgcmV2ZXJzZXMgdGhlIGxpc3Qgb2YgYW5p bWF0aW9ucyBiZWZvcmUgZ2l2aW5nIHRoZW0gdG8gQ0EsIHdoaWNoIGZpeGVzCisgICAgICAgIHRo ZSBidWcuCisKKyAgICAgICAgTm8gdGVzdHMsIGJlY2F1c2UgdGVzdGluZyB3b3VsZCByZXF1aXJl IHJ1bm5pbmcgdW5kZXIgYW4gYXBwIGxpbmtlZCBvbiBTbm93TGVvcGFyZC4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpHcmFwaGljc0xheWVyQ0E6OmFwcGVuZFRvVW5jb21taXR0ZWRBbmltYXRpb25zKToKKyAg ICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6Y3JlYXRlVHJhbnNmb3JtQW5pbWF0aW9u c0Zyb21LZXlmcmFtZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNz TGF5ZXJDQS5oOgorCiAyMDExLTExLTE3ICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBp Z2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIHBsdWdpbnMvZ2V0LXVybC1ub3RpZnktd2l0aC11 cmwtdGhhdC1mYWlscy10by1sb2FkLmh0bWwgb24gYm90cyBhZnRlciByMTAwNDY2CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0Eu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNB LmNwcAppbmRleCBiZWJhNGFhNWFiNzRiYmZmYjY2NDRmNjU2MWZjM2YwMGM0YjkzODVjLi4zMjY1 ZDczMDUxYzJmZGZiNmNiNjQwYWU1MjdlYjEyZDMxODBmNjhjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAKQEAg LTE2OTcsNiArMTY5NywyOSBAQCBib29sIEdyYXBoaWNzTGF5ZXJDQTo6Y3JlYXRlQW5pbWF0aW9u RnJvbUtleWZyYW1lcyhjb25zdCBLZXlmcmFtZVZhbHVlTGlzdCYgdmFsdQogICAgIHJldHVybiB0 cnVlOwogfQogCitib29sIEdyYXBoaWNzTGF5ZXJDQTo6YXBwZW5kVG9VbmNvbW1pdHRlZEFuaW1h dGlvbnMoY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmIHZhbHVlTGlzdCwgY29uc3QgVHJhbnNmb3Jt T3BlcmF0aW9uTGlzdCYgZnVuY3Rpb25MaXN0LCBjb25zdCBBbmltYXRpb24qIGFuaW1hdGlvbiwg Y29uc3QgU3RyaW5nJiBhbmltYXRpb25OYW1lLCBjb25zdCBJbnRTaXplJiBib3hTaXplLCBpbnQg YW5pbWF0aW9uSW5kZXgsIGRvdWJsZSB0aW1lT2Zmc2V0LCBib29sIGlzTWF0cml4QW5pbWF0aW9u KQoreworICAgIFRyYW5zZm9ybU9wZXJhdGlvbjo6T3BlcmF0aW9uVHlwZSB0cmFuc2Zvcm1PcCA9 IGlzTWF0cml4QW5pbWF0aW9uID8gVHJhbnNmb3JtT3BlcmF0aW9uOjpNQVRSSVhfM0QgOiBmdW5j dGlvbkxpc3RbYW5pbWF0aW9uSW5kZXhdOworICAgIGJvb2wgYWRkaXRpdmUgPSBhbmltYXRpb25J bmRleCA+IDA7CisgICAgYm9vbCBpc0tleWZyYW1lID0gdmFsdWVMaXN0LnNpemUoKSA+IDI7CisK KyAgICBSZWZQdHI8UGxhdGZvcm1DQUFuaW1hdGlvbj4gY2FBbmltYXRpb247CisgICAgYm9vbCB2 YWxpZE1hdHJpY2VzID0gdHJ1ZTsKKyAgICBpZiAoaXNLZXlmcmFtZSkgeworICAgICAgICBjYUFu aW1hdGlvbiA9IGNyZWF0ZUtleWZyYW1lQW5pbWF0aW9uKGFuaW1hdGlvbiwgdmFsdWVMaXN0LnBy b3BlcnR5KCksIGFkZGl0aXZlKTsKKyAgICAgICAgdmFsaWRNYXRyaWNlcyA9IHNldFRyYW5zZm9y bUFuaW1hdGlvbktleWZyYW1lcyh2YWx1ZUxpc3QsIGFuaW1hdGlvbiwgY2FBbmltYXRpb24uZ2V0 KCksIGFuaW1hdGlvbkluZGV4LCB0cmFuc2Zvcm1PcCwgaXNNYXRyaXhBbmltYXRpb24sIGJveFNp emUpOworICAgIH0gZWxzZSB7CisgICAgICAgIGNhQW5pbWF0aW9uID0gY3JlYXRlQmFzaWNBbmlt YXRpb24oYW5pbWF0aW9uLCB2YWx1ZUxpc3QucHJvcGVydHkoKSwgYWRkaXRpdmUpOworICAgICAg ICB2YWxpZE1hdHJpY2VzID0gc2V0VHJhbnNmb3JtQW5pbWF0aW9uRW5kcG9pbnRzKHZhbHVlTGlz dCwgYW5pbWF0aW9uLCBjYUFuaW1hdGlvbi5nZXQoKSwgYW5pbWF0aW9uSW5kZXgsIHRyYW5zZm9y bU9wLCBpc01hdHJpeEFuaW1hdGlvbiwgYm94U2l6ZSk7CisgICAgfQorICAgIAorICAgIGlmICgh dmFsaWRNYXRyaWNlcykKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgbV91bmNvbWl0dGVk QW5pbWF0aW9ucy5hcHBlbmQoTGF5ZXJQcm9wZXJ0eUFuaW1hdGlvbihjYUFuaW1hdGlvbiwgYW5p bWF0aW9uTmFtZSwgdmFsdWVMaXN0LnByb3BlcnR5KCksIGFuaW1hdGlvbkluZGV4LCB0aW1lT2Zm c2V0KSk7CisgICAgcmV0dXJuIHRydWU7Cit9CisKIGJvb2wgR3JhcGhpY3NMYXllckNBOjpjcmVh dGVUcmFuc2Zvcm1BbmltYXRpb25zRnJvbUtleWZyYW1lcyhjb25zdCBLZXlmcmFtZVZhbHVlTGlz dCYgdmFsdWVMaXN0LCBjb25zdCBBbmltYXRpb24qIGFuaW1hdGlvbiwgY29uc3QgU3RyaW5nJiBh bmltYXRpb25OYW1lLCBkb3VibGUgdGltZU9mZnNldCwgY29uc3QgSW50U2l6ZSYgYm94U2l6ZSkK IHsKICAgICBBU1NFUlQodmFsdWVMaXN0LnByb3BlcnR5KCkgPT0gQW5pbWF0ZWRQcm9wZXJ0eVdl YmtpdFRyYW5zZm9ybSk7CkBAIC0xNzE3LDQxICsxNzQwLDMzIEBAIGJvb2wgR3JhcGhpY3NMYXll ckNBOjpjcmVhdGVUcmFuc2Zvcm1BbmltYXRpb25zRnJvbUtleWZyYW1lcyhjb25zdCBLZXlmcmFt ZVZhbHVlCiAgICAgLy8gQWxzbywgd2UgY2FuJ3QgZG8gY29tcG9uZW50IGFuaW1hdGlvbiB1bmxl c3Mgd2UgaGF2ZSB2YWx1ZUZ1bmN0aW9uLCBzbyB3ZSBuZWVkIHRvIGRvIG1hdHJpeCBhbmltYXRp b24KICAgICAvLyBpZiB0aGF0J3Mgbm90IHRydWUgYXMgd2VsbC4KICAgICBib29sIGlzTWF0cml4 QW5pbWF0aW9uID0gIWxpc3RzTWF0Y2ggfHwgIVBsYXRmb3JtQ0FBbmltYXRpb246OnN1cHBvcnRz VmFsdWVGdW5jdGlvbigpOwotICAgIAotICAgIHNpemVfdCBudW1BbmltYXRpb25zID0gaXNNYXRy aXhBbmltYXRpb24gPyAxIDogZnVuY3Rpb25MaXN0LnNpemUoKTsKLSAgICBib29sIGlzS2V5ZnJh bWUgPSB2YWx1ZUxpc3Quc2l6ZSgpID4gMjsKLSAgICAKLSAgICAvLyBJdGVyYXRlIHRocm91Z2gg dGhlIHRyYW5zZm9ybSBmdW5jdGlvbnMsIHNlbmRpbmcgYW4gYW5pbWF0aW9uIGZvciBlYWNoIG9u ZS4KLSAgICBmb3IgKHNpemVfdCBhbmltYXRpb25JbmRleCA9IDA7IGFuaW1hdGlvbkluZGV4IDwg bnVtQW5pbWF0aW9uczsgKythbmltYXRpb25JbmRleCkgewotICAgICAgICBUcmFuc2Zvcm1PcGVy YXRpb246Ok9wZXJhdGlvblR5cGUgdHJhbnNmb3JtT3AgPSBpc01hdHJpeEFuaW1hdGlvbiA/IFRy YW5zZm9ybU9wZXJhdGlvbjo6TUFUUklYXzNEIDogZnVuY3Rpb25MaXN0W2FuaW1hdGlvbkluZGV4 XTsKLSAgICAgICAgUmVmUHRyPFBsYXRmb3JtQ0FBbmltYXRpb24+IGNhQW5pbWF0aW9uOworICAg IGludCBudW1BbmltYXRpb25zID0gaXNNYXRyaXhBbmltYXRpb24gPyAxIDogZnVuY3Rpb25MaXN0 LnNpemUoKTsKIAotICAgICAgICBib29sIGFkZGl0aXZlOwotI2lmICFkZWZpbmVkKEJVSUxESU5H X09OX0xFT1BBUkQpICYmICFkZWZpbmVkKEJVSUxESU5HX09OX1NOT1dfTEVPUEFSRCkgJiYgIVBM QVRGT1JNKFdJTikKLSAgICAgICAgLy8gT2xkIHZlcnNpb25zIG9mIENvcmUgQW5pbWF0aW9uIGFw cGx5IGFuaW1hdGlvbnMgaW4gcmV2ZXJzZSBvcmRlciAoPHJkYXI6Ly9wcm9ibGVtLzcwOTU2Mzg+ KSBzbyB3ZSBuZWVkIHRoZSBsYXN0IG9uZSB3ZSBhZGQgKHBlciBwcm9wZXJ0eSkKKyAgICBib29s IHJldmVyc2VBbmltYXRpb25MaXN0ID0gdHJ1ZTsKKyNpZiAhZGVmaW5lZChCVUlMRElOR19PTl9T Tk9XX0xFT1BBUkQpICYmICFQTEFURk9STShXSU4pCisgICAgICAgIC8vIE9sZCB2ZXJzaW9ucyBv ZiBDb3JlIEFuaW1hdGlvbiBhcHBseSBhbmltYXRpb25zIGluIHJldmVyc2Ugb3JkZXIgKDxyZGFy Oi8vcHJvYmxlbS83MDk1NjM4Pikgc28gd2UgbmVlZCB0byBmbGlwIHRoZSBsaXN0LgogICAgICAg ICAvLyB0byBiZSBub24tYWRkaXRpdmUuIEZvciBiaW5hcnkgY29tcGF0aWJpbGl0eSwgdGhlIGN1 cnJlbnQgdmVyc2lvbiBvZiBDb3JlIEFuaW1hdGlvbiBwcmVzZXJ2ZXMgdGhpcyBiZWhhdmlvciBm b3IgYXBwbGljYXRpb25zIGxpbmtlZAogICAgICAgICAvLyBvbiBvciBiZWZvcmUgU25vdyBMZW9w YXJkLgogICAgICAgICAvLyBGSVhNRTogVGhpcyBmaXggaGFzIG5vdCBiZWVuIGFkZGVkIHRvIFF1 YXJ0ekNvcmUgb24gV2luZG93cyB5ZXQgKDxyZGFyOi8vcHJvYmxlbS85MTEyMjMzPikgc28gd2Ug ZXhwZWN0IHRoZQogICAgICAgICAvLyByZXZlcnNlZCBhbmltYXRpb24gYmVoYXZpb3IKICAgICAg ICAgc3RhdGljIGJvb2wgZXhlY3V0YWJsZVdhc0xpbmtlZE9uT3JCZWZvcmVTbm93TGVvcGFyZCA9 IHdrRXhlY3V0YWJsZVdhc0xpbmtlZE9uT3JCZWZvcmVTbm93TGVvcGFyZCgpOwogICAgICAgICBp ZiAoIWV4ZWN1dGFibGVXYXNMaW5rZWRPbk9yQmVmb3JlU25vd0xlb3BhcmQpCi0gICAgICAgICAg ICBhZGRpdGl2ZSA9IGFuaW1hdGlvbkluZGV4ID4gMDsKLSAgICAgICAgZWxzZQorICAgICAgICAg ICAgcmV2ZXJzZUFuaW1hdGlvbkxpc3QgPSBmYWxzZTsKICNlbmRpZgotICAgICAgICAgICAgYWRk aXRpdmUgPSBhbmltYXRpb25JbmRleCA8IChudW1BbmltYXRpb25zIC0gMSk7Ci0KLSAgICAgICAg aWYgKGlzS2V5ZnJhbWUpIHsKLSAgICAgICAgICAgIGNhQW5pbWF0aW9uID0gY3JlYXRlS2V5ZnJh bWVBbmltYXRpb24oYW5pbWF0aW9uLCB2YWx1ZUxpc3QucHJvcGVydHkoKSwgYWRkaXRpdmUpOwot ICAgICAgICAgICAgdmFsaWRNYXRyaWNlcyA9IHNldFRyYW5zZm9ybUFuaW1hdGlvbktleWZyYW1l cyh2YWx1ZUxpc3QsIGFuaW1hdGlvbiwgY2FBbmltYXRpb24uZ2V0KCksIGFuaW1hdGlvbkluZGV4 LCB0cmFuc2Zvcm1PcCwgaXNNYXRyaXhBbmltYXRpb24sIGJveFNpemUpOwotICAgICAgICB9IGVs c2UgewotICAgICAgICAgICAgY2FBbmltYXRpb24gPSBjcmVhdGVCYXNpY0FuaW1hdGlvbihhbmlt YXRpb24sIHZhbHVlTGlzdC5wcm9wZXJ0eSgpLCBhZGRpdGl2ZSk7Ci0gICAgICAgICAgICB2YWxp ZE1hdHJpY2VzID0gc2V0VHJhbnNmb3JtQW5pbWF0aW9uRW5kcG9pbnRzKHZhbHVlTGlzdCwgYW5p bWF0aW9uLCBjYUFuaW1hdGlvbi5nZXQoKSwgYW5pbWF0aW9uSW5kZXgsIHRyYW5zZm9ybU9wLCBp c01hdHJpeEFuaW1hdGlvbiwgYm94U2l6ZSk7CisgICAgaWYgKHJldmVyc2VBbmltYXRpb25MaXN0 KSB7CisgICAgICAgIGZvciAoaW50IGFuaW1hdGlvbkluZGV4ID0gbnVtQW5pbWF0aW9ucyAtIDE7 IGFuaW1hdGlvbkluZGV4ID49IDA7IC0tYW5pbWF0aW9uSW5kZXgpIHsKKyAgICAgICAgICAgIGlm ICghYXBwZW5kVG9VbmNvbW1pdHRlZEFuaW1hdGlvbnModmFsdWVMaXN0LCBmdW5jdGlvbkxpc3Qs IGFuaW1hdGlvbiwgYW5pbWF0aW9uTmFtZSwgYm94U2l6ZSwgYW5pbWF0aW9uSW5kZXgsIHRpbWVP ZmZzZXQsIGlzTWF0cml4QW5pbWF0aW9uKSkgeworICAgICAgICAgICAgICAgIHZhbGlkTWF0cmlj ZXMgPSBmYWxzZTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgfQorICAgIH0gZWxzZSB7CisgICAgICAgIGZvciAoaW50IGFuaW1hdGlvbkluZGV4ID0gMDsg YW5pbWF0aW9uSW5kZXggPCBudW1BbmltYXRpb25zOyArK2FuaW1hdGlvbkluZGV4KSB7CisgICAg ICAgICAgICBpZiAoIWFwcGVuZFRvVW5jb21taXR0ZWRBbmltYXRpb25zKHZhbHVlTGlzdCwgZnVu Y3Rpb25MaXN0LCBhbmltYXRpb24sIGFuaW1hdGlvbk5hbWUsIGJveFNpemUsIGFuaW1hdGlvbklu ZGV4LCB0aW1lT2Zmc2V0LCBpc01hdHJpeEFuaW1hdGlvbikpIHsKKyAgICAgICAgICAgICAgICB2 YWxpZE1hdHJpY2VzID0gZmFsc2U7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAg ICB9CiAgICAgICAgIH0KLSAgICAgICAgCi0gICAgICAgIGlmICghdmFsaWRNYXRyaWNlcykKLSAg ICAgICAgICAgIGJyZWFrOwotICAgIAotICAgICAgICBtX3VuY29taXR0ZWRBbmltYXRpb25zLmFw cGVuZChMYXllclByb3BlcnR5QW5pbWF0aW9uKGNhQW5pbWF0aW9uLCBhbmltYXRpb25OYW1lLCB2 YWx1ZUxpc3QucHJvcGVydHkoKSwgYW5pbWF0aW9uSW5kZXgsIHRpbWVPZmZzZXQpKTsKICAgICB9 CiAKICAgICByZXR1cm4gdmFsaWRNYXRyaWNlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKaW5kZXggMTUyM2RhN2MyMmMx MDNlNTk4N2UxZWYyZjJhM2NkNGVkMTQ0ZjFhNi4uY2Y3NjM2NGFjOGY0ODY0ZTNiYWFkOTU0Mzcy NTdiOGE5MmU0Y2NjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvR3JhcGhpY3NMYXllckNBLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKQEAgLTMxMyw2ICszMTMsOCBAQCBwcml2YXRlOgog ICAgIHN0YXRpYyB2b2lkIG1vdmVPckNvcHlMYXllckFuaW1hdGlvbihNb3ZlT3JDb3B5LCBjb25z dCBTdHJpbmcmIGFuaW1hdGlvbklkZW50aWZpZXIsIFBsYXRmb3JtQ0FMYXllciAqZnJvbUxheWVy LCBQbGF0Zm9ybUNBTGF5ZXIgKnRvTGF5ZXIpOwogICAgIHZvaWQgbW92ZU9yQ29weUFuaW1hdGlv bnNGb3JQcm9wZXJ0eShNb3ZlT3JDb3B5LCBBbmltYXRlZFByb3BlcnR5SUQsIFBsYXRmb3JtQ0FM YXllciAqIGZyb21MYXllciwgUGxhdGZvcm1DQUxheWVyICogdG9MYXllcik7CiAgICAgCisgICAg Ym9vbCBhcHBlbmRUb1VuY29tbWl0dGVkQW5pbWF0aW9ucyhjb25zdCBLZXlmcmFtZVZhbHVlTGlz dCYsIGNvbnN0IFRyYW5zZm9ybU9wZXJhdGlvbkxpc3QmLCBjb25zdCBBbmltYXRpb24qLCBjb25z dCBTdHJpbmcmIGFuaW1hdGlvbk5hbWUsIGNvbnN0IEludFNpemUmIGJveFNpemUsIGludCBhbmlt YXRpb25JbmRleCwgZG91YmxlIHRpbWVPZmZzZXQsIGJvb2wgaXNNYXRyaXhBbmltYXRpb24pOwor ICAgIAogICAgIGVudW0gTGF5ZXJDaGFuZ2UgewogICAgICAgICBOb0NoYW5nZSA9IDAsCiAgICAg ICAgIE5hbWVDaGFuZ2VkID0gMSA8PCAxLAo= 115715 2011-11-17 17:37:46 -0800 2011-11-17 21:43:05 -0800 Patch bug-72641-20111117173745.patch text/plain 13955 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWMxNjk3NzM2N2ExNThj MDYwNTI0MWM2ZWE0NmY0YjE2MTMxNDQ4My4uMTdkNDliNDQ0YWI3YzQ0MTdhNGUzMmYxZjA5OWRh NWVlY2NhMjM2NyAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDExLTExLTE3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFwcGVhcmFuY2Ug b2YgY29tcG91bmQgdHJhbnNmb3JtIGFuaW1hdGlvbnMgdW5kZXIgYXBwcyBsaW5rZWQgb24gU25v d0xlb3BhcmQgaXMgaW5jb3JyZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03MjY0MQorICAgICAgICBhbmQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzEwMzE0MjY3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEdyYXBoaWNzTGF5ZXJDQSBjb250YWlucyBhICJsaW5rZWQgb24gb3IgYWZ0ZXIiIGNoZWNr IHRvIGFjY291bnQgZm9yIGEgYnVnIGluCisgICAgICAgIENvcmUgQW5pbWF0aW9uIG9uIFNub3dM ZW9wYXJkIGFuZCBlYXJsaWVyLCB3aGljaCBpcyB0aGF0IENBIHdvdWxkIGFwcGx5IHRoZSBsaXN0 CisgICAgICAgIG9mIGFuaW1hdGlvbnMgaW4gcmV2ZXJzZSBvcmRlci4KKyAgICAgICAgCisgICAg ICAgIE91ciBwcmV2aW91cyBmaXggd2FzIGluY29ycmVjdCwgYmVjYXVzZSBpdCBvbmx5IGFkanVz dGVkIHRoZSAnYWRkaXRpdmUnIHByb3BlcnR5CisgICAgICAgIG9mIHRoZSBhbmltYXRpb24gbGlz dCBiYXNlZCBvbiBvcmRlcmluZywgcmF0aGVyIHRoYW4gZmxpcHBpbmcgdGhlIGVudGlyZSBsaXN0 LgorICAgICAgICBUaGlzIGNoYW5nZSByZXZlcnNlcyB0aGUgbGlzdCBvZiBhbmltYXRpb25zIGJl Zm9yZSBnaXZpbmcgdGhlbSB0byBDQSwgd2hpY2ggZml4ZXMKKyAgICAgICAgdGhlIGJ1Zy4KKyAg ICAgICAgICAgICAgICAKKyAgICAgICAgVGVzdDogYW5pbWF0aW9ucy8zZC9hZGRpdGl2ZS10cmFu c2Zvcm0tYW5pbWF0aW9ucy5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9H cmFwaGljc0xheWVyQ0EuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNBOjph cHBlbmRUb1VuY29tbWl0dGVkQW5pbWF0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0xheWVyQ0E6OmNyZWF0ZVRyYW5zZm9ybUFuaW1hdGlvbnNGcm9tS2V5ZnJhbWVzKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaDoKKwogMjAxMS0xMS0x NyAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBb R1RLXSBwbHVnaW5zL2dldC11cmwtbm90aWZ5LXdpdGgtdXJsLXRoYXQtZmFpbHMtdG8tbG9hZC5o dG1sIG9uIGJvdHMgYWZ0ZXIgcjEwMDQ2NgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAKaW5kZXggYmViYTRhYTVhYjc0 YmJmZmI2NjQ0ZjY1NjFmYzNmMDBjNGI5Mzg1Yy4uMzI2NWQ3MzA1MWMyZmRmYjZjYjY0MGFlNTI3 ZWIxMmQzMTgwZjY4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCkBAIC0xNjk3LDYgKzE2OTcsMjkgQEAgYm9v bCBHcmFwaGljc0xheWVyQ0E6OmNyZWF0ZUFuaW1hdGlvbkZyb21LZXlmcmFtZXMoY29uc3QgS2V5 ZnJhbWVWYWx1ZUxpc3QmIHZhbHUKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorYm9vbCBHcmFwaGlj c0xheWVyQ0E6OmFwcGVuZFRvVW5jb21taXR0ZWRBbmltYXRpb25zKGNvbnN0IEtleWZyYW1lVmFs dWVMaXN0JiB2YWx1ZUxpc3QsIGNvbnN0IFRyYW5zZm9ybU9wZXJhdGlvbkxpc3QmIGZ1bmN0aW9u TGlzdCwgY29uc3QgQW5pbWF0aW9uKiBhbmltYXRpb24sIGNvbnN0IFN0cmluZyYgYW5pbWF0aW9u TmFtZSwgY29uc3QgSW50U2l6ZSYgYm94U2l6ZSwgaW50IGFuaW1hdGlvbkluZGV4LCBkb3VibGUg dGltZU9mZnNldCwgYm9vbCBpc01hdHJpeEFuaW1hdGlvbikKK3sKKyAgICBUcmFuc2Zvcm1PcGVy YXRpb246Ok9wZXJhdGlvblR5cGUgdHJhbnNmb3JtT3AgPSBpc01hdHJpeEFuaW1hdGlvbiA/IFRy YW5zZm9ybU9wZXJhdGlvbjo6TUFUUklYXzNEIDogZnVuY3Rpb25MaXN0W2FuaW1hdGlvbkluZGV4 XTsKKyAgICBib29sIGFkZGl0aXZlID0gYW5pbWF0aW9uSW5kZXggPiAwOworICAgIGJvb2wgaXNL ZXlmcmFtZSA9IHZhbHVlTGlzdC5zaXplKCkgPiAyOworCisgICAgUmVmUHRyPFBsYXRmb3JtQ0FB bmltYXRpb24+IGNhQW5pbWF0aW9uOworICAgIGJvb2wgdmFsaWRNYXRyaWNlcyA9IHRydWU7Cisg ICAgaWYgKGlzS2V5ZnJhbWUpIHsKKyAgICAgICAgY2FBbmltYXRpb24gPSBjcmVhdGVLZXlmcmFt ZUFuaW1hdGlvbihhbmltYXRpb24sIHZhbHVlTGlzdC5wcm9wZXJ0eSgpLCBhZGRpdGl2ZSk7Cisg ICAgICAgIHZhbGlkTWF0cmljZXMgPSBzZXRUcmFuc2Zvcm1BbmltYXRpb25LZXlmcmFtZXModmFs dWVMaXN0LCBhbmltYXRpb24sIGNhQW5pbWF0aW9uLmdldCgpLCBhbmltYXRpb25JbmRleCwgdHJh bnNmb3JtT3AsIGlzTWF0cml4QW5pbWF0aW9uLCBib3hTaXplKTsKKyAgICB9IGVsc2UgeworICAg ICAgICBjYUFuaW1hdGlvbiA9IGNyZWF0ZUJhc2ljQW5pbWF0aW9uKGFuaW1hdGlvbiwgdmFsdWVM aXN0LnByb3BlcnR5KCksIGFkZGl0aXZlKTsKKyAgICAgICAgdmFsaWRNYXRyaWNlcyA9IHNldFRy YW5zZm9ybUFuaW1hdGlvbkVuZHBvaW50cyh2YWx1ZUxpc3QsIGFuaW1hdGlvbiwgY2FBbmltYXRp b24uZ2V0KCksIGFuaW1hdGlvbkluZGV4LCB0cmFuc2Zvcm1PcCwgaXNNYXRyaXhBbmltYXRpb24s IGJveFNpemUpOworICAgIH0KKyAgICAKKyAgICBpZiAoIXZhbGlkTWF0cmljZXMpCisgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgIG1fdW5jb21pdHRlZEFuaW1hdGlvbnMuYXBwZW5kKExheWVy UHJvcGVydHlBbmltYXRpb24oY2FBbmltYXRpb24sIGFuaW1hdGlvbk5hbWUsIHZhbHVlTGlzdC5w cm9wZXJ0eSgpLCBhbmltYXRpb25JbmRleCwgdGltZU9mZnNldCkpOworICAgIHJldHVybiB0cnVl OworfQorCiBib29sIEdyYXBoaWNzTGF5ZXJDQTo6Y3JlYXRlVHJhbnNmb3JtQW5pbWF0aW9uc0Zy b21LZXlmcmFtZXMoY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmIHZhbHVlTGlzdCwgY29uc3QgQW5p bWF0aW9uKiBhbmltYXRpb24sIGNvbnN0IFN0cmluZyYgYW5pbWF0aW9uTmFtZSwgZG91YmxlIHRp bWVPZmZzZXQsIGNvbnN0IEludFNpemUmIGJveFNpemUpCiB7CiAgICAgQVNTRVJUKHZhbHVlTGlz dC5wcm9wZXJ0eSgpID09IEFuaW1hdGVkUHJvcGVydHlXZWJraXRUcmFuc2Zvcm0pOwpAQCAtMTcx Nyw0MSArMTc0MCwzMyBAQCBib29sIEdyYXBoaWNzTGF5ZXJDQTo6Y3JlYXRlVHJhbnNmb3JtQW5p bWF0aW9uc0Zyb21LZXlmcmFtZXMoY29uc3QgS2V5ZnJhbWVWYWx1ZQogICAgIC8vIEFsc28sIHdl IGNhbid0IGRvIGNvbXBvbmVudCBhbmltYXRpb24gdW5sZXNzIHdlIGhhdmUgdmFsdWVGdW5jdGlv biwgc28gd2UgbmVlZCB0byBkbyBtYXRyaXggYW5pbWF0aW9uCiAgICAgLy8gaWYgdGhhdCdzIG5v dCB0cnVlIGFzIHdlbGwuCiAgICAgYm9vbCBpc01hdHJpeEFuaW1hdGlvbiA9ICFsaXN0c01hdGNo IHx8ICFQbGF0Zm9ybUNBQW5pbWF0aW9uOjpzdXBwb3J0c1ZhbHVlRnVuY3Rpb24oKTsKLSAgICAK LSAgICBzaXplX3QgbnVtQW5pbWF0aW9ucyA9IGlzTWF0cml4QW5pbWF0aW9uID8gMSA6IGZ1bmN0 aW9uTGlzdC5zaXplKCk7Ci0gICAgYm9vbCBpc0tleWZyYW1lID0gdmFsdWVMaXN0LnNpemUoKSA+ IDI7Ci0gICAgCi0gICAgLy8gSXRlcmF0ZSB0aHJvdWdoIHRoZSB0cmFuc2Zvcm0gZnVuY3Rpb25z LCBzZW5kaW5nIGFuIGFuaW1hdGlvbiBmb3IgZWFjaCBvbmUuCi0gICAgZm9yIChzaXplX3QgYW5p bWF0aW9uSW5kZXggPSAwOyBhbmltYXRpb25JbmRleCA8IG51bUFuaW1hdGlvbnM7ICsrYW5pbWF0 aW9uSW5kZXgpIHsKLSAgICAgICAgVHJhbnNmb3JtT3BlcmF0aW9uOjpPcGVyYXRpb25UeXBlIHRy YW5zZm9ybU9wID0gaXNNYXRyaXhBbmltYXRpb24gPyBUcmFuc2Zvcm1PcGVyYXRpb246Ok1BVFJJ WF8zRCA6IGZ1bmN0aW9uTGlzdFthbmltYXRpb25JbmRleF07Ci0gICAgICAgIFJlZlB0cjxQbGF0 Zm9ybUNBQW5pbWF0aW9uPiBjYUFuaW1hdGlvbjsKKyAgICBpbnQgbnVtQW5pbWF0aW9ucyA9IGlz TWF0cml4QW5pbWF0aW9uID8gMSA6IGZ1bmN0aW9uTGlzdC5zaXplKCk7CiAKLSAgICAgICAgYm9v bCBhZGRpdGl2ZTsKLSNpZiAhZGVmaW5lZChCVUlMRElOR19PTl9MRU9QQVJEKSAmJiAhZGVmaW5l ZChCVUlMRElOR19PTl9TTk9XX0xFT1BBUkQpICYmICFQTEFURk9STShXSU4pCi0gICAgICAgIC8v IE9sZCB2ZXJzaW9ucyBvZiBDb3JlIEFuaW1hdGlvbiBhcHBseSBhbmltYXRpb25zIGluIHJldmVy c2Ugb3JkZXIgKDxyZGFyOi8vcHJvYmxlbS83MDk1NjM4Pikgc28gd2UgbmVlZCB0aGUgbGFzdCBv bmUgd2UgYWRkIChwZXIgcHJvcGVydHkpCisgICAgYm9vbCByZXZlcnNlQW5pbWF0aW9uTGlzdCA9 IHRydWU7CisjaWYgIWRlZmluZWQoQlVJTERJTkdfT05fU05PV19MRU9QQVJEKSAmJiAhUExBVEZP Uk0oV0lOKQorICAgICAgICAvLyBPbGQgdmVyc2lvbnMgb2YgQ29yZSBBbmltYXRpb24gYXBwbHkg YW5pbWF0aW9ucyBpbiByZXZlcnNlIG9yZGVyICg8cmRhcjovL3Byb2JsZW0vNzA5NTYzOD4pIHNv IHdlIG5lZWQgdG8gZmxpcCB0aGUgbGlzdC4KICAgICAgICAgLy8gdG8gYmUgbm9uLWFkZGl0aXZl LiBGb3IgYmluYXJ5IGNvbXBhdGliaWxpdHksIHRoZSBjdXJyZW50IHZlcnNpb24gb2YgQ29yZSBB bmltYXRpb24gcHJlc2VydmVzIHRoaXMgYmVoYXZpb3IgZm9yIGFwcGxpY2F0aW9ucyBsaW5rZWQK ICAgICAgICAgLy8gb24gb3IgYmVmb3JlIFNub3cgTGVvcGFyZC4KICAgICAgICAgLy8gRklYTUU6 IFRoaXMgZml4IGhhcyBub3QgYmVlbiBhZGRlZCB0byBRdWFydHpDb3JlIG9uIFdpbmRvd3MgeWV0 ICg8cmRhcjovL3Byb2JsZW0vOTExMjIzMz4pIHNvIHdlIGV4cGVjdCB0aGUKICAgICAgICAgLy8g cmV2ZXJzZWQgYW5pbWF0aW9uIGJlaGF2aW9yCiAgICAgICAgIHN0YXRpYyBib29sIGV4ZWN1dGFi bGVXYXNMaW5rZWRPbk9yQmVmb3JlU25vd0xlb3BhcmQgPSB3a0V4ZWN1dGFibGVXYXNMaW5rZWRP bk9yQmVmb3JlU25vd0xlb3BhcmQoKTsKICAgICAgICAgaWYgKCFleGVjdXRhYmxlV2FzTGlua2Vk T25PckJlZm9yZVNub3dMZW9wYXJkKQotICAgICAgICAgICAgYWRkaXRpdmUgPSBhbmltYXRpb25J bmRleCA+IDA7Ci0gICAgICAgIGVsc2UKKyAgICAgICAgICAgIHJldmVyc2VBbmltYXRpb25MaXN0 ID0gZmFsc2U7CiAjZW5kaWYKLSAgICAgICAgICAgIGFkZGl0aXZlID0gYW5pbWF0aW9uSW5kZXgg PCAobnVtQW5pbWF0aW9ucyAtIDEpOwotCi0gICAgICAgIGlmIChpc0tleWZyYW1lKSB7Ci0gICAg ICAgICAgICBjYUFuaW1hdGlvbiA9IGNyZWF0ZUtleWZyYW1lQW5pbWF0aW9uKGFuaW1hdGlvbiwg dmFsdWVMaXN0LnByb3BlcnR5KCksIGFkZGl0aXZlKTsKLSAgICAgICAgICAgIHZhbGlkTWF0cmlj ZXMgPSBzZXRUcmFuc2Zvcm1BbmltYXRpb25LZXlmcmFtZXModmFsdWVMaXN0LCBhbmltYXRpb24s IGNhQW5pbWF0aW9uLmdldCgpLCBhbmltYXRpb25JbmRleCwgdHJhbnNmb3JtT3AsIGlzTWF0cml4 QW5pbWF0aW9uLCBib3hTaXplKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGNhQW5p bWF0aW9uID0gY3JlYXRlQmFzaWNBbmltYXRpb24oYW5pbWF0aW9uLCB2YWx1ZUxpc3QucHJvcGVy dHkoKSwgYWRkaXRpdmUpOwotICAgICAgICAgICAgdmFsaWRNYXRyaWNlcyA9IHNldFRyYW5zZm9y bUFuaW1hdGlvbkVuZHBvaW50cyh2YWx1ZUxpc3QsIGFuaW1hdGlvbiwgY2FBbmltYXRpb24uZ2V0 KCksIGFuaW1hdGlvbkluZGV4LCB0cmFuc2Zvcm1PcCwgaXNNYXRyaXhBbmltYXRpb24sIGJveFNp emUpOworICAgIGlmIChyZXZlcnNlQW5pbWF0aW9uTGlzdCkgeworICAgICAgICBmb3IgKGludCBh bmltYXRpb25JbmRleCA9IG51bUFuaW1hdGlvbnMgLSAxOyBhbmltYXRpb25JbmRleCA+PSAwOyAt LWFuaW1hdGlvbkluZGV4KSB7CisgICAgICAgICAgICBpZiAoIWFwcGVuZFRvVW5jb21taXR0ZWRB bmltYXRpb25zKHZhbHVlTGlzdCwgZnVuY3Rpb25MaXN0LCBhbmltYXRpb24sIGFuaW1hdGlvbk5h bWUsIGJveFNpemUsIGFuaW1hdGlvbkluZGV4LCB0aW1lT2Zmc2V0LCBpc01hdHJpeEFuaW1hdGlv bikpIHsKKyAgICAgICAgICAgICAgICB2YWxpZE1hdHJpY2VzID0gZmFsc2U7CisgICAgICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9IGVsc2UgeworICAg ICAgICBmb3IgKGludCBhbmltYXRpb25JbmRleCA9IDA7IGFuaW1hdGlvbkluZGV4IDwgbnVtQW5p bWF0aW9uczsgKythbmltYXRpb25JbmRleCkgeworICAgICAgICAgICAgaWYgKCFhcHBlbmRUb1Vu Y29tbWl0dGVkQW5pbWF0aW9ucyh2YWx1ZUxpc3QsIGZ1bmN0aW9uTGlzdCwgYW5pbWF0aW9uLCBh bmltYXRpb25OYW1lLCBib3hTaXplLCBhbmltYXRpb25JbmRleCwgdGltZU9mZnNldCwgaXNNYXRy aXhBbmltYXRpb24pKSB7CisgICAgICAgICAgICAgICAgdmFsaWRNYXRyaWNlcyA9IGZhbHNlOwor ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgICAg IAotICAgICAgICBpZiAoIXZhbGlkTWF0cmljZXMpCi0gICAgICAgICAgICBicmVhazsKLSAgICAK LSAgICAgICAgbV91bmNvbWl0dGVkQW5pbWF0aW9ucy5hcHBlbmQoTGF5ZXJQcm9wZXJ0eUFuaW1h dGlvbihjYUFuaW1hdGlvbiwgYW5pbWF0aW9uTmFtZSwgdmFsdWVMaXN0LnByb3BlcnR5KCksIGFu aW1hdGlvbkluZGV4LCB0aW1lT2Zmc2V0KSk7CiAgICAgfQogCiAgICAgcmV0dXJuIHZhbGlkTWF0 cmljZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9H cmFwaGljc0xheWVyQ0EuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dy YXBoaWNzTGF5ZXJDQS5oCmluZGV4IDE1MjNkYTdjMjJjMTAzZTU5ODdlMWVmMmYyYTNjZDRlZDE0 NGYxYTYuLmNmNzYzNjRhYzhmNDg2NGUzYmFhZDk1NDM3MjU3YjhhOTJlNGNjYzggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJD QS5oCkBAIC0zMTMsNiArMzEzLDggQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCBtb3ZlT3JD b3B5TGF5ZXJBbmltYXRpb24oTW92ZU9yQ29weSwgY29uc3QgU3RyaW5nJiBhbmltYXRpb25JZGVu dGlmaWVyLCBQbGF0Zm9ybUNBTGF5ZXIgKmZyb21MYXllciwgUGxhdGZvcm1DQUxheWVyICp0b0xh eWVyKTsKICAgICB2b2lkIG1vdmVPckNvcHlBbmltYXRpb25zRm9yUHJvcGVydHkoTW92ZU9yQ29w eSwgQW5pbWF0ZWRQcm9wZXJ0eUlELCBQbGF0Zm9ybUNBTGF5ZXIgKiBmcm9tTGF5ZXIsIFBsYXRm b3JtQ0FMYXllciAqIHRvTGF5ZXIpOwogICAgIAorICAgIGJvb2wgYXBwZW5kVG9VbmNvbW1pdHRl ZEFuaW1hdGlvbnMoY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmLCBjb25zdCBUcmFuc2Zvcm1PcGVy YXRpb25MaXN0JiwgY29uc3QgQW5pbWF0aW9uKiwgY29uc3QgU3RyaW5nJiBhbmltYXRpb25OYW1l LCBjb25zdCBJbnRTaXplJiBib3hTaXplLCBpbnQgYW5pbWF0aW9uSW5kZXgsIGRvdWJsZSB0aW1l T2Zmc2V0LCBib29sIGlzTWF0cml4QW5pbWF0aW9uKTsKKyAgICAKICAgICBlbnVtIExheWVyQ2hh bmdlIHsKICAgICAgICAgTm9DaGFuZ2UgPSAwLAogICAgICAgICBOYW1lQ2hhbmdlZCA9IDEgPDwg MSwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwppbmRleCBjZWIxNjY4MmRjMTgxMDk0YjJjMDExNGEzOTEzNTdmMmU5NjMxZTY1Li44NjA3 MDg2ZTIyOWU2YWNlNzc3OWY3ZTI3NzMyYTI0NjVkMmRjN2I1IDEwMDc1NQotLS0gYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMTEtMTcgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisK KyAgICAgICAgQXBwZWFyYW5jZSBvZiBjb21wb3VuZCB0cmFuc2Zvcm0gYW5pbWF0aW9ucyB1bmRl ciBhcHBzIGxpbmtlZCBvbiBTbm93TGVvcGFyZCBpcyBpbmNvcnJlY3QKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyNjQxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBQaXhlbCB0ZXN0IGZvciBh IGhhcmR3YXJlLWFuaW1hdGVkIHRyYW5mb3JtLCB3aGVyZSBvcmRlciBvZiBvcGVyYXRpb25zIG1h dHRlcnMuCisKKyAgICAgICAgKiBhbmltYXRpb25zLzNkL2FkZGl0aXZlLXRyYW5zZm9ybS1hbmlt YXRpb25zLWV4cGVjdGVkLnBuZzogQWRkZWQuCisgICAgICAgICogYW5pbWF0aW9ucy8zZC9hZGRp dGl2ZS10cmFuc2Zvcm0tYW5pbWF0aW9ucy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9y bS9tYWMvYW5pbWF0aW9ucy8zZC9hZGRpdGl2ZS10cmFuc2Zvcm0tYW5pbWF0aW9ucy1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorCiAyMDExLTExLTE3ICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBh cHBsZS5jb20+CiAKICAgICAgICAgV2ViS2l0VGVzdFJ1bm5lciBuZWVkcyB0byBzdXBwb3J0IGFj Y2Vzc2liaWxpdHktcmVsYXRlZCBEUlQgQVBJcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYW5p bWF0aW9ucy8zZC9hZGRpdGl2ZS10cmFuc2Zvcm0tYW5pbWF0aW9ucy1leHBlY3RlZC5wbmcgYi9M YXlvdXRUZXN0cy9hbmltYXRpb25zLzNkL2FkZGl0aXZlLXRyYW5zZm9ybS1hbmltYXRpb25zLWV4 cGVjdGVkLnBuZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43ZWY0NWNmMThkOGI2MWM0ZTFkZWRkZTEzMDhiM2NhMjZj MTViZDIzCkdJVCBiaW5hcnkgcGF0Y2gKbGl0ZXJhbCAxMTM5Nwp6Y21lSE5kcEp+UzcoY19yeEho N1RXaWAyJGF2OD9HSTFKQH1pNlJ4dG1gWjVHMiltWDt3RndDK2M4YzJVY0FMbmgKekF+TEt7VGdt Mkg9ODx1S3RRfHh8JjEjUl4lPjIyMz8oWHliSFEpMmljYHdpUnl6bCRfe215c0p5MVZYQGteRCok CnpmKj1fT2Qpd1UqQnVhb0Y1Zyhpd3kyQ2g7NnBzRkVxMSpZO0RNelQza2pTVm9oI0Z7MkdObil7 KUJ0Xj0wZn1sRAp6V1FlWnlPXnBud3EoRFBzMUVTfDgraWNXfU4tJngxP20jOUorI19nKmY8dmhn Nm9XYkspZjNYe3R9eCQ0JWA1SXIKekg5c3NUVlI8QztTZGJeM2VDMSg/Y1YoMEJBSTlhST5AVkw0 SkhUakU9ZilSe3pmR2w/SCQ9WXx4MTFBfmV0Vk1rCnpVNnhGdkxjcnxaV0w0KUcpdzJBe0JvezRE KE1LUHZkZ2pLPXcxeC0jdUZXMHlaQkBgKXQrMjxfdClZJXJLY0xWdgp6aVNiaD1aezswdk4mUjcr cXZrR25iISV6dGMtZlMhTkBGTn1qTWxAUHI/ZkxKTzNPX3M2SWpfc157VCE1dF8yQHgKenFzd3pU JldgNjFqcH59NUJZa2RTQnttKjVyQk09bCk2U19+SXolI3A4NGA4azRMMFVaNnxpWTtGbFMyVSY4 dEwoCnowV0hualMtUHApblJkSk4yN35OTXJEckJLTXhMRFhGVFJ5TWE9Q0NBZT1keG49PXdTPzw9 c1pKQDU5ckVwIVEjXwp6ezVNb3ZTTEI4SjgyMSsjI29JS2c3cytXPjUwQkE8YkdjTVQmYn0+Y0c/ ZGpKMllNQTVoNldFd2lKb04pd1FAaFcKelhCQSYxKXNQSkxQNCNvI0ZKZWNENGJ3QURKM214YmNk fDF0aTEhOz0tclVsVzBNQSF7b1FfQnRqTG4pRHl7fmV2Cnp7bG9xJl5TeH5MSytfR2lDLXU9RFIt KlBjTiRKVyNuPm0+XyhnNiVne2hlOW9iJjlIdktlcShheTwkc0VKMWpPfAp6eFdyWjc3NHdfRlk9 eiZ0PkhWYkBHbn4pKS01UTxna0pwfVZDQCo7OSFGYFo4UWR1Z2BQKWRqal9AJkBqdWdSbXEKeiVT dkhQRFYpY0ElM3o3VEFOOUZnbDFGRWhAbGJ8bTRsaGNvKiZ1c048SFE7dD5CX3FrZXpWJTRsNVZI aCpYN2ktCnpKJHY9OFEwQGhDZTQ4YVItP09SbFBtTERtbWVIViFudmBqcSN0bX5CTTZ6IWxPV295 NGlySGtCeU9mcSNia2dXaAp6LXZQWiZAJSpabjJZV3Z+IVdIVTlzSE5BZnBTRndKR3tHYHRTXkFn TGteXnFDUyo8fiUxd2BNYHNAQlpQPm19YzIKenBKIXskPmAxPk91VUp+YkR2OTVWK2p7Png8KX52 Qi0zPTFlMnlATXVUNkpNdT92endxYSpAdjJeVU9mKzQ3YVY0Cnp2PiZEWWEtPCNaKn12NS13bThv ZmVkeVY3YTQ2VjYocmlqUWRfP0s1QyFATTFkJksre1loT3B8dURAbSZINlQkTwp6PWVLUWlFcW1r a3tCazdJZj13eWg1ZilJSFlQcHhtcnQ5dWshQm5rZ3dxST8mKTgwS2lrUlRPUHohU1R6Q2ZRTjwK emxmTUIzNWctUiFZcCltI3g2QXQyVDVKMyZZczxjUVp7dVhDKz8lJURzans/I2dEdiRoSENKN3xY SnV1QCF4TFp4CnohaVpwVD16QGRQSGpBMkU1IXlqJntWfHc2dmR8N0U3bEYpbmFgRFMxMyRgTmxD SVROd0VmSXI+TmJCMFA8Wnt0Qgp6SGtybmNmazI1QTVzYHJuNTZGdWxtLWNiXm98UE9ISGxBWCEm eGw5UUVUcHQtaGJPUnYwJUZyOGEyYj5+U3ZtZ3kKejFPZ2w8RCYkYUU5IzQzQj51YzImZGpicTJ2 dG1MSE8qSUt7eGAmMFdBVEk9WkZDeiNAMnpRMU48JEBFKkxWMDJPCnpsbXIxYGExYmsxMTFlJjxl WldEMGc4KHlQWF44JFNoYjhhUlNXOVBUdzB3TlJacUFmaFk/Rj12cWByN18qd0VaYQp6a055MDs3 K3kke3pLRX5aM1YyaiM2WkRFRUVuTjluIU9fOEJDT2JhUSshcjhEa3Q4bUkkeER+IzE0Tjd5ajY5 eFoKej9hPC1sUnc1SXtKPyl4KWZ6aTcpY21sMU89SD97dWQ8VElaSnMmcH03P3E8fnhQUDQ4eGB5 dT1PJFA/KUVMSz99CnpJMn0rc0Q1Q19PI2goc2Y/dHJPYEJGc01uMl4wQE00TnJCUz5KaWA7c3Nl a2ttaWBJeF5JPmZZZD5CRig0Q0c1dgp6SjE8bnxOcXJuSDFNXzBEJl9nYVRMYjc1RDAxaFdEQWAo PDw7SztgfTFWKThmUT9zIzwlfUU0T0VLVT1eOHt1fj4KeilfJHRZTVBPNWxzeW5mNTF3dzh+Nykl UkQxKUtffm00eis9OVIhMjl2TV5EPnZfLW9DVT1XQEZrUXdhO0tvVmRDCnpQJCVAQUtPbUhWQnJJ UDIwUHo3eCFxU1RwS29TNStTaUlUJkFDbS1QQkhJZ3NhSj51UDB4VnhfMUVtTyo7JHFuWQp6cjNq U2I7QHV9dWlhO3FZYSR9JHJmbF4lSiN7ViZyRnJqcFlnKWd4aEE9I25kNis7ZW91Q18lcy16NURG RzNKQXkKCmxpdGVyYWwgMApIY21WP2QwMDAwMQoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Fu aW1hdGlvbnMvM2QvYWRkaXRpdmUtdHJhbnNmb3JtLWFuaW1hdGlvbnMuaHRtbCBiL0xheW91dFRl c3RzL2FuaW1hdGlvbnMvM2QvYWRkaXRpdmUtdHJhbnNmb3JtLWFuaW1hdGlvbnMuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi42MjY5OTM0MWIyYWViNzM5YzJhMDk1Mjc1NTg0YjZlZGU3MWI4Yjk4Ci0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy8zZC9hZGRpdGl2ZS10cmFuc2Zvcm0t YW5pbWF0aW9ucy5odG1sCkBAIC0wLDAgKzEsNDMgQEAKKzwhRE9DVFlQRSBodG1sPgorCis8aHRt bD4KKzxoZWFkPgorICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgorICAgIC5ib3ggeworICAgICAg aGVpZ2h0OiAxMDBweDsKKyAgICAgIHdpZHRoOiAxMDBweDsKKyAgICAgIGJhY2tncm91bmQtY29s b3I6IGJsdWU7CisgICAgfQorICAgIAorICAgICNib3ggeworICAgICAgLXdlYmtpdC1hbmltYXRp b246IGFuaW0gMnMgbGluZWFyIGJvdGg7CisgICAgfQorICAgIAorICAgIEAtd2Via2l0LWtleWZy YW1lcyBhbmltIHsKKyAgICAgICAgZnJvbSB7IC13ZWJraXQtdHJhbnNmb3JtOiByb3RhdGUoMGRl ZykgdHJhbnNsYXRlKC0xMDBweCwgMCk7IH0KKyAgICAgICAgdG8gICB7IC13ZWJraXQtdHJhbnNm b3JtOiByb3RhdGUoMTgwZGVnKSB0cmFuc2xhdGUoMzAwcHgsIDApOyB9CisgICAgfQorCisgICAg I3Jlc3VsdCB7CisgICAgICBvcGFjaXR5OiAwOyAvKiBoaWRlIGluIHBpeGVsIHJlc3VsdCAqLwor ICAgIH0KKyAgPC9zdHlsZT4KKyAgPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9hbmltYXRpb24t dGVzdC1oZWxwZXJzLmpzIiB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPjwvc2NyaXB0PgorICA8c2Ny aXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisgICAgY29uc3QgZXhwZWN0ZWRWYWx1ZXMgPSBb CisgICAgICAvLyBbdGltZSwgZWxlbWVudC1pZCwgcHJvcGVydHksIGV4cGVjdGVkLXZhbHVlLCB0 b2xlcmFuY2VdCisgICAgICBbImFuaW0iLCAgMSwgImJveCIsICAid2Via2l0VHJhbnNmb3JtIiwg WzAsIDEsIC0xLCAwLCAwLCAxMDBdLCAwLjAwMl0sCisgICAgXTsKKyAgICAKKyAgICBjb25zdCBk b1BpeGVsVGVzdCA9IHRydWU7CisgICAgY29uc3QgZGlzYWJsZVBhdXNlQW5pbWF0aW9uQVBJID0g ZmFsc2U7CisgICAgcnVuQW5pbWF0aW9uVGVzdChleHBlY3RlZFZhbHVlcywgbnVsbCwgbnVsbCwg ZGlzYWJsZVBhdXNlQW5pbWF0aW9uQVBJLCBkb1BpeGVsVGVzdCk7CisgIDwvc2NyaXB0PgorPC9o ZWFkPgorPGJvZHk+CisKKzxkaXYgY2xhc3M9ImJveCIgaWQ9ImJveCI+PC9kaXY+Cis8ZGl2IGlk PSJyZXN1bHQiPjwvZGl2PgorCis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMvYW5pbWF0aW9ucy8zZC9hZGRpdGl2ZS10cmFuc2Zvcm0tYW5pbWF0 aW9ucy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYW5pbWF0aW9ucy8z ZC9hZGRpdGl2ZS10cmFuc2Zvcm0tYW5pbWF0aW9ucy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u OGQzMzhhNjg0MTk0MGUzYWQxNjMyNTk1ZDlmNDRmMGZmZWVlYTM4MgotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hbmltYXRpb25zLzNkL2FkZGl0aXZlLXRyYW5z Zm9ybS1hbmltYXRpb25zLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEyIEBACitsYXllciBhdCAo MCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyVmlldyBhdCAoMCwwKSBzaXplIDgwMHg2MDAKK2xh eWVyIGF0ICgwLDApIHNpemUgODAweDEzNAorICBSZW5kZXJCbG9jayB7SFRNTH0gYXQgKDAsMCkg c2l6ZSA4MDB4MTM0CisgICAgUmVuZGVyQm9keSB7Qk9EWX0gYXQgKDgsOCkgc2l6ZSA3ODR4MTE4 CitsYXllciBhdCAoOCw4KSBzaXplIDEwMHgxMDAKKyAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAs MCkgc2l6ZSAxMDB4MTAwIFtiZ2NvbG9yPSMwMDAwRkZdCitsYXllciBhdCAoOCwxMDgpIHNpemUg Nzg0eDE4CisgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDEwMCkgc2l6ZSA3ODR4MTgKKyAgICBS ZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSA2Mjl4MTgKKyAgICAgIHRleHQgcnVuIGF0 ICgwLDApIHdpZHRoIDYyOTogIlBBU1MgLSBcIndlYmtpdFRyYW5zZm9ybVwiIHByb3BlcnR5IGZv ciBcImJveFwiIGVsZW1lbnQgYXQgMXMgc2F3IHNvbWV0aGluZyBjbG9zZSB0bzogMCwxLC0xLDAs MCwxMDAiCisgICAgUmVuZGVyQlIge0JSfSBhdCAoNjI5LDApIHNpemUgMHgxOAo=