29192 2009-09-11 10:21:37 -0700 Allow WebKit clients to opt out of high resolution timers on Windows 2023-12-03 11:48:17 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows Vista RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=265748 P2 Normal --- 1 sfalken sfalken oldest_to_newest 146625 0 sfalken 2009-09-11 10:21:37 -0700 Gives WebKit embedders an option to opt out of high resolution timers. Default is that high resolution timers are enabled. If high res timers are disabled, all timers are fired via WM_TIMER. Also disables timeBeginPeriod/timeEndPeriod if high resolution timers are disabled. 146627 1 39448 sfalken 2009-09-11 10:28:40 -0700 Created attachment 39448 Add code to disable high-res timers conditionally 146645 2 39448 darin 2009-09-11 10:57:27 -0700 Comment on attachment 39448 Add code to disable high-res timers conditionally I'm not sure PLATFORM(WIN) is the right ifdef. I think it's strange that we're naming the static data members with a "gX" naming scheme. This is not consistent with "m_". 146649 3 sfalken 2009-09-11 11:02:20 -0700 I'm not sure PLATFORM(WIN) fully represents this either, but this seems OK for now. I'd rather conditionalize it for now to the only platform where this is supported. The "g" naming matches the other static member in Settings. I agree it is a bit odd, and wonder about the utility of even putting this in a static data member vs. a static in the cpp file. 146651 4 sfalken 2009-09-11 11:05:13 -0700 r48308 146800 5 39491 sfalken 2009-09-11 16:44:04 -0700 Created attachment 39491 Fix bug with preferences to settings propagation 39448 2009-09-11 10:28:40 -0700 2009-09-11 10:57:26 -0700 Add code to disable high-res timers conditionally patch.diff text/plain 10876 sfalken SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODMwNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMDktMTEgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBbGxvdyBXZWJLaXQgY2xpZW50cyB0byBvcHQgb3V0IG9mIGhpZ2ggcmVzb2x1dGlvbiB0aW1l cnMgb24gV2luZG93cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI5MTkyCisKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNldHRpbmdzOjpzZXRTaG91bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVycyk6IEFkZGVk LgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaDogQWRkZWQgZ2V0dGVyL3NldHRlciBmb3Igc2hv dWxkVXNlSGlnaFJlc29sdXRpb25UaW1lcnMuCisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6 c2hvdWxkVXNlSGlnaFJlc29sdXRpb25UaW1lcnMpOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9y bS93aW4vU2hhcmVkVGltZXJXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2V0U2hhcmVkVGlt ZXJGaXJlVGltZSk6IERvbid0IHJ1biBoaWdoIHJlc29sdXRpb24gdGltZXIgY29kZSBpZiBpdCBp cyBkaXNhYmxlZC4KKwogMjAwOS0wOS0xMSAgQW50b24gTXVoaW4gIDxhbnRvbm1AY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgpJbmRleDogV2ViQ29yZS9w YWdlL1NldHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3Bw CShyZXZpc2lvbiA0ODMwMikKKysrIFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQ4LDYgKzQ4LDEwIEBAIHN0YXRpYyB2b2lkIHNldE5lZWRzUmVhcHBseVN0eWxl c0luQWxsRnIKIGJvb2wgU2V0dGluZ3M6OmdTaG91bGRQYWludE5hdGl2ZUNvbnRyb2xzID0gdHJ1 ZTsKICNlbmRpZgogCisjaWYgUExBVEZPUk0oV0lOKQorYm9vbCBTZXR0aW5nczo6Z1Nob3VsZFVz ZUhpZ2hSZXNvbHV0aW9uVGltZXJzID0gdHJ1ZTsKKyNlbmRpZgorCiBTZXR0aW5nczo6U2V0dGlu Z3MoUGFnZSogcGFnZSkKICAgICA6IG1fcGFnZShwYWdlKQogICAgICwgbV9lZGl0YWJsZUxpbmtC ZWhhdmlvcihFZGl0YWJsZUxpbmtEZWZhdWx0QmVoYXZpb3IpCkBAIC00OTMsNCArNDk3LDExIEBA IHZvaWQgU2V0dGluZ3M6OnNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmcKICAgICBzZXROZWVkc1Jl YXBwbHlTdHlsZXNJbkFsbEZyYW1lcyhtX3BhZ2UpOwogfQogCisjaWYgUExBVEZPUk0oV0lOKQor dm9pZCBTZXR0aW5nczo6c2V0U2hvdWxkVXNlSGlnaFJlc29sdXRpb25UaW1lcnMoYm9vbCBzaG91 bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVycykKK3sKKyAgICBnU2hvdWxkVXNlSGlnaFJlc29sdXRp b25UaW1lcnMgPSBzaG91bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVyczsKK30KKyNlbmRpZgorCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAkocmV2aXNpb24gNDgzMDIpCisrKyBX ZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAkod29ya2luZyBjb3B5KQpAQCAtMjUzLDYgKzI1MywxMSBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgc2V0QWNjZWxlcmF0ZWRDb21wb3Np dGluZ0VuYWJsZWQoYm9vbCk7CiAgICAgICAgIGJvb2wgYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Vu YWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2FjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkOyB9 CiAKKyNpZiBQTEFURk9STShXSU4pCisgICAgICAgIHN0YXRpYyB2b2lkIHNldFNob3VsZFVzZUhp Z2hSZXNvbHV0aW9uVGltZXJzKGJvb2wpOworICAgICAgICBzdGF0aWMgYm9vbCBzaG91bGRVc2VI aWdoUmVzb2x1dGlvblRpbWVycygpIHsgcmV0dXJuIGdTaG91bGRVc2VIaWdoUmVzb2x1dGlvblRp bWVyczsgfQorI2VuZGlmCisKICAgICBwcml2YXRlOgogICAgICAgICBQYWdlKiBtX3BhZ2U7CiAg ICAgICAgIApAQCAtMzIxLDYgKzMyNiw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICNpZiBVU0Uo U0FGQVJJX1RIRU1FKQogICAgICAgICBzdGF0aWMgYm9vbCBnU2hvdWxkUGFpbnROYXRpdmVDb250 cm9sczsKICNlbmRpZgorI2lmIFBMQVRGT1JNKFdJTikKKyAgICAgICAgc3RhdGljIGJvb2wgZ1No b3VsZFVzZUhpZ2hSZXNvbHV0aW9uVGltZXJzOworI2VuZGlmCiAgICAgfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS93aW4vU2hhcmVkVGltZXJXaW4u Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vd2luL1NoYXJlZFRpbWVyV2luLmNw cAkocmV2aXNpb24gNDgzMDIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL3dpbi9TaGFyZWRUaW1lcldp bi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJTaGFyZWRU aW1lci5oIgogCiAjaW5jbHVkZSAiUGFnZS5oIgorI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5j bHVkZSAiV2lkZ2V0LmgiCiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KICNpbmNsdWRlIDx3 dGYvQ3VycmVudFRpbWUuaD4KQEAgLTE2MCwzNSArMTYxLDM4IEBAIHZvaWQgc2V0U2hhcmVkVGlt ZXJGaXJlVGltZShkb3VibGUgZmlyZVQKICAgICAgICAgICAgIGludGVydmFsSW5NUyA9ICh1bnNp Z25lZClpbnRlcnZhbDsKICAgICB9CiAKLSAgICBpZiAoaW50ZXJ2YWwgPCBoaWdoUmVzb2x1dGlv blRocmVzaG9sZE1zZWMpIHsKLSAgICAgICAgaWYgKCFoaWdoUmVzVGltZXJBY3RpdmUpIHsKLSAg ICAgICAgICAgIGhpZ2hSZXNUaW1lckFjdGl2ZSA9IHRydWU7Ci0gICAgICAgICAgICB0aW1lQmVn aW5QZXJpb2QodGltZXJSZXNvbHV0aW9uKTsKLSAgICAgICAgfQotICAgICAgICBTZXRUaW1lcih0 aW1lcldpbmRvd0hhbmRsZSwgZW5kSGlnaFJlc1RpbWVySUQsIHN0b3BIaWdoUmVzVGltZXJJbk1z ZWMsIDApOwotICAgIH0KLQogICAgIGluaXRpYWxpemVPZmZTY3JlZW5UaW1lcldpbmRvdygpOwog ICAgIGJvb2wgdGltZXJTZXQgPSBmYWxzZTsKLSAgICBEV09SRCBxdWV1ZVN0YXR1cyA9IExPV09S RChHZXRRdWV1ZVN0YXR1cyhRU19QQUlOVCB8IFFTX01PVVNFQlVUVE9OIHwgUVNfS0VZIHwgUVNf UkFXSU5QVVQpKTsKIAotICAgIC8vIFdpbjMyIGhhcyBhIHRyaS1sZXZlbCBxdWV1ZSB3aXRoIGFw cGxpY2F0aW9uIG1lc3NhZ2VzID4gdXNlciBpbnB1dCA+IFdNX1BBSU5UL1dNX1RJTUVSLgorICAg IGlmIChTZXR0aW5nczo6c2hvdWxkVXNlSGlnaFJlc29sdXRpb25UaW1lcnMoKSkgeworICAgICAg ICBpZiAoaW50ZXJ2YWwgPCBoaWdoUmVzb2x1dGlvblRocmVzaG9sZE1zZWMpIHsKKyAgICAgICAg ICAgIGlmICghaGlnaFJlc1RpbWVyQWN0aXZlKSB7CisgICAgICAgICAgICAgICAgaGlnaFJlc1Rp bWVyQWN0aXZlID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICB0aW1lQmVnaW5QZXJpb2QodGltZXJS ZXNvbHV0aW9uKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIFNldFRpbWVyKHRpbWVyV2lu ZG93SGFuZGxlLCBlbmRIaWdoUmVzVGltZXJJRCwgc3RvcEhpZ2hSZXNUaW1lckluTXNlYywgMCk7 CisgICAgICAgIH0KKworICAgICAgICBEV09SRCBxdWV1ZVN0YXR1cyA9IExPV09SRChHZXRRdWV1 ZVN0YXR1cyhRU19QQUlOVCB8IFFTX01PVVNFQlVUVE9OIHwgUVNfS0VZIHwgUVNfUkFXSU5QVVQp KTsKKworICAgICAgICAvLyBXaW4zMiBoYXMgYSB0cmktbGV2ZWwgcXVldWUgd2l0aCBhcHBsaWNh dGlvbiBtZXNzYWdlcyA+IHVzZXIgaW5wdXQgPiBXTV9QQUlOVC9XTV9USU1FUi4KIAotICAgIC8v IElmIHRoZSBxdWV1ZSBkb2Vzbid0IGNvbnRhaW5zIGlucHV0IGV2ZW50cywgd2UgdXNlIGEgaGln aGVyIHByaW9ydHkgdGltZXIgZXZlbnQgcG9zdGluZyBtZWNoYW5pc20uCi0gICAgaWYgKCEocXVl dWVTdGF0dXMgJiAoUVNfTU9VU0VCVVRUT04gfCBRU19LRVkgfCBRU19SQVdJTlBVVCkpKSB7Ci0g ICAgICAgIGlmIChpbnRlcnZhbEluTVMgPCBVU0VSX1RJTUVSX01JTklNVU0gJiYgIXByb2Nlc3Np bmdDdXN0b21UaW1lck1lc3NhZ2UgJiYgIShxdWV1ZVN0YXR1cyAmIFFTX1BBSU5UKSkgewotICAg ICAgICAgICAgLy8gQ2FsbCBQb3N0TWVzc2FnZSBpbW1lZGlhdGVseSBpZiB0aGUgdGltZXIgaXMg YWxyZWFkeSBleHBpcmVkLCB1bmxlc3MgYSBwYWludCBpcyBwZW5kaW5nLgotICAgICAgICAgICAg Ly8gKHdlIHByaW9yaXRpemUgcGFpbnRzIG92ZXIgdGltZXJzKQotICAgICAgICAgICAgaWYgKElu dGVybG9ja2VkSW5jcmVtZW50KCZwZW5kaW5nVGltZXJzKSA9PSAxKQotICAgICAgICAgICAgICAg IFBvc3RNZXNzYWdlKHRpbWVyV2luZG93SGFuZGxlLCB0aW1lckZpcmVkTWVzc2FnZSwgMCwgMCk7 Ci0gICAgICAgICAgICB0aW1lclNldCA9IHRydWU7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAg ICAgICAvLyBPdGhlcndpc2UsIGRlbGF5IHRoZSBQb3N0TWVzc2FnZSB2aWEgYSBDcmVhdGVUaW1l clF1ZXVlVGltZXIKLSAgICAgICAgICAgIGlmICghdGltZXJRdWV1ZSkKLSAgICAgICAgICAgICAg ICB0aW1lclF1ZXVlID0gQ3JlYXRlVGltZXJRdWV1ZSgpOwotICAgICAgICAgICAgaWYgKHRpbWVy KQotICAgICAgICAgICAgICAgIERlbGV0ZVRpbWVyUXVldWVUaW1lcih0aW1lclF1ZXVlLCB0aW1l ciwgMCk7Ci0gICAgICAgICAgICB0aW1lclNldCA9IENyZWF0ZVRpbWVyUXVldWVUaW1lcigmdGlt ZXIsIHRpbWVyUXVldWUsIHF1ZXVlVGltZXJQcm9jLCAwLCBpbnRlcnZhbEluTVMsIDAsIFdUX0VY RUNVVEVJTlRJTUVSVEhSRUFEIHwgV1RfRVhFQ1VURU9OTFlPTkNFKTsKKyAgICAgICAgLy8gSWYg dGhlIHF1ZXVlIGRvZXNuJ3QgY29udGFpbnMgaW5wdXQgZXZlbnRzLCB3ZSB1c2UgYSBoaWdoZXIg cHJpb3J0eSB0aW1lciBldmVudCBwb3N0aW5nIG1lY2hhbmlzbS4KKyAgICAgICAgaWYgKCEocXVl dWVTdGF0dXMgJiAoUVNfTU9VU0VCVVRUT04gfCBRU19LRVkgfCBRU19SQVdJTlBVVCkpKSB7Cisg ICAgICAgICAgICBpZiAoaW50ZXJ2YWxJbk1TIDwgVVNFUl9USU1FUl9NSU5JTVVNICYmICFwcm9j ZXNzaW5nQ3VzdG9tVGltZXJNZXNzYWdlICYmICEocXVldWVTdGF0dXMgJiBRU19QQUlOVCkpIHsK KyAgICAgICAgICAgICAgICAvLyBDYWxsIFBvc3RNZXNzYWdlIGltbWVkaWF0ZWx5IGlmIHRoZSB0 aW1lciBpcyBhbHJlYWR5IGV4cGlyZWQsIHVubGVzcyBhIHBhaW50IGlzIHBlbmRpbmcuCisgICAg ICAgICAgICAgICAgLy8gKHdlIHByaW9yaXRpemUgcGFpbnRzIG92ZXIgdGltZXJzKQorICAgICAg ICAgICAgICAgIGlmIChJbnRlcmxvY2tlZEluY3JlbWVudCgmcGVuZGluZ1RpbWVycykgPT0gMSkK KyAgICAgICAgICAgICAgICAgICAgUG9zdE1lc3NhZ2UodGltZXJXaW5kb3dIYW5kbGUsIHRpbWVy RmlyZWRNZXNzYWdlLCAwLCAwKTsKKyAgICAgICAgICAgICAgICB0aW1lclNldCA9IHRydWU7Cisg ICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIC8vIE90aGVyd2lzZSwgZGVsYXkg dGhlIFBvc3RNZXNzYWdlIHZpYSBhIENyZWF0ZVRpbWVyUXVldWVUaW1lcgorICAgICAgICAgICAg ICAgIGlmICghdGltZXJRdWV1ZSkKKyAgICAgICAgICAgICAgICAgICAgdGltZXJRdWV1ZSA9IENy ZWF0ZVRpbWVyUXVldWUoKTsKKyAgICAgICAgICAgICAgICBpZiAodGltZXIpCisgICAgICAgICAg ICAgICAgICAgIERlbGV0ZVRpbWVyUXVldWVUaW1lcih0aW1lclF1ZXVlLCB0aW1lciwgMCk7Cisg ICAgICAgICAgICAgICAgdGltZXJTZXQgPSBDcmVhdGVUaW1lclF1ZXVlVGltZXIoJnRpbWVyLCB0 aW1lclF1ZXVlLCBxdWV1ZVRpbWVyUHJvYywgMCwgaW50ZXJ2YWxJbk1TLCAwLCBXVF9FWEVDVVRF SU5USU1FUlRIUkVBRCB8IFdUX0VYRUNVVEVPTkxZT05DRSk7CisgICAgICAgICAgICB9CiAgICAg ICAgIH0KICAgICB9CiAKSW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC93aW4vQ2hhbmdlTG9nCShyZXZpc2lvbiA0ODMwNCkKKysrIFdlYktpdC93aW4vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDktMDktMTEgIFN0ZXZl IEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBXZWJLaXQgY2xpZW50cyB0byBvcHQgb3V0 IG9mIGhpZ2ggcmVzb2x1dGlvbiB0aW1lcnMgb24gV2luZG93cy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5MTkyCisKKyAgICAgICAgKiBJbnRlcmZh Y2VzL0lXZWJQcmVmZXJlbmNlc1ByaXZhdGUuaWRsOiBBZGRlZCBnZXR0ZXIvc2V0dGVyLgorICAg ICAgICBQdXQgdGhpcyBqdXN0IGFmdGVyIGxhc3QgNC4wLjMgbWV0aG9kIGZvciBmdXR1cmUgbWVy Z2luZy4KKyAgICAgICAgKiBJbnRlcmZhY2VzL1dlYktpdC5pZGw6IFRvdWNoZWQgdG8gZm9yY2Ug YSByZWJ1aWxkLgorICAgICAgICAqIFdlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oOiBBZGRlZCBw cmVmcyBrZXkgZm9yIGhpZ2ggcmVzIHRpbWVycy4KKyAgICAgICAgKiBXZWJQcmVmZXJlbmNlcy5j cHA6CisgICAgICAgIChXZWJQcmVmZXJlbmNlczo6aW5pdGlhbGl6ZURlZmF1bHRTZXR0aW5ncyk6 IEluaXRpYWxpemUgaGlnaCByZXMgdGltZXJzIHRvIGVuYWJsZWQuCisgICAgICAgIChXZWJQcmVm ZXJlbmNlczo6c2V0U2hvdWxkVXNlSGlnaFJlc29sdXRpb25UaW1lcnMpOiBBZGRlZC4KKyAgICAg ICAgKFdlYlByZWZlcmVuY2VzOjpzaG91bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVycyk6IEFkZGVk LgorICAgICAgICAqIFdlYlByZWZlcmVuY2VzLmg6IEFkZGVkIGdldHRlci9zZXR0ZXIuCisKIDIw MDktMDktMTEgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEdldCB1 c2VyIHNjcmlwdC9zdHlsZXNoZWV0IHRlc3RzIHJ1bm5pbmcgb24gV2luZG93cwpJbmRleDogV2Vi S2l0L3dpbi9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv d2luL1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCShyZXZpc2lvbiA0ODMwMikKKysrIFdlYktp dC93aW4vV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyNCwz ICsxMjQsNSBAQAogI2RlZmluZSBXZWJLaXRab29tc1RleHRPbmx5UHJlZmVyZW5jZUtleSAiV2Vi S2l0Wm9vbXNUZXh0T25seSIKIAogI2RlZmluZSBXZWJLaXRYU1NBdWRpdG9yRW5hYmxlZFByZWZl cmVuY2VLZXkgIldlYktpdFhTU0F1ZGl0b3JFbmFibGVkIgorCisjZGVmaW5lIFdlYktpdFVzZUhp Z2hSZXNvbHV0aW9uVGltZXJzUHJlZmVyZW5jZUtleSAiV2ViS2l0VXNlSGlnaFJlc29sdXRpb25U aW1lcnMiCkluZGV4OiBXZWJLaXQvd2luL1dlYlByZWZlcmVuY2VzLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvd2luL1dlYlByZWZlcmVuY2VzLmNwcAkocmV2aXNpb24gNDgzMDIpCisrKyBXZWJL aXQvd2luL1dlYlByZWZlcmVuY2VzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQ3LDYgKzI0Nyw4 IEBAIHZvaWQgV2ViUHJlZmVyZW5jZXM6OmluaXRpYWxpemVEZWZhdWx0U2UKIAogICAgIENGRGlj dGlvbmFyeUFkZFZhbHVlKGRlZmF1bHRzLCBDRlNUUihXZWJLaXRQYWludE5hdGl2ZUNvbnRyb2xz UHJlZmVyZW5jZUtleSksIGtDRkJvb2xlYW5UcnVlKTsKIAorICAgIENGRGljdGlvbmFyeUFkZFZh bHVlKGRlZmF1bHRzLCBDRlNUUihXZWJLaXRVc2VIaWdoUmVzb2x1dGlvblRpbWVyc1ByZWZlcmVu Y2VLZXkpLCBrQ0ZCb29sZWFuVHJ1ZSk7CisKICAgICBkZWZhdWx0U2V0dGluZ3MgPSBkZWZhdWx0 czsKIH0KIApAQCAtMTMwMSw2ICsxMzAzLDE4IEBAIEhSRVNVTFQgV2ViUHJlZmVyZW5jZXM6Onpv b21zVGV4dE9ubHkoQk8KICAgICByZXR1cm4gU19PSzsKIH0KIAorSFJFU1VMVCBTVERNRVRIT0RD QUxMVFlQRSBXZWJQcmVmZXJlbmNlczo6c2V0U2hvdWxkVXNlSGlnaFJlc29sdXRpb25UaW1lcnMo Qk9PTCB1c2VIaWdoUmVzb2x1dGlvblRpbWVycykKK3sKKyAgICBzZXRCb29sVmFsdWUoQ0ZTVFIo V2ViS2l0VXNlSGlnaFJlc29sdXRpb25UaW1lcnNQcmVmZXJlbmNlS2V5KSwgdXNlSGlnaFJlc29s dXRpb25UaW1lcnMpOworICAgIHJldHVybiBTX09LOworfQorCitIUkVTVUxUIFNURE1FVEhPRENB TExUWVBFIFdlYlByZWZlcmVuY2VzOjpzaG91bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVycyhCT09M KiB1c2VIaWdoUmVzb2x1dGlvblRpbWVycykKK3sKKyAgICAqdXNlSGlnaFJlc29sdXRpb25UaW1l cnMgPSBib29sVmFsdWVGb3JLZXkoQ0ZTVFIoV2ViS2l0VXNlSGlnaFJlc29sdXRpb25UaW1lcnNQ cmVmZXJlbmNlS2V5KSk7CisgICAgcmV0dXJuIFNfT0s7Cit9CisKIEhSRVNVTFQgV2ViUHJlZmVy ZW5jZXM6OnNldFByZWZlcmVuY2VGb3JUZXN0KEJTVFIga2V5LCBCU1RSIHZhbHVlKQogewogICAg IGlmICghU3lzU3RyaW5nTGVuKGtleSkgfHwgIVN5c1N0cmluZ0xlbih2YWx1ZSkpCkluZGV4OiBX ZWJLaXQvd2luL1dlYlByZWZlcmVuY2VzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3dpbi9XZWJQ cmVmZXJlbmNlcy5oCShyZXZpc2lvbiA0ODMwMikKKysrIFdlYktpdC93aW4vV2ViUHJlZmVyZW5j ZXMuaAkod29ya2luZyBjb3B5KQpAQCAtMzYyLDYgKzM2MiwxMiBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIHNldFhTU0F1ZGl0b3JFbmFibGVkKAogICAg IC8qIFtpbl0gKi8gQk9PTCBlbmFibGVkKTsKIAorICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRI T0RDQUxMVFlQRSBzZXRTaG91bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVycygKKyAgICAvKiBbaW5d ICovIEJPT0wgdXNlSGlnaFJlc29sdXRpb25UaW1lcnMpOworCisgICAgdmlydHVhbCBIUkVTVUxU IFNURE1FVEhPRENBTExUWVBFIHNob3VsZFVzZUhpZ2hSZXNvbHV0aW9uVGltZXJzKAorICAgIC8q IFtyZXR2YWxdW291dF0gKi8gQk9PTCogdXNlSGlnaFJlc29sdXRpb25UaW1lcnMpOworCiAgICAg dmlydHVhbCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIHNldFByZWZlcmVuY2VGb3JUZXN0KAog ICAgIC8qIFtpbl0gKi8gQlNUUiBrZXksCiAgICAgLyogW2luXSAqLyBCU1RSIHZhbHVlKTsKSW5k ZXg6IFdlYktpdC93aW4vSW50ZXJmYWNlcy9JV2ViUHJlZmVyZW5jZXNQcml2YXRlLmlkbAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvd2luL0ludGVyZmFjZXMvSVdlYlByZWZlcmVuY2VzUHJpdmF0ZS5p ZGwJKHJldmlzaW9uIDQ4MzAyKQorKysgV2ViS2l0L3dpbi9JbnRlcmZhY2VzL0lXZWJQcmVmZXJl bmNlc1ByaXZhdGUuaWRsCSh3b3JraW5nIGNvcHkpCkBAIC03OSw2ICs3OSw5IEBAIGludGVyZmFj ZSBJV2ViUHJlZmVyZW5jZXNQcml2YXRlIDogSVVua24KICAgICBIUkVTVUxUIGlzWFNTQXVkaXRv ckVuYWJsZWQoW291dCwgcmV0dmFsXSBCT09MICplbmFibGVkKTsKICAgICBIUkVTVUxUIHNldFhT U0F1ZGl0b3JFbmFibGVkKFtpbl0gQk9PTCBlbmFibGVkKTsKIAorICAgIEhSRVNVTFQgc2V0U2hv dWxkVXNlSGlnaFJlc29sdXRpb25UaW1lcnMoW2luXSBCT09MIHVzZUhpZ2hSZXNvbHV0aW9uVGlt ZXJzKTsKKyAgICBIUkVTVUxUIHNob3VsZFVzZUhpZ2hSZXNvbHV0aW9uVGltZXJzKFtvdXQsIHJl dHZhbF0gQk9PTCogdXNlSGlnaFJlc29sdXRpb25UaW1lcnMpOworCiAgICAgLy8gVXNlZCB0byBz ZXQgcHJlZmVyZW5jZSBzcGVjaWZpZWQgYnkgYSB0ZXN0IHZpYSBMYXlvdXRUZXN0Q29udHJvbGxl ci5vdmVycmlkZVByZWZlcmVuY2UoLi4pLgogICAgIC8vIFVzZWQgYnkgRHVtcFJlbmRlclRyZWUu CiAgICAgSFJFU1VMVCBzZXRQcmVmZXJlbmNlRm9yVGVzdChbaW5dIEJTVFIga2V5LCBbaW5dIEJT VFIgdmFsdWUpOwpJbmRleDogV2ViS2l0L3dpbi9JbnRlcmZhY2VzL1dlYktpdC5pZGwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L3dpbi9JbnRlcmZhY2VzL1dlYktpdC5pZGwJKHJldmlzaW9uIDQ4MzAy KQorKysgV2ViS2l0L3dpbi9JbnRlcmZhY2VzL1dlYktpdC5pZGwJKHdvcmtpbmcgY29weSkKQEAg LTM2OCw0ICszNjgsMyBAQCBsaWJyYXJ5IFdlYktpdAogICAgIH0KIH0KIAotCg== 39491 2009-09-11 16:44:04 -0700 2009-09-11 16:58:43 -0700 Fix bug with preferences to settings propagation patch.diff text/plain 1752 sfalken SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQ4MzIx KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMDkt MTEgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcm9wZXJseSBwcm9wYWdhdGUgcHJl ZmVyZW5jZSBmcm9tIFdlYlByZWZlcmVuY2VzIHRvIFdlYkNvcmU6OlNldHRpbmdzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkxOTIKKworICAgICAg ICAqIFdlYlZpZXcuY3BwOgorICAgICAgICAoV2ViVmlldzo6aW5pdFdpdGhGcmFtZSk6IEFwcGx5 IHNldHRpbmcgd2hlbiBjcmVhdGluZyBhIG5ldyBXZWJWaWV3LgorICAgICAgICAoV2ViVmlldzo6 bm90aWZ5UHJlZmVyZW5jZXNDaGFuZ2VkKTogQXBwbHkgc2V0dGluZyB3aGVuIHByZWZlcmVuY2Vz IGNoYW5nZS4KKwogMjAwOS0wOS0xMSAgU3RldmUgRmFsa2VuYnVyZyAgPHNmYWxrZW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViVmlldy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViVmlldy5jcHAJKHJldmlzaW9uIDQ4MzAyKQorKysgV2ViVmll dy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzMzgsNiArMjMzOCwxMCBAQCBIUkVTVUxUIFNURE1F VEhPRENBTExUWVBFIFdlYlZpZXc6OmluaXRXCiAgICAgICAgIFNldHRpbmdzOjpzZXRTaG91bGRQ YWludE5hdGl2ZUNvbnRyb2xzKHNob3VsZFBhaW50TmF0aXZlQ29udHJvbHMpOwogI2VuZGlmCiAK KyAgICBCT09MIHVzZUhpZ2hSZXNvbHV0aW9uVGltZXI7CisgICAgaWYgKFNVQ0NFRURFRChtX3By ZWZlcmVuY2VzLT5zaG91bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVycygmdXNlSGlnaFJlc29sdXRp b25UaW1lcikpKQorICAgICAgICBTZXR0aW5nczo6c2V0U2hvdWxkVXNlSGlnaFJlc29sdXRpb25U aW1lcnModXNlSGlnaFJlc29sdXRpb25UaW1lcik7CisKICAgICBtX3BhZ2UgPSBuZXcgUGFnZShu ZXcgV2ViQ2hyb21lQ2xpZW50KHRoaXMpLCBuZXcgV2ViQ29udGV4dE1lbnVDbGllbnQodGhpcyks IG5ldyBXZWJFZGl0b3JDbGllbnQodGhpcyksIG5ldyBXZWJEcmFnQ2xpZW50KHRoaXMpLCBuZXcg V2ViSW5zcGVjdG9yQ2xpZW50KHRoaXMpKTsKIAogICAgIEJTVFIgbG9jYWxTdG9yYWdlUGF0aDsK QEAgLTQzODksNiArNDM5MywxMSBAQCBIUkVTVUxUIFdlYlZpZXc6Om5vdGlmeVByZWZlcmVuY2Vz Q2hhbmdlCiAgICAgc2V0dGluZ3MtPnNldFNob3VsZFBhaW50TmF0aXZlQ29udHJvbHMoISFlbmFi bGVkKTsKICNlbmRpZgogCisgICAgaHIgPSBwcmVmc1ByaXZhdGUtPnNob3VsZFVzZUhpZ2hSZXNv bHV0aW9uVGltZXJzKCZlbmFibGVkKTsKKyAgICBpZiAoRkFJTEVEKGhyKSkKKyAgICAgICAgcmV0 dXJuIGhyOworICAgIHNldHRpbmdzLT5zZXRTaG91bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVycyhl bmFibGVkKTsKKwogICAgIGlmICghbV9jbG9zZVdpbmRvd1RpbWVyLmlzQWN0aXZlKCkpCiAgICAg ICAgIG1fbWFpbkZyYW1lLT5pbnZhbGlkYXRlKCk7IC8vIEZJWE1FCiAK