51863 2011-01-03 18:57:48 -0800 [chromium] WEBKIT_API and styling fixes for the chromium api. 2011-01-05 14:21:02 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 levin levin commit-queue fishd oldest_to_newest 328878 0 levin 2011-01-03 18:57:48 -0800 See summary. Making some fixes according to https://lists.webkit.org/pipermail/webkit-dev/2010-December/015188.html 328879 1 77864 levin 2011-01-03 19:01:34 -0800 Created attachment 77864 Patch 328899 2 77864 eric 2011-01-03 23:40:30 -0800 Comment on attachment 77864 Patch These look right to me. 328914 3 77864 fishd 2011-01-04 00:57:51 -0800 Comment on attachment 77864 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=77864&action=review > WebKit/chromium/public/WebDOMEventListener.h:51 > + virtual ~WebDOMEventListener(); this will break the build. because the implementation is provided by a .cpp file and callable by chromium, it needs to be marked WEBKIT_API. it is rather unusual for us to have virtual destructors in the API like this. the destructor needs to be virtual because this is an interface meant to be subclassed. to keep the rules simple, we could just have this be implemented inline to a private method, and then that private method would be marked WEBKIT_API. 328985 4 levin 2011-01-04 07:10:57 -0800 (In reply to comment #3) > (From update of attachment 77864 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=77864&action=review > > > WebKit/chromium/public/WebDOMEventListener.h:51 > > + virtual ~WebDOMEventListener(); > > this will break the build. because the implementation is provided by > a .cpp file and callable by chromium, it needs to be marked WEBKIT_API. > > it is rather unusual for us to have virtual destructors in the API like > this. the destructor needs to be virtual because this is an interface > meant to be subclassed. to keep the rules simple, we could just have > this be implemented inline to a private method, and then that private > method would be marked WEBKIT_API. According to https://lists.webkit.org/pipermail/webkit-dev/2010-December/015188.html, virtual functions should not have WEBKIT_API. Why doesn't that apply in this case? 328987 5 levin 2011-01-04 07:21:55 -0800 (In reply to comment #4) > (In reply to comment #3) > > (From update of attachment 77864 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=77864&action=review > > > > > WebKit/chromium/public/WebDOMEventListener.h:51 > > > + virtual ~WebDOMEventListener(); > > > > this will break the build. because the implementation is provided by > > a .cpp file and callable by chromium, it needs to be marked WEBKIT_API. > > > > it is rather unusual for us to have virtual destructors in the API like > > this. the destructor needs to be virtual because this is an interface > > meant to be subclassed. to keep the rules simple, we could just have > > this be implemented inline to a private method, and then that private > > method would be marked WEBKIT_API. > > According to https://lists.webkit.org/pipermail/webkit-dev/2010-December/015188.html, virtual functions should not have WEBKIT_API. Why doesn't that apply in this case? Perhaps this is it: virtual functions should have WEBKIT_API if a derived implementation may be implemented outside of WebKit, and it may want to call the base implementation and that is the case for WebDOMEventListener? 329030 6 fishd 2011-01-04 09:53:59 -0800 (In reply to comment #4) > According to https://lists.webkit.org/pipermail/webkit-dev/2010-December/015188.html, virtual functions should not have WEBKIT_API. Why doesn't that apply in this case? Sorry, my expectation when writing that rule was that all virtual functions would have inline implementations. It is a rare case that they do not. To make the rules easier to follow, how about we make the virtual ~WebDOMEventListener have an inline implementation that calls a private WEBKIT_API method, named 'reset' and similarly have the constructor call an 'initialize' method. The constructor should null out m_private before calling initialize. 329199 7 77927 levin 2011-01-04 14:05:06 -0800 Created attachment 77927 Patch 329787 8 77927 commit-queue 2011-01-05 14:20:55 -0800 Comment on attachment 77927 Patch Clearing flags on attachment: 77927 Committed r75106: <http://trac.webkit.org/changeset/75106> 329788 9 commit-queue 2011-01-05 14:21:02 -0800 All reviewed patches have been landed. Closing bug. 77864 2011-01-03 19:01:34 -0800 2011-01-04 14:05:02 -0800 Patch bug-51863-20110103190133.patch text/plain 11020 levin ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDZlZjA1OGMzM2UyYjYxNTg5Y2EzOGEzMGU0MjE1ZTc4MGVmYmEyZWYu LmViNzY1OGVjZGM3MWQzYjM5NDhjNjgzODcwNDRiMGRjOGFiY2ExMGUgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDQwIEBACisyMDExLTAxLTAzICBEYXZpZCBMZXZpbiAgPGxldmluQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb Y2hyb21pdW1dIFdFQktJVF9BUEkgYW5kIHN0eWxpbmcgZml4ZXMgZm9yIHRoZSBjaHJvbWl1bSBh cGkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTg2 MworCisgICAgICAgIFJlbW92ZWQgc29tZSBpbmNvcnJlY3QgdXNlcyBvZiBXRUJLSVRfQVBJLgor ICAgICAgICBGaXhlZCBzb21lIGFiYnJldmlhdGlvbnMgYnkgbWFraW5nIHRoZW0gd2hvbGUgd29y ZHMuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViQW5pbWF0aW9uQ29udHJvbGxlci5oOiBSZW1vdmVk IFdFQktJVF9BUEkgZnJvbSB2aXJ0dWFsIGZ1bmN0aW9ucy4KKyAgICAgICAgKiBwdWJsaWMvV2Vi RE9NRXZlbnRMaXN0ZW5lci5oOiBEaXR0by4KKyAgICAgICAgKiBwdWJsaWMvV2ViRm9ybUVsZW1l bnQuaDogUmVtb3ZlZCBXRUJLSVRfQVBJIGZyb20gaW5saW5lIGZ1bmN0aW9ucworICAgICAgICBh bmQgZml4ZWQgc29tZSBhYmJyZXZpYXRpb25zLgorICAgICAgICAoV2ViS2l0OjpXZWJGb3JtRWxl bWVudDo6V2ViRm9ybUVsZW1lbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJGb3JtRWxlbWVudDo6 b3BlcmF0b3I9KToKKyAgICAgICAgKFdlYktpdDo6V2ViRm9ybUVsZW1lbnQ6OmFzc2lnbik6Cisg ICAgICAgICogcHVibGljL1dlYklEQkRhdGFiYXNlRXJyb3IuaDogRGl0dG8uCisgICAgICAgIChX ZWJLaXQ6OldlYklEQkRhdGFiYXNlRXJyb3I6OldlYklEQkRhdGFiYXNlRXJyb3IpOgorICAgICAg ICAoV2ViS2l0OjpXZWJJREJEYXRhYmFzZUVycm9yOjpvcGVyYXRvcj0pOgorICAgICAgICAqIHB1 YmxpYy9XZWJJbnB1dEVsZW1lbnQuaDogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OldlYklucHV0 RWxlbWVudDo6V2ViSW5wdXRFbGVtZW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViSW5wdXRFbGVt ZW50OjpvcGVyYXRvcj0pOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnB1dEVsZW1lbnQ6OmFzc2ln bik6CisgICAgICAgICogcHVibGljL1dlYkxhYmVsRWxlbWVudC5oOiBEaXR0by4KKyAgICAgICAg KFdlYktpdDo6V2ViTGFiZWxFbGVtZW50OjpXZWJMYWJlbEVsZW1lbnQpOgorICAgICAgICAoV2Vi S2l0OjpXZWJMYWJlbEVsZW1lbnQ6Om9wZXJhdG9yPSk6CisgICAgICAgIChXZWJLaXQ6OldlYkxh YmVsRWxlbWVudDo6YXNzaWduKToKKyAgICAgICAgKiBwdWJsaWMvV2ViT3B0aW9uRWxlbWVudC5o OiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViT3B0aW9uRWxlbWVudDo6V2ViT3B0aW9uRWxl bWVudCk6CisgICAgICAgIChXZWJLaXQ6OldlYk9wdGlvbkVsZW1lbnQ6Om9wZXJhdG9yPSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYk9wdGlvbkVsZW1lbnQ6OmFzc2lnbik6CisgICAgICAgICogcHVi bGljL1dlYlNlbGVjdEVsZW1lbnQuaDogRGl0dG8gKGFuZCBtaW5vciBzcGFjaW5nIGNsZWFudXAp LgorICAgICAgICAoV2ViS2l0OjpXZWJTZWxlY3RFbGVtZW50OjpXZWJTZWxlY3RFbGVtZW50KToK KyAgICAgICAgKFdlYktpdDo6V2ViU2VsZWN0RWxlbWVudDo6b3BlcmF0b3I9KToKKyAgICAgICAg KFdlYktpdDo6V2ViU2VsZWN0RWxlbWVudDo6YXNzaWduKToKKwogMjAxMS0wMS0wMyAgRGFuaWVs IEJhdGVzICA8ZGJhdGVzQHJpbS5jb20+CiAKICAgICAgICAgQXR0ZW1wdCB0byBmaXggdGhlIENo cm9taXVtIExpbnV4IFJlbGVhc2UgYnVpbGQgYWZ0ZXIgY2hhbmdlc2V0IDc0ODk1IDxodHRwOi8v dHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC83NDg5NT4uCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYkFuaW1hdGlvbkNvbnRyb2xsZXIuaCBiL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViQW5pbWF0aW9uQ29udHJvbGxlci5oCmluZGV4IDBkM2ZjZjVmM2U0NzA1NTlmNGMy NzgzYmQ4YjdjNTZhMDMyNzk5ZWIuLmM2MWU1MzExZThjODgwZjRkZGMwMmM3NjhjYzI4YWUwOGM4 Nzk0OTYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQW5pbWF0aW9uQ29u dHJvbGxlci5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQW5pbWF0aW9uQ29udHJv bGxlci5oCkBAIC00MywxNiArNDMsMTcgQEAgY2xhc3MgV2ViVVJMOwogLy8gb3duZWQgYnkgYSBX ZWJGcmFtZSBhbmQgaXRzIGxpZmUgc3BhbiBpcyBib3VuZCB0byB0aGF0IFdlYkZyYW1lLgogY2xh c3MgV2ViQW5pbWF0aW9uQ29udHJvbGxlciB7CiBwdWJsaWM6Ci0gICAgV0VCS0lUX0FQSSB2aXJ0 dWFsIGJvb2wgcGF1c2VBbmltYXRpb25BdFRpbWUoV2ViRWxlbWVudCYsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiBhbmlt YXRpb25OYW1lLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGRvdWJsZSB0aW1lKSA9IDA7Ci0gICAgV0VCS0lUX0FQSSB2aXJ0dWFsIGJvb2wgcGF1c2VU cmFuc2l0aW9uQXRUaW1lKFdlYkVsZW1lbnQmLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJTdHJpbmcmIHByb3BlcnR5TmFtZSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG91YmxlIHRp bWUpID0gMDsKLQotICAgIFdFQktJVF9BUEkgdmlydHVhbCB1bnNpZ25lZCBudW1iZXJPZkFjdGl2 ZUFuaW1hdGlvbnMoKSBjb25zdCA9IDA7Ci0gICAgV0VCS0lUX0FQSSB2aXJ0dWFsIHZvaWQgc3Vz cGVuZEFuaW1hdGlvbnMoKSBjb25zdCA9IDA7Ci0gICAgV0VCS0lUX0FQSSB2aXJ0dWFsIHZvaWQg cmVzdW1lQW5pbWF0aW9ucygpIGNvbnN0ID0gMDsKKyAgICB2aXJ0dWFsIGJvb2wgcGF1c2VBbmlt YXRpb25BdFRpbWUoV2ViRWxlbWVudCYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnN0IFdlYlN0cmluZyYgYW5pbWF0aW9uTmFtZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZG91YmxlIHRpbWUpID0gMDsKKyAgICB2aXJ0dWFsIGJvb2wg cGF1c2VUcmFuc2l0aW9uQXRUaW1lKFdlYkVsZW1lbnQmLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiBwcm9wZXJ0eU5hbWUsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkb3VibGUgdGltZSkgPSAwOworCisgICAg dmlydHVhbCB1bnNpZ25lZCBudW1iZXJPZkFjdGl2ZUFuaW1hdGlvbnMoKSBjb25zdCA9IDA7Cisg ICAgdmlydHVhbCB2b2lkIHN1c3BlbmRBbmltYXRpb25zKCkgY29uc3QgPSAwOworICAgIHZpcnR1 YWwgdm9pZCByZXN1bWVBbmltYXRpb25zKCkgY29uc3QgPSAwOworCiBwcm90ZWN0ZWQ6CiAgICAg fldlYkFuaW1hdGlvbkNvbnRyb2xsZXIoKSB7IH0KIH07CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYkRPTUV2ZW50TGlzdGVuZXIuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViRE9NRXZlbnRMaXN0ZW5lci5oCmluZGV4IDRiMzJiOTMyNzkzYTkwNTM5Y2FmYjliZmZk ZTNkM2FmMTMxOTU1ODQuLmIxMTVlYmQ0MmRhYjg5MDI1MzIyNWIzMmFhMGUzMDU0M2MwZDNhZGEg MTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRE9NRXZlbnRMaXN0ZW5lci5o CisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRE9NRXZlbnRMaXN0ZW5lci5oCkBAIC00 OCw3ICs0OCw3IEBAIGNsYXNzIFdlYlN0cmluZzsKIGNsYXNzIFdlYkRPTUV2ZW50TGlzdGVuZXIg ewogcHVibGljOgogICAgIFdFQktJVF9BUEkgV2ViRE9NRXZlbnRMaXN0ZW5lcigpOwotICAgIFdF QktJVF9BUEkgdmlydHVhbCB+V2ViRE9NRXZlbnRMaXN0ZW5lcigpOworICAgIHZpcnR1YWwgfldl YkRPTUV2ZW50TGlzdGVuZXIoKTsKIAogICAgIC8vIENhbGxlZCB3aGVuIGFuIGV2ZW50IGlzIHJl Y2VpdmVkLgogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVFdmVudChjb25zdCBXZWJET01FdmVudCYp ID0gMDsKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRm9ybUVsZW1lbnQu aCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRm9ybUVsZW1lbnQuaAppbmRleCAyYjRlZTUz NWVmZTljYzg1NTMxNDIxM2NiOTM3YTEyMDAzNWNlYTM5Li41MzU1NGQ3Mjg4ZTViMWJjNDdmZjhj MzkwNzgwMjM2MDhjYTliZTQ0IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YkZvcm1FbGVtZW50LmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGb3JtRWxlbWVu dC5oCkBAIC01MCwxNCArNTAsMTQgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAgICAgICAgIH5XZWJG b3JtRWxlbWVudCgpIHsgcmVzZXQoKTsgfQogCiAgICAgICAgIFdlYkZvcm1FbGVtZW50KCkgOiBX ZWJFbGVtZW50KCkgeyB9Ci0gICAgICAgIFdlYkZvcm1FbGVtZW50KGNvbnN0IFdlYkZvcm1FbGVt ZW50JiBlKSA6IFdlYkVsZW1lbnQoZSkgeyB9CisgICAgICAgIFdlYkZvcm1FbGVtZW50KGNvbnN0 IFdlYkZvcm1FbGVtZW50JiBlbGVtZW50KSA6IFdlYkVsZW1lbnQoZWxlbWVudCkgeyB9CiAKLSAg ICAgICAgV2ViRm9ybUVsZW1lbnQmIG9wZXJhdG9yPShjb25zdCBXZWJGb3JtRWxlbWVudCYgZSkK KyAgICAgICAgV2ViRm9ybUVsZW1lbnQmIG9wZXJhdG9yPShjb25zdCBXZWJGb3JtRWxlbWVudCYg ZWxlbWVudCkKICAgICAgICAgewotICAgICAgICAgICAgV2ViRWxlbWVudDo6YXNzaWduKGUpOwor ICAgICAgICAgICAgV2ViRWxlbWVudDo6YXNzaWduKGVsZW1lbnQpOwogICAgICAgICAgICAgcmV0 dXJuICp0aGlzOwogICAgICAgICB9Ci0gICAgICAgIFdFQktJVF9BUEkgdm9pZCBhc3NpZ24oY29u c3QgV2ViRm9ybUVsZW1lbnQmIGUpIHsgV2ViRWxlbWVudDo6YXNzaWduKGUpOyB9CisgICAgICAg IHZvaWQgYXNzaWduKGNvbnN0IFdlYkZvcm1FbGVtZW50JiBlbGVtZW50KSB7IFdlYkVsZW1lbnQ6 OmFzc2lnbihlbGVtZW50KTsgfQogCiAgICAgICAgIFdFQktJVF9BUEkgYm9vbCBhdXRvQ29tcGxl dGUoKSBjb25zdDsKICAgICAgICAgV0VCS0lUX0FQSSBXZWJTdHJpbmcgYWN0aW9uKCkgY29uc3Q7 CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklEQkRhdGFiYXNlRXJyb3Iu aCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSURCRGF0YWJhc2VFcnJvci5oCmluZGV4IGMx ODFmNzhjNTAxZThmNjA3MGFlNDk1NjYxMjQ5ZjYxMzlkODUxZWIuLmYyNDdiMzYxNTAzN2I2MjI4 ZWI4YjczZDk4ZTdhYTEyNGFkOGExZDIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViSURCRGF0YWJhc2VFcnJvci5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi SURCRGF0YWJhc2VFcnJvci5oCkBAIC00MiwxMSArNDIsMTEgQEAgY2xhc3MgV2ViSURCRGF0YWJh c2VFcnJvciB7CiBwdWJsaWM6CiAgICAgfldlYklEQkRhdGFiYXNlRXJyb3IoKSB7IHJlc2V0KCk7 IH0KIAotICAgIFdFQktJVF9BUEkgV2ViSURCRGF0YWJhc2VFcnJvcih1bnNpZ25lZCBzaG9ydCBj b2RlLCBjb25zdCBXZWJTdHJpbmcmIG1lc3NhZ2UpIHsgYXNzaWduKGNvZGUsIG1lc3NhZ2UpOyB9 Ci0gICAgV0VCS0lUX0FQSSBXZWJJREJEYXRhYmFzZUVycm9yKGNvbnN0IFdlYklEQkRhdGFiYXNl RXJyb3ImIGUpIHsgYXNzaWduKGUpOyB9Ci0gICAgV0VCS0lUX0FQSSBXZWJJREJEYXRhYmFzZUVy cm9yJiBvcGVyYXRvcj0oY29uc3QgV2ViSURCRGF0YWJhc2VFcnJvciYgZSkKKyAgICBXZWJJREJE YXRhYmFzZUVycm9yKHVuc2lnbmVkIHNob3J0IGNvZGUsIGNvbnN0IFdlYlN0cmluZyYgbWVzc2Fn ZSkgeyBhc3NpZ24oY29kZSwgbWVzc2FnZSk7IH0KKyAgICBXZWJJREJEYXRhYmFzZUVycm9yKGNv bnN0IFdlYklEQkRhdGFiYXNlRXJyb3ImIGVycm9yKSB7IGFzc2lnbihlcnJvcik7IH0KKyAgICBX ZWJJREJEYXRhYmFzZUVycm9yJiBvcGVyYXRvcj0oY29uc3QgV2ViSURCRGF0YWJhc2VFcnJvciYg ZXJyb3IpCiAgICAgewotICAgICAgICBhc3NpZ24oZSk7CisgICAgICAgIGFzc2lnbihlcnJvcik7 CiAgICAgICAgIHJldHVybiAqdGhpczsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViSW5wdXRFbGVtZW50LmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YklucHV0RWxlbWVudC5oCmluZGV4IDNkZDdlNDBlYTNkMzg1NGZiNDNkZjVhYWRmZmMyODE1M2Mx YWEyMWUuLmJlODYyM2NkOTgwZWZiOWRjOTdhMzI0YzJjZTJlYzMzYTc3ZWE2MDggMTAwNjQ0Ci0t LSBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSW5wdXRFbGVtZW50LmgKKysrIGIvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJJbnB1dEVsZW1lbnQuaApAQCAtNDMsMTQgKzQzLDE0IEBAIG5h bWVzcGFjZSBXZWJLaXQgewogICAgIGNsYXNzIFdlYklucHV0RWxlbWVudCA6IHB1YmxpYyBXZWJG b3JtQ29udHJvbEVsZW1lbnQgewogICAgIHB1YmxpYzoKICAgICAgICAgV2ViSW5wdXRFbGVtZW50 KCkgOiBXZWJGb3JtQ29udHJvbEVsZW1lbnQoKSB7IH0KLSAgICAgICAgV2ViSW5wdXRFbGVtZW50 KGNvbnN0IFdlYklucHV0RWxlbWVudCYgZSkgOiBXZWJGb3JtQ29udHJvbEVsZW1lbnQoZSkgeyB9 CisgICAgICAgIFdlYklucHV0RWxlbWVudChjb25zdCBXZWJJbnB1dEVsZW1lbnQmIGVsZW1lbnQp IDogV2ViRm9ybUNvbnRyb2xFbGVtZW50KGVsZW1lbnQpIHsgfQogCi0gICAgICAgIFdlYklucHV0 RWxlbWVudCYgb3BlcmF0b3I9KGNvbnN0IFdlYklucHV0RWxlbWVudCYgZSkKKyAgICAgICAgV2Vi SW5wdXRFbGVtZW50JiBvcGVyYXRvcj0oY29uc3QgV2ViSW5wdXRFbGVtZW50JiBlbGVtZW50KQog ICAgICAgICB7Ci0gICAgICAgICAgICBXZWJGb3JtQ29udHJvbEVsZW1lbnQ6OmFzc2lnbihlKTsK KyAgICAgICAgICAgIFdlYkZvcm1Db250cm9sRWxlbWVudDo6YXNzaWduKGVsZW1lbnQpOwogICAg ICAgICAgICAgcmV0dXJuICp0aGlzOwogICAgICAgICB9Ci0gICAgICAgIFdFQktJVF9BUEkgdm9p ZCBhc3NpZ24oY29uc3QgV2ViSW5wdXRFbGVtZW50JiBlKSB7IFdlYkZvcm1Db250cm9sRWxlbWVu dDo6YXNzaWduKGUpOyB9CisgICAgICAgIHZvaWQgYXNzaWduKGNvbnN0IFdlYklucHV0RWxlbWVu dCYgZWxlbWVudCkgeyBXZWJGb3JtQ29udHJvbEVsZW1lbnQ6OmFzc2lnbihlbGVtZW50KTsgfQog CiAgICAgICAgIC8vIFRoaXMgcmV0dXJucyB0cnVlIGZvciBhbGwgb2YgdGV4dGZpZWxkLWxvb2tp bmcgdHlwZXMgc3VjaCBhcyB0ZXh0LAogICAgICAgICAvLyBwYXNzd29yZCwgc2VhcmNoLCBlbWFp bCwgdXJsLCBhbmQgbnVtYmVyLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJMYWJlbEVsZW1lbnQuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTGFiZWxFbGVtZW50 LmgKaW5kZXggM2U5N2MzOTJlMGU5MGFkYTU2MjhlYjA4YWVjOWI1ZDZlYTljODQ5NC4uZWI5YjA2 ZDEzNTQwMzdiOTNjNmQ3MDRjYzg0ZTRiZDNkNTBhZjA3MSAxMDA2NDQKLS0tIGEvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJMYWJlbEVsZW1lbnQuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYkxhYmVsRWxlbWVudC5oCkBAIC00NCwxNSArNDQsMTUgQEAgbmFtZXNwYWNlIFdlYktp dCB7CiBjbGFzcyBXZWJMYWJlbEVsZW1lbnQgOiBwdWJsaWMgV2ViRWxlbWVudCB7CiBwdWJsaWM6 CiAgICAgV2ViTGFiZWxFbGVtZW50KCkgOiBXZWJFbGVtZW50KCkgeyB9Ci0gICAgV2ViTGFiZWxF bGVtZW50KGNvbnN0IFdlYkxhYmVsRWxlbWVudCYgZSkgOiBXZWJFbGVtZW50KGUpIHsgfQorICAg IFdlYkxhYmVsRWxlbWVudChjb25zdCBXZWJMYWJlbEVsZW1lbnQmIGVsZW1lbnQpIDogV2ViRWxl bWVudChlbGVtZW50KSB7IH0KIAotICAgIFdlYkxhYmVsRWxlbWVudCYgb3BlcmF0b3I9KGNvbnN0 IFdlYkxhYmVsRWxlbWVudCYgZSkKKyAgICBXZWJMYWJlbEVsZW1lbnQmIG9wZXJhdG9yPShjb25z dCBXZWJMYWJlbEVsZW1lbnQmIGVsZW1lbnQpCiAgICAgewotICAgICAgICBXZWJFbGVtZW50Ojph c3NpZ24oZSk7CisgICAgICAgIFdlYkVsZW1lbnQ6OmFzc2lnbihlbGVtZW50KTsKICAgICAgICAg cmV0dXJuICp0aGlzOwogICAgIH0KIAotICAgIFdFQktJVF9BUEkgdm9pZCBhc3NpZ24oY29uc3Qg V2ViTGFiZWxFbGVtZW50JiBlKSB7IFdlYkVsZW1lbnQ6OmFzc2lnbihlKTsgfQorICAgIHZvaWQg YXNzaWduKGNvbnN0IFdlYkxhYmVsRWxlbWVudCYgZWxlbWVudCkgeyBXZWJFbGVtZW50Ojphc3Np Z24oZWxlbWVudCk7IH0KIAogICAgIFdFQktJVF9BUEkgV2ViRWxlbWVudCBjb3JyZXNwb25kaW5n Q29udHJvbCgpOwogCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk9wdGlv bkVsZW1lbnQuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViT3B0aW9uRWxlbWVudC5oCmlu ZGV4IDE2ODlhNTc4ODg2YzdiYjBkY2Q0MTUwNjIyZjk1NGE3ZmJhMjgxNzMuLjI0YTZlYWE4MTlh OTdiNjcxZmY0MGI4ZDkzODM1Y2M2YjRlZWFiNDggMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViT3B0aW9uRWxlbWVudC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViT3B0aW9uRWxlbWVudC5oCkBAIC00NCwxNCArNDQsMTQgQEAgbmFtZXNwYWNlIFdlYktpdCB7 CiBjbGFzcyBXZWJPcHRpb25FbGVtZW50IDogcHVibGljIFdlYkZvcm1Db250cm9sRWxlbWVudCB7 CiBwdWJsaWM6CiAgICAgV2ViT3B0aW9uRWxlbWVudCgpIDogV2ViRm9ybUNvbnRyb2xFbGVtZW50 KCkgeyB9Ci0gICAgV2ViT3B0aW9uRWxlbWVudChjb25zdCBXZWJPcHRpb25FbGVtZW50JiBlKSA6 IFdlYkZvcm1Db250cm9sRWxlbWVudChlKSB7IH0KKyAgICBXZWJPcHRpb25FbGVtZW50KGNvbnN0 IFdlYk9wdGlvbkVsZW1lbnQmIGVsZW1lbnQpIDogV2ViRm9ybUNvbnRyb2xFbGVtZW50KGVsZW1l bnQpIHsgfQogCi0gICAgV2ViT3B0aW9uRWxlbWVudCYgb3BlcmF0b3I9KGNvbnN0IFdlYk9wdGlv bkVsZW1lbnQmIGUpCisgICAgV2ViT3B0aW9uRWxlbWVudCYgb3BlcmF0b3I9KGNvbnN0IFdlYk9w dGlvbkVsZW1lbnQmIGVsZW1lbnQpCiAgICAgewotICAgICAgICBXZWJGb3JtQ29udHJvbEVsZW1l bnQ6OmFzc2lnbihlKTsKKyAgICAgICAgV2ViRm9ybUNvbnRyb2xFbGVtZW50Ojphc3NpZ24oZWxl bWVudCk7CiAgICAgICAgIHJldHVybiAqdGhpczsKICAgICB9Ci0gICAgV0VCS0lUX0FQSSB2b2lk IGFzc2lnbihjb25zdCBXZWJPcHRpb25FbGVtZW50JiBlKSB7IFdlYkZvcm1Db250cm9sRWxlbWVu dDo6YXNzaWduKGUpOyB9CisgICAgdm9pZCBhc3NpZ24oY29uc3QgV2ViT3B0aW9uRWxlbWVudCYg ZWxlbWVudCkgeyBXZWJGb3JtQ29udHJvbEVsZW1lbnQ6OmFzc2lnbihlbGVtZW50KTsgfQogCiAg ICAgV0VCS0lUX0FQSSB2b2lkIHNldFZhbHVlKGNvbnN0IFdlYlN0cmluZyYpOwogICAgIFdFQktJ VF9BUEkgV2ViU3RyaW5nIHZhbHVlKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYlNlbGVjdEVsZW1lbnQuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi U2VsZWN0RWxlbWVudC5oCmluZGV4IDNlN2Y1ZTI0N2QzYWM4OWU5ODcwOTVkNTRkNGJjYzk2ZDRi ODZlZTEuLjk3ZDNhNzhhZTU3NDRjYmY4YmM5NjEzN2M1Njc2ZTE5YWE1Y2UxMDEgMTAwNjQ0Ci0t LSBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU2VsZWN0RWxlbWVudC5oCisrKyBiL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViU2VsZWN0RWxlbWVudC5oCkBAIC00NSwxNCArNDUsMTQgQEAg bmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBXZWJTZWxlY3RFbGVtZW50IDogcHVibGljIFdlYkZv cm1Db250cm9sRWxlbWVudCB7CiBwdWJsaWM6CiAgICAgV2ViU2VsZWN0RWxlbWVudCgpIDogV2Vi Rm9ybUNvbnRyb2xFbGVtZW50KCkgeyB9Ci0gICAgV2ViU2VsZWN0RWxlbWVudChjb25zdCBXZWJT ZWxlY3RFbGVtZW50JiBlKSA6IFdlYkZvcm1Db250cm9sRWxlbWVudChlKSB7IH0KKyAgICBXZWJT ZWxlY3RFbGVtZW50KGNvbnN0IFdlYlNlbGVjdEVsZW1lbnQmIGVsZW1lbnQpIDogV2ViRm9ybUNv bnRyb2xFbGVtZW50KGVsZW1lbnQpIHsgfQogCi0gICAgV2ViU2VsZWN0RWxlbWVudCYgb3BlcmF0 b3I9KGNvbnN0IFdlYlNlbGVjdEVsZW1lbnQmIGUpCi0gICAgeyAKLSAgICAgICAgV2ViRm9ybUNv bnRyb2xFbGVtZW50Ojphc3NpZ24oZSk7IAotICAgICAgICByZXR1cm4gKnRoaXM7IAorICAgIFdl YlNlbGVjdEVsZW1lbnQmIG9wZXJhdG9yPShjb25zdCBXZWJTZWxlY3RFbGVtZW50JiBlbGVtZW50 KQorICAgIHsKKyAgICAgICAgV2ViRm9ybUNvbnRyb2xFbGVtZW50Ojphc3NpZ24oZWxlbWVudCk7 CisgICAgICAgIHJldHVybiAqdGhpczsKICAgICB9Ci0gICAgV0VCS0lUX0FQSSB2b2lkIGFzc2ln bihjb25zdCBXZWJTZWxlY3RFbGVtZW50JiBlKSB7IFdlYkZvcm1Db250cm9sRWxlbWVudDo6YXNz aWduKGUpOyB9CisgICAgdm9pZCBhc3NpZ24oY29uc3QgV2ViU2VsZWN0RWxlbWVudCYgZWxlbWVu dCkgeyBXZWJGb3JtQ29udHJvbEVsZW1lbnQ6OmFzc2lnbihlbGVtZW50KTsgfQogCiAgICAgV0VC S0lUX0FQSSB2b2lkIHNldFZhbHVlKGNvbnN0IFdlYlN0cmluZyYpOwogICAgIFdFQktJVF9BUEkg V2ViU3RyaW5nIHZhbHVlKCk7Cg== 77927 2011-01-04 14:05:06 -0800 2011-01-05 14:20:55 -0800 Patch bug-51863-20110104140504.patch text/plain 10373 levin ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDZlZjA1OGMzM2UyYjYxNTg5Y2EzOGEzMGU0MjE1ZTc4MGVmYmEyZWYu LmVjNjg4ZDhkYTlkZmM2NDkxOGJiNDgzMGE0YWU0Yzc3OTgzNzAyZjYgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDM5IEBACisyMDExLTAxLTAzICBEYXZpZCBMZXZpbiAgPGxldmluQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb Y2hyb21pdW1dIFdFQktJVF9BUEkgYW5kIHN0eWxpbmcgZml4ZXMgZm9yIHRoZSBjaHJvbWl1bSBh cGkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTg2 MworCisgICAgICAgIFJlbW92ZWQgc29tZSBpbmNvcnJlY3QgdXNlcyBvZiBXRUJLSVRfQVBJLgor ICAgICAgICBGaXhlZCBzb21lIGFiYnJldmlhdGlvbnMgYnkgbWFraW5nIHRoZW0gd2hvbGUgd29y ZHMuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViQW5pbWF0aW9uQ29udHJvbGxlci5oOiBSZW1vdmVk IFdFQktJVF9BUEkgZnJvbSB2aXJ0dWFsIGZ1bmN0aW9ucy4KKyAgICAgICAgKiBwdWJsaWMvV2Vi Rm9ybUVsZW1lbnQuaDogUmVtb3ZlZCBXRUJLSVRfQVBJIGZyb20gaW5saW5lIGZ1bmN0aW9ucwor ICAgICAgICBhbmQgZml4ZWQgc29tZSBhYmJyZXZpYXRpb25zLgorICAgICAgICAoV2ViS2l0OjpX ZWJGb3JtRWxlbWVudDo6V2ViRm9ybUVsZW1lbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJGb3Jt RWxlbWVudDo6b3BlcmF0b3I9KToKKyAgICAgICAgKFdlYktpdDo6V2ViRm9ybUVsZW1lbnQ6OmFz c2lnbik6CisgICAgICAgICogcHVibGljL1dlYklEQkRhdGFiYXNlRXJyb3IuaDogRGl0dG8uCisg ICAgICAgIChXZWJLaXQ6OldlYklEQkRhdGFiYXNlRXJyb3I6OldlYklEQkRhdGFiYXNlRXJyb3Ip OgorICAgICAgICAoV2ViS2l0OjpXZWJJREJEYXRhYmFzZUVycm9yOjpvcGVyYXRvcj0pOgorICAg ICAgICAqIHB1YmxpYy9XZWJJbnB1dEVsZW1lbnQuaDogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6 OldlYklucHV0RWxlbWVudDo6V2ViSW5wdXRFbGVtZW50KToKKyAgICAgICAgKFdlYktpdDo6V2Vi SW5wdXRFbGVtZW50OjpvcGVyYXRvcj0pOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnB1dEVsZW1l bnQ6OmFzc2lnbik6CisgICAgICAgICogcHVibGljL1dlYkxhYmVsRWxlbWVudC5oOiBEaXR0by4K KyAgICAgICAgKFdlYktpdDo6V2ViTGFiZWxFbGVtZW50OjpXZWJMYWJlbEVsZW1lbnQpOgorICAg ICAgICAoV2ViS2l0OjpXZWJMYWJlbEVsZW1lbnQ6Om9wZXJhdG9yPSk6CisgICAgICAgIChXZWJL aXQ6OldlYkxhYmVsRWxlbWVudDo6YXNzaWduKToKKyAgICAgICAgKiBwdWJsaWMvV2ViT3B0aW9u RWxlbWVudC5oOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViT3B0aW9uRWxlbWVudDo6V2Vi T3B0aW9uRWxlbWVudCk6CisgICAgICAgIChXZWJLaXQ6OldlYk9wdGlvbkVsZW1lbnQ6Om9wZXJh dG9yPSk6CisgICAgICAgIChXZWJLaXQ6OldlYk9wdGlvbkVsZW1lbnQ6OmFzc2lnbik6CisgICAg ICAgICogcHVibGljL1dlYlNlbGVjdEVsZW1lbnQuaDogRGl0dG8gKGFuZCBtaW5vciBzcGFjaW5n IGNsZWFudXApLgorICAgICAgICAoV2ViS2l0OjpXZWJTZWxlY3RFbGVtZW50OjpXZWJTZWxlY3RF bGVtZW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViU2VsZWN0RWxlbWVudDo6b3BlcmF0b3I9KToK KyAgICAgICAgKFdlYktpdDo6V2ViU2VsZWN0RWxlbWVudDo6YXNzaWduKToKKwogMjAxMS0wMS0w MyAgRGFuaWVsIEJhdGVzICA8ZGJhdGVzQHJpbS5jb20+CiAKICAgICAgICAgQXR0ZW1wdCB0byBm aXggdGhlIENocm9taXVtIExpbnV4IFJlbGVhc2UgYnVpbGQgYWZ0ZXIgY2hhbmdlc2V0IDc0ODk1 IDxodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC83NDg5NT4uCmRpZmYgLS1naXQgYS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkFuaW1hdGlvbkNvbnRyb2xsZXIuaCBiL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViQW5pbWF0aW9uQ29udHJvbGxlci5oCmluZGV4IDBkM2ZjZjVmM2U0 NzA1NTlmNGMyNzgzYmQ4YjdjNTZhMDMyNzk5ZWIuLmM2MWU1MzExZThjODgwZjRkZGMwMmM3Njhj YzI4YWUwOGM4Nzk0OTYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQW5p bWF0aW9uQ29udHJvbGxlci5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQW5pbWF0 aW9uQ29udHJvbGxlci5oCkBAIC00MywxNiArNDMsMTcgQEAgY2xhc3MgV2ViVVJMOwogLy8gb3du ZWQgYnkgYSBXZWJGcmFtZSBhbmQgaXRzIGxpZmUgc3BhbiBpcyBib3VuZCB0byB0aGF0IFdlYkZy YW1lLgogY2xhc3MgV2ViQW5pbWF0aW9uQ29udHJvbGxlciB7CiBwdWJsaWM6Ci0gICAgV0VCS0lU X0FQSSB2aXJ0dWFsIGJvb2wgcGF1c2VBbmltYXRpb25BdFRpbWUoV2ViRWxlbWVudCYsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViU3Ry aW5nJiBhbmltYXRpb25OYW1lLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGRvdWJsZSB0aW1lKSA9IDA7Ci0gICAgV0VCS0lUX0FQSSB2aXJ0dWFsIGJv b2wgcGF1c2VUcmFuc2l0aW9uQXRUaW1lKFdlYkVsZW1lbnQmLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJTdHJpbmcmIHByb3BlcnR5 TmFtZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZG91YmxlIHRpbWUpID0gMDsKLQotICAgIFdFQktJVF9BUEkgdmlydHVhbCB1bnNpZ25lZCBudW1i ZXJPZkFjdGl2ZUFuaW1hdGlvbnMoKSBjb25zdCA9IDA7Ci0gICAgV0VCS0lUX0FQSSB2aXJ0dWFs IHZvaWQgc3VzcGVuZEFuaW1hdGlvbnMoKSBjb25zdCA9IDA7Ci0gICAgV0VCS0lUX0FQSSB2aXJ0 dWFsIHZvaWQgcmVzdW1lQW5pbWF0aW9ucygpIGNvbnN0ID0gMDsKKyAgICB2aXJ0dWFsIGJvb2wg cGF1c2VBbmltYXRpb25BdFRpbWUoV2ViRWxlbWVudCYsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnN0IFdlYlN0cmluZyYgYW5pbWF0aW9uTmFtZSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG91YmxlIHRpbWUpID0gMDsKKyAgICB2aXJ0 dWFsIGJvb2wgcGF1c2VUcmFuc2l0aW9uQXRUaW1lKFdlYkVsZW1lbnQmLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiBwcm9wZXJ0eU5hbWUs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkb3VibGUgdGltZSkgPSAw OworCisgICAgdmlydHVhbCB1bnNpZ25lZCBudW1iZXJPZkFjdGl2ZUFuaW1hdGlvbnMoKSBjb25z dCA9IDA7CisgICAgdmlydHVhbCB2b2lkIHN1c3BlbmRBbmltYXRpb25zKCkgY29uc3QgPSAwOwor ICAgIHZpcnR1YWwgdm9pZCByZXN1bWVBbmltYXRpb25zKCkgY29uc3QgPSAwOworCiBwcm90ZWN0 ZWQ6CiAgICAgfldlYkFuaW1hdGlvbkNvbnRyb2xsZXIoKSB7IH0KIH07CmRpZmYgLS1naXQgYS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZvcm1FbGVtZW50LmggYi9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkZvcm1FbGVtZW50LmgKaW5kZXggMmI0ZWU1MzVlZmU5Y2M4NTUzMTQyMTNjYjkz N2ExMjAwMzVjZWEzOS4uNTM1NTRkNzI4OGU1YjFiYzQ3ZmY4YzM5MDc4MDIzNjA4Y2E5YmU0NCAx MDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGb3JtRWxlbWVudC5oCisrKyBi L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRm9ybUVsZW1lbnQuaApAQCAtNTAsMTQgKzUwLDE0 IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogICAgICAgICB+V2ViRm9ybUVsZW1lbnQoKSB7IHJlc2V0 KCk7IH0KIAogICAgICAgICBXZWJGb3JtRWxlbWVudCgpIDogV2ViRWxlbWVudCgpIHsgfQotICAg ICAgICBXZWJGb3JtRWxlbWVudChjb25zdCBXZWJGb3JtRWxlbWVudCYgZSkgOiBXZWJFbGVtZW50 KGUpIHsgfQorICAgICAgICBXZWJGb3JtRWxlbWVudChjb25zdCBXZWJGb3JtRWxlbWVudCYgZWxl bWVudCkgOiBXZWJFbGVtZW50KGVsZW1lbnQpIHsgfQogCi0gICAgICAgIFdlYkZvcm1FbGVtZW50 JiBvcGVyYXRvcj0oY29uc3QgV2ViRm9ybUVsZW1lbnQmIGUpCisgICAgICAgIFdlYkZvcm1FbGVt ZW50JiBvcGVyYXRvcj0oY29uc3QgV2ViRm9ybUVsZW1lbnQmIGVsZW1lbnQpCiAgICAgICAgIHsK LSAgICAgICAgICAgIFdlYkVsZW1lbnQ6OmFzc2lnbihlKTsKKyAgICAgICAgICAgIFdlYkVsZW1l bnQ6OmFzc2lnbihlbGVtZW50KTsKICAgICAgICAgICAgIHJldHVybiAqdGhpczsKICAgICAgICAg fQotICAgICAgICBXRUJLSVRfQVBJIHZvaWQgYXNzaWduKGNvbnN0IFdlYkZvcm1FbGVtZW50JiBl KSB7IFdlYkVsZW1lbnQ6OmFzc2lnbihlKTsgfQorICAgICAgICB2b2lkIGFzc2lnbihjb25zdCBX ZWJGb3JtRWxlbWVudCYgZWxlbWVudCkgeyBXZWJFbGVtZW50Ojphc3NpZ24oZWxlbWVudCk7IH0K IAogICAgICAgICBXRUJLSVRfQVBJIGJvb2wgYXV0b0NvbXBsZXRlKCkgY29uc3Q7CiAgICAgICAg IFdFQktJVF9BUEkgV2ViU3RyaW5nIGFjdGlvbigpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJJREJEYXRhYmFzZUVycm9yLmggYi9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYklEQkRhdGFiYXNlRXJyb3IuaAppbmRleCBjMTgxZjc4YzUwMWU4ZjYwNzBhZTQ5 NTY2MTI0OWY2MTM5ZDg1MWViLi5mMjQ3YjM2MTUwMzdiNjIyOGViOGI3M2Q5OGU3YWExMjRhZDhh MWQyIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklEQkRhdGFiYXNlRXJy b3IuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklEQkRhdGFiYXNlRXJyb3IuaApA QCAtNDIsMTEgKzQyLDExIEBAIGNsYXNzIFdlYklEQkRhdGFiYXNlRXJyb3IgewogcHVibGljOgog ICAgIH5XZWJJREJEYXRhYmFzZUVycm9yKCkgeyByZXNldCgpOyB9CiAKLSAgICBXRUJLSVRfQVBJ IFdlYklEQkRhdGFiYXNlRXJyb3IodW5zaWduZWQgc2hvcnQgY29kZSwgY29uc3QgV2ViU3RyaW5n JiBtZXNzYWdlKSB7IGFzc2lnbihjb2RlLCBtZXNzYWdlKTsgfQotICAgIFdFQktJVF9BUEkgV2Vi SURCRGF0YWJhc2VFcnJvcihjb25zdCBXZWJJREJEYXRhYmFzZUVycm9yJiBlKSB7IGFzc2lnbihl KTsgfQotICAgIFdFQktJVF9BUEkgV2ViSURCRGF0YWJhc2VFcnJvciYgb3BlcmF0b3I9KGNvbnN0 IFdlYklEQkRhdGFiYXNlRXJyb3ImIGUpCisgICAgV2ViSURCRGF0YWJhc2VFcnJvcih1bnNpZ25l ZCBzaG9ydCBjb2RlLCBjb25zdCBXZWJTdHJpbmcmIG1lc3NhZ2UpIHsgYXNzaWduKGNvZGUsIG1l c3NhZ2UpOyB9CisgICAgV2ViSURCRGF0YWJhc2VFcnJvcihjb25zdCBXZWJJREJEYXRhYmFzZUVy cm9yJiBlcnJvcikgeyBhc3NpZ24oZXJyb3IpOyB9CisgICAgV2ViSURCRGF0YWJhc2VFcnJvciYg b3BlcmF0b3I9KGNvbnN0IFdlYklEQkRhdGFiYXNlRXJyb3ImIGVycm9yKQogICAgIHsKLSAgICAg ICAgYXNzaWduKGUpOworICAgICAgICBhc3NpZ24oZXJyb3IpOwogICAgICAgICByZXR1cm4gKnRo aXM7CiAgICAgfQogCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklucHV0 RWxlbWVudC5oIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJbnB1dEVsZW1lbnQuaAppbmRl eCAzZGQ3ZTQwZWEzZDM4NTRmYjQzZGY1YWFkZmZjMjgxNTNjMWFhMjFlLi5iZTg2MjNjZDk4MGVm YjlkYzk3YTMyNGMyY2UyZWMzM2E3N2VhNjA4IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYklucHV0RWxlbWVudC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi SW5wdXRFbGVtZW50LmgKQEAgLTQzLDE0ICs0MywxNCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICAg ICBjbGFzcyBXZWJJbnB1dEVsZW1lbnQgOiBwdWJsaWMgV2ViRm9ybUNvbnRyb2xFbGVtZW50IHsK ICAgICBwdWJsaWM6CiAgICAgICAgIFdlYklucHV0RWxlbWVudCgpIDogV2ViRm9ybUNvbnRyb2xF bGVtZW50KCkgeyB9Ci0gICAgICAgIFdlYklucHV0RWxlbWVudChjb25zdCBXZWJJbnB1dEVsZW1l bnQmIGUpIDogV2ViRm9ybUNvbnRyb2xFbGVtZW50KGUpIHsgfQorICAgICAgICBXZWJJbnB1dEVs ZW1lbnQoY29uc3QgV2ViSW5wdXRFbGVtZW50JiBlbGVtZW50KSA6IFdlYkZvcm1Db250cm9sRWxl bWVudChlbGVtZW50KSB7IH0KIAotICAgICAgICBXZWJJbnB1dEVsZW1lbnQmIG9wZXJhdG9yPShj b25zdCBXZWJJbnB1dEVsZW1lbnQmIGUpCisgICAgICAgIFdlYklucHV0RWxlbWVudCYgb3BlcmF0 b3I9KGNvbnN0IFdlYklucHV0RWxlbWVudCYgZWxlbWVudCkKICAgICAgICAgewotICAgICAgICAg ICAgV2ViRm9ybUNvbnRyb2xFbGVtZW50Ojphc3NpZ24oZSk7CisgICAgICAgICAgICBXZWJGb3Jt Q29udHJvbEVsZW1lbnQ6OmFzc2lnbihlbGVtZW50KTsKICAgICAgICAgICAgIHJldHVybiAqdGhp czsKICAgICAgICAgfQotICAgICAgICBXRUJLSVRfQVBJIHZvaWQgYXNzaWduKGNvbnN0IFdlYklu cHV0RWxlbWVudCYgZSkgeyBXZWJGb3JtQ29udHJvbEVsZW1lbnQ6OmFzc2lnbihlKTsgfQorICAg ICAgICB2b2lkIGFzc2lnbihjb25zdCBXZWJJbnB1dEVsZW1lbnQmIGVsZW1lbnQpIHsgV2ViRm9y bUNvbnRyb2xFbGVtZW50Ojphc3NpZ24oZWxlbWVudCk7IH0KIAogICAgICAgICAvLyBUaGlzIHJl dHVybnMgdHJ1ZSBmb3IgYWxsIG9mIHRleHRmaWVsZC1sb29raW5nIHR5cGVzIHN1Y2ggYXMgdGV4 dCwKICAgICAgICAgLy8gcGFzc3dvcmQsIHNlYXJjaCwgZW1haWwsIHVybCwgYW5kIG51bWJlci4K ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTGFiZWxFbGVtZW50LmggYi9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkxhYmVsRWxlbWVudC5oCmluZGV4IDNlOTdjMzkyZTBl OTBhZGE1NjI4ZWIwOGFlYzliNWQ2ZWE5Yzg0OTQuLmViOWIwNmQxMzU0MDM3YjkzYzZkNzA0Y2M4 NGU0YmQzZDUwYWYwNzEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTGFi ZWxFbGVtZW50LmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJMYWJlbEVsZW1lbnQu aApAQCAtNDQsMTUgKzQ0LDE1IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgV2ViTGFiZWxF bGVtZW50IDogcHVibGljIFdlYkVsZW1lbnQgewogcHVibGljOgogICAgIFdlYkxhYmVsRWxlbWVu dCgpIDogV2ViRWxlbWVudCgpIHsgfQotICAgIFdlYkxhYmVsRWxlbWVudChjb25zdCBXZWJMYWJl bEVsZW1lbnQmIGUpIDogV2ViRWxlbWVudChlKSB7IH0KKyAgICBXZWJMYWJlbEVsZW1lbnQoY29u c3QgV2ViTGFiZWxFbGVtZW50JiBlbGVtZW50KSA6IFdlYkVsZW1lbnQoZWxlbWVudCkgeyB9CiAK LSAgICBXZWJMYWJlbEVsZW1lbnQmIG9wZXJhdG9yPShjb25zdCBXZWJMYWJlbEVsZW1lbnQmIGUp CisgICAgV2ViTGFiZWxFbGVtZW50JiBvcGVyYXRvcj0oY29uc3QgV2ViTGFiZWxFbGVtZW50JiBl bGVtZW50KQogICAgIHsKLSAgICAgICAgV2ViRWxlbWVudDo6YXNzaWduKGUpOworICAgICAgICBX ZWJFbGVtZW50Ojphc3NpZ24oZWxlbWVudCk7CiAgICAgICAgIHJldHVybiAqdGhpczsKICAgICB9 CiAKLSAgICBXRUJLSVRfQVBJIHZvaWQgYXNzaWduKGNvbnN0IFdlYkxhYmVsRWxlbWVudCYgZSkg eyBXZWJFbGVtZW50Ojphc3NpZ24oZSk7IH0KKyAgICB2b2lkIGFzc2lnbihjb25zdCBXZWJMYWJl bEVsZW1lbnQmIGVsZW1lbnQpIHsgV2ViRWxlbWVudDo6YXNzaWduKGVsZW1lbnQpOyB9CiAKICAg ICBXRUJLSVRfQVBJIFdlYkVsZW1lbnQgY29ycmVzcG9uZGluZ0NvbnRyb2woKTsKIApkaWZmIC0t Z2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJPcHRpb25FbGVtZW50LmggYi9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYk9wdGlvbkVsZW1lbnQuaAppbmRleCAxNjg5YTU3ODg4NmM3YmIw ZGNkNDE1MDYyMmY5NTRhN2ZiYTI4MTczLi4yNGE2ZWFhODE5YTk3YjY3MWZmNDBiOGQ5MzgzNWNj NmI0ZWVhYjQ4IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk9wdGlvbkVs ZW1lbnQuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk9wdGlvbkVsZW1lbnQuaApA QCAtNDQsMTQgKzQ0LDE0IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgV2ViT3B0aW9uRWxl bWVudCA6IHB1YmxpYyBXZWJGb3JtQ29udHJvbEVsZW1lbnQgewogcHVibGljOgogICAgIFdlYk9w dGlvbkVsZW1lbnQoKSA6IFdlYkZvcm1Db250cm9sRWxlbWVudCgpIHsgfQotICAgIFdlYk9wdGlv bkVsZW1lbnQoY29uc3QgV2ViT3B0aW9uRWxlbWVudCYgZSkgOiBXZWJGb3JtQ29udHJvbEVsZW1l bnQoZSkgeyB9CisgICAgV2ViT3B0aW9uRWxlbWVudChjb25zdCBXZWJPcHRpb25FbGVtZW50JiBl bGVtZW50KSA6IFdlYkZvcm1Db250cm9sRWxlbWVudChlbGVtZW50KSB7IH0KIAotICAgIFdlYk9w dGlvbkVsZW1lbnQmIG9wZXJhdG9yPShjb25zdCBXZWJPcHRpb25FbGVtZW50JiBlKQorICAgIFdl Yk9wdGlvbkVsZW1lbnQmIG9wZXJhdG9yPShjb25zdCBXZWJPcHRpb25FbGVtZW50JiBlbGVtZW50 KQogICAgIHsKLSAgICAgICAgV2ViRm9ybUNvbnRyb2xFbGVtZW50Ojphc3NpZ24oZSk7CisgICAg ICAgIFdlYkZvcm1Db250cm9sRWxlbWVudDo6YXNzaWduKGVsZW1lbnQpOwogICAgICAgICByZXR1 cm4gKnRoaXM7CiAgICAgfQotICAgIFdFQktJVF9BUEkgdm9pZCBhc3NpZ24oY29uc3QgV2ViT3B0 aW9uRWxlbWVudCYgZSkgeyBXZWJGb3JtQ29udHJvbEVsZW1lbnQ6OmFzc2lnbihlKTsgfQorICAg IHZvaWQgYXNzaWduKGNvbnN0IFdlYk9wdGlvbkVsZW1lbnQmIGVsZW1lbnQpIHsgV2ViRm9ybUNv bnRyb2xFbGVtZW50Ojphc3NpZ24oZWxlbWVudCk7IH0KIAogICAgIFdFQktJVF9BUEkgdm9pZCBz ZXRWYWx1ZShjb25zdCBXZWJTdHJpbmcmKTsKICAgICBXRUJLSVRfQVBJIFdlYlN0cmluZyB2YWx1 ZSgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTZWxlY3RF bGVtZW50LmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNlbGVjdEVsZW1lbnQuaAppbmRl eCAzZTdmNWUyNDdkM2FjODllOTg3MDk1ZDU0ZDRiY2M5NmQ0Yjg2ZWUxLi45N2QzYTc4YWU1NzQ0 Y2JmOGJjOTYxMzdjNTY3NmUxOWFhNWNlMTAxIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYlNlbGVjdEVsZW1lbnQuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YlNlbGVjdEVsZW1lbnQuaApAQCAtNDUsMTQgKzQ1LDE0IEBAIG5hbWVzcGFjZSBXZWJLaXQgewog Y2xhc3MgV2ViU2VsZWN0RWxlbWVudCA6IHB1YmxpYyBXZWJGb3JtQ29udHJvbEVsZW1lbnQgewog cHVibGljOgogICAgIFdlYlNlbGVjdEVsZW1lbnQoKSA6IFdlYkZvcm1Db250cm9sRWxlbWVudCgp IHsgfQotICAgIFdlYlNlbGVjdEVsZW1lbnQoY29uc3QgV2ViU2VsZWN0RWxlbWVudCYgZSkgOiBX ZWJGb3JtQ29udHJvbEVsZW1lbnQoZSkgeyB9CisgICAgV2ViU2VsZWN0RWxlbWVudChjb25zdCBX ZWJTZWxlY3RFbGVtZW50JiBlbGVtZW50KSA6IFdlYkZvcm1Db250cm9sRWxlbWVudChlbGVtZW50 KSB7IH0KIAotICAgIFdlYlNlbGVjdEVsZW1lbnQmIG9wZXJhdG9yPShjb25zdCBXZWJTZWxlY3RF bGVtZW50JiBlKQotICAgIHsgCi0gICAgICAgIFdlYkZvcm1Db250cm9sRWxlbWVudDo6YXNzaWdu KGUpOyAKLSAgICAgICAgcmV0dXJuICp0aGlzOyAKKyAgICBXZWJTZWxlY3RFbGVtZW50JiBvcGVy YXRvcj0oY29uc3QgV2ViU2VsZWN0RWxlbWVudCYgZWxlbWVudCkKKyAgICB7CisgICAgICAgIFdl YkZvcm1Db250cm9sRWxlbWVudDo6YXNzaWduKGVsZW1lbnQpOworICAgICAgICByZXR1cm4gKnRo aXM7CiAgICAgfQotICAgIFdFQktJVF9BUEkgdm9pZCBhc3NpZ24oY29uc3QgV2ViU2VsZWN0RWxl bWVudCYgZSkgeyBXZWJGb3JtQ29udHJvbEVsZW1lbnQ6OmFzc2lnbihlKTsgfQorICAgIHZvaWQg YXNzaWduKGNvbnN0IFdlYlNlbGVjdEVsZW1lbnQmIGVsZW1lbnQpIHsgV2ViRm9ybUNvbnRyb2xF bGVtZW50Ojphc3NpZ24oZWxlbWVudCk7IH0KIAogICAgIFdFQktJVF9BUEkgdm9pZCBzZXRWYWx1 ZShjb25zdCBXZWJTdHJpbmcmKTsKICAgICBXRUJLSVRfQVBJIFdlYlN0cmluZyB2YWx1ZSgpOwo=