86052 2012-05-09 19:23:57 -0700 Split MediaPlayer::enterFullscreen into 2 separate functions 2012-05-12 14:42:44 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 86181 0 qinmin webkit-unassigned abarth benjamin dglazkov eric.carlson feature-media-reviews fishd jamesr jer.noble tkent tkent+wkapi webkit.review.bot oldest_to_newest 620171 0 qinmin 2012-05-09 19:23:57 -0700 split MediaPlayer::enterFullscreen into 2 seperate functions 620175 1 141074 qinmin 2012-05-09 19:37:04 -0700 Created attachment 141074 Patch 620178 2 webkit.review.bot 2012-05-09 19:39:30 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 620186 3 141074 benjamin 2012-05-09 19:52:55 -0700 Comment on attachment 141074 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141074&action=review Looks good. > Source/WebCore/ChangeLog:9 > + not do the same. And ios does not need the return value. This has nothing to do with iOS, it was a general design issue. > Source/WebKit/chromium/ChangeLog:12 > + It is confusing that enterFullscreen returns a boolean while exitFullscreen does > + not do the same. And ios does not need the return value. > + So remove the return value on enterFullscreen and make a seperate canEnterFullscreen() > + function for android. > + No behavior change, just refactoring. You don't have to copy the text in each ChangeLog. The description is supposed to be related to the part including the ChangeLog (so in this case only about the Chromium changes). > Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp:359 > + if (m_webMediaPlayer) > + return m_webMediaPlayer->canEnterFullscreen(); > + return false; This could simply be written return m_webMediaPlayer && m_webMediaPlayer->canEnterFullscreen(); 621018 4 141267 qinmin 2012-05-10 14:45:22 -0700 Created attachment 141267 Patch 621022 5 qinmin 2012-05-10 14:46:10 -0700 (In reply to comment #3) > (From update of attachment 141074 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=141074&action=review > > Looks good. > > > Source/WebCore/ChangeLog:9 > > + not do the same. And ios does not need the return value. > > This has nothing to do with iOS, it was a general design issue. > > > Source/WebKit/chromium/ChangeLog:12 > > + It is confusing that enterFullscreen returns a boolean while exitFullscreen does > > + not do the same. And ios does not need the return value. > > + So remove the return value on enterFullscreen and make a seperate canEnterFullscreen() > > + function for android. > > + No behavior change, just refactoring. > > You don't have to copy the text in each ChangeLog. The description is supposed to be related to the part including the ChangeLog (so in this case only about the Chromium changes). > > > Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp:359 > > + if (m_webMediaPlayer) > > + return m_webMediaPlayer->canEnterFullscreen(); > > + return false; > > This could simply be written > return m_webMediaPlayer && m_webMediaPlayer->canEnterFullscreen(); Done, changed it in the new patch 621193 6 141267 benjamin 2012-05-10 18:56:41 -0700 Comment on attachment 141267 Patch You did not update the Changelogs... Let's land like this, no big deal for the copied text. 621246 7 141267 webkit.review.bot 2012-05-10 21:26:35 -0700 Comment on attachment 141267 Patch Clearing flags on attachment: 141267 Committed r116727: <http://trac.webkit.org/changeset/116727> 621247 8 webkit.review.bot 2012-05-10 21:26:40 -0700 All reviewed patches have been landed. Closing bug. 621344 9 webkit.review.bot 2012-05-11 00:25:49 -0700 Re-opened since this is blocked by 86181 621351 10 tkent 2012-05-11 00:31:48 -0700 (In reply to comment #7) > (From update of attachment 141267 [details]) > Clearing flags on attachment: 141267 > > Committed r116727: <http://trac.webkit.org/changeset/116727> I'm rolling this out because of a build failure on Android. http://build.webkit.org/builders/Chromium%20Android%20Release/builds/17398/steps/compile-webkit/logs/stdio Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp:343: error: prototype for 'bool WebKit::WebMediaPlayerClientImpl::enterFullscreen()' does not match any in class 'WebKit::WebMediaPlayerClientImpl' Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h:138: error: candidate is: virtual void WebKit::WebMediaPlayerClientImpl::enterFullscreen() 621589 11 141404 qinmin 2012-05-11 06:47:34 -0700 Created attachment 141404 Patch 621595 12 qinmin 2012-05-11 06:49:18 -0700 This should fix the break on the downstream android bot, and also updated the changeLog in chromium 621725 13 141404 abarth 2012-05-11 09:51:16 -0700 Comment on attachment 141404 Patch Forwarding benjamin's r+ 621743 14 141404 webkit.review.bot 2012-05-11 10:04:38 -0700 Comment on attachment 141404 Patch Clearing flags on attachment: 141404 Committed r116782: <http://trac.webkit.org/changeset/116782> 621744 15 webkit.review.bot 2012-05-11 10:04:46 -0700 All reviewed patches have been landed. Closing bug. 621782 16 141404 ap 2012-05-11 10:36:36 -0700 Comment on attachment 141404 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141404&action=review > Source/WebCore/ChangeLog:3 > + split MediaPlayer::enterFullscreen into 2 seperate functions Ideally, this would have been updated to match updated bug title. 622205 17 benjamin 2012-05-11 19:26:03 -0700 I am a bit late to the party here. Thanks Adam for reviewing the update. 622239 18 abarth 2012-05-11 23:08:13 -0700 (In reply to comment #17) > I am a bit late to the party here. Thanks Adam for reviewing the update. Sorry, I didn't mean to jump in on your review. It looked like Min had addressed all of your comments and the patch itself looked simple enough. 622418 19 benjamin 2012-05-12 14:42:44 -0700 (In reply to comment #17) > > I am a bit late to the party here. Thanks Adam for reviewing the update. > > Sorry, I didn't mean to jump in on your review. It looked like Min had addressed all of your comments and the patch itself looked simple enough. I was not ironic in any way. I was away for a little while that morning, I genuinely appreciate you took the time to review the build fix on this patch. 141074 2012-05-09 19:37:04 -0700 2012-05-10 14:45:17 -0700 Patch bug-86052-20120509193703.patch text/plain 9403 qinmin U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2NDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjFmODliZGM4MzI1OGVh ZDA3ZmFjMmUwMTM2YzIyMmQyZDllZTYyNy4uM2Y2OWZjMjc2NjFjYThiOTllYzQ1MjUxNGEyMTUz MTAzZmUxM2FmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA1LTA5ICBNaW4g UWluICA8cWlubWluQGdvb2dsZS5jb20+CisKKyAgICAgICAgc3BsaXQgTWVkaWFQbGF5ZXI6OmVu dGVyRnVsbHNjcmVlbiBpbnRvIDIgc2VwZXJhdGUgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjA1MgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IGlzIGNvbmZ1c2luZyB0aGF0IGVudGVy RnVsbHNjcmVlbiByZXR1cm5zIGEgYm9vbGVhbiB3aGlsZSBleGl0RnVsbHNjcmVlbiBkb2VzCisg ICAgICAgIG5vdCBkbyB0aGUgc2FtZS4gQW5kIGlvcyBkb2VzIG5vdCBuZWVkIHRoZSByZXR1cm4g dmFsdWUuCisgICAgICAgIFNvIHJlbW92ZSB0aGUgcmV0dXJuIHZhbHVlIG9uIGVudGVyRnVsbHNj cmVlbiBhbmQgbWFrZSBhIHNlcGVyYXRlIGNhbkVudGVyRnVsbHNjcmVlbigpCisgICAgICAgIGZ1 bmN0aW9uIGZvciBhbmRyb2lkLgorICAgICAgICBObyB0ZXN0cyBhcyB0aGVyZSBhcmUgbm8gYmVo YXZpb3IgY2hhbmdlLCBqdXN0IHJlZmFjdG9yaW5nLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvTWVkaWFQbGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXI6OmVu dGVyRnVsbHNjcmVlbik6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyOjpjYW5FbnRlckZ1bGxzY3JlZW4pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL01lZGlhUGxheWVyLmg6CisgICAgICAgIChNZWRpYVBsYXllcik6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRlLmg6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2U6OmVudGVyRnVsbHNjcmVlbik6CisgICAgICAgIChN ZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2UpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlSW50ZXJmYWNlOjpjYW5FbnRlckZ1bGxzY3JlZW4pOgorCiAyMDEyLTAzLTMxICBS b2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KIAogICAgICAgICBDU1MgMi4xIGZhaWx1 cmU6IGZpcnN0LWxldHRlci1uZXN0ZWQtMDA0Lmh0bSBmYWlscwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwppbmRleCA1NjVkNTZlYmRiZDRlM2NjM2QzNGY5MDA3ZDc2NTAyNjEyODBhYjJjLi5iNDQ0 ZDhjMmNmYzdmZjRhY2Y3MWUyYTU3NmZhMWQ1ZmFhODZmOWYxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA1LTA5ICBNaW4gUWluICA8cWlubWluQGdv b2dsZS5jb20+CisKKyAgICAgICAgc3BsaXQgTWVkaWFQbGF5ZXI6OmVudGVyRnVsbHNjcmVlbiBp bnRvIDIgc2VwZXJhdGUgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04NjA1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEl0IGlzIGNvbmZ1c2luZyB0aGF0IGVudGVyRnVsbHNjcmVlbiByZXR1 cm5zIGEgYm9vbGVhbiB3aGlsZSBleGl0RnVsbHNjcmVlbiBkb2VzCisgICAgICAgIG5vdCBkbyB0 aGUgc2FtZS4gQW5kIGlvcyBkb2VzIG5vdCBuZWVkIHRoZSByZXR1cm4gdmFsdWUuCisgICAgICAg IFNvIHJlbW92ZSB0aGUgcmV0dXJuIHZhbHVlIG9uIGVudGVyRnVsbHNjcmVlbiBhbmQgbWFrZSBh IHNlcGVyYXRlIGNhbkVudGVyRnVsbHNjcmVlbigpCisgICAgICAgIGZ1bmN0aW9uIGZvciBhbmRy b2lkLgorICAgICAgICBObyBiZWhhdmlvciBjaGFuZ2UsIGp1c3QgcmVmYWN0b3JpbmcuCisKKyAg ICAgICAgKiBwdWJsaWMvV2ViTWVkaWFQbGF5ZXIuaDoKKyAgICAgICAgKFdlYk1lZGlhUGxheWVy KToKKyAgICAgICAgKFdlYktpdDo6V2ViTWVkaWFQbGF5ZXI6OmVudGVyRnVsbHNjcmVlbik6Cisg ICAgICAgIChXZWJLaXQ6OldlYk1lZGlhUGxheWVyOjpjYW5FbnRlckZ1bGxzY3JlZW4pOgorICAg ICAgICAqIHNyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmVudGVyRnVsbHNjcmVlbik6CisgICAgICAgIChX ZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmV4aXRG dWxsc2NyZWVuKToKKyAgICAgICAgKiBzcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmg6Cisg ICAgICAgIChXZWJNZWRpYVBsYXllckNsaWVudEltcGwpOgorICAgICAgICAqIHNyYy9XZWJWaWV3 SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjplbnRlckZ1bGxTY3JlZW5G b3JFbGVtZW50KToKKwogMjAxMi0wNS0wOCAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFtjaHJvbWl1bV0gbW92ZSBldmVudF9saXN0ZW5lcl91bml0dGVzdCB0byB3 ZWJraXRfdW5pdF90ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvTWVkaWFQbGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv TWVkaWFQbGF5ZXIuY3BwCmluZGV4IGQ4NzNlYzVlYzAxNWUzOWNjNmUxNmM3MjU1YjI5NDZjZjk1 NGI5NGUuLjlmYzYxNGQ0NWYxMzcyY2EzNzBiNDI2MmRmNDg2MWMxMmIyM2IyMDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAKQEAgLTc3 MCw5ICs3NzAsOSBAQCB2b2lkIE1lZGlhUGxheWVyOjpzZXRDb250cm9scyhib29sIGNvbnRyb2xz KQogI2VuZGlmCiAKICNpZiBFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9WSURFTykgfHwgVVNFKE5B VElWRV9GVUxMU0NSRUVOX1ZJREVPKQotYm9vbCBNZWRpYVBsYXllcjo6ZW50ZXJGdWxsc2NyZWVu KCkgY29uc3QKK3ZvaWQgTWVkaWFQbGF5ZXI6OmVudGVyRnVsbHNjcmVlbigpCiB7Ci0gICAgcmV0 dXJuIG1fcHJpdmF0ZS0+ZW50ZXJGdWxsc2NyZWVuKCk7CisgICAgbV9wcml2YXRlLT5lbnRlckZ1 bGxzY3JlZW4oKTsKIH0KIAogdm9pZCBNZWRpYVBsYXllcjo6ZXhpdEZ1bGxzY3JlZW4oKQpAQCAt NzgxLDYgKzc4MSwxMyBAQCB2b2lkIE1lZGlhUGxheWVyOjpleGl0RnVsbHNjcmVlbigpCiB9CiAj ZW5kaWYKIAorI2lmIFVTRShOQVRJVkVfRlVMTFNDUkVFTl9WSURFTykKK2Jvb2wgTWVkaWFQbGF5 ZXI6OmNhbkVudGVyRnVsbHNjcmVlbigpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fcHJpdmF0ZS0+ Y2FuRW50ZXJGdWxsc2NyZWVuKCk7Cit9CisjZW5kaWYKKwogI2lmIFVTRShBQ0NFTEVSQVRFRF9D T01QT1NJVElORykKIHZvaWQgTWVkaWFQbGF5ZXI6OmFjY2VsZXJhdGVkUmVuZGVyaW5nU3RhdGVD aGFuZ2VkKCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L01lZGlhUGxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBs YXllci5oCmluZGV4IDAwY2EwNjQ1MDQwNzZlMWUyNDlkMzk2ZmU4NzI2NjE2NDE2N2M2YzguLmZk NjIzMDUwMzE1NzhmMTAzOTc3NmQ2YzVkNGQwMzM3OWNlMjNiNWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaApAQCAtMzI3LDEwICszMjcsMTQg QEAgcHVibGljOgogI2VuZGlmCiAKICNpZiBFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9WSURFTykg fHwgVVNFKE5BVElWRV9GVUxMU0NSRUVOX1ZJREVPKQotICAgIGJvb2wgZW50ZXJGdWxsc2NyZWVu KCkgY29uc3Q7CisgICAgdm9pZCBlbnRlckZ1bGxzY3JlZW4oKTsKICAgICB2b2lkIGV4aXRGdWxs c2NyZWVuKCk7CiAjZW5kaWYKIAorI2lmIFVTRShOQVRJVkVfRlVMTFNDUkVFTl9WSURFTykKKyAg ICBib29sIGNhbkVudGVyRnVsbHNjcmVlbigpIGNvbnN0OworI2VuZGlmCisKICNpZiBVU0UoQUND RUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgLy8gd2hldGhlciBhY2NlbGVyYXRlZCByZW5kZXJp bmcgaXMgc3VwcG9ydGVkIGJ5IHRoZSBtZWRpYSBlbmdpbmUgZm9yIHRoZSBjdXJyZW50IG1lZGlh LgogICAgIGJvb2wgc3VwcG9ydHNBY2NlbGVyYXRlZFJlbmRlcmluZygpIGNvbnN0OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRl LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclByaXZhdGUu aAppbmRleCAxNzVkN2M1YmNhNDlhNDkwZWQ3ZjA1MmM2ZDY4YmM4N2UwODgwNTk5Li5jM2EzZGZh NmFiYWE5ZDJlNzUwMDAwNGFiZTlhYzMxNzdhZjM4Y2Y2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclByaXZhdGUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclByaXZhdGUuaApAQCAtMTE4LDEw ICsxMTgsMTQgQEAgcHVibGljOgogI2VuZGlmCiAKICNpZiBFTkFCTEUoUExVR0lOX1BST1hZX0ZP Ul9WSURFTykgfHwgVVNFKE5BVElWRV9GVUxMU0NSRUVOX1ZJREVPKQotICAgIHZpcnR1YWwgYm9v bCBlbnRlckZ1bGxzY3JlZW4oKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwg dm9pZCBlbnRlckZ1bGxzY3JlZW4oKSBjb25zdCB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZXhpdEZ1 bGxzY3JlZW4oKSB7IH0KICNlbmRpZgogCisjaWYgVVNFKE5BVElWRV9GVUxMU0NSRUVOX1ZJREVP KQorICAgIHZpcnR1YWwgYm9vbCBjYW5FbnRlckZ1bGxzY3JlZW4oKSBjb25zdCB7IHJldHVybiBm YWxzZTsgfQorI2VuZGlmCisKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAg Ly8gd2hldGhlciBhY2NlbGVyYXRlZCByZW5kZXJpbmcgaXMgc3VwcG9ydGVkIGJ5IHRoZSBtZWRp YSBlbmdpbmUgZm9yIHRoZSBjdXJyZW50IG1lZGlhLgogICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0 c0FjY2VsZXJhdGVkUmVuZGVyaW5nKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk1lZGlhUGxheWVyLmggYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllci5oCmluZGV4IGEyYTlmYjli NDFjMTVlMDEzMjEzZmQzYjM3MWM5YTBiNGU0NmEwYTYuLjY3MDYzMGY5NTAxMmM5MzZkYTQ1MGUy OTI1NzBmODFjYjBlZDBhYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYk1lZGlhUGxheWVyLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViTWVkaWFQbGF5ZXIuaApAQCAtMTg0LDEwICsxODQsMTEgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgTWVkaWFLZXlFeGNlcHRpb24gYWRkS2V5KGNvbnN0IFdlYlN0cmluZyYga2V5U3lzdGVtLCBj b25zdCB1bnNpZ25lZCBjaGFyKiBrZXksIHVuc2lnbmVkIGtleUxlbmd0aCwgY29uc3QgdW5zaWdu ZWQgY2hhciogaW5pdERhdGEsIHVuc2lnbmVkIGluaXREYXRhTGVuZ3RoLCBjb25zdCBXZWJTdHJp bmcmIHNlc3Npb25JZCkgeyByZXR1cm4gTWVkaWFLZXlFeGNlcHRpb25LZXlTeXN0ZW1Ob3RTdXBw b3J0ZWQ7IH0KICAgICB2aXJ0dWFsIE1lZGlhS2V5RXhjZXB0aW9uIGNhbmNlbEtleVJlcXVlc3Qo Y29uc3QgV2ViU3RyaW5nJiBrZXlTeXN0ZW0sIGNvbnN0IFdlYlN0cmluZyYgc2Vzc2lvbklkKSB7 IHJldHVybiBNZWRpYUtleUV4Y2VwdGlvbktleVN5c3RlbU5vdFN1cHBvcnRlZDsgfQogCi0gICAg Ly8gSW5zdHVjdCBXZWJNZWRpYVBsYXllciB0byBlbnRlci9leGl0IGZ1bGxzY3JlZW4uCi0gICAg Ly8gUmV0dXJucyB0cnVlIGlmIHRoZSBwbGF5ZXIgY2FuIGVudGVyIGZ1bGxzY3JlZW4uCi0gICAg dmlydHVhbCBib29sIGVudGVyRnVsbHNjcmVlbigpIHsgcmV0dXJuIGZhbHNlOyB9CisgICAgLy8g SW5zdHJ1Y3QgV2ViTWVkaWFQbGF5ZXIgdG8gZW50ZXIvZXhpdCBmdWxsc2NyZWVuLgorICAgIHZp cnR1YWwgdm9pZCBlbnRlckZ1bGxzY3JlZW4oKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZXhpdEZ1 bGxzY3JlZW4oKSB7IH0KKyAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhlIHBsYXllciBjYW4gZW50 ZXIgZnVsbHNjcmVlbi4KKyAgICB2aXJ0dWFsIGJvb2wgY2FuRW50ZXJGdWxsc2NyZWVuKCkgY29u c3QgeyByZXR1cm4gZmFsc2U7IH0KIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBs LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1w bC5jcHAKaW5kZXggOGJhMDNmMDRhNjdlNjliNzAyM2JlZTdkOGQ5Y2E1OTk5ZGY5YWI2OS4uYzI0 M2M1OGI2OGViMzE4MmU1ODVjMDZlNjIzNzQ1OGU3ZmY3ZTNiNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwCkBA IC0zNDAsMTEgKzM0MCwxMCBAQCB2b2lkIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6cGF1c2Uo KQogfQogCiAjaWYgVVNFKE5BVElWRV9GVUxMU0NSRUVOX1ZJREVPKQotYm9vbCBXZWJNZWRpYVBs YXllckNsaWVudEltcGw6OmVudGVyRnVsbHNjcmVlbigpIGNvbnN0Citib29sIFdlYk1lZGlhUGxh eWVyQ2xpZW50SW1wbDo6ZW50ZXJGdWxsc2NyZWVuKCkKIHsKICAgICBpZiAobV93ZWJNZWRpYVBs YXllcikKLSAgICAgICAgcmV0dXJuIG1fd2ViTWVkaWFQbGF5ZXItPmVudGVyRnVsbHNjcmVlbigp OwotICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgbV93ZWJNZWRpYVBsYXllci0+ZW50ZXJGdWxs c2NyZWVuKCk7CiB9CiAKIHZvaWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpleGl0RnVsbHNj cmVlbigpCkBAIC0zNTIsNiArMzUxLDEzIEBAIHZvaWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBs OjpleGl0RnVsbHNjcmVlbigpCiAgICAgaWYgKG1fd2ViTWVkaWFQbGF5ZXIpCiAgICAgICAgIG1f d2ViTWVkaWFQbGF5ZXItPmV4aXRGdWxsc2NyZWVuKCk7CiB9CisKK2Jvb2wgV2ViTWVkaWFQbGF5 ZXJDbGllbnRJbXBsOjpjYW5FbnRlckZ1bGxzY3JlZW4oKSBjb25zdAoreworICAgIGlmIChtX3dl Yk1lZGlhUGxheWVyKQorICAgICAgICByZXR1cm4gbV93ZWJNZWRpYVBsYXllci0+Y2FuRW50ZXJG dWxsc2NyZWVuKCk7CisgICAgcmV0dXJuIGZhbHNlOworfQogI2VuZGlmCiAKICNpZiBFTkFCTEUo TUVESUFfU09VUkNFKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi TWVkaWFQbGF5ZXJDbGllbnRJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJN ZWRpYVBsYXllckNsaWVudEltcGwuaAppbmRleCAzYWZiMWY1ZTU1NjJkODgxYWQ4OWM5YmY4YTVk NjkwMTUwNTE2OTM2Li5lMDZkM2U1MjM2OTNhZmUxM2I2ZjkwZTFhNGNlNjgwZTdlYWU1OTAzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVu dEltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNs aWVudEltcGwuaApAQCAtMTM1LDggKzEzNSw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHVuc2ln bmVkIGF1ZGlvRGVjb2RlZEJ5dGVDb3VudCgpIGNvbnN0OwogICAgIHZpcnR1YWwgdW5zaWduZWQg dmlkZW9EZWNvZGVkQnl0ZUNvdW50KCkgY29uc3Q7CiAjaWYgVVNFKE5BVElWRV9GVUxMU0NSRUVO X1ZJREVPKQotICAgIHZpcnR1YWwgYm9vbCBlbnRlckZ1bGxzY3JlZW4oKSBjb25zdDsKKyAgICB2 aXJ0dWFsIHZvaWQgZW50ZXJGdWxsc2NyZWVuKCk7CiAgICAgdmlydHVhbCB2b2lkIGV4aXRGdWxs c2NyZWVuKCk7CisgICAgdmlydHVhbCBib29sIGNhbkVudGVyRnVsbHNjcmVlbigpIGNvbnN0Owog I2VuZGlmCiAKICNpZiBFTkFCTEUoV0VCX0FVRElPKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IGQ1OWZiMjI4MjY4M2MyMDhhZWY0ZmFjOWJkMTgwMWNk ZGM4ZmZmNWYuLjFjNWYyNmI5MmEyZWU4ODRhNmM4MDNjNGVhMmY5ZDBkMWQ0MDk5YTcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTE1ODcsOCArMTU4 NywxMCBAQCB2b2lkIFdlYlZpZXdJbXBsOjplbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KFdlYkNv cmU6OkVsZW1lbnQqIGVsZW1lbnQpCiAjaWYgVVNFKE5BVElWRV9GVUxMU0NSRUVOX1ZJREVPKQog ICAgIGlmIChlbGVtZW50ICYmIGVsZW1lbnQtPmlzTWVkaWFFbGVtZW50KCkpIHsKICAgICAgICAg SFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVtZW50ID0gc3RhdGljX2Nhc3Q8SFRNTE1lZGlhRWxl bWVudCo+KGVsZW1lbnQpOwotICAgICAgICBpZiAobWVkaWFFbGVtZW50LT5wbGF5ZXIoKSAmJiBt ZWRpYUVsZW1lbnQtPnBsYXllcigpLT5lbnRlckZ1bGxzY3JlZW4oKSkKKyAgICAgICAgaWYgKG1l ZGlhRWxlbWVudC0+cGxheWVyKCkgJiYgbWVkaWFFbGVtZW50LT5wbGF5ZXIoKS0+Y2FuRW50ZXJG dWxsc2NyZWVuKCkpIHsKKyAgICAgICAgICAgIG1lZGlhRWxlbWVudC0+cGxheWVyKCktPmVudGVy RnVsbHNjcmVlbigpOwogICAgICAgICAgICAgbV9wcm92aXNpb25hbEZ1bGxTY3JlZW5FbGVtZW50 ID0gZWxlbWVudDsKKyAgICAgICAgfQogICAgICAgICByZXR1cm47CiAgICAgfQogI2VuZGlmCg== 141267 2012-05-10 14:45:22 -0700 2012-05-11 06:47:29 -0700 Patch bug-86052-20120510144521.patch text/plain 9373 qinmin U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2NDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjFmODliZGM4MzI1OGVh ZDA3ZmFjMmUwMTM2YzIyMmQyZDllZTYyNy4uM2Y2OWZjMjc2NjFjYThiOTllYzQ1MjUxNGEyMTUz MTAzZmUxM2FmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA1LTA5ICBNaW4g UWluICA8cWlubWluQGdvb2dsZS5jb20+CisKKyAgICAgICAgc3BsaXQgTWVkaWFQbGF5ZXI6OmVu dGVyRnVsbHNjcmVlbiBpbnRvIDIgc2VwZXJhdGUgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjA1MgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IGlzIGNvbmZ1c2luZyB0aGF0IGVudGVy RnVsbHNjcmVlbiByZXR1cm5zIGEgYm9vbGVhbiB3aGlsZSBleGl0RnVsbHNjcmVlbiBkb2VzCisg ICAgICAgIG5vdCBkbyB0aGUgc2FtZS4gQW5kIGlvcyBkb2VzIG5vdCBuZWVkIHRoZSByZXR1cm4g dmFsdWUuCisgICAgICAgIFNvIHJlbW92ZSB0aGUgcmV0dXJuIHZhbHVlIG9uIGVudGVyRnVsbHNj cmVlbiBhbmQgbWFrZSBhIHNlcGVyYXRlIGNhbkVudGVyRnVsbHNjcmVlbigpCisgICAgICAgIGZ1 bmN0aW9uIGZvciBhbmRyb2lkLgorICAgICAgICBObyB0ZXN0cyBhcyB0aGVyZSBhcmUgbm8gYmVo YXZpb3IgY2hhbmdlLCBqdXN0IHJlZmFjdG9yaW5nLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvTWVkaWFQbGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXI6OmVu dGVyRnVsbHNjcmVlbik6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyOjpjYW5FbnRlckZ1bGxzY3JlZW4pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL01lZGlhUGxheWVyLmg6CisgICAgICAgIChNZWRpYVBsYXllcik6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRlLmg6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2U6OmVudGVyRnVsbHNjcmVlbik6CisgICAgICAgIChN ZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2UpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlSW50ZXJmYWNlOjpjYW5FbnRlckZ1bGxzY3JlZW4pOgorCiAyMDEyLTAzLTMxICBS b2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KIAogICAgICAgICBDU1MgMi4xIGZhaWx1 cmU6IGZpcnN0LWxldHRlci1uZXN0ZWQtMDA0Lmh0bSBmYWlscwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwppbmRleCA1NjVkNTZlYmRiZDRlM2NjM2QzNGY5MDA3ZDc2NTAyNjEyODBhYjJjLi5iNDQ0 ZDhjMmNmYzdmZjRhY2Y3MWUyYTU3NmZhMWQ1ZmFhODZmOWYxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA1LTA5ICBNaW4gUWluICA8cWlubWluQGdv b2dsZS5jb20+CisKKyAgICAgICAgc3BsaXQgTWVkaWFQbGF5ZXI6OmVudGVyRnVsbHNjcmVlbiBp bnRvIDIgc2VwZXJhdGUgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04NjA1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEl0IGlzIGNvbmZ1c2luZyB0aGF0IGVudGVyRnVsbHNjcmVlbiByZXR1 cm5zIGEgYm9vbGVhbiB3aGlsZSBleGl0RnVsbHNjcmVlbiBkb2VzCisgICAgICAgIG5vdCBkbyB0 aGUgc2FtZS4gQW5kIGlvcyBkb2VzIG5vdCBuZWVkIHRoZSByZXR1cm4gdmFsdWUuCisgICAgICAg IFNvIHJlbW92ZSB0aGUgcmV0dXJuIHZhbHVlIG9uIGVudGVyRnVsbHNjcmVlbiBhbmQgbWFrZSBh IHNlcGVyYXRlIGNhbkVudGVyRnVsbHNjcmVlbigpCisgICAgICAgIGZ1bmN0aW9uIGZvciBhbmRy b2lkLgorICAgICAgICBObyBiZWhhdmlvciBjaGFuZ2UsIGp1c3QgcmVmYWN0b3JpbmcuCisKKyAg ICAgICAgKiBwdWJsaWMvV2ViTWVkaWFQbGF5ZXIuaDoKKyAgICAgICAgKFdlYk1lZGlhUGxheWVy KToKKyAgICAgICAgKFdlYktpdDo6V2ViTWVkaWFQbGF5ZXI6OmVudGVyRnVsbHNjcmVlbik6Cisg ICAgICAgIChXZWJLaXQ6OldlYk1lZGlhUGxheWVyOjpjYW5FbnRlckZ1bGxzY3JlZW4pOgorICAg ICAgICAqIHNyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmVudGVyRnVsbHNjcmVlbik6CisgICAgICAgIChX ZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmV4aXRG dWxsc2NyZWVuKToKKyAgICAgICAgKiBzcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmg6Cisg ICAgICAgIChXZWJNZWRpYVBsYXllckNsaWVudEltcGwpOgorICAgICAgICAqIHNyYy9XZWJWaWV3 SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjplbnRlckZ1bGxTY3JlZW5G b3JFbGVtZW50KToKKwogMjAxMi0wNS0wOCAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFtjaHJvbWl1bV0gbW92ZSBldmVudF9saXN0ZW5lcl91bml0dGVzdCB0byB3 ZWJraXRfdW5pdF90ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvTWVkaWFQbGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv TWVkaWFQbGF5ZXIuY3BwCmluZGV4IGQ4NzNlYzVlYzAxNWUzOWNjNmUxNmM3MjU1YjI5NDZjZjk1 NGI5NGUuLjlmYzYxNGQ0NWYxMzcyY2EzNzBiNDI2MmRmNDg2MWMxMmIyM2IyMDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAKQEAgLTc3 MCw5ICs3NzAsOSBAQCB2b2lkIE1lZGlhUGxheWVyOjpzZXRDb250cm9scyhib29sIGNvbnRyb2xz KQogI2VuZGlmCiAKICNpZiBFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9WSURFTykgfHwgVVNFKE5B VElWRV9GVUxMU0NSRUVOX1ZJREVPKQotYm9vbCBNZWRpYVBsYXllcjo6ZW50ZXJGdWxsc2NyZWVu KCkgY29uc3QKK3ZvaWQgTWVkaWFQbGF5ZXI6OmVudGVyRnVsbHNjcmVlbigpCiB7Ci0gICAgcmV0 dXJuIG1fcHJpdmF0ZS0+ZW50ZXJGdWxsc2NyZWVuKCk7CisgICAgbV9wcml2YXRlLT5lbnRlckZ1 bGxzY3JlZW4oKTsKIH0KIAogdm9pZCBNZWRpYVBsYXllcjo6ZXhpdEZ1bGxzY3JlZW4oKQpAQCAt NzgxLDYgKzc4MSwxMyBAQCB2b2lkIE1lZGlhUGxheWVyOjpleGl0RnVsbHNjcmVlbigpCiB9CiAj ZW5kaWYKIAorI2lmIFVTRShOQVRJVkVfRlVMTFNDUkVFTl9WSURFTykKK2Jvb2wgTWVkaWFQbGF5 ZXI6OmNhbkVudGVyRnVsbHNjcmVlbigpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fcHJpdmF0ZS0+ Y2FuRW50ZXJGdWxsc2NyZWVuKCk7Cit9CisjZW5kaWYKKwogI2lmIFVTRShBQ0NFTEVSQVRFRF9D T01QT1NJVElORykKIHZvaWQgTWVkaWFQbGF5ZXI6OmFjY2VsZXJhdGVkUmVuZGVyaW5nU3RhdGVD aGFuZ2VkKCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L01lZGlhUGxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBs YXllci5oCmluZGV4IDAwY2EwNjQ1MDQwNzZlMWUyNDlkMzk2ZmU4NzI2NjE2NDE2N2M2YzguLmZk NjIzMDUwMzE1NzhmMTAzOTc3NmQ2YzVkNGQwMzM3OWNlMjNiNWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaApAQCAtMzI3LDEwICszMjcsMTQg QEAgcHVibGljOgogI2VuZGlmCiAKICNpZiBFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9WSURFTykg fHwgVVNFKE5BVElWRV9GVUxMU0NSRUVOX1ZJREVPKQotICAgIGJvb2wgZW50ZXJGdWxsc2NyZWVu KCkgY29uc3Q7CisgICAgdm9pZCBlbnRlckZ1bGxzY3JlZW4oKTsKICAgICB2b2lkIGV4aXRGdWxs c2NyZWVuKCk7CiAjZW5kaWYKIAorI2lmIFVTRShOQVRJVkVfRlVMTFNDUkVFTl9WSURFTykKKyAg ICBib29sIGNhbkVudGVyRnVsbHNjcmVlbigpIGNvbnN0OworI2VuZGlmCisKICNpZiBVU0UoQUND RUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgLy8gd2hldGhlciBhY2NlbGVyYXRlZCByZW5kZXJp bmcgaXMgc3VwcG9ydGVkIGJ5IHRoZSBtZWRpYSBlbmdpbmUgZm9yIHRoZSBjdXJyZW50IG1lZGlh LgogICAgIGJvb2wgc3VwcG9ydHNBY2NlbGVyYXRlZFJlbmRlcmluZygpIGNvbnN0OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRl LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclByaXZhdGUu aAppbmRleCAxNzVkN2M1YmNhNDlhNDkwZWQ3ZjA1MmM2ZDY4YmM4N2UwODgwNTk5Li5jM2EzZGZh NmFiYWE5ZDJlNzUwMDAwNGFiZTlhYzMxNzdhZjM4Y2Y2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclByaXZhdGUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclByaXZhdGUuaApAQCAtMTE4LDEw ICsxMTgsMTQgQEAgcHVibGljOgogI2VuZGlmCiAKICNpZiBFTkFCTEUoUExVR0lOX1BST1hZX0ZP Ul9WSURFTykgfHwgVVNFKE5BVElWRV9GVUxMU0NSRUVOX1ZJREVPKQotICAgIHZpcnR1YWwgYm9v bCBlbnRlckZ1bGxzY3JlZW4oKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwg dm9pZCBlbnRlckZ1bGxzY3JlZW4oKSBjb25zdCB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZXhpdEZ1 bGxzY3JlZW4oKSB7IH0KICNlbmRpZgogCisjaWYgVVNFKE5BVElWRV9GVUxMU0NSRUVOX1ZJREVP KQorICAgIHZpcnR1YWwgYm9vbCBjYW5FbnRlckZ1bGxzY3JlZW4oKSBjb25zdCB7IHJldHVybiBm YWxzZTsgfQorI2VuZGlmCisKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAg Ly8gd2hldGhlciBhY2NlbGVyYXRlZCByZW5kZXJpbmcgaXMgc3VwcG9ydGVkIGJ5IHRoZSBtZWRp YSBlbmdpbmUgZm9yIHRoZSBjdXJyZW50IG1lZGlhLgogICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0 c0FjY2VsZXJhdGVkUmVuZGVyaW5nKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk1lZGlhUGxheWVyLmggYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllci5oCmluZGV4IGEyYTlmYjli NDFjMTVlMDEzMjEzZmQzYjM3MWM5YTBiNGU0NmEwYTYuLjY3MDYzMGY5NTAxMmM5MzZkYTQ1MGUy OTI1NzBmODFjYjBlZDBhYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYk1lZGlhUGxheWVyLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViTWVkaWFQbGF5ZXIuaApAQCAtMTg0LDEwICsxODQsMTEgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgTWVkaWFLZXlFeGNlcHRpb24gYWRkS2V5KGNvbnN0IFdlYlN0cmluZyYga2V5U3lzdGVtLCBj b25zdCB1bnNpZ25lZCBjaGFyKiBrZXksIHVuc2lnbmVkIGtleUxlbmd0aCwgY29uc3QgdW5zaWdu ZWQgY2hhciogaW5pdERhdGEsIHVuc2lnbmVkIGluaXREYXRhTGVuZ3RoLCBjb25zdCBXZWJTdHJp bmcmIHNlc3Npb25JZCkgeyByZXR1cm4gTWVkaWFLZXlFeGNlcHRpb25LZXlTeXN0ZW1Ob3RTdXBw b3J0ZWQ7IH0KICAgICB2aXJ0dWFsIE1lZGlhS2V5RXhjZXB0aW9uIGNhbmNlbEtleVJlcXVlc3Qo Y29uc3QgV2ViU3RyaW5nJiBrZXlTeXN0ZW0sIGNvbnN0IFdlYlN0cmluZyYgc2Vzc2lvbklkKSB7 IHJldHVybiBNZWRpYUtleUV4Y2VwdGlvbktleVN5c3RlbU5vdFN1cHBvcnRlZDsgfQogCi0gICAg Ly8gSW5zdHVjdCBXZWJNZWRpYVBsYXllciB0byBlbnRlci9leGl0IGZ1bGxzY3JlZW4uCi0gICAg Ly8gUmV0dXJucyB0cnVlIGlmIHRoZSBwbGF5ZXIgY2FuIGVudGVyIGZ1bGxzY3JlZW4uCi0gICAg dmlydHVhbCBib29sIGVudGVyRnVsbHNjcmVlbigpIHsgcmV0dXJuIGZhbHNlOyB9CisgICAgLy8g SW5zdHJ1Y3QgV2ViTWVkaWFQbGF5ZXIgdG8gZW50ZXIvZXhpdCBmdWxsc2NyZWVuLgorICAgIHZp cnR1YWwgdm9pZCBlbnRlckZ1bGxzY3JlZW4oKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZXhpdEZ1 bGxzY3JlZW4oKSB7IH0KKyAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhlIHBsYXllciBjYW4gZW50 ZXIgZnVsbHNjcmVlbi4KKyAgICB2aXJ0dWFsIGJvb2wgY2FuRW50ZXJGdWxsc2NyZWVuKCkgY29u c3QgeyByZXR1cm4gZmFsc2U7IH0KIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBs LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1w bC5jcHAKaW5kZXggOGJhMDNmMDRhNjdlNjliNzAyM2JlZTdkOGQ5Y2E1OTk5ZGY5YWI2OS4uYWVj ZTczMmFmZTY0NDA4YzU5YjA3MTYwMzI2YmMyMTk5NjliMTg1MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwCkBA IC0zNDAsMTEgKzM0MCwxMCBAQCB2b2lkIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6cGF1c2Uo KQogfQogCiAjaWYgVVNFKE5BVElWRV9GVUxMU0NSRUVOX1ZJREVPKQotYm9vbCBXZWJNZWRpYVBs YXllckNsaWVudEltcGw6OmVudGVyRnVsbHNjcmVlbigpIGNvbnN0Citib29sIFdlYk1lZGlhUGxh eWVyQ2xpZW50SW1wbDo6ZW50ZXJGdWxsc2NyZWVuKCkKIHsKICAgICBpZiAobV93ZWJNZWRpYVBs YXllcikKLSAgICAgICAgcmV0dXJuIG1fd2ViTWVkaWFQbGF5ZXItPmVudGVyRnVsbHNjcmVlbigp OwotICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgbV93ZWJNZWRpYVBsYXllci0+ZW50ZXJGdWxs c2NyZWVuKCk7CiB9CiAKIHZvaWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpleGl0RnVsbHNj cmVlbigpCkBAIC0zNTIsNiArMzUxLDExIEBAIHZvaWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBs OjpleGl0RnVsbHNjcmVlbigpCiAgICAgaWYgKG1fd2ViTWVkaWFQbGF5ZXIpCiAgICAgICAgIG1f d2ViTWVkaWFQbGF5ZXItPmV4aXRGdWxsc2NyZWVuKCk7CiB9CisKK2Jvb2wgV2ViTWVkaWFQbGF5 ZXJDbGllbnRJbXBsOjpjYW5FbnRlckZ1bGxzY3JlZW4oKSBjb25zdAoreworICAgIHJldHVybiBt X3dlYk1lZGlhUGxheWVyICYmIG1fd2ViTWVkaWFQbGF5ZXItPmNhbkVudGVyRnVsbHNjcmVlbigp OworfQogI2VuZGlmCiAKICNpZiBFTkFCTEUoTUVESUFfU09VUkNFKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmggYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuaAppbmRleCAz YWZiMWY1ZTU1NjJkODgxYWQ4OWM5YmY4YTVkNjkwMTUwNTE2OTM2Li5lMDZkM2U1MjM2OTNhZmUx M2I2ZjkwZTFhNGNlNjgwZTdlYWU1OTAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuaApAQCAtMTM1LDggKzEzNSw5IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIHVuc2lnbmVkIGF1ZGlvRGVjb2RlZEJ5dGVDb3VudCgpIGNv bnN0OwogICAgIHZpcnR1YWwgdW5zaWduZWQgdmlkZW9EZWNvZGVkQnl0ZUNvdW50KCkgY29uc3Q7 CiAjaWYgVVNFKE5BVElWRV9GVUxMU0NSRUVOX1ZJREVPKQotICAgIHZpcnR1YWwgYm9vbCBlbnRl ckZ1bGxzY3JlZW4oKSBjb25zdDsKKyAgICB2aXJ0dWFsIHZvaWQgZW50ZXJGdWxsc2NyZWVuKCk7 CiAgICAgdmlydHVhbCB2b2lkIGV4aXRGdWxsc2NyZWVuKCk7CisgICAgdmlydHVhbCBib29sIGNh bkVudGVyRnVsbHNjcmVlbigpIGNvbnN0OwogI2VuZGlmCiAKICNpZiBFTkFCTEUoV0VCX0FVRElP KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IGQ1OWZi MjI4MjY4M2MyMDhhZWY0ZmFjOWJkMTgwMWNkZGM4ZmZmNWYuLjFjNWYyNmI5MmEyZWU4ODRhNmM4 MDNjNGVhMmY5ZDBkMWQ0MDk5YTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJW aWV3SW1wbC5jcHAKQEAgLTE1ODcsOCArMTU4NywxMCBAQCB2b2lkIFdlYlZpZXdJbXBsOjplbnRl ckZ1bGxTY3JlZW5Gb3JFbGVtZW50KFdlYkNvcmU6OkVsZW1lbnQqIGVsZW1lbnQpCiAjaWYgVVNF KE5BVElWRV9GVUxMU0NSRUVOX1ZJREVPKQogICAgIGlmIChlbGVtZW50ICYmIGVsZW1lbnQtPmlz TWVkaWFFbGVtZW50KCkpIHsKICAgICAgICAgSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVtZW50 ID0gc3RhdGljX2Nhc3Q8SFRNTE1lZGlhRWxlbWVudCo+KGVsZW1lbnQpOwotICAgICAgICBpZiAo bWVkaWFFbGVtZW50LT5wbGF5ZXIoKSAmJiBtZWRpYUVsZW1lbnQtPnBsYXllcigpLT5lbnRlckZ1 bGxzY3JlZW4oKSkKKyAgICAgICAgaWYgKG1lZGlhRWxlbWVudC0+cGxheWVyKCkgJiYgbWVkaWFF bGVtZW50LT5wbGF5ZXIoKS0+Y2FuRW50ZXJGdWxsc2NyZWVuKCkpIHsKKyAgICAgICAgICAgIG1l ZGlhRWxlbWVudC0+cGxheWVyKCktPmVudGVyRnVsbHNjcmVlbigpOwogICAgICAgICAgICAgbV9w cm92aXNpb25hbEZ1bGxTY3JlZW5FbGVtZW50ID0gZWxlbWVudDsKKyAgICAgICAgfQogICAgICAg ICByZXR1cm47CiAgICAgfQogI2VuZGlmCg== 141404 2012-05-11 06:47:34 -0700 2012-05-11 10:36:36 -0700 Patch bug-86052-20120511064733.patch text/plain 9327 qinmin U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2NDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjFmODliZGM4MzI1OGVh ZDA3ZmFjMmUwMTM2YzIyMmQyZDllZTYyNy4uM2Y2OWZjMjc2NjFjYThiOTllYzQ1MjUxNGEyMTUz MTAzZmUxM2FmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA1LTA5ICBNaW4g UWluICA8cWlubWluQGdvb2dsZS5jb20+CisKKyAgICAgICAgc3BsaXQgTWVkaWFQbGF5ZXI6OmVu dGVyRnVsbHNjcmVlbiBpbnRvIDIgc2VwZXJhdGUgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjA1MgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IGlzIGNvbmZ1c2luZyB0aGF0IGVudGVy RnVsbHNjcmVlbiByZXR1cm5zIGEgYm9vbGVhbiB3aGlsZSBleGl0RnVsbHNjcmVlbiBkb2VzCisg ICAgICAgIG5vdCBkbyB0aGUgc2FtZS4gQW5kIGlvcyBkb2VzIG5vdCBuZWVkIHRoZSByZXR1cm4g dmFsdWUuCisgICAgICAgIFNvIHJlbW92ZSB0aGUgcmV0dXJuIHZhbHVlIG9uIGVudGVyRnVsbHNj cmVlbiBhbmQgbWFrZSBhIHNlcGVyYXRlIGNhbkVudGVyRnVsbHNjcmVlbigpCisgICAgICAgIGZ1 bmN0aW9uIGZvciBhbmRyb2lkLgorICAgICAgICBObyB0ZXN0cyBhcyB0aGVyZSBhcmUgbm8gYmVo YXZpb3IgY2hhbmdlLCBqdXN0IHJlZmFjdG9yaW5nLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvTWVkaWFQbGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXI6OmVu dGVyRnVsbHNjcmVlbik6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyOjpjYW5FbnRlckZ1bGxzY3JlZW4pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL01lZGlhUGxheWVyLmg6CisgICAgICAgIChNZWRpYVBsYXllcik6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRlLmg6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2U6OmVudGVyRnVsbHNjcmVlbik6CisgICAgICAgIChN ZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2UpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlSW50ZXJmYWNlOjpjYW5FbnRlckZ1bGxzY3JlZW4pOgorCiAyMDEyLTAzLTMxICBS b2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KIAogICAgICAgICBDU1MgMi4xIGZhaWx1 cmU6IGZpcnN0LWxldHRlci1uZXN0ZWQtMDA0Lmh0bSBmYWlscwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwppbmRleCA1NjVkNTZlYmRiZDRlM2NjM2QzNGY5MDA3ZDc2NTAyNjEyODBhYjJjLi43NDY3 ZjAzZTFmZGYwMWNiZGY0MGU0YjRkYWY1NTNhMmI1ZDMxZDMzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTA1LTA5ICBNaW4gUWluICA8cWlubWluQGdv b2dsZS5jb20+CisKKyAgICAgICAgc3BsaXQgTWVkaWFQbGF5ZXI6OmVudGVyRnVsbHNjcmVlbiBp bnRvIDIgc2VwZXJhdGUgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04NjA1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEluIFdlYkNvcmUsIHdlIHNwbGl0dGVkIGJvb2wgZW50ZXJGdWxsc2Ny ZWVuKCkgaW50byB0d28gc2VwZXJhdGUgY2FsbHM6CisgICAgICAgIHZvaWQgZW50ZXJGdWxsc2Ny ZWVuKCkgYW5kIGJvb2wgY2FuRW50ZXJGdWxsc2NyZWVuKCkKKyAgICAgICAgVGhpcyBpcyB0aGUg Y2hhbmdlIGluIHRoZSBjaHJvbWl1bSBwYXJ0IHRoYXQgd2UgbmVlZGVkIHRvIHN1cHBvcnQgdGhl IFdlYkNvcmUgY2hhbmdlCisgICAgICAgIE5vIGJlaGF2aW9yIGNoYW5nZSwganVzdCByZWZhY3Rv cmluZy4KKworICAgICAgICAqIHB1YmxpYy9XZWJNZWRpYVBsYXllci5oOgorICAgICAgICAoV2Vi TWVkaWFQbGF5ZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVBsYXllcjo6ZW50ZXJGdWxs c2NyZWVuKToKKyAgICAgICAgKFdlYktpdDo6V2ViTWVkaWFQbGF5ZXI6OmNhbkVudGVyRnVsbHNj cmVlbik6CisgICAgICAgICogc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6ZW50ZXJGdWxsc2NyZWVuKToK KyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhUGxheWVyQ2xpZW50 SW1wbDo6ZXhpdEZ1bGxzY3JlZW4pOgorICAgICAgICAqIHNyYy9XZWJNZWRpYVBsYXllckNsaWVu dEltcGwuaDoKKyAgICAgICAgKFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbCk6CisgICAgICAgICog c3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmVudGVy RnVsbFNjcmVlbkZvckVsZW1lbnQpOgorCiAyMDEyLTA1LTA4ICBUb255IENoYW5nICA8dG9ueUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBtb3ZlIGV2ZW50X2xpc3RlbmVyX3Vu aXR0ZXN0IHRvIHdlYmtpdF91bml0X3Rlc3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAKaW5kZXggZDg3M2VjNWVjMDE1ZTM5Y2M2ZTE2Yzcy NTViMjk0NmNmOTU0Yjk0ZS4uOWZjNjE0ZDQ1ZjEzNzJjYTM3MGI0MjYyZGY0ODYxYzEyYjIzYjIw NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5 ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVy LmNwcApAQCAtNzcwLDkgKzc3MCw5IEBAIHZvaWQgTWVkaWFQbGF5ZXI6OnNldENvbnRyb2xzKGJv b2wgY29udHJvbHMpCiAjZW5kaWYKIAogI2lmIEVOQUJMRShQTFVHSU5fUFJPWFlfRk9SX1ZJREVP KSB8fCBVU0UoTkFUSVZFX0ZVTExTQ1JFRU5fVklERU8pCi1ib29sIE1lZGlhUGxheWVyOjplbnRl ckZ1bGxzY3JlZW4oKSBjb25zdAordm9pZCBNZWRpYVBsYXllcjo6ZW50ZXJGdWxsc2NyZWVuKCkK IHsKLSAgICByZXR1cm4gbV9wcml2YXRlLT5lbnRlckZ1bGxzY3JlZW4oKTsKKyAgICBtX3ByaXZh dGUtPmVudGVyRnVsbHNjcmVlbigpOwogfQogCiB2b2lkIE1lZGlhUGxheWVyOjpleGl0RnVsbHNj cmVlbigpCkBAIC03ODEsNiArNzgxLDEzIEBAIHZvaWQgTWVkaWFQbGF5ZXI6OmV4aXRGdWxsc2Ny ZWVuKCkKIH0KICNlbmRpZgogCisjaWYgVVNFKE5BVElWRV9GVUxMU0NSRUVOX1ZJREVPKQorYm9v bCBNZWRpYVBsYXllcjo6Y2FuRW50ZXJGdWxsc2NyZWVuKCkgY29uc3QKK3sKKyAgICByZXR1cm4g bV9wcml2YXRlLT5jYW5FbnRlckZ1bGxzY3JlZW4oKTsKK30KKyNlbmRpZgorCiAjaWYgVVNFKEFD Q0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogdm9pZCBNZWRpYVBsYXllcjo6YWNjZWxlcmF0ZWRSZW5k ZXJpbmdTdGF0ZUNoYW5nZWQoKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL01lZGlhUGxheWVyLmgKaW5kZXggMDBjYTA2NDUwNDA3NmUxZTI0OWQzOTZmZTg3MjY2MTY0 MTY3YzZjOC4uZmQ2MjMwNTAzMTU3OGYxMDM5Nzc2ZDZjNWQ0ZDAzMzc5Y2UyM2I1YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCkBAIC0zMjcs MTAgKzMyNywxNCBAQCBwdWJsaWM6CiAjZW5kaWYKIAogI2lmIEVOQUJMRShQTFVHSU5fUFJPWFlf Rk9SX1ZJREVPKSB8fCBVU0UoTkFUSVZFX0ZVTExTQ1JFRU5fVklERU8pCi0gICAgYm9vbCBlbnRl ckZ1bGxzY3JlZW4oKSBjb25zdDsKKyAgICB2b2lkIGVudGVyRnVsbHNjcmVlbigpOwogICAgIHZv aWQgZXhpdEZ1bGxzY3JlZW4oKTsKICNlbmRpZgogCisjaWYgVVNFKE5BVElWRV9GVUxMU0NSRUVO X1ZJREVPKQorICAgIGJvb2wgY2FuRW50ZXJGdWxsc2NyZWVuKCkgY29uc3Q7CisjZW5kaWYKKwog I2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAvLyB3aGV0aGVyIGFjY2VsZXJh dGVkIHJlbmRlcmluZyBpcyBzdXBwb3J0ZWQgYnkgdGhlIG1lZGlhIGVuZ2luZSBmb3IgdGhlIGN1 cnJlbnQgbWVkaWEuCiAgICAgYm9vbCBzdXBwb3J0c0FjY2VsZXJhdGVkUmVuZGVyaW5nKCkgY29u c3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBs YXllclByaXZhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxh eWVyUHJpdmF0ZS5oCmluZGV4IDE3NWQ3YzViY2E0OWE0OTBlZDdmMDUyYzZkNjhiYzg3ZTA4ODA1 OTkuLmMzYTNkZmE2YWJhYTlkMmU3NTAwMDA0YWJlOWFjMzE3N2FmMzhjZjYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5o CkBAIC0xMTgsMTAgKzExOCwxNCBAQCBwdWJsaWM6CiAjZW5kaWYKIAogI2lmIEVOQUJMRShQTFVH SU5fUFJPWFlfRk9SX1ZJREVPKSB8fCBVU0UoTkFUSVZFX0ZVTExTQ1JFRU5fVklERU8pCi0gICAg dmlydHVhbCBib29sIGVudGVyRnVsbHNjcmVlbigpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9Cisg ICAgdmlydHVhbCB2b2lkIGVudGVyRnVsbHNjcmVlbigpIGNvbnN0IHsgfQogICAgIHZpcnR1YWwg dm9pZCBleGl0RnVsbHNjcmVlbigpIHsgfQogI2VuZGlmCiAKKyNpZiBVU0UoTkFUSVZFX0ZVTExT Q1JFRU5fVklERU8pCisgICAgdmlydHVhbCBib29sIGNhbkVudGVyRnVsbHNjcmVlbigpIGNvbnN0 IHsgcmV0dXJuIGZhbHNlOyB9CisjZW5kaWYKKwogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJ VElORykKICAgICAvLyB3aGV0aGVyIGFjY2VsZXJhdGVkIHJlbmRlcmluZyBpcyBzdXBwb3J0ZWQg YnkgdGhlIG1lZGlhIGVuZ2luZSBmb3IgdGhlIGN1cnJlbnQgbWVkaWEuCiAgICAgdmlydHVhbCBi b29sIHN1cHBvcnRzQWNjZWxlcmF0ZWRSZW5kZXJpbmcoKSBjb25zdCB7IHJldHVybiBmYWxzZTsg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5 ZXIuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk1lZGlhUGxheWVyLmgKaW5k ZXggYTJhOWZiOWI0MWMxNWUwMTMyMTNmZDNiMzcxYzlhMGI0ZTQ2YTBhNi4uNjcwNjMwZjk1MDEy YzkzNmRhNDUwZTI5MjU3MGY4MWNiMGVkMGFhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllci5oCkBAIC0xODQsMTAgKzE4NCwxMSBAQCBwdWJsaWM6 CiAgICAgdmlydHVhbCBNZWRpYUtleUV4Y2VwdGlvbiBhZGRLZXkoY29uc3QgV2ViU3RyaW5nJiBr ZXlTeXN0ZW0sIGNvbnN0IHVuc2lnbmVkIGNoYXIqIGtleSwgdW5zaWduZWQga2V5TGVuZ3RoLCBj b25zdCB1bnNpZ25lZCBjaGFyKiBpbml0RGF0YSwgdW5zaWduZWQgaW5pdERhdGFMZW5ndGgsIGNv bnN0IFdlYlN0cmluZyYgc2Vzc2lvbklkKSB7IHJldHVybiBNZWRpYUtleUV4Y2VwdGlvbktleVN5 c3RlbU5vdFN1cHBvcnRlZDsgfQogICAgIHZpcnR1YWwgTWVkaWFLZXlFeGNlcHRpb24gY2FuY2Vs S2V5UmVxdWVzdChjb25zdCBXZWJTdHJpbmcmIGtleVN5c3RlbSwgY29uc3QgV2ViU3RyaW5nJiBz ZXNzaW9uSWQpIHsgcmV0dXJuIE1lZGlhS2V5RXhjZXB0aW9uS2V5U3lzdGVtTm90U3VwcG9ydGVk OyB9CiAKLSAgICAvLyBJbnN0dWN0IFdlYk1lZGlhUGxheWVyIHRvIGVudGVyL2V4aXQgZnVsbHNj cmVlbi4KLSAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhlIHBsYXllciBjYW4gZW50ZXIgZnVsbHNj cmVlbi4KLSAgICB2aXJ0dWFsIGJvb2wgZW50ZXJGdWxsc2NyZWVuKCkgeyByZXR1cm4gZmFsc2U7 IH0KKyAgICAvLyBJbnN0cnVjdCBXZWJNZWRpYVBsYXllciB0byBlbnRlci9leGl0IGZ1bGxzY3Jl ZW4uCisgICAgdmlydHVhbCB2b2lkIGVudGVyRnVsbHNjcmVlbigpIHsgfQogICAgIHZpcnR1YWwg dm9pZCBleGl0RnVsbHNjcmVlbigpIHsgfQorICAgIC8vIFJldHVybnMgdHJ1ZSBpZiB0aGUgcGxh eWVyIGNhbiBlbnRlciBmdWxsc2NyZWVuLgorICAgIHZpcnR1YWwgYm9vbCBjYW5FbnRlckZ1bGxz Y3JlZW4oKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2Vi S2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXll ckNsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5 ZXJDbGllbnRJbXBsLmNwcAppbmRleCA4YmEwM2YwNGE2N2U2OWI3MDIzYmVlN2Q4ZDljYTU5OTlk ZjlhYjY5Li45NTAwNjhkMmYyM2QzNGQ1ZjA1Zjk5OTM1MjViZGNlOWJmZjRjZjJiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50 SW1wbC5jcHAKQEAgLTM0MCwxMSArMzQwLDEwIEBAIHZvaWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJ bXBsOjpwYXVzZSgpCiB9CiAKICNpZiBVU0UoTkFUSVZFX0ZVTExTQ1JFRU5fVklERU8pCi1ib29s IFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6ZW50ZXJGdWxsc2NyZWVuKCkgY29uc3QKK3ZvaWQg V2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjplbnRlckZ1bGxzY3JlZW4oKQogewogICAgIGlmICht X3dlYk1lZGlhUGxheWVyKQotICAgICAgICByZXR1cm4gbV93ZWJNZWRpYVBsYXllci0+ZW50ZXJG dWxsc2NyZWVuKCk7Ci0gICAgcmV0dXJuIGZhbHNlOworICAgICAgICBtX3dlYk1lZGlhUGxheWVy LT5lbnRlckZ1bGxzY3JlZW4oKTsKIH0KIAogdm9pZCBXZWJNZWRpYVBsYXllckNsaWVudEltcGw6 OmV4aXRGdWxsc2NyZWVuKCkKQEAgLTM1Miw2ICszNTEsMTEgQEAgdm9pZCBXZWJNZWRpYVBsYXll ckNsaWVudEltcGw6OmV4aXRGdWxsc2NyZWVuKCkKICAgICBpZiAobV93ZWJNZWRpYVBsYXllcikK ICAgICAgICAgbV93ZWJNZWRpYVBsYXllci0+ZXhpdEZ1bGxzY3JlZW4oKTsKIH0KKworYm9vbCBX ZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmNhbkVudGVyRnVsbHNjcmVlbigpIGNvbnN0Cit7Cisg ICAgcmV0dXJuIG1fd2ViTWVkaWFQbGF5ZXIgJiYgbV93ZWJNZWRpYVBsYXllci0+Y2FuRW50ZXJG dWxsc2NyZWVuKCk7Cit9CiAjZW5kaWYKIAogI2lmIEVOQUJMRShNRURJQV9TT1VSQ0UpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudElt cGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1w bC5oCmluZGV4IDNhZmIxZjVlNTU2MmQ4ODFhZDg5YzliZjhhNWQ2OTAxNTA1MTY5MzYuLmUwNmQz ZTUyMzY5M2FmZTEzYjZmOTBlMWE0Y2U2ODBlN2VhZTU5MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5oCkBAIC0xMzUs OCArMTM1LDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdW5zaWduZWQgYXVkaW9EZWNvZGVkQnl0 ZUNvdW50KCkgY29uc3Q7CiAgICAgdmlydHVhbCB1bnNpZ25lZCB2aWRlb0RlY29kZWRCeXRlQ291 bnQoKSBjb25zdDsKICNpZiBVU0UoTkFUSVZFX0ZVTExTQ1JFRU5fVklERU8pCi0gICAgdmlydHVh bCBib29sIGVudGVyRnVsbHNjcmVlbigpIGNvbnN0OworICAgIHZpcnR1YWwgdm9pZCBlbnRlckZ1 bGxzY3JlZW4oKTsKICAgICB2aXJ0dWFsIHZvaWQgZXhpdEZ1bGxzY3JlZW4oKTsKKyAgICB2aXJ0 dWFsIGJvb2wgY2FuRW50ZXJGdWxsc2NyZWVuKCkgY29uc3Q7CiAjZW5kaWYKIAogI2lmIEVOQUJM RShXRUJfQVVESU8pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJW aWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAK aW5kZXggZDU5ZmIyMjgyNjgzYzIwOGFlZjRmYWM5YmQxODAxY2RkYzhmZmY1Zi4uMWM1ZjI2Yjky YTJlZTg4NGE2YzgwM2M0ZWEyZjlkMGQxZDQwOTlhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMTU4Nyw4ICsxNTg3LDEwIEBAIHZvaWQgV2ViVmll d0ltcGw6OmVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQoV2ViQ29yZTo6RWxlbWVudCogZWxlbWVu dCkKICNpZiBVU0UoTkFUSVZFX0ZVTExTQ1JFRU5fVklERU8pCiAgICAgaWYgKGVsZW1lbnQgJiYg ZWxlbWVudC0+aXNNZWRpYUVsZW1lbnQoKSkgewogICAgICAgICBIVE1MTWVkaWFFbGVtZW50KiBt ZWRpYUVsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MTWVkaWFFbGVtZW50Kj4oZWxlbWVudCk7Ci0g ICAgICAgIGlmIChtZWRpYUVsZW1lbnQtPnBsYXllcigpICYmIG1lZGlhRWxlbWVudC0+cGxheWVy KCktPmVudGVyRnVsbHNjcmVlbigpKQorICAgICAgICBpZiAobWVkaWFFbGVtZW50LT5wbGF5ZXIo KSAmJiBtZWRpYUVsZW1lbnQtPnBsYXllcigpLT5jYW5FbnRlckZ1bGxzY3JlZW4oKSkgeworICAg ICAgICAgICAgbWVkaWFFbGVtZW50LT5wbGF5ZXIoKS0+ZW50ZXJGdWxsc2NyZWVuKCk7CiAgICAg ICAgICAgICBtX3Byb3Zpc2lvbmFsRnVsbFNjcmVlbkVsZW1lbnQgPSBlbGVtZW50OworICAgICAg ICB9CiAgICAgICAgIHJldHVybjsKICAgICB9CiAjZW5kaWYK