61908 2011-06-01 23:30:20 -0700 [chromium] PageSerializer::generateMHTML() should return a WebData 2013-04-11 13:59:44 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 62409 1 jcivelli jcivelli fishd schenney webkit.review.bot oldest_to_newest 413939 0 jcivelli 2011-06-01 23:30:20 -0700 We need a WebSharedBuffer class that wraps the WebCore::SharedBuffer and PageSerializer::getSomeData() should return a WebSharedBuffer 414513 1 95826 jcivelli 2011-06-02 15:54:10 -0700 Created attachment 95826 Patch 414972 2 95826 fishd 2011-06-03 10:03:25 -0700 Comment on attachment 95826 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95826&action=review > Source/WebKit/chromium/public/WebSharedBuffer.h:69 > + WebPrivatePtr<WebCore::SharedBuffer> m_private; This class looks like WebData. Can we just use that? :-) 415021 3 95933 jcivelli 2011-06-03 11:23:33 -0700 Created attachment 95933 Patch 415022 4 95826 jcivelli 2011-06-03 11:24:21 -0700 Comment on attachment 95826 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95826&action=review >> Source/WebKit/chromium/public/WebSharedBuffer.h:69 >> + WebPrivatePtr<WebCore::SharedBuffer> m_private; > > This class looks like WebData. Can we just use that? :-) Doh! I missed that class somehow. Using it now. 415030 5 95933 fishd 2011-06-03 11:33:28 -0700 Comment on attachment 95933 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95933&action=review > Source/WebKit/chromium/public/WebData.h:90 > + WEBKIT_API size_t getSomeData(const char*& data, size_t position) const; why do you need this method when you already have direct access to the entire buffer via the "data" method? 415105 6 95933 jcivelli 2011-06-03 12:46:58 -0700 Comment on attachment 95933 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95933&action=review >> Source/WebKit/chromium/public/WebData.h:90 >> + WEBKIT_API size_t getSomeData(const char*& data, size_t position) const; > > why do you need this method when you already have direct access to the entire buffer > via the "data" method? From SharedBuffer.h about data(): "Calling this function will force internal segmented buffers to be merged into a flat buffer. Use getSomeData() whenever possible for better performance." 417676 7 95933 fishd 2011-06-08 16:34:25 -0700 Comment on attachment 95933 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95933&action=review >>> Source/WebKit/chromium/public/WebData.h:90 >>> + WEBKIT_API size_t getSomeData(const char*& data, size_t position) const; >> >> why do you need this method when you already have direct access to the entire buffer >> via the "data" method? > > From SharedBuffer.h about data(): > "Calling this function will force internal segmented buffers to be merged into a flat buffer. Use getSomeData() whenever possible for better performance." OK, I see. I think it would help then to extend the comment above "data()" to explain why getSomeData() should be preferred (i.e., that it could require flattening the internal buffer). 418257 8 96637 jcivelli 2011-06-09 13:55:31 -0700 Created attachment 96637 Patch for landing 418318 9 96637 webkit.review.bot 2011-06-09 14:45:30 -0700 Comment on attachment 96637 Patch for landing Clearing flags on attachment: 96637 Committed r88486: <http://trac.webkit.org/changeset/88486> 418319 10 webkit.review.bot 2011-06-09 14:45:35 -0700 All reviewed patches have been landed. Closing bug. 418416 11 jcivelli 2011-06-09 17:17:22 -0700 Broke the Windows build (a test would not compile), patch got reverted. 418421 12 96670 jcivelli 2011-06-09 17:25:25 -0700 Created attachment 96670 Patch 418795 13 96762 jcivelli 2011-06-10 11:08:26 -0700 Created attachment 96762 Patch for landing 418817 14 webkit.review.bot 2011-06-10 11:49:17 -0700 The commit-queue encountered the following flaky tests while processing attachment 96762: http/tests/local/stylesheet-and-script-load-order.html bug 62450 (author: koivisto@iki.fi) The commit-queue is continuing to process your patch. 418819 15 96762 webkit.review.bot 2011-06-10 11:50:41 -0700 Comment on attachment 96762 Patch for landing Rejecting attachment 96762 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-02', '--port..." exit_code: 1 Last 500 characters of output: viewed" or "Rubber stamp" (case insensitive). 'svn update /mnt/git/webkit-commit-queue/Source/WebKit/chromium/third_party/skia/include --revision 1561 --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' U /mnt/git/webkit-commit-queue/Source/WebKit/chromium/third_party/skia/include/core/SkScalar.h Updated to revision 1561. ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/8826464 874148 16 schenney 2013-04-11 13:59:44 -0700 https://code.google.com/p/chromium/issues/detail?id=230570 95826 2011-06-02 15:54:10 -0700 2011-06-03 11:24:21 -0700 Patch bug-61908-20110602155409.patch text/plain 9068 jcivelli U3VidmVyc2lvbiBSZXZpc2lvbjogODc5NjAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg ZGExZTg3OGM2NWY0MTFhOTI1OGM0MWQ3OTMxMmI5YjQ1MjE3NmUyNy4uOWI1Yzk5MDhiZWYxMGJl ZWMzMDI0MDhjODk2ODFlNjBhOGFmMDY0ZiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNyBAQAorMjAxMS0wNi0wMSAgSmF5IENpdmVsbGkgIDxqY2l2ZWxsaUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UGFnZVNlcmlhbGl6ZXI6OnNlcmlhbGl6ZVRvTUhUTUwoKSBub3cgcmV0dXJucyBhIFdlYlNoYXJl ZEJ1ZmZlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTYxOTA4CisKKyAgICAgICAgKiBXZWJLaXQuZ3lwOgorICAgICAgICAqIHB1YmxpYy9XZWJQYWdl U2VyaWFsaXplci5oOgorICAgICAgICAqIHB1YmxpYy9XZWJTaGFyZWRCdWZmZXIuaDogQWRkZWQu CisgICAgICAgICogc3JjL1dlYlBhZ2VTZXJpYWxpemVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVNlcmlhbGl6ZXI6OnNlcmlhbGl6ZVRvTUhUTUwpOgorICAgICAgICAqIHNyYy9XZWJT aGFyZWRCdWZmZXIuY3BwOiBBZGRlZC4KKwogMjAxMS0wNi0wMiAgSmF5IENpdmVsbGkgIDxqY2l2 ZWxsaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cCBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vV2ViS2l0Lmd5cAppbmRleCBhMzUxNDZhOTY4MmQyMDE3NjA0N2ZmYTA1MGFl NzBkYzExM2JmZmQ0Li41YTQ4MjEzNGI3N2UxZmU2NTZkNmE2OTUzMzM3MzQ0YTdhMWJhY2ZhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCkBAIC01NDgsNiArNTQ4LDggQEAKICAgICAgICAg ICAgICAgICAnc3JjL1dlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHAnLAogICAgICAgICAgICAg ICAgICdzcmMvV2ViU2V0dGluZ3NJbXBsLmNwcCcsCiAgICAgICAgICAgICAgICAgJ3NyYy9XZWJT ZXR0aW5nc0ltcGwuaCcsCisgICAgICAgICAgICAgICAgJ3NyYy9XZWJTaGFyZWRCdWZmZXIuY3Bw JywKKyAgICAgICAgICAgICAgICAnc3JjL1dlYlNoYXJlZEJ1ZmZlci5oJywKICAgICAgICAgICAg ICAgICAnc3JjL1dlYlNoYXJlZFdvcmtlckltcGwuY3BwJywKICAgICAgICAgICAgICAgICAnc3Jj L1dlYlNoYXJlZFdvcmtlckltcGwuaCcsCiAgICAgICAgICAgICAgICAgJ3NyYy9XZWJTcGVlY2hJ bnB1dENvbnRyb2xsZXJNb2NrSW1wbC5jcHAnLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViUGFnZVNlcmlhbGl6ZXIuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYlBhZ2VTZXJpYWxpemVyLmgKaW5kZXggZTJkYjA3YmU0MTgwNTdiMGU4NmQy YTVjODA2ODc4N2RkMGJjZmU3OS4uYTllMDBmNzc4OTBhNjc1YmU3YzRjZmE5ZGI2NTFjNmFkNDYw NTUyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGFnZVNl cmlhbGl6ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQYWdlU2Vy aWFsaXplci5oCkBAIC0zMyw2ICszMyw3IEBACiAKICNpbmNsdWRlICJXZWJDU3RyaW5nLmgiCiAj aW5jbHVkZSAiV2ViQ29tbW9uLmgiCisjaW5jbHVkZSAiV2ViU2hhcmVkQnVmZmVyLmgiCiAjaW5j bHVkZSAiV2ViVVJMLmgiCiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtNTksNyArNjAsNyBAQCBw dWJsaWM6CiAgICAgV0VCS0lUX0FQSSBzdGF0aWMgdm9pZCBzZXJpYWxpemUoV2ViVmlldyosIFdl YlZlY3RvcjxSZXNvdXJjZT4qKTsKIAogICAgIC8vIFNlcmlhbGl6ZXMgdGhlIFdlYlZpZXcgY29u dGVudHMgdG8gYSBNSFRNTCByZXByZXNlbnRhdGlvbi4KLSAgICBXRUJLSVRfQVBJIHN0YXRpYyBX ZWJDU3RyaW5nIHNlcmlhbGl6ZVRvTUhUTUwoV2ViVmlldyopOworICAgIFdFQktJVF9BUEkgc3Rh dGljIFdlYlNoYXJlZEJ1ZmZlciBzZXJpYWxpemVUb01IVE1MKFdlYlZpZXcqKTsKIAogICAgIC8v IElNUE9SVEFOVDoKICAgICAvLyBUaGUgQVBJIGJlbG93IGlzIGFuIG9sZGVyIGltcGxlbWVudGF0 aW9uIG9mIGEgcGFnZXNlcmlhbGl6YXRpb24gdGhhdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViU2hhcmVkQnVmZmVyLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJTaGFyZWRCdWZmZXIuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jMWRkN2Y2YTA0NmZhNGJj YTJmODQ3ZmZmMzczMTZlN2FhM2Y5NzMwCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViU2hhcmVkQnVmZmVyLmgKQEAgLTAsMCArMSw3NCBAQAorLyoK KyAqIENvcHlyaWdodCAoQykgMjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor ICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQorICogbWV0OgorICoKKyAqICAgICAq IFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29w eXJpZ2h0CisgKiBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93 aW5nIGRpc2NsYWltZXIuCisgKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisgKiBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisgKiBpbiB0aGUgZG9j dW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisgKiBk aXN0cmlidXRpb24uCisgKiAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5v ciB0aGUgbmFtZXMgb2YgaXRzCisgKiBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3Jz ZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQorICogdGhpcyBzb2Z0d2FyZSB3aXRo b3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyAqCisgKiBUSElTIFNPRlRX QVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JT CisgKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xV RElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBN RVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCisgKiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBB UkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorICogT1dORVIg T1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lE RU5UQUwsCisgKiBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAo SU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElU VVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyAqIERBVEEsIE9SIFBST0ZJVFM7 IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorICog VEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElU WSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lO RyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpZm5k ZWYgV2ViU2hhcmVkQnVmZmVyX2gKKyNkZWZpbmUgV2ViU2hhcmVkQnVmZmVyX2gKKworI2luY2x1 ZGUgIldlYkNvbW1vbi5oIgorI2luY2x1ZGUgIldlYlByaXZhdGVQdHIuaCIKKworbmFtZXNwYWNl IFdlYkNvcmUgeyBjbGFzcyBTaGFyZWRCdWZmZXI7IH0KKworbmFtZXNwYWNlIFdlYktpdCB7CisK K2NsYXNzIFdlYlNoYXJlZEJ1ZmZlciB7CitwdWJsaWM6CisgICAgfldlYlNoYXJlZEJ1ZmZlcigp OworCisgICAgc2l6ZV90IHNpemUoKSBjb25zdDsKKworICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0 OworCisgICAgLy8gU2V0cyB8ZGF0YXwgdG8gcG9pbnQgdG8gdGhlIGNvbnRlbnQgb2YgdGhlIFNo YXJlZEJ1ZmZlciBhdCBpbmRleCB8cG9zaXRpb258CisgICAgLy8gYW5kIHJldHVybnMgdGhlIG51 bWJlciBvZiBieXRlcyBhdmFpbGFibGUgdG8gYmUgcmVhZCBpbiB8ZGF0YXwuCisgICAgLy8gUmV0 dXJuIDAgd2hlbiBubyBtb3JlIGRhdGEgaXMgbGVmdC4KKyAgICAvLyBVc2FnZToKKyAgICAvLyAg ICAgIGNvbnN0IGNoYXIqIHNlZ21lbnQ7CisgICAgLy8gICAgICBzaXplX3QgcG9zaXRpb24gPSAw OworICAgIC8vICAgICAgd2hpbGUgKHNpemVfdCBsZW5ndGggPSBzaGFyZWRCdWZmZXIuZ2V0U29t ZURhdGEoc2VnbWVudCwgcG9zaXRpb24pKSB7CisgICAgLy8gICAgICAgICAgLy8gVXNlIHRoZSBk YXRhLiBmb3IgZXhhbXBsZTogZGVjb2Rlci0+ZGVjb2RlKHNlZ21lbnQsIGxlbmd0aCk7CisgICAg Ly8gICAgICAgICAgcG9zaXRpb24gKz0gbGVuZ3RoOworICAgIC8vICAgICAgfQorICAgIHNpemVf dCBnZXRTb21lRGF0YShjb25zdCBjaGFyKiYgZGF0YSwgc2l6ZV90IHBvc2l0aW9uKSBjb25zdDsK KworICAgIC8vIFJldHVybnMgYWxsIHRoZSBkYXRhIGZyb20gdGhlIFNoYXJlZEJ1ZmZlci4gUHJl ZmVyIHVzaW5nIGdldFNvbWVEYXRhKCkuCisgICAgY29uc3QgY2hhciogZGF0YSgpIGNvbnN0Owor CisjaWYgV0VCS0lUX0lNUExFTUVOVEFUSU9OCisgICAgV2ViU2hhcmVkQnVmZmVyKGNvbnN0IFdU Rjo6UGFzc1JlZlB0cjxXZWJDb3JlOjpTaGFyZWRCdWZmZXI+Jik7CisjZW5kaWYKKworcHJpdmF0 ZToKKyAgICBXZWJQcml2YXRlUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4gbV9wcml2YXRlOwor fTsKKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0CisKKyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXIuY3BwIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXIuY3BwCmluZGV4IDZkZjg0YmI2Yjk2YThk ZDM0YzI2ODZlMjA2NjEyOGQ3ZTBmZjViYmQuLjgwZmU3ZGQ5ZTViZjQ5MGY4YmYwZDg4ODJhMWEw NGU2YzA0NWVmYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBh Z2VTZXJpYWxpemVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQYWdl U2VyaWFsaXplci5jcHAKQEAgLTIwMSwxMSArMjAxLDkgQEAgdm9pZCBXZWJQYWdlU2VyaWFsaXpl cjo6c2VyaWFsaXplKFdlYlZpZXcqIHZpZXcsIFdlYlZlY3RvcjxXZWJQYWdlU2VyaWFsaXplcjo6 UmUKICAgICAqcmVzb3VyY2VzUGFyYW0gPSByZXN1bHQ7ICAgICAgICAgCiB9CiAKLVdlYkNTdHJp bmcgV2ViUGFnZVNlcmlhbGl6ZXI6OnNlcmlhbGl6ZVRvTUhUTUwoV2ViVmlldyogdmlldykKK1dl YlNoYXJlZEJ1ZmZlciBXZWJQYWdlU2VyaWFsaXplcjo6c2VyaWFsaXplVG9NSFRNTChXZWJWaWV3 KiB2aWV3KQogewotICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IG1odG1sID0gTUhUTUxBcmNoaXZl OjpnZW5lcmF0ZU1IVE1MRGF0YShzdGF0aWNfY2FzdDxXZWJWaWV3SW1wbCo+KHZpZXcpLT5wYWdl KCkpOwotICAgIC8vIEZJWE1FOiB3ZSBhcmUgY29weWluZyBhbGwgdGhlIGRhdGEgaGVyZS4gSWRl YWx5IHdlIHdvdWxkIGhhdmUgYSBXZWJTaGFyZWREYXRhKCkuCi0gICAgcmV0dXJuIFdlYkNTdHJp bmcobWh0bWwtPmRhdGEoKSwgbWh0bWwtPnNpemUoKSk7CisgICAgcmV0dXJuIE1IVE1MQXJjaGl2 ZTo6Z2VuZXJhdGVNSFRNTERhdGEoc3RhdGljX2Nhc3Q8V2ViVmlld0ltcGwqPih2aWV3KS0+cGFn ZSgpKTsKIH0KIAogYm9vbCBXZWJQYWdlU2VyaWFsaXplcjo6c2VyaWFsaXplKFdlYkZyYW1lKiBm cmFtZSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNoYXJlZEJ1 ZmZlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTaGFyZWRCdWZmZXIuY3Bw Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjQ3M2U3MGNkODJkMmQ5NjMwMDRjYTNmMDBiMTNkNTg4YTM2NGE5NzIKLS0t IC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTaGFyZWRCdWZm ZXIuY3BwCkBAIC0wLDAgKzEsNzAgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cyBhcmUKKyAqIG1ldDoKKyAqCisgKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNv ZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogICAgICogUmVk aXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICog Y29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lcgorICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVy aWFscyBwcm92aWRlZCB3aXRoIHRoZQorICogZGlzdHJpYnV0aW9uLgorICogICAgICogTmVpdGhl ciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cworICogY29udHJp YnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVk IGZyb20KKyAqIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBl cm1pc3Npb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJ R0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8s IFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNI QUxMIFRIRSBDT1BZUklHSFQKKyAqIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9S IEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZ LCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRF RCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBP RiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhP V0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIg SU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVH TElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQor ICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBP RiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiV2Vi U2hhcmVkQnVmZmVyLmgiCisKKyNpbmNsdWRlICJTaGFyZWRCdWZmZXIuaCIKKwordXNpbmcgbmFt ZXNwYWNlIFdlYkNvcmU7CisKK25hbWVzcGFjZSBXZWJLaXQgeworCitXZWJTaGFyZWRCdWZmZXI6 On5XZWJTaGFyZWRCdWZmZXIoKQoreworICAgIG1fcHJpdmF0ZS5yZXNldCgpOworfQorCitzaXpl X3QgV2ViU2hhcmVkQnVmZmVyOjpzaXplKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9wcml2YXRl LT5zaXplKCk7Cit9CisKK2Jvb2wgV2ViU2hhcmVkQnVmZmVyOjppc0VtcHR5KCkgY29uc3QKK3sK KyAgICByZXR1cm4gbV9wcml2YXRlLT5pc0VtcHR5KCk7Cit9CisKK3NpemVfdCBXZWJTaGFyZWRC dWZmZXI6OmdldFNvbWVEYXRhKGNvbnN0IGNoYXIqJiBkYXRhLCBzaXplX3QgcG9zaXRpb24pIGNv bnN0Cit7CisgICAgcmV0dXJuIG1fcHJpdmF0ZS0+Z2V0U29tZURhdGEoZGF0YSwgcG9zaXRpb24p OworfQorCitjb25zdCBjaGFyKiBXZWJTaGFyZWRCdWZmZXI6OmRhdGEoKSBjb25zdAoreworICAg IHJldHVybiBtX3ByaXZhdGUtPmRhdGEoKTsKK30KKworV2ViU2hhcmVkQnVmZmVyOjpXZWJTaGFy ZWRCdWZmZXIoY29uc3QgV1RGOjpQYXNzUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4mIGJ1 ZmZlcikKKyAgICA6IG1fcHJpdmF0ZShidWZmZXIpCit7Cit9CisKK30gLy8gbmFtZXNwYWNlIFdl YktpdAo= 95933 2011-06-03 11:23:33 -0700 2011-06-09 13:55:28 -0700 Patch bug-61908-20110603112332.patch text/plain 5090 jcivelli U3VidmVyc2lvbiBSZXZpc2lvbjogODgwMjkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg MGFkYjNlNTAxNjU3NmU0YTE3OGQzMTY4NmI3MmMwYTcwYjQ3ZGI5OC4uNDQ1ZGI0YzIyY2MwY2Q5 YzliODMyMzAwNWM4NjFkODc3NDJlMWQ4MCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOSBAQAorMjAxMS0wNi0wMyAgSmF5IENpdmVsbGkgIDxqY2l2ZWxsaUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UGFnZSBzZXJpYWxpemVyIEFQSXMgbm93IHVzZSBXZWJEYXRhIGluc3RlYWQgb2YgZmV0Y2hpbmcg dGhlIGVudGlyZQorICAgICAgICByZXNvdXJjZSBjb250ZW50cy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxOTA4CisKKyAgICAgICAgKiBwdWJsaWMv V2ViRGF0YS5oOgorICAgICAgICAqIHB1YmxpYy9XZWJQYWdlU2VyaWFsaXplci5oOgorICAgICAg ICAqIHNyYy9XZWJEYXRhLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YTo6Z2V0U29tZURh dGEpOgorICAgICAgICAqIHNyYy9XZWJQYWdlU2VyaWFsaXplci5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VTZXJpYWxpemVyOjpzZXJpYWxpemUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlU2VyaWFsaXplcjo6c2VyaWFsaXplVG9NSFRNTCk6CisKIDIwMTEtMDYtMDMgIE5hb2tpIFRh a2FubyAgPHRha2Fuby5uYW9raUBnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJp YyBTZWlkZWwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJE YXRhLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEYXRhLmgKaW5kZXggNTg3 NGJlZDMxNjgyMzk1NzYwODIyOTU3MjQ1NzgzYzM4Yzc1ZTY2OC4uYTA0Y2FlOTNmMzI3ZjZmMGM0 OWE2NTA1NjU1ZmQ5MTY2ZmQyM2FmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViRGF0YS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YkRhdGEuaApAQCAtNzYsNiArNzYsMjAgQEAgcHVibGljOgogICAgIFdFQktJVF9BUEkgdm9pZCBh c3NpZ24oY29uc3QgY2hhciogZGF0YSwgc2l6ZV90IHNpemUpOwogCiAgICAgV0VCS0lUX0FQSSBz aXplX3Qgc2l6ZSgpIGNvbnN0OworCisgICAgLy8gU2V0cyB8ZGF0YXwgdG8gcG9pbnQgdG8gdGhl IGNvbnRlbnQgb2YgdGhlIFdlYkRhdGEgYXQgaW5kZXggfHBvc2l0aW9ufAorICAgIC8vIGFuZCBy ZXR1cm5zIHRoZSBudW1iZXIgb2YgYnl0ZXMgYXZhaWxhYmxlIHRvIGJlIHJlYWQgaW4gfGRhdGF8 LgorICAgIC8vIFJldHVybiAwIHdoZW4gbm8gbW9yZSBkYXRhIGlzIGxlZnQuCisgICAgLy8gVXNh Z2U6CisgICAgLy8gICAgICBjb25zdCBjaGFyKiBzZWdtZW50OworICAgIC8vICAgICAgc2l6ZV90 IHBvc2l0aW9uID0gMDsKKyAgICAvLyAgICAgIHdoaWxlIChzaXplX3QgbGVuZ3RoID0gd2ViRGF0 YS5nZXRTb21lRGF0YShzZWdtZW50LCBwb3NpdGlvbikpIHsKKyAgICAvLyAgICAgICAgICAvLyBV c2UgdGhlIGRhdGEuIGZvciBleGFtcGxlOiBkZWNvZGVyLT5kZWNvZGUoc2VnbWVudCwgbGVuZ3Ro KTsKKyAgICAvLyAgICAgICAgICBwb3NpdGlvbiArPSBsZW5ndGg7CisgICAgLy8gICAgICB9Cisg ICAgV0VCS0lUX0FQSSBzaXplX3QgZ2V0U29tZURhdGEoY29uc3QgY2hhciomIGRhdGEsIHNpemVf dCBwb3NpdGlvbikgY29uc3Q7CisKKyAgICAvLyBSZXR1cm5zIGFsbCB0aGUgZGF0YSBmcm9tIHRo ZSBTaGFyZWRCdWZmZXIuIFByZWZlciB1c2luZyBnZXRTb21lRGF0YSgpLgogICAgIFdFQktJVF9B UEkgY29uc3QgY2hhciogZGF0YSgpIGNvbnN0OwogCiAgICAgYm9vbCBpc0VtcHR5KCkgY29uc3Qg eyByZXR1cm4gIXNpemUoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViUGFnZVNlcmlhbGl6ZXIuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYlBhZ2VTZXJpYWxpemVyLmgKaW5kZXggZTJkYjA3YmU0MTgwNTdiMGU4NmQyYTVjODA2ODc4 N2RkMGJjZmU3OS4uYzlkYzlkYjU3NzU1MWMwNWFjYTUwZmViODJlZjc5NDg5NTY2Mjg4MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGFnZVNlcmlhbGl6ZXIu aAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQYWdlU2VyaWFsaXplci5o CkBAIC0zMyw2ICszMyw3IEBACiAKICNpbmNsdWRlICJXZWJDU3RyaW5nLmgiCiAjaW5jbHVkZSAi V2ViQ29tbW9uLmgiCisjaW5jbHVkZSAiV2ViRGF0YS5oIgogI2luY2x1ZGUgIldlYlVSTC5oIgog CiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTQ5LDcgKzUwLDcgQEAgcHVibGljOgogICAgIHN0cnVj dCBSZXNvdXJjZSB7CiAgICAgICAgIFdlYlVSTCB1cmw7CiAgICAgICAgIFdlYkNTdHJpbmcgbWlt ZVR5cGU7Ci0gICAgICAgIFdlYkNTdHJpbmcgZGF0YTsKKyAgICAgICAgV2ViRGF0YSBkYXRhOwog ICAgIH07CiAKICAgICAvLyBTZXJpYWxpemVzIGFsbCB0aGUgZnJhbWVzIGZyb20gdGhlIFdlYlZp ZXcsIHJldHJpZXZlcyB0aGUgcGFnZSdzCkBAIC01OSw3ICs2MCw3IEBAIHB1YmxpYzoKICAgICBX RUJLSVRfQVBJIHN0YXRpYyB2b2lkIHNlcmlhbGl6ZShXZWJWaWV3KiwgV2ViVmVjdG9yPFJlc291 cmNlPiopOwogCiAgICAgLy8gU2VyaWFsaXplcyB0aGUgV2ViVmlldyBjb250ZW50cyB0byBhIE1I VE1MIHJlcHJlc2VudGF0aW9uLgotICAgIFdFQktJVF9BUEkgc3RhdGljIFdlYkNTdHJpbmcgc2Vy aWFsaXplVG9NSFRNTChXZWJWaWV3Kik7CisgICAgV0VCS0lUX0FQSSBzdGF0aWMgV2ViRGF0YSBz ZXJpYWxpemVUb01IVE1MKFdlYlZpZXcqKTsKIAogICAgIC8vIElNUE9SVEFOVDoKICAgICAvLyBU aGUgQVBJIGJlbG93IGlzIGFuIG9sZGVyIGltcGxlbWVudGF0aW9uIG9mIGEgcGFnZXNlcmlhbGl6 YXRpb24gdGhhdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRGF0 YS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEYXRhLmNwcAppbmRleCA2YWFm ZTc5NmRkM2JlZTlmY2FiMmE3OWNjZTRlZGVkOGEwODBmYzk3Li43ZWYwMjI4YjE2YThlZWRmZTRl ODU0ZTVhYmMyZDhiZWU3YzVjNGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJEYXRhLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEYXRh LmNwcApAQCAtNjksNiArNjksMTEgQEAgc2l6ZV90IFdlYkRhdGE6OnNpemUoKSBjb25zdAogICAg IHJldHVybiBjb25zdF9jYXN0PFdlYkRhdGFQcml2YXRlKj4obV9wcml2YXRlKS0+c2l6ZSgpOwog fQogCitzaXplX3QgV2ViRGF0YTo6Z2V0U29tZURhdGEoY29uc3QgY2hhciomIGRhdGEsIHNpemVf dCBwb3NpdGlvbikgY29uc3QKK3sKKyAgICByZXR1cm4gbV9wcml2YXRlLT5nZXRTb21lRGF0YShk YXRhLCBwb3NpdGlvbik7Cit9CisKIGNvbnN0IGNoYXIqIFdlYkRhdGE6OmRhdGEoKSBjb25zdAog ewogICAgIGlmICghbV9wcml2YXRlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXIuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViUGFnZVNlcmlhbGl6ZXIuY3BwCmluZGV4IDZkZjg0YmI2Yjk2YThkZDM0YzI2ODZlMjA2NjEy OGQ3ZTBmZjViYmQuLmNkMGFlYzdlNDM5ZmIwMThkMDU1YTNiMWE5NzJmNjUyNGM2YzcwMmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVyLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQYWdlU2VyaWFsaXplci5jcHAK QEAgLTE5MywxOSArMTkzLDE1IEBAIHZvaWQgV2ViUGFnZVNlcmlhbGl6ZXI6OnNlcmlhbGl6ZShX ZWJWaWV3KiB2aWV3LCBXZWJWZWN0b3I8V2ViUGFnZVNlcmlhbGl6ZXI6OlJlCiAgICAgICAgIFJl c291cmNlIHJlc291cmNlOwogICAgICAgICByZXNvdXJjZS51cmwgPSBpdGVyLT51cmw7CiAgICAg ICAgIHJlc291cmNlLm1pbWVUeXBlID0gaXRlci0+bWltZVR5cGUuYXNjaWkoKTsKLSAgICAgICAg Ly8gRklYTUU6IHdlIGFyZSBjb3B5aW5nIGFsbCB0aGUgcmVzb3VyY2UgZGF0YSBoZXJlLiBJZGVh bHkgd2Ugd291bGQgaGF2ZSBhIFdlYlNoYXJlZERhdGEoKS4KLSAgICAgICAgcmVzb3VyY2UuZGF0 YSA9IFdlYkNTdHJpbmcoaXRlci0+ZGF0YS0+ZGF0YSgpLCBpdGVyLT5kYXRhLT5zaXplKCkpOwor ICAgICAgICByZXNvdXJjZS5kYXRhID0gaXRlci0+ZGF0YTsKICAgICAgICAgcmVzdWx0LmFwcGVu ZChyZXNvdXJjZSk7CiAgICAgfQotCiAgICAgKnJlc291cmNlc1BhcmFtID0gcmVzdWx0OyAgICAg ICAgIAogfQogCi1XZWJDU3RyaW5nIFdlYlBhZ2VTZXJpYWxpemVyOjpzZXJpYWxpemVUb01IVE1M KFdlYlZpZXcqIHZpZXcpCitXZWJEYXRhIFdlYlBhZ2VTZXJpYWxpemVyOjpzZXJpYWxpemVUb01I VE1MKFdlYlZpZXcqIHZpZXcpCiB7Ci0gICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gbWh0bWwgPSBN SFRNTEFyY2hpdmU6OmdlbmVyYXRlTUhUTUxEYXRhKHN0YXRpY19jYXN0PFdlYlZpZXdJbXBsKj4o dmlldyktPnBhZ2UoKSk7Ci0gICAgLy8gRklYTUU6IHdlIGFyZSBjb3B5aW5nIGFsbCB0aGUgZGF0 YSBoZXJlLiBJZGVhbHkgd2Ugd291bGQgaGF2ZSBhIFdlYlNoYXJlZERhdGEoKS4KLSAgICByZXR1 cm4gV2ViQ1N0cmluZyhtaHRtbC0+ZGF0YSgpLCBtaHRtbC0+c2l6ZSgpKTsKKyAgICByZXR1cm4g TUhUTUxBcmNoaXZlOjpnZW5lcmF0ZU1IVE1MRGF0YShzdGF0aWNfY2FzdDxXZWJWaWV3SW1wbCo+ KHZpZXcpLT5wYWdlKCkpOwogfQogCiBib29sIFdlYlBhZ2VTZXJpYWxpemVyOjpzZXJpYWxpemUo V2ViRnJhbWUqIGZyYW1lLAo= 96637 2011-06-09 13:55:31 -0700 2011-06-09 17:25:21 -0700 Patch for landing bug-61908-20110609135530.patch text/plain 5180 jcivelli U3VidmVyc2lvbiBSZXZpc2lvbjogODg0NzgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg NzEwNmZkZGI5ZTBkNzY5YTAyYWIwMzA4ZWI1YzU4YmE0Y2I2ZjMyOS4uNzQ3YzVkYzUxZGY2YmFl NTM3ZWI0YWJjMDJkOGU2OGJkMmFhMjFkMiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOSBAQAorMjAxMS0wNi0wOSAgSmF5IENpdmVsbGkgIDxqY2l2ZWxsaUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgorCisgICAgICAgIFBh Z2Ugc2VyaWFsaXplciBBUElzIG5vdyB1c2UgV2ViRGF0YSBpbnN0ZWFkIG9mIGZldGNoaW5nIHRo ZSBlbnRpcmUKKyAgICAgICAgcmVzb3VyY2UgY29udGVudHMuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTkwOAorCisgICAgICAgICogcHVibGljL1dl YkRhdGEuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViUGFnZVNlcmlhbGl6ZXIuaDoKKyAgICAgICAg KiBzcmMvV2ViRGF0YS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGE6OmdldFNvbWVEYXRh KToKKyAgICAgICAgKiBzcmMvV2ViUGFnZVNlcmlhbGl6ZXIuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlU2VyaWFsaXplcjo6c2VyaWFsaXplKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVNlcmlhbGl6ZXI6OnNlcmlhbGl6ZVRvTUhUTUwpOgorCiAyMDExLTA2LTA5ICBCaWxsIEJ1ZGdl ICA8YmJ1ZGdlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRo LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGF0YS5oIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGF0YS5oCmluZGV4IDU4NzRiZWQzMTY4 MjM5NTc2MDgyMjk1NzI0NTc4M2MzOGM3NWU2NjguLmRkNzI5MDFmM2I4MDM0YTcwYThhOGY3NDRl OGRlOGJlMmI3OGI2ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYkRhdGEuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEYXRhLmgK QEAgLTc2LDYgKzc2LDIyIEBAIHB1YmxpYzoKICAgICBXRUJLSVRfQVBJIHZvaWQgYXNzaWduKGNv bnN0IGNoYXIqIGRhdGEsIHNpemVfdCBzaXplKTsKIAogICAgIFdFQktJVF9BUEkgc2l6ZV90IHNp emUoKSBjb25zdDsKKworICAgIC8vIFNldHMgfGRhdGF8IHRvIHBvaW50IHRvIHRoZSBjb250ZW50 IG9mIHRoZSBXZWJEYXRhIGF0IGluZGV4IHxwb3NpdGlvbnwKKyAgICAvLyBhbmQgcmV0dXJucyB0 aGUgbnVtYmVyIG9mIGJ5dGVzIGF2YWlsYWJsZSB0byBiZSByZWFkIGluIHxkYXRhfC4KKyAgICAv LyBSZXR1cm4gMCB3aGVuIG5vIG1vcmUgZGF0YSBpcyBsZWZ0LgorICAgIC8vIFVzYWdlOgorICAg IC8vICAgICAgY29uc3QgY2hhciogc2VnbWVudDsKKyAgICAvLyAgICAgIHNpemVfdCBwb3NpdGlv biA9IDA7CisgICAgLy8gICAgICB3aGlsZSAoc2l6ZV90IGxlbmd0aCA9IHdlYkRhdGEuZ2V0U29t ZURhdGEoc2VnbWVudCwgcG9zaXRpb24pKSB7CisgICAgLy8gICAgICAgICAgLy8gVXNlIHRoZSBk YXRhLiBmb3IgZXhhbXBsZTogZGVjb2Rlci0+ZGVjb2RlKHNlZ21lbnQsIGxlbmd0aCk7CisgICAg Ly8gICAgICAgICAgcG9zaXRpb24gKz0gbGVuZ3RoOworICAgIC8vICAgICAgfQorICAgIFdFQktJ VF9BUEkgc2l6ZV90IGdldFNvbWVEYXRhKGNvbnN0IGNoYXIqJiBkYXRhLCBzaXplX3QgcG9zaXRp b24pIGNvbnN0OworCisgICAgLy8gUmV0dXJucyBhbGwgdGhlIGRhdGEgZnJvbSB0aGUgU2hhcmVk QnVmZmVyLgorICAgIC8vIENvbnNpZGVyIHVzaW5nIGdldFNvbWVEYXRhKCkgYXMgZGF0YSgpIGNv dWxkIHJlcXVpcmUgZmxhdHRlbmluZyB0aGUgaW50ZXJuYWwgYnVmZmVyCisgICAgLy8gd2hpY2gg bWlnaHQgYmUgZXhwZW5zaXZlLgogICAgIFdFQktJVF9BUEkgY29uc3QgY2hhciogZGF0YSgpIGNv bnN0OwogCiAgICAgYm9vbCBpc0VtcHR5KCkgY29uc3QgeyByZXR1cm4gIXNpemUoKTsgfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGFnZVNlcmlhbGl6ZXIu aCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlBhZ2VTZXJpYWxpemVyLmgKaW5k ZXggZTJkYjA3YmU0MTgwNTdiMGU4NmQyYTVjODA2ODc4N2RkMGJjZmU3OS4uYzlkYzlkYjU3NzU1 MWMwNWFjYTUwZmViODJlZjc5NDg5NTY2Mjg4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViUGFnZVNlcmlhbGl6ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJQYWdlU2VyaWFsaXplci5oCkBAIC0zMyw2ICszMyw3IEBACiAKICNp bmNsdWRlICJXZWJDU3RyaW5nLmgiCiAjaW5jbHVkZSAiV2ViQ29tbW9uLmgiCisjaW5jbHVkZSAi V2ViRGF0YS5oIgogI2luY2x1ZGUgIldlYlVSTC5oIgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAg LTQ5LDcgKzUwLDcgQEAgcHVibGljOgogICAgIHN0cnVjdCBSZXNvdXJjZSB7CiAgICAgICAgIFdl YlVSTCB1cmw7CiAgICAgICAgIFdlYkNTdHJpbmcgbWltZVR5cGU7Ci0gICAgICAgIFdlYkNTdHJp bmcgZGF0YTsKKyAgICAgICAgV2ViRGF0YSBkYXRhOwogICAgIH07CiAKICAgICAvLyBTZXJpYWxp emVzIGFsbCB0aGUgZnJhbWVzIGZyb20gdGhlIFdlYlZpZXcsIHJldHJpZXZlcyB0aGUgcGFnZSdz CkBAIC01OSw3ICs2MCw3IEBAIHB1YmxpYzoKICAgICBXRUJLSVRfQVBJIHN0YXRpYyB2b2lkIHNl cmlhbGl6ZShXZWJWaWV3KiwgV2ViVmVjdG9yPFJlc291cmNlPiopOwogCiAgICAgLy8gU2VyaWFs aXplcyB0aGUgV2ViVmlldyBjb250ZW50cyB0byBhIE1IVE1MIHJlcHJlc2VudGF0aW9uLgotICAg IFdFQktJVF9BUEkgc3RhdGljIFdlYkNTdHJpbmcgc2VyaWFsaXplVG9NSFRNTChXZWJWaWV3Kik7 CisgICAgV0VCS0lUX0FQSSBzdGF0aWMgV2ViRGF0YSBzZXJpYWxpemVUb01IVE1MKFdlYlZpZXcq KTsKIAogICAgIC8vIElNUE9SVEFOVDoKICAgICAvLyBUaGUgQVBJIGJlbG93IGlzIGFuIG9sZGVy IGltcGxlbWVudGF0aW9uIG9mIGEgcGFnZXNlcmlhbGl6YXRpb24gdGhhdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRGF0YS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJEYXRhLmNwcAppbmRleCA2YWFmZTc5NmRkM2JlZTlmY2FiMmE3OWNjZTRl ZGVkOGEwODBmYzk3Li43ZWYwMjI4YjE2YThlZWRmZTRlODU0ZTVhYmMyZDhiZWU3YzVjNGE5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEYXRhLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEYXRhLmNwcApAQCAtNjksNiArNjksMTEgQEAg c2l6ZV90IFdlYkRhdGE6OnNpemUoKSBjb25zdAogICAgIHJldHVybiBjb25zdF9jYXN0PFdlYkRh dGFQcml2YXRlKj4obV9wcml2YXRlKS0+c2l6ZSgpOwogfQogCitzaXplX3QgV2ViRGF0YTo6Z2V0 U29tZURhdGEoY29uc3QgY2hhciomIGRhdGEsIHNpemVfdCBwb3NpdGlvbikgY29uc3QKK3sKKyAg ICByZXR1cm4gbV9wcml2YXRlLT5nZXRTb21lRGF0YShkYXRhLCBwb3NpdGlvbik7Cit9CisKIGNv bnN0IGNoYXIqIFdlYkRhdGE6OmRhdGEoKSBjb25zdAogewogICAgIGlmICghbV9wcml2YXRlKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXIu Y3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXIuY3BwCmlu ZGV4IDZkZjg0YmI2Yjk2YThkZDM0YzI2ODZlMjA2NjEyOGQ3ZTBmZjViYmQuLmNkMGFlYzdlNDM5 ZmIwMThkMDU1YTNiMWE5NzJmNjUyNGM2YzcwMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJQYWdlU2VyaWFsaXplci5jcHAKQEAgLTE5MywxOSArMTkzLDE1IEBAIHZv aWQgV2ViUGFnZVNlcmlhbGl6ZXI6OnNlcmlhbGl6ZShXZWJWaWV3KiB2aWV3LCBXZWJWZWN0b3I8 V2ViUGFnZVNlcmlhbGl6ZXI6OlJlCiAgICAgICAgIFJlc291cmNlIHJlc291cmNlOwogICAgICAg ICByZXNvdXJjZS51cmwgPSBpdGVyLT51cmw7CiAgICAgICAgIHJlc291cmNlLm1pbWVUeXBlID0g aXRlci0+bWltZVR5cGUuYXNjaWkoKTsKLSAgICAgICAgLy8gRklYTUU6IHdlIGFyZSBjb3B5aW5n IGFsbCB0aGUgcmVzb3VyY2UgZGF0YSBoZXJlLiBJZGVhbHkgd2Ugd291bGQgaGF2ZSBhIFdlYlNo YXJlZERhdGEoKS4KLSAgICAgICAgcmVzb3VyY2UuZGF0YSA9IFdlYkNTdHJpbmcoaXRlci0+ZGF0 YS0+ZGF0YSgpLCBpdGVyLT5kYXRhLT5zaXplKCkpOworICAgICAgICByZXNvdXJjZS5kYXRhID0g aXRlci0+ZGF0YTsKICAgICAgICAgcmVzdWx0LmFwcGVuZChyZXNvdXJjZSk7CiAgICAgfQotCiAg ICAgKnJlc291cmNlc1BhcmFtID0gcmVzdWx0OyAgICAgICAgIAogfQogCi1XZWJDU3RyaW5nIFdl YlBhZ2VTZXJpYWxpemVyOjpzZXJpYWxpemVUb01IVE1MKFdlYlZpZXcqIHZpZXcpCitXZWJEYXRh IFdlYlBhZ2VTZXJpYWxpemVyOjpzZXJpYWxpemVUb01IVE1MKFdlYlZpZXcqIHZpZXcpCiB7Ci0g ICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gbWh0bWwgPSBNSFRNTEFyY2hpdmU6OmdlbmVyYXRlTUhU TUxEYXRhKHN0YXRpY19jYXN0PFdlYlZpZXdJbXBsKj4odmlldyktPnBhZ2UoKSk7Ci0gICAgLy8g RklYTUU6IHdlIGFyZSBjb3B5aW5nIGFsbCB0aGUgZGF0YSBoZXJlLiBJZGVhbHkgd2Ugd291bGQg aGF2ZSBhIFdlYlNoYXJlZERhdGEoKS4KLSAgICByZXR1cm4gV2ViQ1N0cmluZyhtaHRtbC0+ZGF0 YSgpLCBtaHRtbC0+c2l6ZSgpKTsKKyAgICByZXR1cm4gTUhUTUxBcmNoaXZlOjpnZW5lcmF0ZU1I VE1MRGF0YShzdGF0aWNfY2FzdDxXZWJWaWV3SW1wbCo+KHZpZXcpLT5wYWdlKCkpOwogfQogCiBi b29sIFdlYlBhZ2VTZXJpYWxpemVyOjpzZXJpYWxpemUoV2ViRnJhbWUqIGZyYW1lLAo= 96670 2011-06-09 17:25:25 -0700 2011-06-10 11:08:22 -0700 Patch bug-61908-20110609172505.patch text/plain 6116 jcivelli U3VidmVyc2lvbiBSZXZpc2lvbjogODg0OTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg NWY0MmM0ZDE2MzMxYTcxM2U3YmVjZDc1ZGI5NDIyMjUwMWYxOWQ5Mi4uZDBjNmIxMThkODE2YWM4 OTFkZjA1NWJiOTUzZDBiYzY5YzdjZmI4NiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMiBAQAorMjAxMS0wNi0wOSAgSmF5IENpdmVsbGkgIDxqY2l2ZWxsaUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmVsYW5kaW5nIHByZXZpb3VzIENMICh0ZXN0cyBub3cgY29tcGlsaW5nIE9LIG9uIFdpbmRvd3Mp OgorICAgICAgICBQYWdlIHNlcmlhbGl6ZXIgQVBJcyBub3cgdXNlIFdlYkRhdGEgaW5zdGVhZCBv ZiBmZXRjaGluZyB0aGUgZW50aXJlCisgICAgICAgIHJlc291cmNlIGNvbnRlbnRzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE5MDgKKworICAgICAg ICAqIHB1YmxpYy9XZWJEYXRhLmg6CisgICAgICAgICogcHVibGljL1dlYlBhZ2VTZXJpYWxpemVy Lmg6CisgICAgICAgICogc3JjL1dlYkRhdGEuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRh OjpnZXRTb21lRGF0YSk6CisgICAgICAgICogc3JjL1dlYlBhZ2VTZXJpYWxpemVyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVNlcmlhbGl6ZXI6OnNlcmlhbGl6ZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VTZXJpYWxpemVyOjpzZXJpYWxpemVUb01IVE1MKToKKyAgICAgICAgKiB0 ZXN0cy9XZWJQYWdlTmV3U2VyaWFsaXplclRlc3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpURVNU X0YpOgorCiAyMDExLTA2LTA5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWls LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByODg0ODYuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEYXRhLmggYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEYXRhLmgKaW5kZXggNTg3NGJlZDMxNjgyMzk1NzYwODIy OTU3MjQ1NzgzYzM4Yzc1ZTY2OC4uZGQ3MjkwMWYzYjgwMzRhNzBhOGE4Zjc0NGU4ZGU4YmUyYjc4 YjZlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGF0YS5o CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRhdGEuaApAQCAtNzYsNiAr NzYsMjIgQEAgcHVibGljOgogICAgIFdFQktJVF9BUEkgdm9pZCBhc3NpZ24oY29uc3QgY2hhciog ZGF0YSwgc2l6ZV90IHNpemUpOwogCiAgICAgV0VCS0lUX0FQSSBzaXplX3Qgc2l6ZSgpIGNvbnN0 OworCisgICAgLy8gU2V0cyB8ZGF0YXwgdG8gcG9pbnQgdG8gdGhlIGNvbnRlbnQgb2YgdGhlIFdl YkRhdGEgYXQgaW5kZXggfHBvc2l0aW9ufAorICAgIC8vIGFuZCByZXR1cm5zIHRoZSBudW1iZXIg b2YgYnl0ZXMgYXZhaWxhYmxlIHRvIGJlIHJlYWQgaW4gfGRhdGF8LgorICAgIC8vIFJldHVybiAw IHdoZW4gbm8gbW9yZSBkYXRhIGlzIGxlZnQuCisgICAgLy8gVXNhZ2U6CisgICAgLy8gICAgICBj b25zdCBjaGFyKiBzZWdtZW50OworICAgIC8vICAgICAgc2l6ZV90IHBvc2l0aW9uID0gMDsKKyAg ICAvLyAgICAgIHdoaWxlIChzaXplX3QgbGVuZ3RoID0gd2ViRGF0YS5nZXRTb21lRGF0YShzZWdt ZW50LCBwb3NpdGlvbikpIHsKKyAgICAvLyAgICAgICAgICAvLyBVc2UgdGhlIGRhdGEuIGZvciBl eGFtcGxlOiBkZWNvZGVyLT5kZWNvZGUoc2VnbWVudCwgbGVuZ3RoKTsKKyAgICAvLyAgICAgICAg ICBwb3NpdGlvbiArPSBsZW5ndGg7CisgICAgLy8gICAgICB9CisgICAgV0VCS0lUX0FQSSBzaXpl X3QgZ2V0U29tZURhdGEoY29uc3QgY2hhciomIGRhdGEsIHNpemVfdCBwb3NpdGlvbikgY29uc3Q7 CisKKyAgICAvLyBSZXR1cm5zIGFsbCB0aGUgZGF0YSBmcm9tIHRoZSBTaGFyZWRCdWZmZXIuCisg ICAgLy8gQ29uc2lkZXIgdXNpbmcgZ2V0U29tZURhdGEoKSBhcyBkYXRhKCkgY291bGQgcmVxdWly ZSBmbGF0dGVuaW5nIHRoZSBpbnRlcm5hbCBidWZmZXIKKyAgICAvLyB3aGljaCBtaWdodCBiZSBl eHBlbnNpdmUuCiAgICAgV0VCS0lUX0FQSSBjb25zdCBjaGFyKiBkYXRhKCkgY29uc3Q7CiAKICAg ICBib29sIGlzRW1wdHkoKSBjb25zdCB7IHJldHVybiAhc2l6ZSgpOyB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQYWdlU2VyaWFsaXplci5oIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGFnZVNlcmlhbGl6ZXIuaAppbmRleCBlMmRiMDdi ZTQxODA1N2IwZTg2ZDJhNWM4MDY4Nzg3ZGQwYmNmZTc5Li5jOWRjOWRiNTc3NTUxYzA1YWNhNTBm ZWI4MmVmNzk0ODk1NjYyODgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJQYWdlU2VyaWFsaXplci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYlBhZ2VTZXJpYWxpemVyLmgKQEAgLTMzLDYgKzMzLDcgQEAKIAogI2luY2x1ZGUgIldl YkNTdHJpbmcuaCIKICNpbmNsdWRlICJXZWJDb21tb24uaCIKKyNpbmNsdWRlICJXZWJEYXRhLmgi CiAjaW5jbHVkZSAiV2ViVVJMLmgiCiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtNDksNyArNTAs NyBAQCBwdWJsaWM6CiAgICAgc3RydWN0IFJlc291cmNlIHsKICAgICAgICAgV2ViVVJMIHVybDsK ICAgICAgICAgV2ViQ1N0cmluZyBtaW1lVHlwZTsKLSAgICAgICAgV2ViQ1N0cmluZyBkYXRhOwor ICAgICAgICBXZWJEYXRhIGRhdGE7CiAgICAgfTsKIAogICAgIC8vIFNlcmlhbGl6ZXMgYWxsIHRo ZSBmcmFtZXMgZnJvbSB0aGUgV2ViVmlldywgcmV0cmlldmVzIHRoZSBwYWdlJ3MKQEAgLTU5LDcg KzYwLDcgQEAgcHVibGljOgogICAgIFdFQktJVF9BUEkgc3RhdGljIHZvaWQgc2VyaWFsaXplKFdl YlZpZXcqLCBXZWJWZWN0b3I8UmVzb3VyY2U+Kik7CiAKICAgICAvLyBTZXJpYWxpemVzIHRoZSBX ZWJWaWV3IGNvbnRlbnRzIHRvIGEgTUhUTUwgcmVwcmVzZW50YXRpb24uCi0gICAgV0VCS0lUX0FQ SSBzdGF0aWMgV2ViQ1N0cmluZyBzZXJpYWxpemVUb01IVE1MKFdlYlZpZXcqKTsKKyAgICBXRUJL SVRfQVBJIHN0YXRpYyBXZWJEYXRhIHNlcmlhbGl6ZVRvTUhUTUwoV2ViVmlldyopOwogCiAgICAg Ly8gSU1QT1JUQU5UOgogICAgIC8vIFRoZSBBUEkgYmVsb3cgaXMgYW4gb2xkZXIgaW1wbGVtZW50 YXRpb24gb2YgYSBwYWdlc2VyaWFsaXphdGlvbiB0aGF0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJEYXRhLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkRhdGEuY3BwCmluZGV4IDZhYWZlNzk2ZGQzYmVlOWZjYWIyYTc5Y2NlNGVkZWQ4YTA4MGZj OTcuLjdlZjAyMjhiMTZhOGVlZGZlNGU4NTRlNWFiYzJkOGJlZTdjNWM0YTkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRhdGEuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYkRhdGEuY3BwCkBAIC02OSw2ICs2OSwxMSBAQCBzaXplX3QgV2Vi RGF0YTo6c2l6ZSgpIGNvbnN0CiAgICAgcmV0dXJuIGNvbnN0X2Nhc3Q8V2ViRGF0YVByaXZhdGUq PihtX3ByaXZhdGUpLT5zaXplKCk7CiB9CiAKK3NpemVfdCBXZWJEYXRhOjpnZXRTb21lRGF0YShj b25zdCBjaGFyKiYgZGF0YSwgc2l6ZV90IHBvc2l0aW9uKSBjb25zdAoreworICAgIHJldHVybiBt X3ByaXZhdGUtPmdldFNvbWVEYXRhKGRhdGEsIHBvc2l0aW9uKTsKK30KKwogY29uc3QgY2hhciog V2ViRGF0YTo6ZGF0YSgpIGNvbnN0CiB7CiAgICAgaWYgKCFtX3ByaXZhdGUpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQYWdlU2VyaWFsaXplci5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQYWdlU2VyaWFsaXplci5jcHAKaW5kZXggNmRmODRi YjZiOTZhOGRkMzRjMjY4NmUyMDY2MTI4ZDdlMGZmNWJiZC4uY2QwYWVjN2U0MzlmYjAxOGQwNTVh M2IxYTk3MmY2NTI0YzZjNzAyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViUGFnZVNlcmlhbGl6ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlBhZ2VTZXJpYWxpemVyLmNwcApAQCAtMTkzLDE5ICsxOTMsMTUgQEAgdm9pZCBXZWJQYWdl U2VyaWFsaXplcjo6c2VyaWFsaXplKFdlYlZpZXcqIHZpZXcsIFdlYlZlY3RvcjxXZWJQYWdlU2Vy aWFsaXplcjo6UmUKICAgICAgICAgUmVzb3VyY2UgcmVzb3VyY2U7CiAgICAgICAgIHJlc291cmNl LnVybCA9IGl0ZXItPnVybDsKICAgICAgICAgcmVzb3VyY2UubWltZVR5cGUgPSBpdGVyLT5taW1l VHlwZS5hc2NpaSgpOwotICAgICAgICAvLyBGSVhNRTogd2UgYXJlIGNvcHlpbmcgYWxsIHRoZSBy ZXNvdXJjZSBkYXRhIGhlcmUuIElkZWFseSB3ZSB3b3VsZCBoYXZlIGEgV2ViU2hhcmVkRGF0YSgp LgotICAgICAgICByZXNvdXJjZS5kYXRhID0gV2ViQ1N0cmluZyhpdGVyLT5kYXRhLT5kYXRhKCks IGl0ZXItPmRhdGEtPnNpemUoKSk7CisgICAgICAgIHJlc291cmNlLmRhdGEgPSBpdGVyLT5kYXRh OwogICAgICAgICByZXN1bHQuYXBwZW5kKHJlc291cmNlKTsKICAgICB9Ci0KICAgICAqcmVzb3Vy Y2VzUGFyYW0gPSByZXN1bHQ7ICAgICAgICAgCiB9CiAKLVdlYkNTdHJpbmcgV2ViUGFnZVNlcmlh bGl6ZXI6OnNlcmlhbGl6ZVRvTUhUTUwoV2ViVmlldyogdmlldykKK1dlYkRhdGEgV2ViUGFnZVNl cmlhbGl6ZXI6OnNlcmlhbGl6ZVRvTUhUTUwoV2ViVmlldyogdmlldykKIHsKLSAgICBSZWZQdHI8 U2hhcmVkQnVmZmVyPiBtaHRtbCA9IE1IVE1MQXJjaGl2ZTo6Z2VuZXJhdGVNSFRNTERhdGEoc3Rh dGljX2Nhc3Q8V2ViVmlld0ltcGwqPih2aWV3KS0+cGFnZSgpKTsKLSAgICAvLyBGSVhNRTogd2Ug YXJlIGNvcHlpbmcgYWxsIHRoZSBkYXRhIGhlcmUuIElkZWFseSB3ZSB3b3VsZCBoYXZlIGEgV2Vi U2hhcmVkRGF0YSgpLgotICAgIHJldHVybiBXZWJDU3RyaW5nKG1odG1sLT5kYXRhKCksIG1odG1s LT5zaXplKCkpOworICAgIHJldHVybiBNSFRNTEFyY2hpdmU6OmdlbmVyYXRlTUhUTUxEYXRhKHN0 YXRpY19jYXN0PFdlYlZpZXdJbXBsKj4odmlldyktPnBhZ2UoKSk7CiB9CiAKIGJvb2wgV2ViUGFn ZVNlcmlhbGl6ZXI6OnNlcmlhbGl6ZShXZWJGcmFtZSogZnJhbWUsCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYlBhZ2VOZXdTZXJpYWxpemVyVGVzdC5jcHAgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYlBhZ2VOZXdTZXJpYWxpemVyVGVzdC5jcHAK aW5kZXggMjRiMGRhY2ViZjMwMmY3YzY0YzA2NGY5ZDNhYTg3NGVmZjI0NmYyNi4uM2FlNmEzNWFl OGQ3OWIwOWJkZTI0ZTUzZTQxMTk5NzhiOTFhOTg0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS90ZXN0cy9XZWJQYWdlTmV3U2VyaWFsaXplclRlc3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViUGFnZU5ld1NlcmlhbGl6ZXJUZXN0LmNwcApAQCAt Mjc2LDcgKzI3Niw3IEBAIFRFU1RfRihXZWJQYWdlTmV3U2VyaWFsaXplVGVzdCwgRElTQUJMRURf U2VyaWFsaXplWE1MSGFzUmlnaHREZWNsYXJhdGlvbikKICAgICAKICAgICAvLyBXZSBleHBlY3Qg b25seSBvbmUgcmVzb3VyY2UsIHRoZSBYTUwuCiAgICAgQVNTRVJUX0VRKDEsIHJlc291cmNlcy5z aXplKCkpOwotICAgIHN0ZDo6c3RyaW5nIHhtbCA9IHJlc291cmNlc1swXS5kYXRhOworICAgIHN0 ZDo6c3RyaW5nIHhtbChyZXNvdXJjZXNbMF0uZGF0YS5kYXRhKCksIHJlc291cmNlc1swXS5kYXRh LnNpemUoKSk7CiAKICAgICAvLyBXZSBzaG91bGQgaGF2ZSBvbmUgYW5kIG9ubHkgb25lIGluc3Rh bmNlIG9mIHRoZSBYTUwgZGVjbGFyYXRpb24uCiAgICAgc2l6ZV90IHBvcyA9IHhtbC5maW5kKCI8 P3htbCB2ZXJzaW9uPSIpOwo= 96762 2011-06-10 11:08:26 -0700 2011-06-10 11:50:41 -0700 Patch for landing bug-61908-20110610110805.patch text/plain 6102 jcivelli U3VidmVyc2lvbiBSZXZpc2lvbjogODg1NDkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg NjJlZDdmNjY4ODlkMjNlYTJkNGNmZmY4MzI0OGEzOTY3NWM3MTRjNi4uYTc2NDMzYzRlZTY0YzFh YmJjNDZlYmQ0NjcxMjg4NDg5OTkzYTMyMSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMiBAQAorMjAxMS0wNi0wOSAgSmF5IENpdmVsbGkgIDxqY2l2ZWxsaUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmVsYW5kaW5nIHByZXZpb3VzIENMICh0ZXN0cyBub3cgY29tcGlsaW5nIE9LIG9uIFdpbmRvd3Mp OgorICAgICAgICBQYWdlIHNlcmlhbGl6ZXIgQVBJcyBub3cgdXNlIFdlYkRhdGEgaW5zdGVhZCBv ZiBmZXRjaGluZyB0aGUgZW50aXJlCisgICAgICAgIHJlc291cmNlIGNvbnRlbnRzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE5MDgKKworICAgICAg ICAqIHB1YmxpYy9XZWJEYXRhLmg6CisgICAgICAgICogcHVibGljL1dlYlBhZ2VTZXJpYWxpemVy Lmg6CisgICAgICAgICogc3JjL1dlYkRhdGEuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRh OjpnZXRTb21lRGF0YSk6CisgICAgICAgICogc3JjL1dlYlBhZ2VTZXJpYWxpemVyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVNlcmlhbGl6ZXI6OnNlcmlhbGl6ZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VTZXJpYWxpemVyOjpzZXJpYWxpemVUb01IVE1MKToKKyAgICAgICAgKiB0 ZXN0cy9XZWJQYWdlTmV3U2VyaWFsaXplclRlc3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpURVNU X0YpOgorCiAyMDExLTA2LTEwICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGF0YS5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViRGF0YS5oCmluZGV4IDU4NzRiZWQzMTY4MjM5NTc2MDgyMjk1NzI0NTc4M2MzOGM3 NWU2NjguLmRkNzI5MDFmM2I4MDM0YTcwYThhOGY3NDRlOGRlOGJlMmI3OGI2ZTggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRhdGEuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEYXRhLmgKQEAgLTc2LDYgKzc2LDIyIEBAIHB1Ymxp YzoKICAgICBXRUJLSVRfQVBJIHZvaWQgYXNzaWduKGNvbnN0IGNoYXIqIGRhdGEsIHNpemVfdCBz aXplKTsKIAogICAgIFdFQktJVF9BUEkgc2l6ZV90IHNpemUoKSBjb25zdDsKKworICAgIC8vIFNl dHMgfGRhdGF8IHRvIHBvaW50IHRvIHRoZSBjb250ZW50IG9mIHRoZSBXZWJEYXRhIGF0IGluZGV4 IHxwb3NpdGlvbnwKKyAgICAvLyBhbmQgcmV0dXJucyB0aGUgbnVtYmVyIG9mIGJ5dGVzIGF2YWls YWJsZSB0byBiZSByZWFkIGluIHxkYXRhfC4KKyAgICAvLyBSZXR1cm4gMCB3aGVuIG5vIG1vcmUg ZGF0YSBpcyBsZWZ0LgorICAgIC8vIFVzYWdlOgorICAgIC8vICAgICAgY29uc3QgY2hhciogc2Vn bWVudDsKKyAgICAvLyAgICAgIHNpemVfdCBwb3NpdGlvbiA9IDA7CisgICAgLy8gICAgICB3aGls ZSAoc2l6ZV90IGxlbmd0aCA9IHdlYkRhdGEuZ2V0U29tZURhdGEoc2VnbWVudCwgcG9zaXRpb24p KSB7CisgICAgLy8gICAgICAgICAgLy8gVXNlIHRoZSBkYXRhLiBmb3IgZXhhbXBsZTogZGVjb2Rl ci0+ZGVjb2RlKHNlZ21lbnQsIGxlbmd0aCk7CisgICAgLy8gICAgICAgICAgcG9zaXRpb24gKz0g bGVuZ3RoOworICAgIC8vICAgICAgfQorICAgIFdFQktJVF9BUEkgc2l6ZV90IGdldFNvbWVEYXRh KGNvbnN0IGNoYXIqJiBkYXRhLCBzaXplX3QgcG9zaXRpb24pIGNvbnN0OworCisgICAgLy8gUmV0 dXJucyBhbGwgdGhlIGRhdGEgZnJvbSB0aGUgU2hhcmVkQnVmZmVyLgorICAgIC8vIENvbnNpZGVy IHVzaW5nIGdldFNvbWVEYXRhKCkgYXMgZGF0YSgpIGNvdWxkIHJlcXVpcmUgZmxhdHRlbmluZyB0 aGUgaW50ZXJuYWwgYnVmZmVyCisgICAgLy8gd2hpY2ggbWlnaHQgYmUgZXhwZW5zaXZlLgogICAg IFdFQktJVF9BUEkgY29uc3QgY2hhciogZGF0YSgpIGNvbnN0OwogCiAgICAgYm9vbCBpc0VtcHR5 KCkgY29uc3QgeyByZXR1cm4gIXNpemUoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViUGFnZVNlcmlhbGl6ZXIuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYlBhZ2VTZXJpYWxpemVyLmgKaW5kZXggZTJkYjA3YmU0MTgwNTdiMGU4NmQy YTVjODA2ODc4N2RkMGJjZmU3OS4uYzlkYzlkYjU3NzU1MWMwNWFjYTUwZmViODJlZjc5NDg5NTY2 Mjg4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViUGFnZVNl cmlhbGl6ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJQYWdlU2Vy aWFsaXplci5oCkBAIC0zMyw2ICszMyw3IEBACiAKICNpbmNsdWRlICJXZWJDU3RyaW5nLmgiCiAj aW5jbHVkZSAiV2ViQ29tbW9uLmgiCisjaW5jbHVkZSAiV2ViRGF0YS5oIgogI2luY2x1ZGUgIldl YlVSTC5oIgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTQ5LDcgKzUwLDcgQEAgcHVibGljOgog ICAgIHN0cnVjdCBSZXNvdXJjZSB7CiAgICAgICAgIFdlYlVSTCB1cmw7CiAgICAgICAgIFdlYkNT dHJpbmcgbWltZVR5cGU7Ci0gICAgICAgIFdlYkNTdHJpbmcgZGF0YTsKKyAgICAgICAgV2ViRGF0 YSBkYXRhOwogICAgIH07CiAKICAgICAvLyBTZXJpYWxpemVzIGFsbCB0aGUgZnJhbWVzIGZyb20g dGhlIFdlYlZpZXcsIHJldHJpZXZlcyB0aGUgcGFnZSdzCkBAIC01OSw3ICs2MCw3IEBAIHB1Ymxp YzoKICAgICBXRUJLSVRfQVBJIHN0YXRpYyB2b2lkIHNlcmlhbGl6ZShXZWJWaWV3KiwgV2ViVmVj dG9yPFJlc291cmNlPiopOwogCiAgICAgLy8gU2VyaWFsaXplcyB0aGUgV2ViVmlldyBjb250ZW50 cyB0byBhIE1IVE1MIHJlcHJlc2VudGF0aW9uLgotICAgIFdFQktJVF9BUEkgc3RhdGljIFdlYkNT dHJpbmcgc2VyaWFsaXplVG9NSFRNTChXZWJWaWV3Kik7CisgICAgV0VCS0lUX0FQSSBzdGF0aWMg V2ViRGF0YSBzZXJpYWxpemVUb01IVE1MKFdlYlZpZXcqKTsKIAogICAgIC8vIElNUE9SVEFOVDoK ICAgICAvLyBUaGUgQVBJIGJlbG93IGlzIGFuIG9sZGVyIGltcGxlbWVudGF0aW9uIG9mIGEgcGFn ZXNlcmlhbGl6YXRpb24gdGhhdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViRGF0YS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEYXRhLmNwcApp bmRleCA2YWFmZTc5NmRkM2JlZTlmY2FiMmE3OWNjZTRlZGVkOGEwODBmYzk3Li43ZWYwMjI4YjE2 YThlZWRmZTRlODU0ZTVhYmMyZDhiZWU3YzVjNGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJEYXRhLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJEYXRhLmNwcApAQCAtNjksNiArNjksMTEgQEAgc2l6ZV90IFdlYkRhdGE6OnNpemUoKSBj b25zdAogICAgIHJldHVybiBjb25zdF9jYXN0PFdlYkRhdGFQcml2YXRlKj4obV9wcml2YXRlKS0+ c2l6ZSgpOwogfQogCitzaXplX3QgV2ViRGF0YTo6Z2V0U29tZURhdGEoY29uc3QgY2hhciomIGRh dGEsIHNpemVfdCBwb3NpdGlvbikgY29uc3QKK3sKKyAgICByZXR1cm4gbV9wcml2YXRlLT5nZXRT b21lRGF0YShkYXRhLCBwb3NpdGlvbik7Cit9CisKIGNvbnN0IGNoYXIqIFdlYkRhdGE6OmRhdGEo KSBjb25zdAogewogICAgIGlmICghbV9wcml2YXRlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXIuY3BwIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXIuY3BwCmluZGV4IDZkZjg0YmI2Yjk2YThkZDM0YzI2 ODZlMjA2NjEyOGQ3ZTBmZjViYmQuLmNkMGFlYzdlNDM5ZmIwMThkMDU1YTNiMWE5NzJmNjUyNGM2 YzcwMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJp YWxpemVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQYWdlU2VyaWFs aXplci5jcHAKQEAgLTE5MywxOSArMTkzLDE1IEBAIHZvaWQgV2ViUGFnZVNlcmlhbGl6ZXI6OnNl cmlhbGl6ZShXZWJWaWV3KiB2aWV3LCBXZWJWZWN0b3I8V2ViUGFnZVNlcmlhbGl6ZXI6OlJlCiAg ICAgICAgIFJlc291cmNlIHJlc291cmNlOwogICAgICAgICByZXNvdXJjZS51cmwgPSBpdGVyLT51 cmw7CiAgICAgICAgIHJlc291cmNlLm1pbWVUeXBlID0gaXRlci0+bWltZVR5cGUuYXNjaWkoKTsK LSAgICAgICAgLy8gRklYTUU6IHdlIGFyZSBjb3B5aW5nIGFsbCB0aGUgcmVzb3VyY2UgZGF0YSBo ZXJlLiBJZGVhbHkgd2Ugd291bGQgaGF2ZSBhIFdlYlNoYXJlZERhdGEoKS4KLSAgICAgICAgcmVz b3VyY2UuZGF0YSA9IFdlYkNTdHJpbmcoaXRlci0+ZGF0YS0+ZGF0YSgpLCBpdGVyLT5kYXRhLT5z aXplKCkpOworICAgICAgICByZXNvdXJjZS5kYXRhID0gaXRlci0+ZGF0YTsKICAgICAgICAgcmVz dWx0LmFwcGVuZChyZXNvdXJjZSk7CiAgICAgfQotCiAgICAgKnJlc291cmNlc1BhcmFtID0gcmVz dWx0OyAgICAgICAgIAogfQogCi1XZWJDU3RyaW5nIFdlYlBhZ2VTZXJpYWxpemVyOjpzZXJpYWxp emVUb01IVE1MKFdlYlZpZXcqIHZpZXcpCitXZWJEYXRhIFdlYlBhZ2VTZXJpYWxpemVyOjpzZXJp YWxpemVUb01IVE1MKFdlYlZpZXcqIHZpZXcpCiB7Ci0gICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4g bWh0bWwgPSBNSFRNTEFyY2hpdmU6OmdlbmVyYXRlTUhUTUxEYXRhKHN0YXRpY19jYXN0PFdlYlZp ZXdJbXBsKj4odmlldyktPnBhZ2UoKSk7Ci0gICAgLy8gRklYTUU6IHdlIGFyZSBjb3B5aW5nIGFs bCB0aGUgZGF0YSBoZXJlLiBJZGVhbHkgd2Ugd291bGQgaGF2ZSBhIFdlYlNoYXJlZERhdGEoKS4K LSAgICByZXR1cm4gV2ViQ1N0cmluZyhtaHRtbC0+ZGF0YSgpLCBtaHRtbC0+c2l6ZSgpKTsKKyAg ICByZXR1cm4gTUhUTUxBcmNoaXZlOjpnZW5lcmF0ZU1IVE1MRGF0YShzdGF0aWNfY2FzdDxXZWJW aWV3SW1wbCo+KHZpZXcpLT5wYWdlKCkpOwogfQogCiBib29sIFdlYlBhZ2VTZXJpYWxpemVyOjpz ZXJpYWxpemUoV2ViRnJhbWUqIGZyYW1lLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS90ZXN0cy9XZWJQYWdlTmV3U2VyaWFsaXplclRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS90ZXN0cy9XZWJQYWdlTmV3U2VyaWFsaXplclRlc3QuY3BwCmluZGV4IDI0YjBkYWNl YmYzMDJmN2M2NGMwNjRmOWQzYWE4NzRlZmYyNDZmMjYuLjNhZTZhMzVhZThkNzliMDliZGUyNGU1 M2U0MTE5OTc4YjkxYTk4NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvV2ViUGFnZU5ld1NlcmlhbGl6ZXJUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3Rlc3RzL1dlYlBhZ2VOZXdTZXJpYWxpemVyVGVzdC5jcHAKQEAgLTI3Niw3ICsyNzYsNyBA QCBURVNUX0YoV2ViUGFnZU5ld1NlcmlhbGl6ZVRlc3QsIERJU0FCTEVEX1NlcmlhbGl6ZVhNTEhh c1JpZ2h0RGVjbGFyYXRpb24pCiAgICAgCiAgICAgLy8gV2UgZXhwZWN0IG9ubHkgb25lIHJlc291 cmNlLCB0aGUgWE1MLgogICAgIEFTU0VSVF9FUSgxLCByZXNvdXJjZXMuc2l6ZSgpKTsKLSAgICBz dGQ6OnN0cmluZyB4bWwgPSByZXNvdXJjZXNbMF0uZGF0YTsKKyAgICBzdGQ6OnN0cmluZyB4bWwo cmVzb3VyY2VzWzBdLmRhdGEuZGF0YSgpLCByZXNvdXJjZXNbMF0uZGF0YS5zaXplKCkpOwogCiAg ICAgLy8gV2Ugc2hvdWxkIGhhdmUgb25lIGFuZCBvbmx5IG9uZSBpbnN0YW5jZSBvZiB0aGUgWE1M IGRlY2xhcmF0aW9uLgogICAgIHNpemVfdCBwb3MgPSB4bWwuZmluZCgiPD94bWwgdmVyc2lvbj0i KTsK