94356 2012-08-17 09:51:06 -0700 Respect system setting for rubber-banding in ScrollAnimatorMac. 2012-08-22 10:59:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 asvitkine asvitkine andersca bdakin enne sam thakis webkit.review.bot oldest_to_newest 698428 0 asvitkine 2012-08-17 09:51:06 -0700 [chromium/mac] Respect system setting for rubber-banding. 698470 1 159156 asvitkine 2012-08-17 10:32:12 -0700 Created attachment 159156 Patch 698471 2 asvitkine 2012-08-17 10:32:49 -0700 Corresponds to http://crbug.com/133131 698472 3 asvitkine 2012-08-17 10:33:31 -0700 Nico: Please review. 698503 4 159156 thakis 2012-08-17 11:16:39 -0700 Comment on attachment 159156 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159156&action=review > Source/WebCore/platform/mac/ScrollAnimatorMac.mm:661 > +#else Does the apple port get this for free somehow? 698504 5 asvitkine 2012-08-17 11:17:56 -0700 (In reply to comment #4) > (From update of attachment 159156 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=159156&action=review > > > Source/WebCore/platform/mac/ScrollAnimatorMac.mm:661 > > +#else > > Does the apple port get this for free somehow? No, they don't respect the setting, as far as I could tell. 698586 6 thakis 2012-08-17 13:00:42 -0700 Hi Beth, it looks like the rest of OS X honors this setting. Is the apple port interested in honoring it too? If so, we can remove the ifdef. Nico 698588 7 bdakin 2012-08-17 13:04:37 -0700 (In reply to comment #6) > Hi Beth, > > it looks like the rest of OS X honors this setting. Is the apple port interested in honoring it too? If so, we can remove the ifdef. > > Nico Hmm, maybe! Sam, what do you think? 698957 8 sam 2012-08-18 15:45:57 -0700 Seems reasonable to support. If you are ever considering making something like this Chromium only in WebCore, don't! Please add a test. 699036 9 asvitkine 2012-08-19 08:57:03 -0700 (In reply to comment #8) > Please add a test. Do you have a suggestion of how to go about writing a test for this? This relies on both system settings and platform-specific wheel events and timings. I'm not sure what the convention is for testing such changes. Can you point me in the right direction? 699115 10 sam 2012-08-19 16:49:45 -0700 (In reply to comment #9) > (In reply to comment #8) > > Please add a test. > > Do you have a suggestion of how to go about writing a test for this? > > This relies on both system settings and platform-specific wheel events and timings. I'm not sure what the convention is for testing such changes. Can you point me in the right direction? Beth, what is the current story with rubber-band testing? Is it non-existent? 699690 11 bdakin 2012-08-20 11:03:47 -0700 (In reply to comment #10) > (In reply to comment #9) > > (In reply to comment #8) > > > Please add a test. > > > > Do you have a suggestion of how to go about writing a test for this? > > > > This relies on both system settings and platform-specific wheel events and timings. I'm not sure what the convention is for testing such changes. Can you point me in the right direction? > > Beth, what is the current story with rubber-band testing? Is it non-existent? Yeah, I don't think we ever devised a way to test this. 699732 12 159478 asvitkine 2012-08-20 11:28:11 -0700 Created attachment 159478 Patch 699733 13 asvitkine 2012-08-20 11:28:53 -0700 (In reply to comment #12) > Created an attachment (id=159478) [details] > Patch Updated patch removes the CHROMIUM ifdefs so that the behavior applies to the Mac port too. 699935 14 159478 thakis 2012-08-20 14:10:04 -0700 Comment on attachment 159478 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159478&action=review > Source/WebCore/platform/mac/ScrollAnimatorMac.mm:657 > + initialized = true; NSUserDefaults usually are supposed to be "live", you shouldn't have to restart your browser after you changed them. Is this method hot? If so, maybe you could give WebScrollAnimationHelperDelegate a +initialize method and call registerDefaults: from there? 699951 15 159478 asvitkine 2012-08-20 14:17:26 -0700 Comment on attachment 159478 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159478&action=review >> Source/WebCore/platform/mac/ScrollAnimatorMac.mm:657 >> + initialized = true; > > NSUserDefaults usually are supposed to be "live", you shouldn't have to restart your browser after you changed them. > > Is this method hot? If so, maybe you could give WebScrollAnimationHelperDelegate a +initialize method and call registerDefaults: from there? For this particular setting, other applications require a restart for the setting to take effect. Regarding whether the method is hot: it's invoked for every mouse wheel event - so perhaps warm, but not hot? 699957 16 159478 thakis 2012-08-20 14:20:24 -0700 Comment on attachment 159478 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159478&action=review >>> Source/WebCore/platform/mac/ScrollAnimatorMac.mm:657 >>> + initialized = true; >> >> NSUserDefaults usually are supposed to be "live", you shouldn't have to restart your browser after you changed them. >> >> Is this method hot? If so, maybe you could give WebScrollAnimationHelperDelegate a +initialize method and call registerDefaults: from there? > > For this particular setting, other applications require a restart for the setting to take effect. > > Regarding whether the method is hot: it's invoked for every mouse wheel event - so perhaps warm, but not hot? If it's consistent with other apps, then I guess it's fine. "// Other apps like XXX require a restart after changing this default." makes a better comment than "// If the key hasn't been set, default to enabling rubber banding." which doesn't add much. With that, LGTM. (I'm not a review though.) 700059 17 thakis 2012-08-20 15:27:23 -0700 > With that, LGTM. (I'm not a review though.) *not a reviewer. Though I'm not a review either. 700267 18 159478 bdakin 2012-08-20 17:51:24 -0700 Comment on attachment 159478 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159478&action=review I think this patch is close, but I would like to see the things I commented on cleaned up. > Source/WebCore/platform/mac/ScrollAnimatorMac.mm:651 > + NSString* key = @"NSScrollViewRubberbanding"; For Objective-C objects, our style guide dictates that the * should go next to the variable name, not the type name. In other words, this should be: NSString *key… > Source/WebCore/platform/mac/ScrollAnimatorMac.mm:652 > + NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; Same as above. > Source/WebCore/platform/mac/ScrollAnimatorMac.mm:654 > + id value = [defaults objectForKey:key]; Can you just use boolForKey here instead of objectForKey? And then avoid all of the conversions below? 700269 19 bdakin 2012-08-20 17:54:10 -0700 (In reply to comment #18) > (From update of attachment 159478 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=159478&action=review > > I think this patch is close, but I would like to see the things I commented on cleaned up. > > > Source/WebCore/platform/mac/ScrollAnimatorMac.mm:651 > > + NSString* key = @"NSScrollViewRubberbanding"; > Actually, there is no need to have a variable for the key here anyway. You can collapse these three lines of code into: enabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"NSScrollViewRubberbanding"]; 700270 20 159478 thakis 2012-08-20 17:54:36 -0700 Comment on attachment 159478 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159478&action=review >> Source/WebCore/platform/mac/ScrollAnimatorMac.mm:654 >> + id value = [defaults objectForKey:key]; > > Can you just use boolForKey here instead of objectForKey? And then avoid all of the conversions below? boolForKey defaults to NO for values that are not present. This wants to default to YES instead (see my suggestion about registerDefaults: above) 700274 21 bdakin 2012-08-20 17:56:48 -0700 (In reply to comment #20) > (From update of attachment 159478 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=159478&action=review > > >> Source/WebCore/platform/mac/ScrollAnimatorMac.mm:654 > >> + id value = [defaults objectForKey:key]; > > > > Can you just use boolForKey here instead of objectForKey? And then avoid all of the conversions below? > > boolForKey defaults to NO for values that are not present. This wants to default to YES instead (see my suggestion about registerDefaults: above) Oh, that makes sense. 700959 22 159731 asvitkine 2012-08-21 11:38:45 -0700 Created attachment 159731 Patch 700961 23 asvitkine 2012-08-21 11:40:54 -0700 (In reply to comment #22) > Created an attachment (id=159731) [details] > Patch I've updated the patch to add a comment per Nico's suggestion and to inline some things per Beth's suggestion. I've kept (and clarified) the comment about the default value and why the code doesn't use -boolForKey:. Please take another look. 700991 24 159731 thakis 2012-08-21 12:20:31 -0700 Comment on attachment 159731 Patch lgtm 700992 25 159731 thakis 2012-08-21 12:20:53 -0700 Comment on attachment 159731 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159731&action=review > Source/WebCore/ChangeLog:3 > + [chromium/mac] Respect system setting for rubber-banding. (nit: Remove [chromium/mac] here) 701004 26 159739 asvitkine 2012-08-21 12:35:07 -0700 Created attachment 159739 Patch 701006 27 asvitkine 2012-08-21 12:35:49 -0700 (In reply to comment #25) > (From update of attachment 159731 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=159731&action=review > > > Source/WebCore/ChangeLog:3 > > + [chromium/mac] Respect system setting for rubber-banding. > > (nit: Remove [chromium/mac] here) Done. 702048 28 159739 jamesr 2012-08-22 10:43:02 -0700 Comment on attachment 159739 Patch R=me 702066 29 159739 webkit.review.bot 2012-08-22 10:59:04 -0700 Comment on attachment 159739 Patch Clearing flags on attachment: 159739 Committed r126321: <http://trac.webkit.org/changeset/126321> 702067 30 webkit.review.bot 2012-08-22 10:59:08 -0700 All reviewed patches have been landed. Closing bug. 159156 2012-08-17 10:32:12 -0700 2012-08-20 11:28:08 -0700 Patch bug-94356-20120817133134.patch text/plain 2810 asvitkine U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1OTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzExNDFhNGE3ZTAyNDc0 NTJmNGMzZGRmMzY5MjgxMWFhNjQwOTNmNi4uZDc4YTMwMjEyYmVmNDgwMTcxYmQ2M2I2YTU1Zjc2 N2EyNzE0NTdhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA4LTE3ICBBbGV4 ZWkgU3ZpdGtpbmUgIDxhc3ZpdGtpbmVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1 bS9tYWNdIFJlc3BlY3Qgc3lzdGVtIHNldHRpbmcgZm9yIHJ1YmJlci1iYW5kaW5nLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQzNTYKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXNwZWN0cyB1c2VyIGRl ZmF1bHRzIHNldHRpbmcgb2YgTlNTY3JvbGxWaWV3UnViYmVyYmFuZGluZywKKyAgICAgICAgd2hp Y2ggY29udHJvbHMgcnViYmVyLWJhbmRpbmcgaW4gb3RoZXIgTWFjIE9TIFggYXBwbGljYXRpb25z LgorCisgICAgICAgIElmIE5TU2Nyb2xsVmlld1J1YmJlcmJhbmRpbmcgaXMgbm90IHNldCwgZGVm YXVsdHMgdG8gZW5hYmxpbmcKKyAgICAgICAgcnViYmVyIGJhbmRpbmcuIE90aGVyd2lzZSwgcnVi YmVyIGJhbmRpbmcgaXMgZGlzYWJsZWQgaWYgdGhlCisgICAgICAgIHZhbHVlIGlzIDAgYW5kIGVu YWJsZWQgb3RoZXJ3aXNlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0aGUgYmVoYXZp b3IgZGVwZW5kcyBvbiBzeXN0ZW0gc2V0dGluZ3MuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMv U2Nyb2xsQW5pbWF0b3JNYWMubW06CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNv cmU6OnJ1YmJlckJhbmRpbmdFbmFibGVkRm9yU3lzdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbEFuaW1hdG9yTWFjOjpoYW5kbGVXaGVlbEV2ZW50KToKKwogMjAxMi0wOC0xNyAgU2hlcmlm ZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjEyNTg5Mi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h Yy9TY3JvbGxBbmltYXRvck1hYy5tbQppbmRleCA2MDBkZWU1ODM4M2Y1OTk2MWY2M2FmOWMxNTM3 OGM1YjM1NWJiZDllLi45YzhiOGY0MzgxNjY0NjcyMGQyYWYyMWM2MzEyOWM4MGY1YTEyMDc5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1t CkBAIC02NDIsNiArNjQyLDI4IEBAIHN0YXRpYyBib29sIHNjcm9sbEFuaW1hdGlvbkVuYWJsZWRG b3JTeXN0ZW0oKQogI2VuZGlmCiB9CiAKKyNpZiBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCitzdGF0 aWMgYm9vbCBydWJiZXJCYW5kaW5nRW5hYmxlZEZvclN5c3RlbSgpCit7CisjaWYgUExBVEZPUk0o Q0hST01JVU0pCisgICAgc3RhdGljIGJvb2wgaW5pdGlhbGl6ZWQgPSBmYWxzZTsKKyAgICBzdGF0 aWMgYm9vbCBlbmFibGVkID0gdHJ1ZTsKKyAgICBpZiAoIWluaXRpYWxpemVkKSB7CisgICAgICAg IE5TU3RyaW5nKiBrZXkgPSBAIk5TU2Nyb2xsVmlld1J1YmJlcmJhbmRpbmciOworICAgICAgICBO U1VzZXJEZWZhdWx0cyogZGVmYXVsdHMgPSBbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVm YXVsdHNdOworICAgICAgICAvLyBJZiB0aGUga2V5IGhhc24ndCBiZWVuIHNldCwgZGVmYXVsdCB0 byBlbmFibGluZyBydWJiZXIgYmFuZGluZy4KKyAgICAgICAgaWQgdmFsdWUgPSBbZGVmYXVsdHMg b2JqZWN0Rm9yS2V5OmtleV07CisgICAgICAgIGlmIChbdmFsdWUgaXNLaW5kT2ZDbGFzczpbTlNO dW1iZXIgY2xhc3NdXSkKKyAgICAgICAgICAgIGVuYWJsZWQgPSBbdmFsdWUgYm9vbFZhbHVlXTsK KyAgICAgICAgaW5pdGlhbGl6ZWQgPSB0cnVlOworICAgIH0KKyAgICByZXR1cm4gZW5hYmxlZDsK KyNlbHNlCisgICAgcmV0dXJuIHRydWU7CisjZW5kaWYKK30KKyNlbmRpZgorCiBib29sIFNjcm9s bEFuaW1hdG9yTWFjOjpzY3JvbGwoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24sIFNj cm9sbEdyYW51bGFyaXR5IGdyYW51bGFyaXR5LCBmbG9hdCBzdGVwLCBmbG9hdCBtdWx0aXBsaWVy KQogewogICAgIG1faGF2ZVNjcm9sbGVkU2luY2VQYWdlTG9hZCA9IHRydWU7CkBAIC05ODEsNyAr MTAwMyw3IEBAIGJvb2wgU2Nyb2xsQW5pbWF0b3JNYWM6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3Qg UGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQogewogICAgIG1faGF2ZVNjcm9sbGVkU2lu Y2VQYWdlTG9hZCA9IHRydWU7CiAKLSAgICBpZiAoIXdoZWVsRXZlbnQuaGFzUHJlY2lzZVNjcm9s bGluZ0RlbHRhcygpKQorICAgIGlmICghd2hlZWxFdmVudC5oYXNQcmVjaXNlU2Nyb2xsaW5nRGVs dGFzKCkgfHwgIXJ1YmJlckJhbmRpbmdFbmFibGVkRm9yU3lzdGVtKCkpCiAgICAgICAgIHJldHVy biBTY3JvbGxBbmltYXRvcjo6aGFuZGxlV2hlZWxFdmVudCh3aGVlbEV2ZW50KTsKIAogICAgIC8v IEZJWE1FOiBUaGlzIGlzIHNvbWV3aGF0IHJvdW5kYWJvdXQgaGFjayB0byBhbGxvdyBmb3J3YXJk aW5nIHdoZWVsIGV2ZW50cwo= 159478 2012-08-20 11:28:11 -0700 2012-08-21 11:38:41 -0700 Patch bug-94356-20120820142732.patch text/plain 2752 asvitkine U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1OTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzExNDFhNGE3ZTAyNDc0 NTJmNGMzZGRmMzY5MjgxMWFhNjQwOTNmNi4uZDc4YTMwMjEyYmVmNDgwMTcxYmQ2M2I2YTU1Zjc2 N2EyNzE0NTdhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA4LTE3ICBBbGV4 ZWkgU3ZpdGtpbmUgIDxhc3ZpdGtpbmVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1 bS9tYWNdIFJlc3BlY3Qgc3lzdGVtIHNldHRpbmcgZm9yIHJ1YmJlci1iYW5kaW5nLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQzNTYKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXNwZWN0cyB1c2VyIGRl ZmF1bHRzIHNldHRpbmcgb2YgTlNTY3JvbGxWaWV3UnViYmVyYmFuZGluZywKKyAgICAgICAgd2hp Y2ggY29udHJvbHMgcnViYmVyLWJhbmRpbmcgaW4gb3RoZXIgTWFjIE9TIFggYXBwbGljYXRpb25z LgorCisgICAgICAgIElmIE5TU2Nyb2xsVmlld1J1YmJlcmJhbmRpbmcgaXMgbm90IHNldCwgZGVm YXVsdHMgdG8gZW5hYmxpbmcKKyAgICAgICAgcnViYmVyIGJhbmRpbmcuIE90aGVyd2lzZSwgcnVi YmVyIGJhbmRpbmcgaXMgZGlzYWJsZWQgaWYgdGhlCisgICAgICAgIHZhbHVlIGlzIDAgYW5kIGVu YWJsZWQgb3RoZXJ3aXNlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0aGUgYmVoYXZp b3IgZGVwZW5kcyBvbiBzeXN0ZW0gc2V0dGluZ3MuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMv U2Nyb2xsQW5pbWF0b3JNYWMubW06CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNv cmU6OnJ1YmJlckJhbmRpbmdFbmFibGVkRm9yU3lzdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbEFuaW1hdG9yTWFjOjpoYW5kbGVXaGVlbEV2ZW50KToKKwogMjAxMi0wOC0xNyAgU2hlcmlm ZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjEyNTg5Mi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h Yy9TY3JvbGxBbmltYXRvck1hYy5tbQppbmRleCA2MDBkZWU1ODM4M2Y1OTk2MWY2M2FmOWMxNTM3 OGM1YjM1NWJiZDllLi42M2MxZjQ2MWM0ZDU0Y2I4ZWE2MDM5OWRhOGYxZDM3Zjg1Y2ExNDlhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1t CkBAIC02NDIsNiArNjQyLDI0IEBAIHN0YXRpYyBib29sIHNjcm9sbEFuaW1hdGlvbkVuYWJsZWRG b3JTeXN0ZW0oKQogI2VuZGlmCiB9CiAKKyNpZiBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCitzdGF0 aWMgYm9vbCBydWJiZXJCYW5kaW5nRW5hYmxlZEZvclN5c3RlbSgpCit7CisgICAgc3RhdGljIGJv b2wgaW5pdGlhbGl6ZWQgPSBmYWxzZTsKKyAgICBzdGF0aWMgYm9vbCBlbmFibGVkID0gdHJ1ZTsK KyAgICBpZiAoIWluaXRpYWxpemVkKSB7CisgICAgICAgIE5TU3RyaW5nKiBrZXkgPSBAIk5TU2Ny b2xsVmlld1J1YmJlcmJhbmRpbmciOworICAgICAgICBOU1VzZXJEZWZhdWx0cyogZGVmYXVsdHMg PSBbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdOworICAgICAgICAvLyBJZiB0 aGUga2V5IGhhc24ndCBiZWVuIHNldCwgZGVmYXVsdCB0byBlbmFibGluZyBydWJiZXIgYmFuZGlu Zy4KKyAgICAgICAgaWQgdmFsdWUgPSBbZGVmYXVsdHMgb2JqZWN0Rm9yS2V5OmtleV07CisgICAg ICAgIGlmIChbdmFsdWUgaXNLaW5kT2ZDbGFzczpbTlNOdW1iZXIgY2xhc3NdXSkKKyAgICAgICAg ICAgIGVuYWJsZWQgPSBbdmFsdWUgYm9vbFZhbHVlXTsKKyAgICAgICAgaW5pdGlhbGl6ZWQgPSB0 cnVlOworICAgIH0KKyAgICByZXR1cm4gZW5hYmxlZDsKK30KKyNlbmRpZgorCiBib29sIFNjcm9s bEFuaW1hdG9yTWFjOjpzY3JvbGwoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24sIFNj cm9sbEdyYW51bGFyaXR5IGdyYW51bGFyaXR5LCBmbG9hdCBzdGVwLCBmbG9hdCBtdWx0aXBsaWVy KQogewogICAgIG1faGF2ZVNjcm9sbGVkU2luY2VQYWdlTG9hZCA9IHRydWU7CkBAIC05ODEsNyAr OTk5LDcgQEAgYm9vbCBTY3JvbGxBbmltYXRvck1hYzo6aGFuZGxlV2hlZWxFdmVudChjb25zdCBQ bGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCiB7CiAgICAgbV9oYXZlU2Nyb2xsZWRTaW5j ZVBhZ2VMb2FkID0gdHJ1ZTsKIAotICAgIGlmICghd2hlZWxFdmVudC5oYXNQcmVjaXNlU2Nyb2xs aW5nRGVsdGFzKCkpCisgICAgaWYgKCF3aGVlbEV2ZW50Lmhhc1ByZWNpc2VTY3JvbGxpbmdEZWx0 YXMoKSB8fCAhcnViYmVyQmFuZGluZ0VuYWJsZWRGb3JTeXN0ZW0oKSkKICAgICAgICAgcmV0dXJu IFNjcm9sbEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQpOwogCiAgICAgLy8g RklYTUU6IFRoaXMgaXMgc29tZXdoYXQgcm91bmRhYm91dCBoYWNrIHRvIGFsbG93IGZvcndhcmRp bmcgd2hlZWwgZXZlbnRzCg== 159731 2012-08-21 11:38:45 -0700 2012-08-21 12:35:01 -0700 Patch bug-94356-20120821143844.patch text/plain 2851 asvitkine U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1OTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzExNDFhNGE3ZTAyNDc0 NTJmNGMzZGRmMzY5MjgxMWFhNjQwOTNmNi4uZDc4YTMwMjEyYmVmNDgwMTcxYmQ2M2I2YTU1Zjc2 N2EyNzE0NTdhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA4LTE3ICBBbGV4 ZWkgU3ZpdGtpbmUgIDxhc3ZpdGtpbmVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1 bS9tYWNdIFJlc3BlY3Qgc3lzdGVtIHNldHRpbmcgZm9yIHJ1YmJlci1iYW5kaW5nLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQzNTYKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXNwZWN0cyB1c2VyIGRl ZmF1bHRzIHNldHRpbmcgb2YgTlNTY3JvbGxWaWV3UnViYmVyYmFuZGluZywKKyAgICAgICAgd2hp Y2ggY29udHJvbHMgcnViYmVyLWJhbmRpbmcgaW4gb3RoZXIgTWFjIE9TIFggYXBwbGljYXRpb25z LgorCisgICAgICAgIElmIE5TU2Nyb2xsVmlld1J1YmJlcmJhbmRpbmcgaXMgbm90IHNldCwgZGVm YXVsdHMgdG8gZW5hYmxpbmcKKyAgICAgICAgcnViYmVyIGJhbmRpbmcuIE90aGVyd2lzZSwgcnVi YmVyIGJhbmRpbmcgaXMgZGlzYWJsZWQgaWYgdGhlCisgICAgICAgIHZhbHVlIGlzIDAgYW5kIGVu YWJsZWQgb3RoZXJ3aXNlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0aGUgYmVoYXZp b3IgZGVwZW5kcyBvbiBzeXN0ZW0gc2V0dGluZ3MuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMv U2Nyb2xsQW5pbWF0b3JNYWMubW06CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNv cmU6OnJ1YmJlckJhbmRpbmdFbmFibGVkRm9yU3lzdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbEFuaW1hdG9yTWFjOjpoYW5kbGVXaGVlbEV2ZW50KToKKwogMjAxMi0wOC0xNyAgU2hlcmlm ZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjEyNTg5Mi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h Yy9TY3JvbGxBbmltYXRvck1hYy5tbQppbmRleCA2MDBkZWU1ODM4M2Y1OTk2MWY2M2FmOWMxNTM3 OGM1YjM1NWJiZDllLi5hNWI1MTJlODRjZTZlMmZhOGQ0NzNhNDZmNWEyYWM0ODA5OThlMjUxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1t CkBAIC02NDIsNiArNjQyLDI0IEBAIHN0YXRpYyBib29sIHNjcm9sbEFuaW1hdGlvbkVuYWJsZWRG b3JTeXN0ZW0oKQogI2VuZGlmCiB9CiAKKyNpZiBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCitzdGF0 aWMgYm9vbCBydWJiZXJCYW5kaW5nRW5hYmxlZEZvclN5c3RlbSgpCit7CisgICAgc3RhdGljIGJv b2wgaW5pdGlhbGl6ZWQgPSBmYWxzZTsKKyAgICBzdGF0aWMgYm9vbCBlbmFibGVkID0gdHJ1ZTsK KyAgICAvLyBDYWNoZXMgdGhlIHJlc3VsdCwgd2hpY2ggaXMgY29uc2lzdGVudCB3aXRoIG90aGVy IGFwcHMgbGlrZSB0aGUgRmluZGVyLCB3aGljaCBhbGwKKyAgICAvLyByZXF1aXJlIGEgcmVzdGFy dCBhZnRlciBjaGFuZ2luZyB0aGlzIGRlZmF1bHQuCisgICAgaWYgKCFpbml0aWFsaXplZCkgewor ICAgICAgICAvLyBVc2VzIC1vYmplY3RGb3JLZXk6IGFuZCBub3QgLWJvb2xGb3JLZXk6IGluIG9y ZGVyIHRvIGRlZmF1bHQgdG8gdHJ1ZSBpZiB0aGUgdmFsdWUgd2Fzbid0IHNldC4KKyAgICAgICAg aWQgdmFsdWUgPSBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBvYmplY3RG b3JLZXk6QCJOU1Njcm9sbFZpZXdSdWJiZXJiYW5kaW5nIl07CisgICAgICAgIGlmIChbdmFsdWUg aXNLaW5kT2ZDbGFzczpbTlNOdW1iZXIgY2xhc3NdXSkKKyAgICAgICAgICAgIGVuYWJsZWQgPSBb dmFsdWUgYm9vbFZhbHVlXTsKKyAgICAgICAgaW5pdGlhbGl6ZWQgPSB0cnVlOworICAgIH0KKyAg ICByZXR1cm4gZW5hYmxlZDsKK30KKyNlbmRpZgorCiBib29sIFNjcm9sbEFuaW1hdG9yTWFjOjpz Y3JvbGwoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24sIFNjcm9sbEdyYW51bGFyaXR5 IGdyYW51bGFyaXR5LCBmbG9hdCBzdGVwLCBmbG9hdCBtdWx0aXBsaWVyKQogewogICAgIG1faGF2 ZVNjcm9sbGVkU2luY2VQYWdlTG9hZCA9IHRydWU7CkBAIC05ODEsNyArOTk5LDcgQEAgYm9vbCBT Y3JvbGxBbmltYXRvck1hYzo6aGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZl bnQmIHdoZWVsRXZlbnQpCiB7CiAgICAgbV9oYXZlU2Nyb2xsZWRTaW5jZVBhZ2VMb2FkID0gdHJ1 ZTsKIAotICAgIGlmICghd2hlZWxFdmVudC5oYXNQcmVjaXNlU2Nyb2xsaW5nRGVsdGFzKCkpCisg ICAgaWYgKCF3aGVlbEV2ZW50Lmhhc1ByZWNpc2VTY3JvbGxpbmdEZWx0YXMoKSB8fCAhcnViYmVy QmFuZGluZ0VuYWJsZWRGb3JTeXN0ZW0oKSkKICAgICAgICAgcmV0dXJuIFNjcm9sbEFuaW1hdG9y OjpoYW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQpOwogCiAgICAgLy8gRklYTUU6IFRoaXMgaXMg c29tZXdoYXQgcm91bmRhYm91dCBoYWNrIHRvIGFsbG93IGZvcndhcmRpbmcgd2hlZWwgZXZlbnRz Cg== 159739 2012-08-21 12:35:07 -0700 2012-08-22 10:59:04 -0700 Patch bug-94356-20120821153505.patch text/plain 2857 asvitkine U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1OTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzExNDFhNGE3ZTAyNDc0 NTJmNGMzZGRmMzY5MjgxMWFhNjQwOTNmNi4uZTViMWEwMzdkZDI5YTVhMDBhNzFjNGI4MTgwMzRm ZTM4NGY2MDFmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA4LTE3ICBBbGV4 ZWkgU3ZpdGtpbmUgIDxhc3ZpdGtpbmVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlc3BlY3Qg c3lzdGVtIHNldHRpbmcgZm9yIHJ1YmJlci1iYW5kaW5nIGluIFNjcm9sbEFuaW1hdG9yTWFjLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQzNTYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXNwZWN0cyB1 c2VyIGRlZmF1bHRzIHNldHRpbmcgb2YgTlNTY3JvbGxWaWV3UnViYmVyYmFuZGluZywKKyAgICAg ICAgd2hpY2ggY29udHJvbHMgcnViYmVyLWJhbmRpbmcgaW4gb3RoZXIgTWFjIE9TIFggYXBwbGlj YXRpb25zLgorCisgICAgICAgIElmIE5TU2Nyb2xsVmlld1J1YmJlcmJhbmRpbmcgaXMgbm90IHNl dCwgZGVmYXVsdHMgdG8gZW5hYmxpbmcKKyAgICAgICAgcnViYmVyIGJhbmRpbmcuIE90aGVyd2lz ZSwgcnViYmVyIGJhbmRpbmcgaXMgZGlzYWJsZWQgaWYgdGhlCisgICAgICAgIHZhbHVlIGlzIDAg YW5kIGVuYWJsZWQgb3RoZXJ3aXNlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0aGUg YmVoYXZpb3IgZGVwZW5kcyBvbiBzeXN0ZW0gc2V0dGluZ3MuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW06CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAg KFdlYkNvcmU6OnJ1YmJlckJhbmRpbmdFbmFibGVkRm9yU3lzdGVtKToKKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbEFuaW1hdG9yTWFjOjpoYW5kbGVXaGVlbEV2ZW50KToKKwogMjAxMi0wOC0xNyAg U2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEyNTg5Mi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQppbmRleCA2MDBkZWU1ODM4M2Y1OTk2MWY2M2Fm OWMxNTM3OGM1YjM1NWJiZDllLi5hNWI1MTJlODRjZTZlMmZhOGQ0NzNhNDZmNWEyYWM0ODA5OThl MjUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0 b3JNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9y TWFjLm1tCkBAIC02NDIsNiArNjQyLDI0IEBAIHN0YXRpYyBib29sIHNjcm9sbEFuaW1hdGlvbkVu YWJsZWRGb3JTeXN0ZW0oKQogI2VuZGlmCiB9CiAKKyNpZiBFTkFCTEUoUlVCQkVSX0JBTkRJTkcp CitzdGF0aWMgYm9vbCBydWJiZXJCYW5kaW5nRW5hYmxlZEZvclN5c3RlbSgpCit7CisgICAgc3Rh dGljIGJvb2wgaW5pdGlhbGl6ZWQgPSBmYWxzZTsKKyAgICBzdGF0aWMgYm9vbCBlbmFibGVkID0g dHJ1ZTsKKyAgICAvLyBDYWNoZXMgdGhlIHJlc3VsdCwgd2hpY2ggaXMgY29uc2lzdGVudCB3aXRo IG90aGVyIGFwcHMgbGlrZSB0aGUgRmluZGVyLCB3aGljaCBhbGwKKyAgICAvLyByZXF1aXJlIGEg cmVzdGFydCBhZnRlciBjaGFuZ2luZyB0aGlzIGRlZmF1bHQuCisgICAgaWYgKCFpbml0aWFsaXpl ZCkgeworICAgICAgICAvLyBVc2VzIC1vYmplY3RGb3JLZXk6IGFuZCBub3QgLWJvb2xGb3JLZXk6 IGluIG9yZGVyIHRvIGRlZmF1bHQgdG8gdHJ1ZSBpZiB0aGUgdmFsdWUgd2Fzbid0IHNldC4KKyAg ICAgICAgaWQgdmFsdWUgPSBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBv YmplY3RGb3JLZXk6QCJOU1Njcm9sbFZpZXdSdWJiZXJiYW5kaW5nIl07CisgICAgICAgIGlmIChb dmFsdWUgaXNLaW5kT2ZDbGFzczpbTlNOdW1iZXIgY2xhc3NdXSkKKyAgICAgICAgICAgIGVuYWJs ZWQgPSBbdmFsdWUgYm9vbFZhbHVlXTsKKyAgICAgICAgaW5pdGlhbGl6ZWQgPSB0cnVlOworICAg IH0KKyAgICByZXR1cm4gZW5hYmxlZDsKK30KKyNlbmRpZgorCiBib29sIFNjcm9sbEFuaW1hdG9y TWFjOjpzY3JvbGwoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24sIFNjcm9sbEdyYW51 bGFyaXR5IGdyYW51bGFyaXR5LCBmbG9hdCBzdGVwLCBmbG9hdCBtdWx0aXBsaWVyKQogewogICAg IG1faGF2ZVNjcm9sbGVkU2luY2VQYWdlTG9hZCA9IHRydWU7CkBAIC05ODEsNyArOTk5LDcgQEAg Ym9vbCBTY3JvbGxBbmltYXRvck1hYzo6aGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdo ZWVsRXZlbnQmIHdoZWVsRXZlbnQpCiB7CiAgICAgbV9oYXZlU2Nyb2xsZWRTaW5jZVBhZ2VMb2Fk ID0gdHJ1ZTsKIAotICAgIGlmICghd2hlZWxFdmVudC5oYXNQcmVjaXNlU2Nyb2xsaW5nRGVsdGFz KCkpCisgICAgaWYgKCF3aGVlbEV2ZW50Lmhhc1ByZWNpc2VTY3JvbGxpbmdEZWx0YXMoKSB8fCAh cnViYmVyQmFuZGluZ0VuYWJsZWRGb3JTeXN0ZW0oKSkKICAgICAgICAgcmV0dXJuIFNjcm9sbEFu aW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQpOwogCiAgICAgLy8gRklYTUU6IFRo aXMgaXMgc29tZXdoYXQgcm91bmRhYm91dCBoYWNrIHRvIGFsbG93IGZvcndhcmRpbmcgd2hlZWwg ZXZlbnRzCg==