66167 2011-08-12 14:31:05 -0700 [Chromium] Add WebFrameClient::didAdoptURLLoader() notification 2011-08-15 17:34:07 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 66163 1 dimich dimich dglazkov fishd jam jennb webkit.review.bot oldest_to_newest 450670 0 dimich 2011-08-12 14:31:05 -0700 In order to update routing ids for loading requests when iframe is reparented between WebFrames, we need to add a notification to WebFrameClient to tell the WebFrame it now owns a specified resource in progress. 450677 1 103818 dimich 2011-08-12 14:36:30 -0700 Created attachment 103818 Patch 450679 2 dimich 2011-08-12 14:39:36 -0700 This patch won't compile w/o previous one from bug 66165 since it uses a new RessourceLoader* parameter of FrameLoaderClient::transferLoadingResourceFromPage 450682 3 103818 fishd 2011-08-12 14:41:53 -0700 Comment on attachment 103818 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103818&action=review > Source/WebKit/chromium/public/WebFrameClient.h:291 > + virtual void adoptLoadingResource(WebURLLoader*) { } Perhaps this should be adoptURLLoader... or, maybe even better: didAdoptURLLoader. The second form suggests that this is informative. The client does not necessarily need to do anything here unless it has special needs. Chromium has special needs. DRT does not. > Source/WebKit/chromium/src/ResourceHandle.cpp:83 > + static WebURLLoader* WebURLLoaderFromResourceHandle(ResourceHandle* handle) { did you really mean for this to be a static method on ResourceHandleInternal? 450687 4 103821 dimich 2011-08-12 14:56:11 -0700 Created attachment 103821 Updated patch Renamed method to didAdoptURLLoader. As for static method - I hope there is a better way, I'm using the fact that ResourceHandleInternal is a 'friend' to ResourceHandle, to pull the 'd' member. We currently don't have access to it otherwise. Do I miss something? 450688 5 103822 dimich 2011-08-12 14:57:57 -0700 Created attachment 103822 Updated ChanegLog 450690 6 webkit.review.bot 2011-08-12 14:58:35 -0700 Attachment 103821 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/chromium/ChangeLog', u'Sourc..." exit_code: 1 Source/WebKit/chromium/src/ResourceHandle.cpp:83: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 450692 7 webkit.review.bot 2011-08-12 14:59:29 -0700 Attachment 103822 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/chromium/ChangeLog', u'Sourc..." exit_code: 1 Source/WebKit/chromium/src/ResourceHandle.cpp:83: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 450696 8 103825 dimich 2011-08-12 15:07:52 -0700 Created attachment 103825 Fixed style error. 450697 9 103825 fishd 2011-08-12 15:12:31 -0700 Comment on attachment 103825 Fixed style error. View in context: https://bugs.webkit.org/attachment.cgi?id=103825&action=review > Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp:1463 > + WebURLLoader* webURLLoader = WebURLLoaderFromResourceHandle(handle); The thing that confuses me is that at this callsite, you are not doing ResourceHandleInternal::WebURLLoaderFromResourceHandle. so, there must be a missing file that defines the global WebURLLoaderFromResourceHandle function? 450700 10 dimich 2011-08-12 15:18:03 -0700 (In reply to comment #9) > (From update of attachment 103825 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=103825&action=review > > > Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp:1463 > > + WebURLLoader* webURLLoader = WebURLLoaderFromResourceHandle(handle); > > The thing that confuses me is that at this callsite, you are not doing ResourceHandleInternal::WebURLLoaderFromResourceHandle. so, there must be a missing file that defines the global WebURLLoaderFromResourceHandle function? Very true. It won't compile. My bad. How do we crack open ResourceHandle? 450702 11 103825 webkit.review.bot 2011-08-12 15:23:02 -0700 Comment on attachment 103825 Fixed style error. Attachment 103825 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/9378018 450768 12 103825 webkit.review.bot 2011-08-12 17:27:32 -0700 Comment on attachment 103825 Fixed style error. Attachment 103825 did not pass cr-mac-ews (chromium): Output: http://queues.webkit.org/results/9357844 450778 13 103850 dimich 2011-08-12 18:25:16 -0700 Created attachment 103850 Patch As discussed offline, created ResourceHandleInternal.h in chromium/src. The impl of the class still lives in ResourceHandle.cpp, I can pull it out into separate file if desired. Data members of ResourceHandleInternal are made private, needed accessors are added. The complete fix consists of WebKit patches for bug 66165 and this one, and also Chromium side here: http://codereview.chromium.org/7647003/ 450779 14 webkit.review.bot 2011-08-12 18:26:49 -0700 Attachment 103850 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/chromium/ChangeLog', u'Sourc..." exit_code: 1 Source/WebKit/chromium/src/ResourceHandleInternal.h:83: set_owner is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebKit/chromium/src/ResourceHandleInternal.h:86: set_client is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 450782 15 103850 webkit.review.bot 2011-08-12 18:37:10 -0700 Comment on attachment 103850 Patch Attachment 103850 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/9380061 450822 16 103850 webkit.review.bot 2011-08-13 00:09:42 -0700 Comment on attachment 103850 Patch Attachment 103850 did not pass cr-mac-ews (chromium): Output: http://queues.webkit.org/results/9378131 450894 17 103850 fishd 2011-08-13 14:13:07 -0700 Comment on attachment 103850 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103850&action=review > Source/WebKit/chromium/src/ResourceHandleInternal.h:99 > + ConnectionState m_state; is this still used for anything? i don't see any way for this to change values. 451168 18 103850 dimich 2011-08-15 11:26:41 -0700 Comment on attachment 103850 Patch Will have updated patch in a moment. 451191 19 103938 dimich 2011-08-15 12:02:27 -0700 Created attachment 103938 Fixed style issue As for m_state member, it's used internally in implementation of Chromium's ResourceHandleInternal to track the states. I can see it changing values and then asserting on them in WebKit/chromium/src/ResourceHandle.cpp 451212 20 103938 webkit.review.bot 2011-08-15 12:26:29 -0700 Comment on attachment 103938 Fixed style issue Attachment 103938 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/9381846 451316 21 103938 webkit.review.bot 2011-08-15 15:13:00 -0700 Comment on attachment 103938 Fixed style issue Attachment 103938 did not pass cr-mac-ews (chromium): Output: http://queues.webkit.org/results/9394617 451380 22 103938 fishd 2011-08-15 16:37:01 -0700 Comment on attachment 103938 Fixed style issue View in context: https://bugs.webkit.org/attachment.cgi?id=103938&action=review > Source/WebKit/chromium/public/WebFrameClient.h:291 > + // when iframe is transferred between windows while it is loading something. "This happens when an iframe, that is loading a subresource, is transferred between windows." 451418 23 dimich 2011-08-15 17:34:07 -0700 Updated and landed manually: http://trac.webkit.org/changeset/93076 103818 2011-08-12 14:36:30 -0700 2011-08-12 14:56:11 -0700 Patch patch.txt text/plain 3120 dimich ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggZmQ4NjBiNC4uZDE2YzBkYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0wOC0xMiAgRG1pdHJ5IFRp dG92ICA8ZGltaWNoQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIEFkZCBXZWJG cmFtZUNsaWVudDo6YWRvcHRMb2FkaW5nUmVzb3VyY2UoKSBub3RpZmljYXRpb24KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MTY3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWVD bGllbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVDbGllbnQ6OmFkb3B0TG9hZGluZ1Jl c291cmNlKToKKyAgICAgICAgKiBzcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnRJbXBsOjp0cmFuc2ZlckxvYWRpbmdSZXNvdXJj ZUZyb21QYWdlKToKKyAgICAgICAgKiBzcmMvUmVzb3VyY2VIYW5kbGUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6V2ViVVJMTG9hZGVyRnJvbVJlc291cmNl SGFuZGxlKToKKwogMjAxMS0wOC0xMiAgVG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xl LmNvbT4KIAogICAgICAgICBbQ2hyb21pdW1dIEltcGxlbWVudCB0aGUgZW1iZWRkZXJzIGZvciB0 aGUgSFRNTDUgVHJhY2sgTGlzdCBvYmplY3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViRnJhbWVDbGllbnQuaAppbmRleCAwYWY5NmNhLi4xOTk4YzBmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgKQEAgLTI4Niw2ICsy ODYsMTAgQEAgcHVibGljOgogICAgIC8vIHNwcmVhZCB0byBvdGhlciBmcmFtZXMgaW4gdGhlIHNh bWUgb3JpZ2luLgogICAgIHZpcnR1YWwgdm9pZCBkaWRSdW5JbnNlY3VyZUNvbnRlbnQoV2ViRnJh bWUqLCBjb25zdCBXZWJTZWN1cml0eU9yaWdpbiYsIGNvbnN0IFdlYlVSTCYgaW5zZWN1cmVVUkwp IHsgfQogCisgICAgLy8gVGhpcyBmcmFtZSBzaG91bGQgYWRvcHQgdGhlIHJlc291cmNlIHRoYXQg aXMgYmVpbmcgbG9hZGVkLiBUaGlzIGhhcHBlbnMKKyAgICAvLyB3aGVuIGlmcmFtZSBpcyB0cmFu c2ZlcnJlZCBiZXR3ZWVuIHdpbmRvd3Mgd2hpbGUgaXQgaXMgbG9hZGluZyBzb21ldGhpbmcuCisg ICAgdmlydHVhbCB2b2lkIGFkb3B0TG9hZGluZ1Jlc291cmNlKFdlYlVSTExvYWRlciopIHsgfQor CiAKICAgICAvLyBTY3JpcHQgbm90aWZpY2F0aW9ucyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKaW5kZXggNzE5ZWMyNC4uNmZlYmRhOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJ bXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVu dEltcGwuY3BwCkBAIC0xNDU4LDYgKzE0NTgsMTEgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudElt cGw6OnRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJvbVBhZ2UodW5zaWduZWQgbG9uZyBpZGVudGkK ICAgICBXZWJGcmFtZUltcGwqIG9sZFdlYkZyYW1lID0gV2ViRnJhbWVJbXBsOjpmcm9tRnJhbWUo b2xkUGFnZS0+bWFpbkZyYW1lKCkpOwogICAgIGlmIChvbGRXZWJGcmFtZSAmJiBvbGRXZWJGcmFt ZS0+Y2xpZW50KCkpCiAgICAgICAgIG9sZFdlYkZyYW1lLT5jbGllbnQoKS0+cmVtb3ZlSWRlbnRp ZmllckZvclJlcXVlc3QoaWRlbnRpZmllcik7CisKKyAgICBSZXNvdXJjZUhhbmRsZSogaGFuZGxl ID0gbG9hZGVyLT5oYW5kbGUoKTsKKyAgICBXZWJVUkxMb2FkZXIqIHdlYlVSTExvYWRlciA9IFdl YlVSTExvYWRlckZyb21SZXNvdXJjZUhhbmRsZShoYW5kbGUpOworICAgIGlmICh3ZWJVUkxMb2Fk ZXIgJiYgbV93ZWJGcmFtZS0+Y2xpZW50KCkpIAorICAgICAgICBtX3dlYkZyYW1lLT5jbGllbnQo KS0+YWRvcHRMb2FkaW5nUmVzb3VyY2Uod2ViVVJMTG9hZGVyKTsKIH0KIAogUGFzc1JlZlB0cjxX aWRnZXQ+IEZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6Y3JlYXRlUGx1Z2luKApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUmVzb3VyY2VIYW5kbGUuY3BwIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvUmVzb3VyY2VIYW5kbGUuY3BwCmluZGV4IDhhNGY4YzEuLjBiYmQy NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1Jlc291cmNlSGFuZGxl LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9SZXNvdXJjZUhhbmRsZS5jcHAK QEAgLTgwLDYgKzgwLDEwIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNoTG9h ZGluZyhXZWJVUkxMb2FkZXIqLCBkb3VibGUgZmluaXNoVGltZSk7CiAgICAgdmlydHVhbCB2b2lk IGRpZEZhaWwoV2ViVVJMTG9hZGVyKiwgY29uc3QgV2ViVVJMRXJyb3ImKTsKIAorICAgIHN0YXRp YyBXZWJVUkxMb2FkZXIqIFdlYlVSTExvYWRlckZyb21SZXNvdXJjZUhhbmRsZShSZXNvdXJjZUhh bmRsZSogaGFuZGxlKSB7CisgICAgICByZXR1cm4gbG9hZGVyLT5kLT5tX2xvYWRlci5nZXQoKTsK KyAgICB9CisKICAgICBlbnVtIENvbm5lY3Rpb25TdGF0ZSB7CiAgICAgICAgIENvbm5lY3Rpb25T dGF0ZU5ldywKICAgICAgICAgQ29ubmVjdGlvblN0YXRlU3RhcnRlZCwK 103821 2011-08-12 14:56:11 -0700 2011-08-12 14:57:57 -0700 Updated patch patch.txt text/plain 3109 dimich ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggZmQ4NjBiNC4uZDE2YzBkYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0wOC0xMiAgRG1pdHJ5IFRp dG92ICA8ZGltaWNoQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIEFkZCBXZWJG cmFtZUNsaWVudDo6YWRvcHRMb2FkaW5nUmVzb3VyY2UoKSBub3RpZmljYXRpb24KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MTY3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWVD bGllbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVDbGllbnQ6OmFkb3B0TG9hZGluZ1Jl c291cmNlKToKKyAgICAgICAgKiBzcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnRJbXBsOjp0cmFuc2ZlckxvYWRpbmdSZXNvdXJj ZUZyb21QYWdlKToKKyAgICAgICAgKiBzcmMvUmVzb3VyY2VIYW5kbGUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6V2ViVVJMTG9hZGVyRnJvbVJlc291cmNl SGFuZGxlKToKKwogMjAxMS0wOC0xMiAgVG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xl LmNvbT4KIAogICAgICAgICBbQ2hyb21pdW1dIEltcGxlbWVudCB0aGUgZW1iZWRkZXJzIGZvciB0 aGUgSFRNTDUgVHJhY2sgTGlzdCBvYmplY3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViRnJhbWVDbGllbnQuaAppbmRleCAwYWY5NmNhLi41NDAxYjg3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgKQEAgLTI4Niw2ICsy ODYsMTAgQEAgcHVibGljOgogICAgIC8vIHNwcmVhZCB0byBvdGhlciBmcmFtZXMgaW4gdGhlIHNh bWUgb3JpZ2luLgogICAgIHZpcnR1YWwgdm9pZCBkaWRSdW5JbnNlY3VyZUNvbnRlbnQoV2ViRnJh bWUqLCBjb25zdCBXZWJTZWN1cml0eU9yaWdpbiYsIGNvbnN0IFdlYlVSTCYgaW5zZWN1cmVVUkwp IHsgfQogCisgICAgLy8gVGhpcyBmcmFtZSBhZG9wdGVkIHRoZSByZXNvdXJjZSB0aGF0IGlzIGJl aW5nIGxvYWRlZC4gVGhpcyBoYXBwZW5zCisgICAgLy8gd2hlbiBpZnJhbWUgaXMgdHJhbnNmZXJy ZWQgYmV0d2VlbiB3aW5kb3dzIHdoaWxlIGl0IGlzIGxvYWRpbmcgc29tZXRoaW5nLgorICAgIHZp cnR1YWwgdm9pZCBkaWRBZG9wdFVSTExvYWRlcihXZWJVUkxMb2FkZXIqKSB7IH0KKwogCiAgICAg Ly8gU2NyaXB0IG5vdGlmaWNhdGlvbnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9G cmFtZUxvYWRlckNsaWVudEltcGwuY3BwCmluZGV4IDcxOWVjMjQuLjJiNTAwZGMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNw cApAQCAtMTQ1OCw2ICsxNDU4LDExIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjp0cmFu c2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVkIGxvbmcgaWRlbnRpCiAgICAgV2Vi RnJhbWVJbXBsKiBvbGRXZWJGcmFtZSA9IFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lKG9sZFBhZ2Ut Pm1haW5GcmFtZSgpKTsKICAgICBpZiAob2xkV2ViRnJhbWUgJiYgb2xkV2ViRnJhbWUtPmNsaWVu dCgpKQogICAgICAgICBvbGRXZWJGcmFtZS0+Y2xpZW50KCktPnJlbW92ZUlkZW50aWZpZXJGb3JS ZXF1ZXN0KGlkZW50aWZpZXIpOworCisgICAgUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSA9IGxvYWRl ci0+aGFuZGxlKCk7CisgICAgV2ViVVJMTG9hZGVyKiB3ZWJVUkxMb2FkZXIgPSBXZWJVUkxMb2Fk ZXJGcm9tUmVzb3VyY2VIYW5kbGUoaGFuZGxlKTsKKyAgICBpZiAod2ViVVJMTG9hZGVyICYmIG1f d2ViRnJhbWUtPmNsaWVudCgpKSAKKyAgICAgICAgbV93ZWJGcmFtZS0+Y2xpZW50KCktPmRpZEFk b3B0VVJMTG9hZGVyKHdlYlVSTExvYWRlcik7CiB9CiAKIFBhc3NSZWZQdHI8V2lkZ2V0PiBGcmFt ZUxvYWRlckNsaWVudEltcGw6OmNyZWF0ZVBsdWdpbigKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1Jlc291cmNlSGFuZGxlLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1Jlc291cmNlSGFuZGxlLmNwcAppbmRleCA4YTRmOGMxLi4wMjZkMDJjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9SZXNvdXJjZUhhbmRsZS5jcHAKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUmVzb3VyY2VIYW5kbGUuY3BwCkBAIC04MCw2ICs4 MCwxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRpZEZpbmlzaExvYWRpbmcoV2ViVVJM TG9hZGVyKiwgZG91YmxlIGZpbmlzaFRpbWUpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRGYWlsKFdl YlVSTExvYWRlciosIGNvbnN0IFdlYlVSTEVycm9yJik7CiAKKyAgICBzdGF0aWMgV2ViVVJMTG9h ZGVyKiBXZWJVUkxMb2FkZXJGcm9tUmVzb3VyY2VIYW5kbGUoUmVzb3VyY2VIYW5kbGUqIGhhbmRs ZSkgeworICAgICAgcmV0dXJuIGhhbmRsZS0+ZC0+bV9sb2FkZXIuZ2V0KCk7CisgICAgfQorCiAg ICAgZW51bSBDb25uZWN0aW9uU3RhdGUgewogICAgICAgICBDb25uZWN0aW9uU3RhdGVOZXcsCiAg ICAgICAgIENvbm5lY3Rpb25TdGF0ZVN0YXJ0ZWQsCg== 103822 2011-08-12 14:57:57 -0700 2011-08-12 15:07:52 -0700 Updated ChanegLog patch.txt text/plain 3103 dimich ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggZmQ4NjBiNC4uMGY3MGYzOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0wOC0xMiAgRG1pdHJ5IFRp dG92ICA8ZGltaWNoQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIEFkZCBXZWJG cmFtZUNsaWVudDo6ZGlkQWRvcHRVUkxMb2FkZXIoKSBub3RpZmljYXRpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MTY3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWVDbGll bnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVDbGllbnQ6OmRpZEFkb3B0VVJMTG9hZGVy KToKKyAgICAgICAgKiBzcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdl YktpdDo6RnJhbWVMb2FkZXJDbGllbnRJbXBsOjp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21Q YWdlKToKKyAgICAgICAgKiBzcmMvUmVzb3VyY2VIYW5kbGUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6V2ViVVJMTG9hZGVyRnJvbVJlc291cmNlSGFuZGxl KToKKwogMjAxMS0wOC0xMiAgVG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4K IAogICAgICAgICBbQ2hyb21pdW1dIEltcGxlbWVudCB0aGUgZW1iZWRkZXJzIGZvciB0aGUgSFRN TDUgVHJhY2sgTGlzdCBvYmplY3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViRnJhbWVDbGllbnQuaAppbmRleCAwYWY5NmNhLi41NDAxYjg3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgKQEAgLTI4Niw2ICsyODYsMTAg QEAgcHVibGljOgogICAgIC8vIHNwcmVhZCB0byBvdGhlciBmcmFtZXMgaW4gdGhlIHNhbWUgb3Jp Z2luLgogICAgIHZpcnR1YWwgdm9pZCBkaWRSdW5JbnNlY3VyZUNvbnRlbnQoV2ViRnJhbWUqLCBj b25zdCBXZWJTZWN1cml0eU9yaWdpbiYsIGNvbnN0IFdlYlVSTCYgaW5zZWN1cmVVUkwpIHsgfQog CisgICAgLy8gVGhpcyBmcmFtZSBhZG9wdGVkIHRoZSByZXNvdXJjZSB0aGF0IGlzIGJlaW5nIGxv YWRlZC4gVGhpcyBoYXBwZW5zCisgICAgLy8gd2hlbiBpZnJhbWUgaXMgdHJhbnNmZXJyZWQgYmV0 d2VlbiB3aW5kb3dzIHdoaWxlIGl0IGlzIGxvYWRpbmcgc29tZXRoaW5nLgorICAgIHZpcnR1YWwg dm9pZCBkaWRBZG9wdFVSTExvYWRlcihXZWJVUkxMb2FkZXIqKSB7IH0KKwogCiAgICAgLy8gU2Ny aXB0IG5vdGlmaWNhdGlvbnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1l TG9hZGVyQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxv YWRlckNsaWVudEltcGwuY3BwCmluZGV4IDcxOWVjMjQuLjJiNTAwZGMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcApAQCAt MTQ1OCw2ICsxNDU4LDExIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjp0cmFuc2Zlckxv YWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVkIGxvbmcgaWRlbnRpCiAgICAgV2ViRnJhbWVJ bXBsKiBvbGRXZWJGcmFtZSA9IFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lKG9sZFBhZ2UtPm1haW5G cmFtZSgpKTsKICAgICBpZiAob2xkV2ViRnJhbWUgJiYgb2xkV2ViRnJhbWUtPmNsaWVudCgpKQog ICAgICAgICBvbGRXZWJGcmFtZS0+Y2xpZW50KCktPnJlbW92ZUlkZW50aWZpZXJGb3JSZXF1ZXN0 KGlkZW50aWZpZXIpOworCisgICAgUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSA9IGxvYWRlci0+aGFu ZGxlKCk7CisgICAgV2ViVVJMTG9hZGVyKiB3ZWJVUkxMb2FkZXIgPSBXZWJVUkxMb2FkZXJGcm9t UmVzb3VyY2VIYW5kbGUoaGFuZGxlKTsKKyAgICBpZiAod2ViVVJMTG9hZGVyICYmIG1fd2ViRnJh bWUtPmNsaWVudCgpKSAKKyAgICAgICAgbV93ZWJGcmFtZS0+Y2xpZW50KCktPmRpZEFkb3B0VVJM TG9hZGVyKHdlYlVSTExvYWRlcik7CiB9CiAKIFBhc3NSZWZQdHI8V2lkZ2V0PiBGcmFtZUxvYWRl ckNsaWVudEltcGw6OmNyZWF0ZVBsdWdpbigKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1Jlc291cmNlSGFuZGxlLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1Jlc291cmNlSGFuZGxlLmNwcAppbmRleCA4YTRmOGMxLi4wMjZkMDJjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9SZXNvdXJjZUhhbmRsZS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvUmVzb3VyY2VIYW5kbGUuY3BwCkBAIC04MCw2ICs4MCwxMCBA QCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRpZEZpbmlzaExvYWRpbmcoV2ViVVJMTG9hZGVy KiwgZG91YmxlIGZpbmlzaFRpbWUpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRGYWlsKFdlYlVSTExv YWRlciosIGNvbnN0IFdlYlVSTEVycm9yJik7CiAKKyAgICBzdGF0aWMgV2ViVVJMTG9hZGVyKiBX ZWJVUkxMb2FkZXJGcm9tUmVzb3VyY2VIYW5kbGUoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSkgewor ICAgICAgcmV0dXJuIGhhbmRsZS0+ZC0+bV9sb2FkZXIuZ2V0KCk7CisgICAgfQorCiAgICAgZW51 bSBDb25uZWN0aW9uU3RhdGUgewogICAgICAgICBDb25uZWN0aW9uU3RhdGVOZXcsCiAgICAgICAg IENvbm5lY3Rpb25TdGF0ZVN0YXJ0ZWQsCg== 103825 2011-08-12 15:07:52 -0700 2011-08-12 18:25:16 -0700 Fixed style error. patch.txt text/plain 3479 dimich ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggZmQ4NjBiNC4uMGY3MGYzOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0wOC0xMiAgRG1pdHJ5IFRp dG92ICA8ZGltaWNoQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIEFkZCBXZWJG cmFtZUNsaWVudDo6ZGlkQWRvcHRVUkxMb2FkZXIoKSBub3RpZmljYXRpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MTY3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWVDbGll bnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVDbGllbnQ6OmRpZEFkb3B0VVJMTG9hZGVy KToKKyAgICAgICAgKiBzcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdl YktpdDo6RnJhbWVMb2FkZXJDbGllbnRJbXBsOjp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21Q YWdlKToKKyAgICAgICAgKiBzcmMvUmVzb3VyY2VIYW5kbGUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6V2ViVVJMTG9hZGVyRnJvbVJlc291cmNlSGFuZGxl KToKKwogMjAxMS0wOC0xMiAgVG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4K IAogICAgICAgICBbQ2hyb21pdW1dIEltcGxlbWVudCB0aGUgZW1iZWRkZXJzIGZvciB0aGUgSFRN TDUgVHJhY2sgTGlzdCBvYmplY3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViRnJhbWVDbGllbnQuaAppbmRleCAwYWY5NmNhLi41NDAxYjg3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgKQEAgLTI4Niw2ICsyODYsMTAg QEAgcHVibGljOgogICAgIC8vIHNwcmVhZCB0byBvdGhlciBmcmFtZXMgaW4gdGhlIHNhbWUgb3Jp Z2luLgogICAgIHZpcnR1YWwgdm9pZCBkaWRSdW5JbnNlY3VyZUNvbnRlbnQoV2ViRnJhbWUqLCBj b25zdCBXZWJTZWN1cml0eU9yaWdpbiYsIGNvbnN0IFdlYlVSTCYgaW5zZWN1cmVVUkwpIHsgfQog CisgICAgLy8gVGhpcyBmcmFtZSBhZG9wdGVkIHRoZSByZXNvdXJjZSB0aGF0IGlzIGJlaW5nIGxv YWRlZC4gVGhpcyBoYXBwZW5zCisgICAgLy8gd2hlbiBpZnJhbWUgaXMgdHJhbnNmZXJyZWQgYmV0 d2VlbiB3aW5kb3dzIHdoaWxlIGl0IGlzIGxvYWRpbmcgc29tZXRoaW5nLgorICAgIHZpcnR1YWwg dm9pZCBkaWRBZG9wdFVSTExvYWRlcihXZWJVUkxMb2FkZXIqKSB7IH0KKwogCiAgICAgLy8gU2Ny aXB0IG5vdGlmaWNhdGlvbnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1l TG9hZGVyQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxv YWRlckNsaWVudEltcGwuY3BwCmluZGV4IDcxOWVjMjQuLjJiNTAwZGMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcApAQCAt MTQ1OCw2ICsxNDU4LDExIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjp0cmFuc2Zlckxv YWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVkIGxvbmcgaWRlbnRpCiAgICAgV2ViRnJhbWVJ bXBsKiBvbGRXZWJGcmFtZSA9IFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lKG9sZFBhZ2UtPm1haW5G cmFtZSgpKTsKICAgICBpZiAob2xkV2ViRnJhbWUgJiYgb2xkV2ViRnJhbWUtPmNsaWVudCgpKQog ICAgICAgICBvbGRXZWJGcmFtZS0+Y2xpZW50KCktPnJlbW92ZUlkZW50aWZpZXJGb3JSZXF1ZXN0 KGlkZW50aWZpZXIpOworCisgICAgUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSA9IGxvYWRlci0+aGFu ZGxlKCk7CisgICAgV2ViVVJMTG9hZGVyKiB3ZWJVUkxMb2FkZXIgPSBXZWJVUkxMb2FkZXJGcm9t UmVzb3VyY2VIYW5kbGUoaGFuZGxlKTsKKyAgICBpZiAod2ViVVJMTG9hZGVyICYmIG1fd2ViRnJh bWUtPmNsaWVudCgpKSAKKyAgICAgICAgbV93ZWJGcmFtZS0+Y2xpZW50KCktPmRpZEFkb3B0VVJM TG9hZGVyKHdlYlVSTExvYWRlcik7CiB9CiAKIFBhc3NSZWZQdHI8V2lkZ2V0PiBGcmFtZUxvYWRl ckNsaWVudEltcGw6OmNyZWF0ZVBsdWdpbigKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1Jlc291cmNlSGFuZGxlLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1Jlc291cmNlSGFuZGxlLmNwcAppbmRleCA4YTRmOGMxLi42MTA4MTNmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9SZXNvdXJjZUhhbmRsZS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvUmVzb3VyY2VIYW5kbGUuY3BwCkBAIC04MCw2ICs4MCw4IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNoTG9hZGluZyhXZWJVUkxMb2FkZXIq LCBkb3VibGUgZmluaXNoVGltZSk7CiAgICAgdmlydHVhbCB2b2lkIGRpZEZhaWwoV2ViVVJMTG9h ZGVyKiwgY29uc3QgV2ViVVJMRXJyb3ImKTsKIAorICAgIHN0YXRpYyBXZWJVUkxMb2FkZXIqIFdl YlVSTExvYWRlckZyb21SZXNvdXJjZUhhbmRsZShSZXNvdXJjZUhhbmRsZSopOworCiAgICAgZW51 bSBDb25uZWN0aW9uU3RhdGUgewogICAgICAgICBDb25uZWN0aW9uU3RhdGVOZXcsCiAgICAgICAg IENvbm5lY3Rpb25TdGF0ZVN0YXJ0ZWQsCkBAIC0xOTcsNiArMTk5LDExIEBAIHZvaWQgUmVzb3Vy Y2VIYW5kbGVJbnRlcm5hbDo6ZGlkRmFpbChXZWJVUkxMb2FkZXIqLCBjb25zdCBXZWJVUkxFcnJv ciYgZXJyb3IpCiAgICAgbV9jbGllbnQtPmRpZEZhaWwobV9vd25lciwgZXJyb3IpOwogfQogCitX ZWJVUkxMb2FkZXIqIFJlc291cmNlSGFuZGxlSW50ZXJuYWw6OldlYlVSTExvYWRlckZyb21SZXNv dXJjZUhhbmRsZShSZXNvdXJjZUhhbmRsZSogaGFuZGxlKQoreyAKKyAgICByZXR1cm4gaGFuZGxl LT5kLT5tX2xvYWRlci5nZXQoKTsKK30KKwogLy8gUmVzb3VyY2VIYW5kbGUgLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiBSZXNv dXJjZUhhbmRsZTo6UmVzb3VyY2VIYW5kbGUoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0 LAo= 103850 2011-08-12 18:25:16 -0700 2011-08-15 12:02:27 -0700 Patch patch.txt text/plain 11760 dimich ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggMjkwOGNiMi4uMzJjZjUzYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMS0wOC0xMiAgRG1pdHJ5IFRp dG92ICA8ZGltaWNoQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIEFkZCBXZWJG cmFtZUNsaWVudDo6YWRvcHRMb2FkaW5nUmVzb3VyY2UoKSBub3RpZmljYXRpb24KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MTY3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWVD bGllbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVDbGllbnQ6OmRpZEFkb3B0VVJMTG9h ZGVyKToKKyAgICAgICAgKiBzcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcDoKKyAgICAgICAg KFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnRJbXBsOjp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZy b21QYWdlKToKKyAgICAgICAgKiBzcmMvUmVzb3VyY2VIYW5kbGUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZUludGVybmFsOjpGcm9tUmVzb3VyY2VIYW5k bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OlJlc291cmNlSGFuZGxlKToK KyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpmaXJzdFJlcXVlc3QpOgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OmNsaWVudCk6CisgICAgICAgIChXZWJDb3JlOjpS ZXNvdXJjZUhhbmRsZTo6c2V0Q2xpZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFu ZGxlOjp+UmVzb3VyY2VIYW5kbGUpOgorICAgICAgICAqIHNyYy9SZXNvdXJjZUhhbmRsZUludGVy bmFsLmg6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6 flJlc291cmNlSGFuZGxlSW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5k bGVJbnRlcm5hbDo6c2V0X293bmVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxl SW50ZXJuYWw6OnJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVJbnRl cm5hbDo6Y2xpZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlSW50ZXJuYWw6 OnNldF9jbGllbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6 bG9hZGVyKToKKwogMjAxMS0wOC0xMiAgU2FkcnVsIEhhYmliIENob3dkaHVyeSAgPHNhZHJ1bEBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2lyZSBnZXN0dXJlIHRhcCBldmVudHMsIGFkZCBzdXBw b3J0IGZvciBnZXN0dXJlIGV2ZW50cyBpbiB0aGUgRFJUIGFuZCBhZGQgYSBsYXlvdXQgdGVzdCBm b3IgaXQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFt ZUNsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQu aAppbmRleCAwYWY5NmNhLi42Y2ZhODI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkZyYW1lQ2xpZW50LmgKQEAgLTU3LDYgKzU3LDcgQEAgY2xhc3MgV2ViU2hhcmVk V29ya2VyOwogY2xhc3MgV2ViU3RvcmFnZVF1b3RhQ2FsbGJhY2tzOwogY2xhc3MgV2ViU3RyaW5n OwogY2xhc3MgV2ViVVJMOworY2xhc3MgV2ViVVJMTG9hZGVyOwogY2xhc3MgV2ViVVJMUmVxdWVz dDsKIGNsYXNzIFdlYlVSTFJlc3BvbnNlOwogY2xhc3MgV2ViV29ya2VyOwpAQCAtMjg2LDYgKzI4 NywxMCBAQCBwdWJsaWM6CiAgICAgLy8gc3ByZWFkIHRvIG90aGVyIGZyYW1lcyBpbiB0aGUgc2Ft ZSBvcmlnaW4uCiAgICAgdmlydHVhbCB2b2lkIGRpZFJ1bkluc2VjdXJlQ29udGVudChXZWJGcmFt ZSosIGNvbnN0IFdlYlNlY3VyaXR5T3JpZ2luJiwgY29uc3QgV2ViVVJMJiBpbnNlY3VyZVVSTCkg eyB9CiAKKyAgICAvLyBUaGlzIGZyYW1lIGFkb3B0ZWQgdGhlIHJlc291cmNlIHRoYXQgaXMgYmVp bmcgbG9hZGVkLiBUaGlzIGhhcHBlbnMKKyAgICAvLyB3aGVuIGlmcmFtZSBpcyB0cmFuc2ZlcnJl ZCBiZXR3ZWVuIHdpbmRvd3Mgd2hpbGUgaXQgaXMgbG9hZGluZyBzb21ldGhpbmcuCisgICAgdmly dHVhbCB2b2lkIGRpZEFkb3B0VVJMTG9hZGVyKFdlYlVSTExvYWRlciopIHsgfQorCiAKICAgICAv LyBTY3JpcHQgbm90aWZpY2F0aW9ucyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv RnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Zy YW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKaW5kZXggNzE5ZWMyNC4uM2YwODk4OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3Bw CkBAIC01NCw2ICs1NCw3IEBACiAjaW5jbHVkZSAiUGx1Z2luRGF0YS5oIgogI2luY2x1ZGUgIlBs dWdpbkRhdGFDaHJvbWl1bS5oIgogI2luY2x1ZGUgIlByb2dyZXNzVHJhY2tlci5oIgorI2luY2x1 ZGUgIlJlc291cmNlSGFuZGxlSW50ZXJuYWwuaCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2lu Y2x1ZGUgIlN0cmluZ0V4dHJhcy5oIgogI2luY2x1ZGUgIldlYkRhdGFTb3VyY2VJbXBsLmgiCkBA IC0xNDU4LDYgKzE0NTksMTEgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEltcGw6OnRyYW5zZmVy TG9hZGluZ1Jlc291cmNlRnJvbVBhZ2UodW5zaWduZWQgbG9uZyBpZGVudGkKICAgICBXZWJGcmFt ZUltcGwqIG9sZFdlYkZyYW1lID0gV2ViRnJhbWVJbXBsOjpmcm9tRnJhbWUob2xkUGFnZS0+bWFp bkZyYW1lKCkpOwogICAgIGlmIChvbGRXZWJGcmFtZSAmJiBvbGRXZWJGcmFtZS0+Y2xpZW50KCkp CiAgICAgICAgIG9sZFdlYkZyYW1lLT5jbGllbnQoKS0+cmVtb3ZlSWRlbnRpZmllckZvclJlcXVl c3QoaWRlbnRpZmllcik7CisKKyAgICBSZXNvdXJjZUhhbmRsZSogaGFuZGxlID0gbG9hZGVyLT5o YW5kbGUoKTsKKyAgICBXZWJVUkxMb2FkZXIqIHdlYlVSTExvYWRlciA9IFJlc291cmNlSGFuZGxl SW50ZXJuYWw6OkZyb21SZXNvdXJjZUhhbmRsZShoYW5kbGUpLT5sb2FkZXIoKTsKKyAgICBpZiAo d2ViVVJMTG9hZGVyICYmIG1fd2ViRnJhbWUtPmNsaWVudCgpKQorICAgICAgICBtX3dlYkZyYW1l LT5jbGllbnQoKS0+ZGlkQWRvcHRVUkxMb2FkZXIod2ViVVJMTG9hZGVyKTsKIH0KIAogUGFzc1Jl ZlB0cjxXaWRnZXQ+IEZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6Y3JlYXRlUGx1Z2luKApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUmVzb3VyY2VIYW5kbGUuY3BwIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUmVzb3VyY2VIYW5kbGUuY3BwCmluZGV4IDhhNGY4YzEu LmYxODE2YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1Jlc291cmNl SGFuZGxlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9SZXNvdXJjZUhhbmRs ZS5jcHAKQEAgLTMzLDYgKzMzLDcgQEAKIAogI2luY2x1ZGUgIlBsYXRmb3JtQnJpZGdlLmgiCiAj aW5jbHVkZSAiUmVzb3VyY2VIYW5kbGVDbGllbnQuaCIKKyNpbmNsdWRlICJSZXNvdXJjZUhhbmRs ZUludGVybmFsLmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VSZXF1ZXN0LmgiCiAjaW5jbHVkZSAiU2hh cmVkQnVmZmVyLmgiCiAKQEAgLTUxLDU0ICs1MiwxMiBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0 OwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiAvLyBSZXNvdXJjZUhhbmRsZUludGVybmFsIC0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCi0KLWNsYXNz IFJlc291cmNlSGFuZGxlSW50ZXJuYWwgOiBwdWJsaWMgV2ViVVJMTG9hZGVyQ2xpZW50IHsKLXB1 YmxpYzoKLSAgICBSZXNvdXJjZUhhbmRsZUludGVybmFsKGNvbnN0IFJlc291cmNlUmVxdWVzdCYg cmVxdWVzdCwgUmVzb3VyY2VIYW5kbGVDbGllbnQqIGNsaWVudCkKLSAgICAgICAgOiBtX3JlcXVl c3QocmVxdWVzdCkKLSAgICAgICAgLCBtX293bmVyKDApCi0gICAgICAgICwgbV9jbGllbnQoY2xp ZW50KQotICAgICAgICAsIG1fc3RhdGUoQ29ubmVjdGlvblN0YXRlTmV3KQotICAgIHsKLSAgICB9 Ci0KLSAgICB2aXJ0dWFsIH5SZXNvdXJjZUhhbmRsZUludGVybmFsKCkgeyB9Ci0KLSAgICB2b2lk IHN0YXJ0KCk7Ci0gICAgdm9pZCBjYW5jZWwoKTsKLSAgICB2b2lkIHNldERlZmVyc0xvYWRpbmco Ym9vbCk7Ci0gICAgYm9vbCBhbGxvd1N0b3JlZENyZWRlbnRpYWxzKCkgY29uc3Q7Ci0KLSAgICAv LyBXZWJVUkxMb2FkZXJDbGllbnQgbWV0aG9kczoKLSAgICB2aXJ0dWFsIHZvaWQgd2lsbFNlbmRS ZXF1ZXN0KFdlYlVSTExvYWRlciosIFdlYlVSTFJlcXVlc3QmLCBjb25zdCBXZWJVUkxSZXNwb25z ZSYpOwotICAgIHZpcnR1YWwgdm9pZCBkaWRTZW5kRGF0YSgKLSAgICAgICAgV2ViVVJMTG9hZGVy KiwgdW5zaWduZWQgbG9uZyBsb25nIGJ5dGVzU2VudCwgdW5zaWduZWQgbG9uZyBsb25nIHRvdGFs Qnl0ZXNUb0JlU2VudCk7Ci0gICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZShXZWJV UkxMb2FkZXIqLCBjb25zdCBXZWJVUkxSZXNwb25zZSYpOwotICAgIHZpcnR1YWwgdm9pZCBkaWRS ZWNlaXZlRGF0YShXZWJVUkxMb2FkZXIqLCBjb25zdCBjaGFyKiBkYXRhLCBpbnQgZGF0YUxlbmd0 aCwgaW50IGVuY29kZWREYXRhTGVuZ3RoKTsKLQotICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZl Q2FjaGVkTWV0YWRhdGEoV2ViVVJMTG9hZGVyKiwgY29uc3QgY2hhciogZGF0YSwgaW50IGRhdGFM ZW5ndGgpOwotICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hMb2FkaW5nKFdlYlVSTExvYWRlcios IGRvdWJsZSBmaW5pc2hUaW1lKTsKLSAgICB2aXJ0dWFsIHZvaWQgZGlkRmFpbChXZWJVUkxMb2Fk ZXIqLCBjb25zdCBXZWJVUkxFcnJvciYpOwotCi0gICAgZW51bSBDb25uZWN0aW9uU3RhdGUgewot ICAgICAgICBDb25uZWN0aW9uU3RhdGVOZXcsCi0gICAgICAgIENvbm5lY3Rpb25TdGF0ZVN0YXJ0 ZWQsCi0gICAgICAgIENvbm5lY3Rpb25TdGF0ZVJlY2VpdmVkUmVzcG9uc2UsCi0gICAgICAgIENv bm5lY3Rpb25TdGF0ZVJlY2VpdmluZ0RhdGEsCi0gICAgICAgIENvbm5lY3Rpb25TdGF0ZUZpbmlz aGVkTG9hZGluZywKLSAgICAgICAgQ29ubmVjdGlvblN0YXRlQ2FuY2VsZWQsCi0gICAgICAgIENv bm5lY3Rpb25TdGF0ZUZhaWxlZCwKLSAgICB9OwotCi0gICAgUmVzb3VyY2VSZXF1ZXN0IG1fcmVx dWVzdDsKLSAgICBSZXNvdXJjZUhhbmRsZSogbV9vd25lcjsKLSAgICBSZXNvdXJjZUhhbmRsZUNs aWVudCogbV9jbGllbnQ7Ci0gICAgT3duUHRyPFdlYlVSTExvYWRlcj4gbV9sb2FkZXI7Ci0KLSAg ICAvLyBVc2VkIGZvciBzYW5pdHkgY2hlY2tpbmcgdG8gbWFrZSBzdXJlIHdlIGRvbid0IGV4cGVy aWVuY2UgaWxsZWdhbCBzdGF0ZQotICAgIC8vIHRyYW5zaXRpb25zLgotICAgIENvbm5lY3Rpb25T dGF0ZSBtX3N0YXRlOwotfTsKK1Jlc291cmNlSGFuZGxlSW50ZXJuYWw6OlJlc291cmNlSGFuZGxl SW50ZXJuYWwoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBSZXNvdXJjZUhhbmRsZUNs aWVudCogY2xpZW50KQorICAgIDogbV9yZXF1ZXN0KHJlcXVlc3QpCisgICAgLCBtX293bmVyKDAp CisgICAgLCBtX2NsaWVudChjbGllbnQpCisgICAgLCBtX3N0YXRlKENvbm5lY3Rpb25TdGF0ZU5l dykKK3sgfQogCiB2b2lkIFJlc291cmNlSGFuZGxlSW50ZXJuYWw6OnN0YXJ0KCkKIHsKQEAgLTE5 Nyw2ICsxNTYsMTEgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZUludGVybmFsOjpkaWRGYWlsKFdlYlVS TExvYWRlciosIGNvbnN0IFdlYlVSTEVycm9yJiBlcnJvcikKICAgICBtX2NsaWVudC0+ZGlkRmFp bChtX293bmVyLCBlcnJvcik7CiB9CiAKK1Jlc291cmNlSGFuZGxlSW50ZXJuYWwqIFJlc291cmNl SGFuZGxlSW50ZXJuYWw6OkZyb21SZXNvdXJjZUhhbmRsZShSZXNvdXJjZUhhbmRsZSogaGFuZGxl KQoreworICAgIHJldHVybiBoYW5kbGUtPmQuZ2V0KCk7Cit9CisKIC8vIFJlc291cmNlSGFuZGxl IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KIAogUmVzb3VyY2VIYW5kbGU6OlJlc291cmNlSGFuZGxlKGNvbnN0IFJlc291cmNlUmVx dWVzdCYgcmVxdWVzdCwKQEAgLTIwNSw3ICsxNjksNyBAQCBSZXNvdXJjZUhhbmRsZTo6UmVzb3Vy Y2VIYW5kbGUoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGJvb2wgc2hvdWxkQ29udGVudFNuaWZmKQogICAgIDogZChhZG9wdFB0 cihuZXcgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbChyZXF1ZXN0LCBjbGllbnQpKSkKIHsKLSAgICBk LT5tX293bmVyID0gdGhpczsKKyAgICBkLT5zZXRfb3duZXIodGhpcyk7CiAKICAgICAvLyBGSVhN RTogRmlndXJlIG91dCB3aGF0IHRvIGRvIHdpdGggdGhlIGJvb2wgcGFyYW1zLgogfQpAQCAtMjI3 LDE3ICsxOTEsMTcgQEAgUGFzc1JlZlB0cjxSZXNvdXJjZUhhbmRsZT4gUmVzb3VyY2VIYW5kbGU6 OmNyZWF0ZShOZXR3b3JraW5nQ29udGV4dCogY29udGV4dCwKIAogUmVzb3VyY2VSZXF1ZXN0JiBS ZXNvdXJjZUhhbmRsZTo6Zmlyc3RSZXF1ZXN0KCkKIHsKLSAgICByZXR1cm4gZC0+bV9yZXF1ZXN0 OworICAgIHJldHVybiBkLT5yZXF1ZXN0KCk7CiB9CiAKIFJlc291cmNlSGFuZGxlQ2xpZW50KiBS ZXNvdXJjZUhhbmRsZTo6Y2xpZW50KCkgY29uc3QKIHsKLSAgICByZXR1cm4gZC0+bV9jbGllbnQ7 CisgICAgcmV0dXJuIGQtPmNsaWVudCgpOwogfQogCiB2b2lkIFJlc291cmNlSGFuZGxlOjpzZXRD bGllbnQoUmVzb3VyY2VIYW5kbGVDbGllbnQqIGNsaWVudCkKIHsKLSAgICBkLT5tX2NsaWVudCA9 IGNsaWVudDsKKyAgICBkLT5zZXRfY2xpZW50KGNsaWVudCk7CiB9CiAKIHZvaWQgUmVzb3VyY2VI YW5kbGU6OnNldERlZmVyc0xvYWRpbmcoYm9vbCB2YWx1ZSkKQEAgLTI2Nyw3ICsyMzEsNyBAQCB2 b2lkIFJlc291cmNlSGFuZGxlOjpjYW5jZWwoKQogCiBSZXNvdXJjZUhhbmRsZTo6flJlc291cmNl SGFuZGxlKCkKIHsKLSAgICBkLT5tX293bmVyID0gMDsKKyAgICBkLT5zZXRfb3duZXIoMCk7CiB9 CiAKIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBSZXNvdXJjZUhhbmRsZTo6YnVmZmVyZWREYXRh KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1Jlc291cmNlSGFuZGxl SW50ZXJuYWwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1Jlc291cmNlSGFuZGxlSW50 ZXJuYWwuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hNWQ3ZjM1Ci0tLSAv ZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUmVzb3VyY2VIYW5kbGVJ bnRlcm5hbC5oCkBAIC0wLDAgKzEsMTA0IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDExIEdv b2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMgYXJlCisgKiBtZXQ6CisgKgorICogICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqICAgICAq IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUK KyAqIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIKKyAqIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBt YXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyAqIGRpc3RyaWJ1dGlvbi4KKyAqICAgICAqIE5l aXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyAqIGNv bnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVy aXZlZCBmcm9tCisgKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRl biBwZXJtaXNzaW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENP UFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyAqICJBUyBJUyIgQU5EIEFOWSBFWFBS RVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVE IFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVT UyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVO VCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxF IEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyAqIFNQRUNJQUwsIEVYRU1Q TEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJ TUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExP U1MgT0YgVVNFLAorICogREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9O KSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisgKiBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVU SEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5H IE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBV U0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJ VFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2lmbmRlZiBSZXNvdXJjZUhhbmRsZUludGVybmFs X2gKKyNkZWZpbmUgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbF9oCisKKyNpbmNsdWRlICJSZXNvdXJj ZVJlcXVlc3QuaCIKKyNpbmNsdWRlICJXZWJDb21tb24uaCIKKyNpbmNsdWRlICJXZWJVUkxMb2Fk ZXIuaCIKKyNpbmNsdWRlICJXZWJVUkxMb2FkZXJDbGllbnQuaCIKKworbmFtZXNwYWNlIFdlYktp dCB7CitjbGFzcyBXZWJVUkxSZXF1ZXN0OworY2xhc3MgV2ViVVJMUmVzcG9uc2U7Cit9CisKK3Vz aW5nIG5hbWVzcGFjZSBXZWJLaXQ7CisKK25hbWVzcGFjZSBXZWJDb3JlIHsKKworY2xhc3MgUmVz b3VyY2VIYW5kbGU7CitjbGFzcyBSZXNvdXJjZUhhbmRsZUNsaWVudDsKKworY2xhc3MgUmVzb3Vy Y2VIYW5kbGVJbnRlcm5hbCA6IHB1YmxpYyBXZWJVUkxMb2FkZXJDbGllbnQgeworcHVibGljOgor ICAgIFJlc291cmNlSGFuZGxlSW50ZXJuYWwoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgUmVzb3Vy Y2VIYW5kbGVDbGllbnQqKTsKKworICAgIHZpcnR1YWwgflJlc291cmNlSGFuZGxlSW50ZXJuYWwo KSB7IH0KKworICAgIHZvaWQgc3RhcnQoKTsKKyAgICB2b2lkIGNhbmNlbCgpOworICAgIHZvaWQg c2V0RGVmZXJzTG9hZGluZyhib29sKTsKKyAgICBib29sIGFsbG93U3RvcmVkQ3JlZGVudGlhbHMo KSBjb25zdDsKKworICAgIC8vIFdlYlVSTExvYWRlckNsaWVudCBtZXRob2RzOgorICAgIHZpcnR1 YWwgdm9pZCB3aWxsU2VuZFJlcXVlc3QoV2ViVVJMTG9hZGVyKiwgV2ViVVJMUmVxdWVzdCYsIGNv bnN0IFdlYlVSTFJlc3BvbnNlJik7CisgICAgdmlydHVhbCB2b2lkIGRpZFNlbmREYXRhKAorICAg ICAgICBXZWJVUkxMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGxvbmcgYnl0ZXNTZW50LCB1bnNpZ25l ZCBsb25nIGxvbmcgdG90YWxCeXRlc1RvQmVTZW50KTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkUmVj ZWl2ZVJlc3BvbnNlKFdlYlVSTExvYWRlciosIGNvbnN0IFdlYlVSTFJlc3BvbnNlJik7CisgICAg dmlydHVhbCB2b2lkIGRpZFJlY2VpdmVEYXRhKFdlYlVSTExvYWRlciosIGNvbnN0IGNoYXIqIGRh dGEsIGludCBkYXRhTGVuZ3RoLCBpbnQgZW5jb2RlZERhdGFMZW5ndGgpOworCisgICAgdmlydHVh bCB2b2lkIGRpZFJlY2VpdmVDYWNoZWRNZXRhZGF0YShXZWJVUkxMb2FkZXIqLCBjb25zdCBjaGFy KiBkYXRhLCBpbnQgZGF0YUxlbmd0aCk7CisgICAgdmlydHVhbCB2b2lkIGRpZEZpbmlzaExvYWRp bmcoV2ViVVJMTG9hZGVyKiwgZG91YmxlIGZpbmlzaFRpbWUpOworICAgIHZpcnR1YWwgdm9pZCBk aWRGYWlsKFdlYlVSTExvYWRlciosIGNvbnN0IFdlYlVSTEVycm9yJik7CisKKyAgICBlbnVtIENv bm5lY3Rpb25TdGF0ZSB7CisgICAgICAgIENvbm5lY3Rpb25TdGF0ZU5ldywKKyAgICAgICAgQ29u bmVjdGlvblN0YXRlU3RhcnRlZCwKKyAgICAgICAgQ29ubmVjdGlvblN0YXRlUmVjZWl2ZWRSZXNw b25zZSwKKyAgICAgICAgQ29ubmVjdGlvblN0YXRlUmVjZWl2aW5nRGF0YSwKKyAgICAgICAgQ29u bmVjdGlvblN0YXRlRmluaXNoZWRMb2FkaW5nLAorICAgICAgICBDb25uZWN0aW9uU3RhdGVDYW5j ZWxlZCwKKyAgICAgICAgQ29ubmVjdGlvblN0YXRlRmFpbGVkLAorICAgIH07CisKKyAgICB2b2lk IHNldF9vd25lcihSZXNvdXJjZUhhbmRsZSogb3duZXIpIHsgbV9vd25lciA9IG93bmVyOyB9Cisg ICAgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KCkgeyByZXR1cm4gbV9yZXF1ZXN0OyB9CisgICAg UmVzb3VyY2VIYW5kbGVDbGllbnQqIGNsaWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fY2xpZW50OyB9 CisgICAgdm9pZCBzZXRfY2xpZW50KFJlc291cmNlSGFuZGxlQ2xpZW50KiBjbGllbnQpIHsgbV9j bGllbnQgPSBjbGllbnQ7IH0KKyAgICBXZWJVUkxMb2FkZXIqIGxvYWRlcigpIGNvbnN0IHsgcmV0 dXJuIG1fbG9hZGVyLmdldCgpOyB9CisKKyAgICBzdGF0aWMgUmVzb3VyY2VIYW5kbGVJbnRlcm5h bCogRnJvbVJlc291cmNlSGFuZGxlKFJlc291cmNlSGFuZGxlKik7CisKK3ByaXZhdGU6CisgICAg UmVzb3VyY2VSZXF1ZXN0IG1fcmVxdWVzdDsKKyAgICBSZXNvdXJjZUhhbmRsZSogbV9vd25lcjsK KyAgICBSZXNvdXJjZUhhbmRsZUNsaWVudCogbV9jbGllbnQ7CisgICAgT3duUHRyPFdlYlVSTExv YWRlcj4gbV9sb2FkZXI7CisKKyAgICAvLyBVc2VkIGZvciBzYW5pdHkgY2hlY2tpbmcgdG8gbWFr ZSBzdXJlIHdlIGRvbid0IGV4cGVyaWVuY2UgaWxsZWdhbCBzdGF0ZQorICAgIC8vIHRyYW5zaXRp b25zLgorICAgIENvbm5lY3Rpb25TdGF0ZSBtX3N0YXRlOworfTsKKworfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQorCisjZW5kaWYK 103938 2011-08-15 12:02:27 -0700 2011-08-15 16:37:01 -0700 Fixed style issue patch.txt text/plain 11753 dimich ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggMjkwOGNiMi4uNjM0ZDZmNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMS0wOC0xMiAgRG1pdHJ5IFRp dG92ICA8ZGltaWNoQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIEFkZCBXZWJG cmFtZUNsaWVudDo6YWRvcHRMb2FkaW5nUmVzb3VyY2UoKSBub3RpZmljYXRpb24KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MTY3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWVD bGllbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVDbGllbnQ6OmRpZEFkb3B0VVJMTG9h ZGVyKToKKyAgICAgICAgKiBzcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcDoKKyAgICAgICAg KFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnRJbXBsOjp0cmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZy b21QYWdlKToKKyAgICAgICAgKiBzcmMvUmVzb3VyY2VIYW5kbGUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZUludGVybmFsOjpGcm9tUmVzb3VyY2VIYW5k bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OlJlc291cmNlSGFuZGxlKToK KyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpmaXJzdFJlcXVlc3QpOgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OmNsaWVudCk6CisgICAgICAgIChXZWJDb3JlOjpS ZXNvdXJjZUhhbmRsZTo6c2V0Q2xpZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFu ZGxlOjp+UmVzb3VyY2VIYW5kbGUpOgorICAgICAgICAqIHNyYy9SZXNvdXJjZUhhbmRsZUludGVy bmFsLmg6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6 flJlc291cmNlSGFuZGxlSW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5k bGVJbnRlcm5hbDo6c2V0T3duZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVJ bnRlcm5hbDo6cmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZUludGVy bmFsOjpjbGllbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6 c2V0Q2xpZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlSW50ZXJuYWw6Omxv YWRlcik6CisKIDIwMTEtMDgtMTIgIFNhZHJ1bCBIYWJpYiBDaG93ZGh1cnkgIDxzYWRydWxAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFdpcmUgZ2VzdHVyZSB0YXAgZXZlbnRzLCBhZGQgc3VwcG9y dCBmb3IgZ2VzdHVyZSBldmVudHMgaW4gdGhlIERSVCBhbmQgYWRkIGEgbGF5b3V0IHRlc3QgZm9y IGl0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWVD bGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgK aW5kZXggMGFmOTZjYS4uNmNmYTgyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViRnJhbWVDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJGcmFtZUNsaWVudC5oCkBAIC01Nyw2ICs1Nyw3IEBAIGNsYXNzIFdlYlNoYXJlZFdv cmtlcjsKIGNsYXNzIFdlYlN0b3JhZ2VRdW90YUNhbGxiYWNrczsKIGNsYXNzIFdlYlN0cmluZzsK IGNsYXNzIFdlYlVSTDsKK2NsYXNzIFdlYlVSTExvYWRlcjsKIGNsYXNzIFdlYlVSTFJlcXVlc3Q7 CiBjbGFzcyBXZWJVUkxSZXNwb25zZTsKIGNsYXNzIFdlYldvcmtlcjsKQEAgLTI4Niw2ICsyODcs MTAgQEAgcHVibGljOgogICAgIC8vIHNwcmVhZCB0byBvdGhlciBmcmFtZXMgaW4gdGhlIHNhbWUg b3JpZ2luLgogICAgIHZpcnR1YWwgdm9pZCBkaWRSdW5JbnNlY3VyZUNvbnRlbnQoV2ViRnJhbWUq LCBjb25zdCBXZWJTZWN1cml0eU9yaWdpbiYsIGNvbnN0IFdlYlVSTCYgaW5zZWN1cmVVUkwpIHsg fQogCisgICAgLy8gVGhpcyBmcmFtZSBhZG9wdGVkIHRoZSByZXNvdXJjZSB0aGF0IGlzIGJlaW5n IGxvYWRlZC4gVGhpcyBoYXBwZW5zCisgICAgLy8gd2hlbiBpZnJhbWUgaXMgdHJhbnNmZXJyZWQg YmV0d2VlbiB3aW5kb3dzIHdoaWxlIGl0IGlzIGxvYWRpbmcgc29tZXRoaW5nLgorICAgIHZpcnR1 YWwgdm9pZCBkaWRBZG9wdFVSTExvYWRlcihXZWJVUkxMb2FkZXIqKSB7IH0KKwogCiAgICAgLy8g U2NyaXB0IG5vdGlmaWNhdGlvbnMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Zy YW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFt ZUxvYWRlckNsaWVudEltcGwuY3BwCmluZGV4IDcxOWVjMjQuLjNmMDg5ODggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcApA QCAtNTQsNiArNTQsNyBAQAogI2luY2x1ZGUgIlBsdWdpbkRhdGEuaCIKICNpbmNsdWRlICJQbHVn aW5EYXRhQ2hyb21pdW0uaCIKICNpbmNsdWRlICJQcm9ncmVzc1RyYWNrZXIuaCIKKyNpbmNsdWRl ICJSZXNvdXJjZUhhbmRsZUludGVybmFsLmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNs dWRlICJTdHJpbmdFeHRyYXMuaCIKICNpbmNsdWRlICJXZWJEYXRhU291cmNlSW1wbC5oIgpAQCAt MTQ1OCw2ICsxNDU5LDExIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjp0cmFuc2Zlckxv YWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVkIGxvbmcgaWRlbnRpCiAgICAgV2ViRnJhbWVJ bXBsKiBvbGRXZWJGcmFtZSA9IFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lKG9sZFBhZ2UtPm1haW5G cmFtZSgpKTsKICAgICBpZiAob2xkV2ViRnJhbWUgJiYgb2xkV2ViRnJhbWUtPmNsaWVudCgpKQog ICAgICAgICBvbGRXZWJGcmFtZS0+Y2xpZW50KCktPnJlbW92ZUlkZW50aWZpZXJGb3JSZXF1ZXN0 KGlkZW50aWZpZXIpOworCisgICAgUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSA9IGxvYWRlci0+aGFu ZGxlKCk7CisgICAgV2ViVVJMTG9hZGVyKiB3ZWJVUkxMb2FkZXIgPSBSZXNvdXJjZUhhbmRsZUlu dGVybmFsOjpGcm9tUmVzb3VyY2VIYW5kbGUoaGFuZGxlKS0+bG9hZGVyKCk7CisgICAgaWYgKHdl YlVSTExvYWRlciAmJiBtX3dlYkZyYW1lLT5jbGllbnQoKSkKKyAgICAgICAgbV93ZWJGcmFtZS0+ Y2xpZW50KCktPmRpZEFkb3B0VVJMTG9hZGVyKHdlYlVSTExvYWRlcik7CiB9CiAKIFBhc3NSZWZQ dHI8V2lkZ2V0PiBGcmFtZUxvYWRlckNsaWVudEltcGw6OmNyZWF0ZVBsdWdpbigKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1Jlc291cmNlSGFuZGxlLmNwcCBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1Jlc291cmNlSGFuZGxlLmNwcAppbmRleCA4YTRmOGMxLi4z ZWQzN2MyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9SZXNvdXJjZUhh bmRsZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUmVzb3VyY2VIYW5kbGUu Y3BwCkBAIC0zMyw2ICszMyw3IEBACiAKICNpbmNsdWRlICJQbGF0Zm9ybUJyaWRnZS5oIgogI2lu Y2x1ZGUgIlJlc291cmNlSGFuZGxlQ2xpZW50LmgiCisjaW5jbHVkZSAiUmVzb3VyY2VIYW5kbGVJ bnRlcm5hbC5oIgogI2luY2x1ZGUgIlJlc291cmNlUmVxdWVzdC5oIgogI2luY2x1ZGUgIlNoYXJl ZEJ1ZmZlci5oIgogCkBAIC01MSw1NCArNTIsMTIgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogLy8gUmVzb3VyY2VIYW5kbGVJbnRlcm5hbCAtLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQotCi1jbGFzcyBS ZXNvdXJjZUhhbmRsZUludGVybmFsIDogcHVibGljIFdlYlVSTExvYWRlckNsaWVudCB7Ci1wdWJs aWM6Ci0gICAgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJl cXVlc3QsIFJlc291cmNlSGFuZGxlQ2xpZW50KiBjbGllbnQpCi0gICAgICAgIDogbV9yZXF1ZXN0 KHJlcXVlc3QpCi0gICAgICAgICwgbV9vd25lcigwKQotICAgICAgICAsIG1fY2xpZW50KGNsaWVu dCkKLSAgICAgICAgLCBtX3N0YXRlKENvbm5lY3Rpb25TdGF0ZU5ldykKLSAgICB7Ci0gICAgfQot Ci0gICAgdmlydHVhbCB+UmVzb3VyY2VIYW5kbGVJbnRlcm5hbCgpIHsgfQotCi0gICAgdm9pZCBz dGFydCgpOwotICAgIHZvaWQgY2FuY2VsKCk7Ci0gICAgdm9pZCBzZXREZWZlcnNMb2FkaW5nKGJv b2wpOwotICAgIGJvb2wgYWxsb3dTdG9yZWRDcmVkZW50aWFscygpIGNvbnN0OwotCi0gICAgLy8g V2ViVVJMTG9hZGVyQ2xpZW50IG1ldGhvZHM6Ci0gICAgdmlydHVhbCB2b2lkIHdpbGxTZW5kUmVx dWVzdChXZWJVUkxMb2FkZXIqLCBXZWJVUkxSZXF1ZXN0JiwgY29uc3QgV2ViVVJMUmVzcG9uc2Um KTsKLSAgICB2aXJ0dWFsIHZvaWQgZGlkU2VuZERhdGEoCi0gICAgICAgIFdlYlVSTExvYWRlcios IHVuc2lnbmVkIGxvbmcgbG9uZyBieXRlc1NlbnQsIHVuc2lnbmVkIGxvbmcgbG9uZyB0b3RhbEJ5 dGVzVG9CZVNlbnQpOwotICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlUmVzcG9uc2UoV2ViVVJM TG9hZGVyKiwgY29uc3QgV2ViVVJMUmVzcG9uc2UmKTsKLSAgICB2aXJ0dWFsIHZvaWQgZGlkUmVj ZWl2ZURhdGEoV2ViVVJMTG9hZGVyKiwgY29uc3QgY2hhciogZGF0YSwgaW50IGRhdGFMZW5ndGgs IGludCBlbmNvZGVkRGF0YUxlbmd0aCk7Ci0KLSAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZUNh Y2hlZE1ldGFkYXRhKFdlYlVSTExvYWRlciosIGNvbnN0IGNoYXIqIGRhdGEsIGludCBkYXRhTGVu Z3RoKTsKLSAgICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNoTG9hZGluZyhXZWJVUkxMb2FkZXIqLCBk b3VibGUgZmluaXNoVGltZSk7Ci0gICAgdmlydHVhbCB2b2lkIGRpZEZhaWwoV2ViVVJMTG9hZGVy KiwgY29uc3QgV2ViVVJMRXJyb3ImKTsKLQotICAgIGVudW0gQ29ubmVjdGlvblN0YXRlIHsKLSAg ICAgICAgQ29ubmVjdGlvblN0YXRlTmV3LAotICAgICAgICBDb25uZWN0aW9uU3RhdGVTdGFydGVk LAotICAgICAgICBDb25uZWN0aW9uU3RhdGVSZWNlaXZlZFJlc3BvbnNlLAotICAgICAgICBDb25u ZWN0aW9uU3RhdGVSZWNlaXZpbmdEYXRhLAotICAgICAgICBDb25uZWN0aW9uU3RhdGVGaW5pc2hl ZExvYWRpbmcsCi0gICAgICAgIENvbm5lY3Rpb25TdGF0ZUNhbmNlbGVkLAotICAgICAgICBDb25u ZWN0aW9uU3RhdGVGYWlsZWQsCi0gICAgfTsKLQotICAgIFJlc291cmNlUmVxdWVzdCBtX3JlcXVl c3Q7Ci0gICAgUmVzb3VyY2VIYW5kbGUqIG1fb3duZXI7Ci0gICAgUmVzb3VyY2VIYW5kbGVDbGll bnQqIG1fY2xpZW50OwotICAgIE93blB0cjxXZWJVUkxMb2FkZXI+IG1fbG9hZGVyOwotCi0gICAg Ly8gVXNlZCBmb3Igc2FuaXR5IGNoZWNraW5nIHRvIG1ha2Ugc3VyZSB3ZSBkb24ndCBleHBlcmll bmNlIGlsbGVnYWwgc3RhdGUKLSAgICAvLyB0cmFuc2l0aW9ucy4KLSAgICBDb25uZWN0aW9uU3Rh dGUgbV9zdGF0ZTsKLX07CitSZXNvdXJjZUhhbmRsZUludGVybmFsOjpSZXNvdXJjZUhhbmRsZUlu dGVybmFsKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgUmVzb3VyY2VIYW5kbGVDbGll bnQqIGNsaWVudCkKKyAgICA6IG1fcmVxdWVzdChyZXF1ZXN0KQorICAgICwgbV9vd25lcigwKQor ICAgICwgbV9jbGllbnQoY2xpZW50KQorICAgICwgbV9zdGF0ZShDb25uZWN0aW9uU3RhdGVOZXcp Cit7IH0KIAogdm9pZCBSZXNvdXJjZUhhbmRsZUludGVybmFsOjpzdGFydCgpCiB7CkBAIC0xOTcs NiArMTU2LDExIEBAIHZvaWQgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6ZGlkRmFpbChXZWJVUkxM b2FkZXIqLCBjb25zdCBXZWJVUkxFcnJvciYgZXJyb3IpCiAgICAgbV9jbGllbnQtPmRpZEZhaWwo bV9vd25lciwgZXJyb3IpOwogfQogCitSZXNvdXJjZUhhbmRsZUludGVybmFsKiBSZXNvdXJjZUhh bmRsZUludGVybmFsOjpGcm9tUmVzb3VyY2VIYW5kbGUoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSkK K3sKKyAgICByZXR1cm4gaGFuZGxlLT5kLmdldCgpOworfQorCiAvLyBSZXNvdXJjZUhhbmRsZSAt LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCiAKIFJlc291cmNlSGFuZGxlOjpSZXNvdXJjZUhhbmRsZShjb25zdCBSZXNvdXJjZVJlcXVl c3QmIHJlcXVlc3QsCkBAIC0yMDUsNyArMTY5LDcgQEAgUmVzb3VyY2VIYW5kbGU6OlJlc291cmNl SGFuZGxlKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBib29sIHNob3VsZENvbnRlbnRTbmlmZikKICAgICA6IGQoYWRvcHRQdHIo bmV3IFJlc291cmNlSGFuZGxlSW50ZXJuYWwocmVxdWVzdCwgY2xpZW50KSkpCiB7Ci0gICAgZC0+ bV9vd25lciA9IHRoaXM7CisgICAgZC0+c2V0T3duZXIodGhpcyk7CiAKICAgICAvLyBGSVhNRTog RmlndXJlIG91dCB3aGF0IHRvIGRvIHdpdGggdGhlIGJvb2wgcGFyYW1zLgogfQpAQCAtMjI3LDE3 ICsxOTEsMTcgQEAgUGFzc1JlZlB0cjxSZXNvdXJjZUhhbmRsZT4gUmVzb3VyY2VIYW5kbGU6OmNy ZWF0ZShOZXR3b3JraW5nQ29udGV4dCogY29udGV4dCwKIAogUmVzb3VyY2VSZXF1ZXN0JiBSZXNv dXJjZUhhbmRsZTo6Zmlyc3RSZXF1ZXN0KCkKIHsKLSAgICByZXR1cm4gZC0+bV9yZXF1ZXN0Owor ICAgIHJldHVybiBkLT5yZXF1ZXN0KCk7CiB9CiAKIFJlc291cmNlSGFuZGxlQ2xpZW50KiBSZXNv dXJjZUhhbmRsZTo6Y2xpZW50KCkgY29uc3QKIHsKLSAgICByZXR1cm4gZC0+bV9jbGllbnQ7Cisg ICAgcmV0dXJuIGQtPmNsaWVudCgpOwogfQogCiB2b2lkIFJlc291cmNlSGFuZGxlOjpzZXRDbGll bnQoUmVzb3VyY2VIYW5kbGVDbGllbnQqIGNsaWVudCkKIHsKLSAgICBkLT5tX2NsaWVudCA9IGNs aWVudDsKKyAgICBkLT5zZXRDbGllbnQoY2xpZW50KTsKIH0KIAogdm9pZCBSZXNvdXJjZUhhbmRs ZTo6c2V0RGVmZXJzTG9hZGluZyhib29sIHZhbHVlKQpAQCAtMjY3LDcgKzIzMSw3IEBAIHZvaWQg UmVzb3VyY2VIYW5kbGU6OmNhbmNlbCgpCiAKIFJlc291cmNlSGFuZGxlOjp+UmVzb3VyY2VIYW5k bGUoKQogewotICAgIGQtPm1fb3duZXIgPSAwOworICAgIGQtPnNldE93bmVyKDApOwogfQogCiBQ YXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gUmVzb3VyY2VIYW5kbGU6OmJ1ZmZlcmVkRGF0YSgpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9SZXNvdXJjZUhhbmRsZUludGVy bmFsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9SZXNvdXJjZUhhbmRsZUludGVybmFs LmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNGJlYmI5MgotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1Jlc291cmNlSGFuZGxlSW50ZXJu YWwuaApAQCAtMCwwICsxLDEwNCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMSBHb29nbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z IGFyZQorICogbWV0OgorICoKKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29k ZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAgICAgKiBSZWRp c3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisgKiBj b3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyCisgKiBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJp YWxzIHByb3ZpZGVkIHdpdGggdGhlCisgKiBkaXN0cmlidXRpb24uCisgKiAgICAgKiBOZWl0aGVy IHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCisgKiBjb250cmli dXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQg ZnJvbQorICogdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVy bWlzc2lvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklH SFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisgKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBP UiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywg VEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9S CisgKiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hB TEwgVEhFIENPUFlSSUdIVAorICogT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1Ig QU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisgKiBTUEVDSUFMLCBFWEVNUExBUlks IE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVE IFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9G IFVTRSwKKyAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9X RVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ TiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdM SUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisg KiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgorICovCisKKyNpZm5kZWYgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbF9oCisj ZGVmaW5lIFJlc291cmNlSGFuZGxlSW50ZXJuYWxfaAorCisjaW5jbHVkZSAiUmVzb3VyY2VSZXF1 ZXN0LmgiCisjaW5jbHVkZSAiV2ViQ29tbW9uLmgiCisjaW5jbHVkZSAiV2ViVVJMTG9hZGVyLmgi CisjaW5jbHVkZSAiV2ViVVJMTG9hZGVyQ2xpZW50LmgiCisKK25hbWVzcGFjZSBXZWJLaXQgewor Y2xhc3MgV2ViVVJMUmVxdWVzdDsKK2NsYXNzIFdlYlVSTFJlc3BvbnNlOworfQorCit1c2luZyBu YW1lc3BhY2UgV2ViS2l0OworCituYW1lc3BhY2UgV2ViQ29yZSB7CisKK2NsYXNzIFJlc291cmNl SGFuZGxlOworY2xhc3MgUmVzb3VyY2VIYW5kbGVDbGllbnQ7CisKK2NsYXNzIFJlc291cmNlSGFu ZGxlSW50ZXJuYWwgOiBwdWJsaWMgV2ViVVJMTG9hZGVyQ2xpZW50IHsKK3B1YmxpYzoKKyAgICBS ZXNvdXJjZUhhbmRsZUludGVybmFsKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIFJlc291cmNlSGFu ZGxlQ2xpZW50Kik7CisKKyAgICB2aXJ0dWFsIH5SZXNvdXJjZUhhbmRsZUludGVybmFsKCkgeyB9 CisKKyAgICB2b2lkIHN0YXJ0KCk7CisgICAgdm9pZCBjYW5jZWwoKTsKKyAgICB2b2lkIHNldERl ZmVyc0xvYWRpbmcoYm9vbCk7CisgICAgYm9vbCBhbGxvd1N0b3JlZENyZWRlbnRpYWxzKCkgY29u c3Q7CisKKyAgICAvLyBXZWJVUkxMb2FkZXJDbGllbnQgbWV0aG9kczoKKyAgICB2aXJ0dWFsIHZv aWQgd2lsbFNlbmRSZXF1ZXN0KFdlYlVSTExvYWRlciosIFdlYlVSTFJlcXVlc3QmLCBjb25zdCBX ZWJVUkxSZXNwb25zZSYpOworICAgIHZpcnR1YWwgdm9pZCBkaWRTZW5kRGF0YSgKKyAgICAgICAg V2ViVVJMTG9hZGVyKiwgdW5zaWduZWQgbG9uZyBsb25nIGJ5dGVzU2VudCwgdW5zaWduZWQgbG9u ZyBsb25nIHRvdGFsQnl0ZXNUb0JlU2VudCk7CisgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVS ZXNwb25zZShXZWJVUkxMb2FkZXIqLCBjb25zdCBXZWJVUkxSZXNwb25zZSYpOworICAgIHZpcnR1 YWwgdm9pZCBkaWRSZWNlaXZlRGF0YShXZWJVUkxMb2FkZXIqLCBjb25zdCBjaGFyKiBkYXRhLCBp bnQgZGF0YUxlbmd0aCwgaW50IGVuY29kZWREYXRhTGVuZ3RoKTsKKworICAgIHZpcnR1YWwgdm9p ZCBkaWRSZWNlaXZlQ2FjaGVkTWV0YWRhdGEoV2ViVVJMTG9hZGVyKiwgY29uc3QgY2hhciogZGF0 YSwgaW50IGRhdGFMZW5ndGgpOworICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hMb2FkaW5nKFdl YlVSTExvYWRlciosIGRvdWJsZSBmaW5pc2hUaW1lKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkRmFp bChXZWJVUkxMb2FkZXIqLCBjb25zdCBXZWJVUkxFcnJvciYpOworCisgICAgZW51bSBDb25uZWN0 aW9uU3RhdGUgeworICAgICAgICBDb25uZWN0aW9uU3RhdGVOZXcsCisgICAgICAgIENvbm5lY3Rp b25TdGF0ZVN0YXJ0ZWQsCisgICAgICAgIENvbm5lY3Rpb25TdGF0ZVJlY2VpdmVkUmVzcG9uc2Us CisgICAgICAgIENvbm5lY3Rpb25TdGF0ZVJlY2VpdmluZ0RhdGEsCisgICAgICAgIENvbm5lY3Rp b25TdGF0ZUZpbmlzaGVkTG9hZGluZywKKyAgICAgICAgQ29ubmVjdGlvblN0YXRlQ2FuY2VsZWQs CisgICAgICAgIENvbm5lY3Rpb25TdGF0ZUZhaWxlZCwKKyAgICB9OworCisgICAgdm9pZCBzZXRP d25lcihSZXNvdXJjZUhhbmRsZSogb3duZXIpIHsgbV9vd25lciA9IG93bmVyOyB9CisgICAgUmVz b3VyY2VSZXF1ZXN0JiByZXF1ZXN0KCkgeyByZXR1cm4gbV9yZXF1ZXN0OyB9CisgICAgUmVzb3Vy Y2VIYW5kbGVDbGllbnQqIGNsaWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fY2xpZW50OyB9CisgICAg dm9pZCBzZXRDbGllbnQoUmVzb3VyY2VIYW5kbGVDbGllbnQqIGNsaWVudCkgeyBtX2NsaWVudCA9 IGNsaWVudDsgfQorICAgIFdlYlVSTExvYWRlciogbG9hZGVyKCkgY29uc3QgeyByZXR1cm4gbV9s b2FkZXIuZ2V0KCk7IH0KKworICAgIHN0YXRpYyBSZXNvdXJjZUhhbmRsZUludGVybmFsKiBGcm9t UmVzb3VyY2VIYW5kbGUoUmVzb3VyY2VIYW5kbGUqKTsKKworcHJpdmF0ZToKKyAgICBSZXNvdXJj ZVJlcXVlc3QgbV9yZXF1ZXN0OworICAgIFJlc291cmNlSGFuZGxlKiBtX293bmVyOworICAgIFJl c291cmNlSGFuZGxlQ2xpZW50KiBtX2NsaWVudDsKKyAgICBPd25QdHI8V2ViVVJMTG9hZGVyPiBt X2xvYWRlcjsKKworICAgIC8vIFVzZWQgZm9yIHNhbml0eSBjaGVja2luZyB0byBtYWtlIHN1cmUg d2UgZG9uJ3QgZXhwZXJpZW5jZSBpbGxlZ2FsIHN0YXRlCisgICAgLy8gdHJhbnNpdGlvbnMuCisg ICAgQ29ubmVjdGlvblN0YXRlIG1fc3RhdGU7Cit9OworCit9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CisKKyNlbmRpZgo=