105728 2012-12-24 10:40:48 -0800 [BlackBerry] Update BB10 media render theme. 2013-01-03 09:33:51 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tijiang webkit-unassigned cmarcelo dglazkov eric.carlson feature-media-reviews jgriggs macpherson menard mifenton ojan.autocc rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 797013 0 tijiang 2012-12-24 10:40:48 -0800 Update media theme using GL friendly method and meet new UX specs. 797025 1 180684 tijiang 2012-12-24 11:18:31 -0800 Created attachment 180684 Patch 797027 2 180684 rwlbuis 2012-12-24 11:23:18 -0800 Comment on attachment 180684 Patch LGTM. 797031 3 180684 webkit.review.bot 2012-12-24 11:38:58 -0800 Comment on attachment 180684 Patch Clearing flags on attachment: 180684 Committed r138447: <http://trac.webkit.org/changeset/138447> 797032 4 webkit.review.bot 2012-12-24 11:39:02 -0800 All reviewed patches have been landed. Closing bug. 798854 5 tijiang 2013-01-02 13:53:23 -0800 Reopening to attach new patch. 798855 6 181059 tijiang 2013-01-02 13:53:26 -0800 Created attachment 181059 Patch 798871 7 181059 yong.li.webkit 2013-01-02 14:06:14 -0800 Comment on attachment 181059 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=181059&action=review > Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp:1094 > + static Image* mediaSliderThumb; > + if (!isEnabled(object)) > + mediaSliderThumb = Image::loadPlatformResource("core_slider_handle_disabled").leakRef(); > + else { > + if (isPressed(object) || isHovered(object) || isFocused(object)) > + mediaSliderThumb = Image::loadPlatformResource("core_slider_handle_pressed").leakRef(); > + else > + mediaSliderThumb = Image::loadPlatformResource("core_media_handle").leakRef(); > + } will this leak an image every time? I would use 3 static Image* objects that are initialized upon first time, and then reused. 798879 8 181059 yong.li.webkit 2013-01-02 14:09:30 -0800 Comment on attachment 181059 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=181059&action=review > Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp:1135 > + static Image* volumeBar = Image::loadPlatformResource("core_slider_played_bg").leakRef(); > + // This is to paint main volume slider bar. A space between 1134 and 1135 would be neat. > Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp:1140 > + bool result = paintSliderTrackRect(object, paintInfo, rect2, volumeBackground); > + > + if (volume > 0) { > + // This is to paint volume bar (left of volume slider thumb) using selection color. > + paintSliderTrackRect(object, paintInfo, volumeRect, volumeBar); I'm confused here. should it be result |= paintSliderTrackRect(object, paintInfo, volumeRect, volumeBar); 798941 9 181075 tijiang 2013-01-02 14:59:13 -0800 Created attachment 181075 Patch 798952 10 181075 yong.li.webkit 2013-01-02 15:09:54 -0800 Comment on attachment 181075 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=181075&action=review LGTM. But it doesn't apply to webkit ToT? You may want John to review it again. > Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp:1089 > static Image* mediaSliderThumb = Image::loadPlatformResource("core_media_handle").leakRef(); > - > + if (!isEnabled(object)) minor: a space here would be nice. 799380 11 181075 jgriggs 2013-01-03 07:50:41 -0800 Comment on attachment 181075 Patch Looks good to me 799381 12 jgriggs 2013-01-03 07:51:08 -0800 R+ from me as well. 799383 13 181176 tijiang 2013-01-03 07:56:40 -0800 Created attachment 181176 Patch 799386 14 181176 webkit.review.bot 2013-01-03 08:25:54 -0800 Comment on attachment 181176 Patch Rejecting attachment 181176 from commit-queue. tijiang@rim.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 799397 15 181176 webkit.review.bot 2013-01-03 09:05:12 -0800 Comment on attachment 181176 Patch Attachment 181176 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/15647746 New failing tests: inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html 799408 16 181176 webkit.review.bot 2013-01-03 09:33:47 -0800 Comment on attachment 181176 Patch Clearing flags on attachment: 181176 Committed r138712: <http://trac.webkit.org/changeset/138712> 799409 17 webkit.review.bot 2013-01-03 09:33:51 -0800 All reviewed patches have been landed. Closing bug. 180684 2012-12-24 11:18:31 -0800 2013-01-02 13:53:18 -0800 Patch bug-105728-20121224141544.patch text/plain 4113 tijiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NDQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWE2MDBmMmQ4NmNiNjNi NTQyMTE5YjZlOTQ3ZTRiZWM3MzczNzJjOS4uZWUxZjE2NzVhMzdjZWEzMDMxMzBiMzRkNzcwMzAx M2YwYmFjOTA3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEyLTI0ICBUaWFu Y2hlbmcgSmlhbmcgIDx0aWppYW5nQHJpbS5jb20+CisKKyAgICAgICAgVXBkYXRlIEJCMTAgbWVk aWEgcmVuZGVyIHRoZW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTA1NzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW50ZXJuYWxseSByZXZpZXdlZCBieSBKb2huIEdyaWdncy4KKyAgICAgICAgVXNl IEdMIHJlbmRlcmVyIHRvIHBhaW50IG1lZGlhIGNvbnRyb2wuCisKKyAgICAgICAgKiBjc3MvbWVk aWFDb250cm9sc0JsYWNrQmVycnkuY3NzOgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEt Y29udHJvbHMtdGltZWxpbmUsIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWVsaW5l KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50TWVkaWFT bGlkZXJUcmFjayk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBh aW50TWVkaWFTbGlkZXJUaHVtYik6CisKIDIwMTItMTItMjQgIFNoZXJpZmYgQm90ICA8d2Via2l0 LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0 IHIxMzg0MzYuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvbWVkaWFDb250cm9sc0Js YWNrQmVycnkuY3NzIGIvU291cmNlL1dlYkNvcmUvY3NzL21lZGlhQ29udHJvbHNCbGFja0JlcnJ5 LmNzcwppbmRleCAzNjUxMDIxMzk2OTI5NTI5ZmIzMzM2Nzc0OGIzOGExNjBjYTc2MzdiLi42YTg0 MTZhNzU2ZjEzMzAyYjZiMGViNWFjNWUyZjljZTM0ZWIxNWY0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvbWVkaWFDb250cm9sc0JsYWNrQmVycnkuY3NzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9tZWRpYUNvbnRyb2xzQmxhY2tCZXJyeS5jc3MKQEAgLTEyOSw2ICsxMjksNyBAQCBh dWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lbGluZSwgdmlkZW86Oi13ZWJraXQtbWVk aWEtY29udHJvbHMtdGltZWxpbmUgewogICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbWVkaWEtc2xp ZGVyOwogICAgIGRpc3BsYXk6IC13ZWJraXQtYm94OwogICAgIC13ZWJraXQtYm94LWZsZXg6IDE7 CisgICAgbWFyZ2luLWJvdHRvbTogMnB4OwogfQogCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy1mdWxsc2NyZWVuLWZ1bGxzY3JlZW4tYnV0dG9uLCBhdWRpbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy1mdWxsc2NyZWVuLWZ1bGxzY3JlZW4tYnV0dG9uIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhlbWVCbGFja0JlcnJ5LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhlbWVCbGFja0JlcnJ5 LmNwcAppbmRleCBiOGY5Njk1MWFiMDQzZmFhZTZjY2ZhZTNlMzA3NDRlYjM3NDJlNTU3Li5iMGZh MzQ0Y2EwY2MxMTVkMDIxNTdjZTJhMGZmMmQzOTMxM2NjZTZkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVy cnkuY3BwCkBAIC0xMDQ1LDggKzEwNDUsOCBAQCBib29sIFJlbmRlclRoZW1lQmxhY2tCZXJyeTo6 cGFpbnRNZWRpYVNsaWRlclRyYWNrKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBQYQogICAg IGludCB3TG9hZGVkID0gY2VpbCgodyAtIG1lZGlhU2xpZGVyVGh1bWJXaWR0aCAqIGZ1bGxTY3Jl ZW5NdWx0aXBsaWVyKSAqIGxvYWRlZCArIG1lZGlhU2xpZGVyVGh1bWJXaWR0aCAqIGZ1bGxTY3Jl ZW5NdWx0aXBsaWVyKTsKIAogICAgIEludFJlY3QgcGxheWVkKHgsIHksIHdQbGF5ZWQsIGgpOwot ICAgIEludFJlY3QgYnVmZmVyZWQoeCwgY2VpbCh5ICsgbWVkaWFTbGlkZXJPdXRsaW5lV2lkdGgp LCB3TG9hZGVkLCBjZWlsKGggLSAyICogbWVkaWFTbGlkZXJPdXRsaW5lV2lkdGgpKTsKLQorICAg IEludFJlY3QgYnVmZmVyZWQoeCwgeSwgd0xvYWRlZCwgaCk7CisjaWYgVVNFKFNLSUEpCiAgICAg Ly8gVGhpcyBpcyB0byBwYWludCBtYWluIHNsaWRlciBiYXIuCiAgICAgYm9vbCByZXN1bHQgPSBw YWludFNsaWRlclRyYWNrUmVjdChvYmplY3QsIHBhaW50SW5mbywgcmVjdDIpOwogCkBAIC0xMDU3 LDYgKzEwNTcsMjEgQEAgYm9vbCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50TWVkaWFTbGlk ZXJUcmFjayhSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGEKICAgICAgICAgLy8gVGhpcyBp cyB0byBwYWludCBwbGF5ZWQgcGFydCBvZiBiYXIgKGxlZnQgb2Ygc2xpZGVyIHRodW1iKSB1c2lu ZyBzZWxlY3Rpb24gY29sb3IuCiAgICAgICAgIHBhaW50U2xpZGVyVHJhY2tSZWN0KG9iamVjdCwg cGFpbnRJbmZvLCBwbGF5ZWQsIHNlbGVjdGlvbiwgc2VsZWN0aW9uLCBzZWxlY3Rpb24sIHNlbGVj dGlvbik7CiAgICAgfQorI2Vsc2UgLy8gR0wgcmVuZGVyZXIKKyAgICBzdGF0aWMgSW1hZ2UqIG1l ZGlhQmFja2dyb3VuZCA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgiY29yZV9zbGlkZXJf dmlkZW9fYmciKS5sZWFrUmVmKCk7CisgICAgc3RhdGljIEltYWdlKiBtZWRpYVBsYXllciA9IElt YWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgiY29yZV9zbGlkZXJfcGxheWVkX2JnIikubGVha1Jl ZigpOworICAgIHN0YXRpYyBJbWFnZSogbWVkaWFDYWNoZSA9IEltYWdlOjpsb2FkUGxhdGZvcm1S ZXNvdXJjZSgiY29yZV9zbGlkZXJfY2FjaGUiKS5sZWFrUmVmKCk7CisKKyAgICBib29sIHJlc3Vs dCA9IHBhaW50U2xpZGVyVHJhY2tSZWN0KG9iamVjdCwgcGFpbnRJbmZvLCByZWN0MiwgbWVkaWFC YWNrZ3JvdW5kKTsKKworICAgIGlmIChsb2FkZWQgPiAwIHx8IHBvc2l0aW9uID4gMCkgeworICAg ICAgICAvLyBUaGlzIGlzIHRvIHBhaW50IGJ1ZmZlcmVkIGJhci4KKyAgICAgICAgcGFpbnRTbGlk ZXJUcmFja1JlY3Qob2JqZWN0LCBwYWludEluZm8sIGJ1ZmZlcmVkLCBtZWRpYUNhY2hlKTsKKwor ICAgICAgICAvLyBUaGlzIGlzIHRvIHBhaW50IHBsYXllZCBwYXJ0IG9mIGJhciAobGVmdCBvZiBz bGlkZXIgdGh1bWIpIHVzaW5nIHNlbGVjdGlvbiBjb2xvci4KKyAgICAgICAgcGFpbnRTbGlkZXJU cmFja1JlY3Qob2JqZWN0LCBwYWludEluZm8sIHBsYXllZCwgbWVkaWFQbGF5ZXIpOworICAgIH0K KyNlbmRpZiAvLyBVU0UoU0tJQSkKICAgICByZXR1cm4gcmVzdWx0OwogI2Vsc2UKICAgICBVTlVT RURfUEFSQU0ob2JqZWN0KTsKQEAgLTEwOTMsNyArMTEwOCw3IEBAIGJvb2wgUmVuZGVyVGhlbWVC bGFja0JlcnJ5OjpwYWludE1lZGlhU2xpZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNv bnN0IFBhCiAKICAgICByZXR1cm4gdHJ1ZTsKICNlbHNlIC8vIEdMIHJlbmRlcmVyCi0gICAgc3Rh dGljIEltYWdlKiBtZWRpYVNsaWRlclRodW1iID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNl KCJjb3JlX3NsaWRlcl9oYW5kbGVfZGlzYWJsZWQiKS5sZWFrUmVmKCk7CisgICAgc3RhdGljIElt YWdlKiBtZWRpYVNsaWRlclRodW1iID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJjb3Jl X21lZGlhX2hhbmRsZSIpLmxlYWtSZWYoKTsKIAogICAgIHJldHVybiBwYWludE1lZGlhQnV0dG9u KHBhaW50SW5mby5jb250ZXh0LCByZWN0LCBtZWRpYVNsaWRlclRodW1iKTsKICNlbmRpZiAvLyBV U0UoU0tJQSkK 181059 2013-01-02 13:53:26 -0800 2013-01-02 14:59:09 -0800 Patch bug-105728-20130102165034.patch text/plain 6796 tijiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDdkMjVkZTJmYWE4Nzc4 ODExOTJhYTk0ZDY5MDU4YmFlNjUwZmRhYS4uZWJhODAwYmQ5MmJjMDYwYmE2YzE4M2I0MTUxMTll OGVhMTVkYWIyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTAxLTAyICBUaWFu Y2hlbmcgSmlhbmcgIDx0aWppYW5nQHJpbS5jb20+CisKKyAgICAgICAgVXBkYXRlIEJCMTAgbWVk aWEgcmVuZGVyIHRoZW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTA1NzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW50ZXJuYWxseSBSZXZpZXdlZCBieSBKb2huIEdyaWdncy4KKworICAgICAgICBV cGRhdGUgR0wgZnJpZW5kbHkgcmVuZGVyIG1ldGhvZCBmb3IgYXVkaW8gdm9sdW1lLgorICAgICAg ICBDaGFuZ2UgdGhlIGJhY2tncm91bmQgY29sb3IgZm9yIGVtYmVkZGVkIG1lZGlhIHBsYXllciB0 byBzZW1pLXRyYW5zcGFyZW50LgorICAgICAgICBDaGFuZ2UgcmVtYWluaW5nIHRpbWUgZm9udCBj b2xvciB0byBncmV5IHRvIG1hdGNoIGZ1bGwgc2NyZWVuIHZpZGVvLgorICAgICAgICBDaGFuZ2Ug bWVkaWEgc2xpZGVyIHRodW1iIGNvbG9yIHRvIGJsdWUgd2hlbiBwcmVzc2VkLgorCisgICAgICAg ICogY3NzL21lZGlhQ29udHJvbHNCbGFja0JlcnJ5LmNzczoKKyAgICAgICAgKGF1ZGlvKToKKyAg ICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWVtYmVkZGVkLXBhbmVsLCB2aWRl bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1lbWJlZGRlZC1wYW5lbCk6CisgICAgICAgICh2aWRl bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLWRpc3BsYXktY29udGFpbmVyLCBhdWRpbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLWRpc3BsYXktY29udGFpbmVyKToKKyAgICAgICAg KHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWVsaW5lLWNvbnRhaW5lciwgYXVkaW86 Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZWxpbmUtY29udGFpbmVyKToKKyAgICAgICAgKGF1 ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJlbnQtdGltZS1kaXNwbGF5LCB2aWRlbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy1jdXJyZW50LXRpbWUtZGlzcGxheSk6CisgICAgICAgICh2 aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLXJlbWFpbmluZy1kaXNwbGF5LCBhdWRp bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLXJlbWFpbmluZy1kaXNwbGF5KToKKyAgICAg ICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXItY29udGFpbmVy KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50TWVkaWFT bGlkZXJUaHVtYik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBh aW50TWVkaWFWb2x1bWVTbGlkZXJUcmFjayk6CisKIDIwMTMtMDEtMDIgIFNoZXJpZmYgQm90ICA8 d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxp bmcgb3V0IHIxMzg2MjcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvbWVkaWFDb250 cm9sc0JsYWNrQmVycnkuY3NzIGIvU291cmNlL1dlYkNvcmUvY3NzL21lZGlhQ29udHJvbHNCbGFj a0JlcnJ5LmNzcwppbmRleCA2YTg0MTZhNzU2ZjEzMzAyYjZiMGViNWFjNWUyZjljZTM0ZWIxNWY0 Li44ZTIxNjc4NTE4MDA4NTM5MGVjMGUxMzA4N2YzOTQzYzM1OTM2MDcxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jc3MvbWVkaWFDb250cm9sc0JsYWNrQmVycnkuY3NzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9tZWRpYUNvbnRyb2xzQmxhY2tCZXJyeS5jc3MKQEAgLTI4LDcgKzI4LDcg QEAKICAvKiBCbGFja0JlcnJ5IGRlZmF1bHQgbWVkaWEgY29udHJvbHMuICovCiAKIGF1ZGlvIHsK LSAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMCwgMCwgMCk7CisgICAgYmFja2dyb3VuZC1jb2xv cjogcmdiYSgzOCwgMzgsIDM4LCAwLjgpOwogICAgIHdpZHRoOiAzMDBweDsKICAgICBoZWlnaHQ6 IDMycHg7CiB9CkBAIC00MSw3ICs0MSw3IEBAIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xz LWVtYmVkZGVkLXBhbmVsLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1lbWJlCiAgICAg Ym90dG9tOiAwOwogICAgIHdpZHRoOiAxMDAlOwogICAgIGhlaWdodDogYXV0bzsKLSAgICBiYWNr Z3JvdW5kLWNvbG9yOiByZ2IoMCwgMCwgMCk7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiYSgz OCwgMzgsIDM4LCAwLjgpOwogfQogCiBhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5l bCwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgewpAQCAtNjMsNyArNjMsNiBA QCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLWRpc3BsYXktY29udGFpbmVyLCBh dWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cgogICAgIC13ZWJraXQtYm94LWFsaWduOiBjZW50ZXI7 CiAgICAgLXdlYmtpdC1ib3gtcGFjazoganVzdGlmeTsKICAgICAtd2Via2l0LWJveC1mbGV4OiAx OwotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigwLCAwLCAwKTsKIH0KIAogdmlkZW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtZnVsbHNjcmVlbi1wbGF5LWJ1dHRvbiwgYXVkaW86Oi13ZWJraXQt bWVkaWEtY29udHJvbHMtZnVsbHNjcmVlbi1wbGF5LWJ1dHRvbiB7CkBAIC04OCw3ICs4Nyw2IEBA IHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWVsaW5lLWNvbnRhaW5lciwgYXVkaW86 Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtCiAgICAgLXdlYmtpdC1ib3gtZmxleDogMTsKICAgICBo ZWlnaHQ6IGF1dG87CiAgICAgd2lkdGg6IDEwMCU7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmdi KDAsIDAsIDApOwogfQogCiBhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1mdWxsc2NyZWVu LWN1cnJlbnQtdGltZS1kaXNwbGF5LCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1mdWxs c2NyZWVuLWN1cnJlbnQtdGltZS1kaXNwbGF5IHsKQEAgLTEwMiw3ICsxMDAsNiBAQCBhdWRpbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy1jdXJyZW50LXRpbWUtZGlzcGxheSwgdmlkZW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbAogICAgIC13ZWJraXQtYm94LWFsaWduOiBjZW50ZXI7CiAgICAgLXdl YmtpdC1ib3gtcGFjazogZW5kOwogICAgIC13ZWJraXQtYm94LWZsZXg6IDA7Ci0gICAgYmFja2dy b3VuZC1jb2xvcjogcmdiKDAsIDAsIDApOwogICAgIGNvbG9yOiAjZmFmYWZhOwogfQogCkBAIC0x MTcsOCArMTE0LDcgQEAgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZS1yZW1haW5p bmctZGlzcGxheSwgYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHIKICAgICAtd2Via2l0LWJveC1h bGlnbjogY2VudGVyOwogICAgIC13ZWJraXQtYm94LXBhY2s6IGVuZDsKICAgICAtd2Via2l0LWJv eC1mbGV4OiAwOwotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigwLCAwLCAwKTsKLSAgICBjb2xv cjogI2ZhZmFmYTsKKyAgICBjb2xvcjogcmdiKDEyNSwgMTI1LCAxMjUpOwogfQogCiBhdWRpbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy1mdWxsc2NyZWVuLXRpbWVsaW5lLCB2aWRlbzo6LXdlYmtp dC1tZWRpYS1jb250cm9scy1mdWxsc2NyZWVuLXRpbWVsaW5lIHsKQEAgLTE2NSw3ICsxNjEsNyBA QCBhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xpZGVyLWNvbnRhaW5lciB7 CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIGxlZnQ6IDBweDsKICAgICByaWdodDogMHB4 OwotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigwLDAsMCk7CisgICAgYmFja2dyb3VuZC1jb2xv cjogcmdiYSgzOCwgMzgsIDM4LCAwLjgpOwogfQogCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy12b2x1bWUtc2xpZGVyLWNvbnRhaW5lciB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5jcHAKaW5k ZXggODliNDQwN2JiMjdmZmM0Yjc5NzBlMDk5OThkYzI5OGM2ZjYxMzA1ZC4uMTEyMWQzOTcyMTQ5 MTU2OTM2ZmRhYzQyMTU5NDZlNzYxZmI2MGQxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhlbWVCbGFja0JlcnJ5LmNwcApA QCAtMTA4Myw3ICsxMDgzLDE1IEBAIGJvb2wgUmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWludE1l ZGlhU2xpZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IFBhCiAKICAgICByZXR1 cm4gdHJ1ZTsKICNlbHNlIC8vIEdMIHJlbmRlcmVyCi0gICAgc3RhdGljIEltYWdlKiBtZWRpYVNs aWRlclRodW1iID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJjb3JlX21lZGlhX2hhbmRs ZSIpLmxlYWtSZWYoKTsKKyAgICBzdGF0aWMgSW1hZ2UqIG1lZGlhU2xpZGVyVGh1bWI7CisgICAg aWYgKCFpc0VuYWJsZWQob2JqZWN0KSkKKyAgICAgICAgbWVkaWFTbGlkZXJUaHVtYiA9IEltYWdl Ojpsb2FkUGxhdGZvcm1SZXNvdXJjZSgiY29yZV9zbGlkZXJfaGFuZGxlX2Rpc2FibGVkIikubGVh a1JlZigpOworICAgIGVsc2UgeworICAgICAgICBpZiAoaXNQcmVzc2VkKG9iamVjdCkgfHwgaXNI b3ZlcmVkKG9iamVjdCkgfHwgaXNGb2N1c2VkKG9iamVjdCkpCisgICAgICAgICAgICBtZWRpYVNs aWRlclRodW1iID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJjb3JlX3NsaWRlcl9oYW5k bGVfcHJlc3NlZCIpLmxlYWtSZWYoKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgbWVkaWFT bGlkZXJUaHVtYiA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgiY29yZV9tZWRpYV9oYW5k bGUiKS5sZWFrUmVmKCk7CisgICAgfQogCiAgICAgcmV0dXJuIHBhaW50TWVkaWFCdXR0b24ocGFp bnRJbmZvLmNvbnRleHQsIHJlY3QsIG1lZGlhU2xpZGVyVGh1bWIpOwogI2VuZGlmIC8vIFVTRShT S0lBKQpAQCAtMTExMyw2ICsxMTIxLDcgQEAgYm9vbCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBh aW50TWVkaWFWb2x1bWVTbGlkZXJUcmFjayhSZW5kZXJPYmplY3QqIG9iamVjdCwgY28KICAgICBJ bnRSZWN0IHJlY3QyKHgsIHksIHcsIGgpOwogICAgIEludFJlY3Qgdm9sdW1lUmVjdCh4LCB5LCBj ZWlsKHcgKiB2b2x1bWUpLCBoKTsKIAorI2lmIFVTRShTS0lBKQogICAgIC8vIFRoaXMgaXMgdG8g cGFpbnQgbWFpbiB2b2x1bWUgc2xpZGVyIGJhci4KICAgICBib29sIHJlc3VsdCA9IHBhaW50U2xp ZGVyVHJhY2tSZWN0KG9iamVjdCwgcGFpbnRJbmZvLCByZWN0MiwgQ29sb3IobWVkaWFTbGlkZXJU cmFja091dGxpbmUpLnJnYigpLCBDb2xvcihtZWRpYVNsaWRlclRyYWNrT3V0bGluZSkucmdiKCks IHJhbmdlU2xpZGVyUmVndWxhclRvcCwgcmFuZ2VTbGlkZXJSZWd1bGFyVG9wKTsKIApAQCAtMTEy MCw2ICsxMTI5LDE3IEBAIGJvb2wgUmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWludE1lZGlhVm9s dW1lU2xpZGVyVHJhY2soUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvCiAgICAgICAgIC8vIFRoaXMg aXMgdG8gcGFpbnQgdm9sdW1lIGJhciAobGVmdCBvZiB2b2x1bWUgc2xpZGVyIHRodW1iKSB1c2lu ZyBzZWxlY3Rpb24gY29sb3IuCiAgICAgICAgIHBhaW50U2xpZGVyVHJhY2tSZWN0KG9iamVjdCwg cGFpbnRJbmZvLCB2b2x1bWVSZWN0LCBDb2xvcihtZWRpYVNsaWRlclRyYWNrT3V0bGluZSkucmdi KCksIENvbG9yKG1lZGlhU2xpZGVyVHJhY2tPdXRsaW5lKS5yZ2IoKSwgc2VsZWN0aW9uLCBzZWxl Y3Rpb24pOwogICAgIH0KKyNlbHNlIC8vIEdMIHJlbmRlcmVyCisgICAgc3RhdGljIEltYWdlKiB2 b2x1bWVCYWNrZ3JvdW5kID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJjb3JlX3NsaWRl cl92aWRlb19iZyIpLmxlYWtSZWYoKTsKKyAgICBzdGF0aWMgSW1hZ2UqIHZvbHVtZUJhciA9IElt YWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgiY29yZV9zbGlkZXJfcGxheWVkX2JnIikubGVha1Jl ZigpOworICAgIC8vIFRoaXMgaXMgdG8gcGFpbnQgbWFpbiB2b2x1bWUgc2xpZGVyIGJhci4KKyAg ICBib29sIHJlc3VsdCA9IHBhaW50U2xpZGVyVHJhY2tSZWN0KG9iamVjdCwgcGFpbnRJbmZvLCBy ZWN0Miwgdm9sdW1lQmFja2dyb3VuZCk7CisKKyAgICBpZiAodm9sdW1lID4gMCkgeworICAgICAg ICAvLyBUaGlzIGlzIHRvIHBhaW50IHZvbHVtZSBiYXIgKGxlZnQgb2Ygdm9sdW1lIHNsaWRlciB0 aHVtYikgdXNpbmcgc2VsZWN0aW9uIGNvbG9yLgorICAgICAgICBwYWludFNsaWRlclRyYWNrUmVj dChvYmplY3QsIHBhaW50SW5mbywgdm9sdW1lUmVjdCwgdm9sdW1lQmFyKTsKKyAgICB9CisjZW5k aWYgLy8gVVNFKFNLSUEpCiAgICAgcmV0dXJuIHJlc3VsdDsKICNlbHNlCiAgICAgVU5VU0VEX1BB UkFNKG9iamVjdCk7Cg== 181075 2013-01-02 14:59:13 -0800 2013-01-03 07:56:36 -0800 Patch bug-105728-20130102175622.patch text/plain 6940 tijiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDdkMjVkZTJmYWE4Nzc4 ODExOTJhYTk0ZDY5MDU4YmFlNjUwZmRhYS4uZWJhODAwYmQ5MmJjMDYwYmE2YzE4M2I0MTUxMTll OGVhMTVkYWIyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTAxLTAyICBUaWFu Y2hlbmcgSmlhbmcgIDx0aWppYW5nQHJpbS5jb20+CisKKyAgICAgICAgVXBkYXRlIEJCMTAgbWVk aWEgcmVuZGVyIHRoZW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTA1NzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW50ZXJuYWxseSBSZXZpZXdlZCBieSBKb2huIEdyaWdncy4KKworICAgICAgICBV cGRhdGUgR0wgZnJpZW5kbHkgcmVuZGVyIG1ldGhvZCBmb3IgYXVkaW8gdm9sdW1lLgorICAgICAg ICBDaGFuZ2UgdGhlIGJhY2tncm91bmQgY29sb3IgZm9yIGVtYmVkZGVkIG1lZGlhIHBsYXllciB0 byBzZW1pLXRyYW5zcGFyZW50LgorICAgICAgICBDaGFuZ2UgcmVtYWluaW5nIHRpbWUgZm9udCBj b2xvciB0byBncmV5IHRvIG1hdGNoIGZ1bGwgc2NyZWVuIHZpZGVvLgorICAgICAgICBDaGFuZ2Ug bWVkaWEgc2xpZGVyIHRodW1iIGNvbG9yIHRvIGJsdWUgd2hlbiBwcmVzc2VkLgorCisgICAgICAg ICogY3NzL21lZGlhQ29udHJvbHNCbGFja0JlcnJ5LmNzczoKKyAgICAgICAgKGF1ZGlvKToKKyAg ICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWVtYmVkZGVkLXBhbmVsLCB2aWRl bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1lbWJlZGRlZC1wYW5lbCk6CisgICAgICAgICh2aWRl bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLWRpc3BsYXktY29udGFpbmVyLCBhdWRpbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLWRpc3BsYXktY29udGFpbmVyKToKKyAgICAgICAg KHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWVsaW5lLWNvbnRhaW5lciwgYXVkaW86 Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZWxpbmUtY29udGFpbmVyKToKKyAgICAgICAgKGF1 ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJlbnQtdGltZS1kaXNwbGF5LCB2aWRlbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy1jdXJyZW50LXRpbWUtZGlzcGxheSk6CisgICAgICAgICh2 aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLXJlbWFpbmluZy1kaXNwbGF5LCBhdWRp bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLXJlbWFpbmluZy1kaXNwbGF5KToKKyAgICAg ICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXItY29udGFpbmVy KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50TWVkaWFT bGlkZXJUaHVtYik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBh aW50TWVkaWFWb2x1bWVTbGlkZXJUcmFjayk6CisKIDIwMTMtMDEtMDIgIFNoZXJpZmYgQm90ICA8 d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxp bmcgb3V0IHIxMzg2MjcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvbWVkaWFDb250 cm9sc0JsYWNrQmVycnkuY3NzIGIvU291cmNlL1dlYkNvcmUvY3NzL21lZGlhQ29udHJvbHNCbGFj a0JlcnJ5LmNzcwppbmRleCA2YTg0MTZhNzU2ZjEzMzAyYjZiMGViNWFjNWUyZjljZTM0ZWIxNWY0 Li44ZTIxNjc4NTE4MDA4NTM5MGVjMGUxMzA4N2YzOTQzYzM1OTM2MDcxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jc3MvbWVkaWFDb250cm9sc0JsYWNrQmVycnkuY3NzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9tZWRpYUNvbnRyb2xzQmxhY2tCZXJyeS5jc3MKQEAgLTI4LDcgKzI4LDcg QEAKICAvKiBCbGFja0JlcnJ5IGRlZmF1bHQgbWVkaWEgY29udHJvbHMuICovCiAKIGF1ZGlvIHsK LSAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMCwgMCwgMCk7CisgICAgYmFja2dyb3VuZC1jb2xv cjogcmdiYSgzOCwgMzgsIDM4LCAwLjgpOwogICAgIHdpZHRoOiAzMDBweDsKICAgICBoZWlnaHQ6 IDMycHg7CiB9CkBAIC00MSw3ICs0MSw3IEBAIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xz LWVtYmVkZGVkLXBhbmVsLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1lbWJlCiAgICAg Ym90dG9tOiAwOwogICAgIHdpZHRoOiAxMDAlOwogICAgIGhlaWdodDogYXV0bzsKLSAgICBiYWNr Z3JvdW5kLWNvbG9yOiByZ2IoMCwgMCwgMCk7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiYSgz OCwgMzgsIDM4LCAwLjgpOwogfQogCiBhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5l bCwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgewpAQCAtNjMsNyArNjMsNiBA QCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLWRpc3BsYXktY29udGFpbmVyLCBh dWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cgogICAgIC13ZWJraXQtYm94LWFsaWduOiBjZW50ZXI7 CiAgICAgLXdlYmtpdC1ib3gtcGFjazoganVzdGlmeTsKICAgICAtd2Via2l0LWJveC1mbGV4OiAx OwotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigwLCAwLCAwKTsKIH0KIAogdmlkZW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtZnVsbHNjcmVlbi1wbGF5LWJ1dHRvbiwgYXVkaW86Oi13ZWJraXQt bWVkaWEtY29udHJvbHMtZnVsbHNjcmVlbi1wbGF5LWJ1dHRvbiB7CkBAIC04OCw3ICs4Nyw2IEBA IHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWVsaW5lLWNvbnRhaW5lciwgYXVkaW86 Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtCiAgICAgLXdlYmtpdC1ib3gtZmxleDogMTsKICAgICBo ZWlnaHQ6IGF1dG87CiAgICAgd2lkdGg6IDEwMCU7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmdi KDAsIDAsIDApOwogfQogCiBhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1mdWxsc2NyZWVu LWN1cnJlbnQtdGltZS1kaXNwbGF5LCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1mdWxs c2NyZWVuLWN1cnJlbnQtdGltZS1kaXNwbGF5IHsKQEAgLTEwMiw3ICsxMDAsNiBAQCBhdWRpbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy1jdXJyZW50LXRpbWUtZGlzcGxheSwgdmlkZW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbAogICAgIC13ZWJraXQtYm94LWFsaWduOiBjZW50ZXI7CiAgICAgLXdl YmtpdC1ib3gtcGFjazogZW5kOwogICAgIC13ZWJraXQtYm94LWZsZXg6IDA7Ci0gICAgYmFja2dy b3VuZC1jb2xvcjogcmdiKDAsIDAsIDApOwogICAgIGNvbG9yOiAjZmFmYWZhOwogfQogCkBAIC0x MTcsOCArMTE0LDcgQEAgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZS1yZW1haW5p bmctZGlzcGxheSwgYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHIKICAgICAtd2Via2l0LWJveC1h bGlnbjogY2VudGVyOwogICAgIC13ZWJraXQtYm94LXBhY2s6IGVuZDsKICAgICAtd2Via2l0LWJv eC1mbGV4OiAwOwotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigwLCAwLCAwKTsKLSAgICBjb2xv cjogI2ZhZmFmYTsKKyAgICBjb2xvcjogcmdiKDEyNSwgMTI1LCAxMjUpOwogfQogCiBhdWRpbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy1mdWxsc2NyZWVuLXRpbWVsaW5lLCB2aWRlbzo6LXdlYmtp dC1tZWRpYS1jb250cm9scy1mdWxsc2NyZWVuLXRpbWVsaW5lIHsKQEAgLTE2NSw3ICsxNjEsNyBA QCBhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xpZGVyLWNvbnRhaW5lciB7 CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIGxlZnQ6IDBweDsKICAgICByaWdodDogMHB4 OwotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigwLDAsMCk7CisgICAgYmFja2dyb3VuZC1jb2xv cjogcmdiYSgzOCwgMzgsIDM4LCAwLjgpOwogfQogCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy12b2x1bWUtc2xpZGVyLWNvbnRhaW5lciB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5jcHAKaW5k ZXggODliNDQwN2JiMjdmZmM0Yjc5NzBlMDk5OThkYzI5OGM2ZjYxMzA1ZC4uZjk0MDc4MWZmMjcx NWExYjIzY2ZlYWE1ZTAwMDU1NmU0MzMxM2RlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhlbWVCbGFja0JlcnJ5LmNwcApA QCAtMTA4Myw4ICsxMDgzLDEzIEBAIGJvb2wgUmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWludE1l ZGlhU2xpZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IFBhCiAKICAgICByZXR1 cm4gdHJ1ZTsKICNlbHNlIC8vIEdMIHJlbmRlcmVyCisgICAgc3RhdGljIEltYWdlKiBkaXNhYmxl ZE1lZGlhU2xpZGVyVGh1bWIgPSBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoImNvcmVfc2xp ZGVyX2hhbmRsZV9kaXNhYmxlZCIpLmxlYWtSZWYoKTsKKyAgICBzdGF0aWMgSW1hZ2UqIHByZXNz ZWRNZWRpYVNsaWRlclRodW1iID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJjb3JlX3Ns aWRlcl9oYW5kbGVfcHJlc3NlZCIpLmxlYWtSZWYoKTsKICAgICBzdGF0aWMgSW1hZ2UqIG1lZGlh U2xpZGVyVGh1bWIgPSBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoImNvcmVfbWVkaWFfaGFu ZGxlIikubGVha1JlZigpOwotCisgICAgaWYgKCFpc0VuYWJsZWQob2JqZWN0KSkKKyAgICAgICAg cmV0dXJuIHBhaW50TWVkaWFCdXR0b24ocGFpbnRJbmZvLmNvbnRleHQsIHJlY3QsIGRpc2FibGVk TWVkaWFTbGlkZXJUaHVtYik7CisgICAgaWYgKGlzUHJlc3NlZChvYmplY3QpIHx8IGlzSG92ZXJl ZChvYmplY3QpIHx8IGlzRm9jdXNlZChvYmplY3QpKQorICAgICAgICByZXR1cm4gcGFpbnRNZWRp YUJ1dHRvbihwYWludEluZm8uY29udGV4dCwgcmVjdCwgcHJlc3NlZE1lZGlhU2xpZGVyVGh1bWIp OwogICAgIHJldHVybiBwYWludE1lZGlhQnV0dG9uKHBhaW50SW5mby5jb250ZXh0LCByZWN0LCBt ZWRpYVNsaWRlclRodW1iKTsKICNlbmRpZiAvLyBVU0UoU0tJQSkKICNlbHNlCkBAIC0xMTEzLDEz ICsxMTE4LDI2IEBAIGJvb2wgUmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWludE1lZGlhVm9sdW1l U2xpZGVyVHJhY2soUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvCiAgICAgSW50UmVjdCByZWN0Mih4 LCB5LCB3LCBoKTsKICAgICBJbnRSZWN0IHZvbHVtZVJlY3QoeCwgeSwgY2VpbCh3ICogdm9sdW1l KSwgaCk7CiAKKyNpZiBVU0UoU0tJQSkKICAgICAvLyBUaGlzIGlzIHRvIHBhaW50IG1haW4gdm9s dW1lIHNsaWRlciBiYXIuCiAgICAgYm9vbCByZXN1bHQgPSBwYWludFNsaWRlclRyYWNrUmVjdChv YmplY3QsIHBhaW50SW5mbywgcmVjdDIsIENvbG9yKG1lZGlhU2xpZGVyVHJhY2tPdXRsaW5lKS5y Z2IoKSwgQ29sb3IobWVkaWFTbGlkZXJUcmFja091dGxpbmUpLnJnYigpLCByYW5nZVNsaWRlclJl Z3VsYXJUb3AsIHJhbmdlU2xpZGVyUmVndWxhclRvcCk7CiAKICAgICBpZiAodm9sdW1lID4gMCkg ewogICAgICAgICAvLyBUaGlzIGlzIHRvIHBhaW50IHZvbHVtZSBiYXIgKGxlZnQgb2Ygdm9sdW1l IHNsaWRlciB0aHVtYikgdXNpbmcgc2VsZWN0aW9uIGNvbG9yLgotICAgICAgICBwYWludFNsaWRl clRyYWNrUmVjdChvYmplY3QsIHBhaW50SW5mbywgdm9sdW1lUmVjdCwgQ29sb3IobWVkaWFTbGlk ZXJUcmFja091dGxpbmUpLnJnYigpLCBDb2xvcihtZWRpYVNsaWRlclRyYWNrT3V0bGluZSkucmdi KCksIHNlbGVjdGlvbiwgc2VsZWN0aW9uKTsKKyAgICAgICAgcmVzdWx0IHw9IHBhaW50U2xpZGVy VHJhY2tSZWN0KG9iamVjdCwgcGFpbnRJbmZvLCB2b2x1bWVSZWN0LCBDb2xvcihtZWRpYVNsaWRl clRyYWNrT3V0bGluZSkucmdiKCksIENvbG9yKG1lZGlhU2xpZGVyVHJhY2tPdXRsaW5lKS5yZ2Io KSwgc2VsZWN0aW9uLCBzZWxlY3Rpb24pOwogICAgIH0KKyNlbHNlIC8vIEdMIHJlbmRlcmVyCisg ICAgc3RhdGljIEltYWdlKiB2b2x1bWVCYWNrZ3JvdW5kID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJl c291cmNlKCJjb3JlX3NsaWRlcl92aWRlb19iZyIpLmxlYWtSZWYoKTsKKyAgICBzdGF0aWMgSW1h Z2UqIHZvbHVtZUJhciA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgiY29yZV9zbGlkZXJf cGxheWVkX2JnIikubGVha1JlZigpOworCisgICAgLy8gVGhpcyBpcyB0byBwYWludCBtYWluIHZv bHVtZSBzbGlkZXIgYmFyLgorICAgIGJvb2wgcmVzdWx0ID0gcGFpbnRTbGlkZXJUcmFja1JlY3Qo b2JqZWN0LCBwYWludEluZm8sIHJlY3QyLCB2b2x1bWVCYWNrZ3JvdW5kKTsKKworICAgIGlmICh2 b2x1bWUgPiAwKSB7CisgICAgICAgIC8vIFRoaXMgaXMgdG8gcGFpbnQgdm9sdW1lIGJhciAobGVm dCBvZiB2b2x1bWUgc2xpZGVyIHRodW1iKSB1c2luZyBzZWxlY3Rpb24gY29sb3IuCisgICAgICAg IHJlc3VsdCB8PSBwYWludFNsaWRlclRyYWNrUmVjdChvYmplY3QsIHBhaW50SW5mbywgdm9sdW1l UmVjdCwgdm9sdW1lQmFyKTsKKyAgICB9CisjZW5kaWYgLy8gVVNFKFNLSUEpCiAgICAgcmV0dXJu IHJlc3VsdDsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKG9iamVjdCk7Cg== 181176 2013-01-03 07:56:40 -0800 2013-01-03 09:33:46 -0800 Patch bug-105728-20130103105348.patch text/plain 6957 tijiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQyNDA1ZjY5YjQ1ZmJm MzQwOGY4YmU0ZWZjYmM3MzViMjJiMTI4NS4uOTQzMmUyZGUyOTFjM2M0YzQ4ZGFhNmMxMmQyOWMy Njk0Y2EzY2MyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTAxLTAyICBUaWFu Y2hlbmcgSmlhbmcgIDx0aWppYW5nQHJpbS5jb20+CisKKyAgICAgICAgVXBkYXRlIEJCMTAgbWVk aWEgcmVuZGVyIHRoZW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTA1NzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW50ZXJuYWxseSBSZXZpZXdlZCBieSBKb2huIEdyaWdncy4KKworICAgICAgICBV cGRhdGUgR0wgZnJpZW5kbHkgcmVuZGVyIG1ldGhvZCBmb3IgYXVkaW8gdm9sdW1lLgorICAgICAg ICBDaGFuZ2UgdGhlIGJhY2tncm91bmQgY29sb3IgZm9yIGVtYmVkZGVkIG1lZGlhIHBsYXllciB0 byBzZW1pLXRyYW5zcGFyZW50LgorICAgICAgICBDaGFuZ2UgcmVtYWluaW5nIHRpbWUgZm9udCBj b2xvciB0byBncmV5IHRvIG1hdGNoIGZ1bGwgc2NyZWVuIHZpZGVvLgorICAgICAgICBDaGFuZ2Ug bWVkaWEgc2xpZGVyIHRodW1iIGNvbG9yIHRvIGJsdWUgd2hlbiBwcmVzc2VkLgorCisgICAgICAg ICogY3NzL21lZGlhQ29udHJvbHNCbGFja0JlcnJ5LmNzczoKKyAgICAgICAgKGF1ZGlvKToKKyAg ICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWVtYmVkZGVkLXBhbmVsLCB2aWRl bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1lbWJlZGRlZC1wYW5lbCk6CisgICAgICAgICh2aWRl bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLWRpc3BsYXktY29udGFpbmVyLCBhdWRpbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLWRpc3BsYXktY29udGFpbmVyKToKKyAgICAgICAg KHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWVsaW5lLWNvbnRhaW5lciwgYXVkaW86 Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZWxpbmUtY29udGFpbmVyKToKKyAgICAgICAgKGF1 ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJlbnQtdGltZS1kaXNwbGF5LCB2aWRlbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy1jdXJyZW50LXRpbWUtZGlzcGxheSk6CisgICAgICAgICh2 aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLXJlbWFpbmluZy1kaXNwbGF5LCBhdWRp bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLXJlbWFpbmluZy1kaXNwbGF5KToKKyAgICAg ICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXItY29udGFpbmVy KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50TWVkaWFT bGlkZXJUaHVtYik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBh aW50TWVkaWFWb2x1bWVTbGlkZXJUcmFjayk6CisKIDIwMTMtMDEtMDMgIE1pa2UgV2VzdCAgPG1r d3N0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBUaGUgJ2JvZHknIG9mIHNlYW1sZXNzIElGcmFt ZXMgc2hvdWxkIGRlZmF1bHQgdG8gJ21hcmdpbjogMCcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9tZWRpYUNvbnRyb2xzQmxhY2tCZXJyeS5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv bWVkaWFDb250cm9sc0JsYWNrQmVycnkuY3NzCmluZGV4IDZhODQxNmE3NTZmMTMzMDJiNmIwZWI1 YWM1ZTJmOWNlMzRlYjE1ZjQuLjhlMjE2Nzg1MTgwMDg1MzkwZWMwZTEzMDg3ZjM5NDNjMzU5MzYw NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tZWRpYUNvbnRyb2xzQmxhY2tCZXJy eS5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL21lZGlhQ29udHJvbHNCbGFja0JlcnJ5LmNz cwpAQCAtMjgsNyArMjgsNyBAQAogIC8qIEJsYWNrQmVycnkgZGVmYXVsdCBtZWRpYSBjb250cm9s cy4gKi8KIAogYXVkaW8gewotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigwLCAwLCAwKTsKKyAg ICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDM4LCAzOCwgMzgsIDAuOCk7CiAgICAgd2lkdGg6IDMw MHB4OwogICAgIGhlaWdodDogMzJweDsKIH0KQEAgLTQxLDcgKzQxLDcgQEAgYXVkaW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtZW1iZWRkZWQtcGFuZWwsIHZpZGVvOjotd2Via2l0LW1lZGlhLWNv bnRyb2xzLWVtYmUKICAgICBib3R0b206IDA7CiAgICAgd2lkdGg6IDEwMCU7CiAgICAgaGVpZ2h0 OiBhdXRvOwotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigwLCAwLCAwKTsKKyAgICBiYWNrZ3Jv dW5kLWNvbG9yOiByZ2JhKDM4LCAzOCwgMzgsIDAuOCk7CiB9CiAKIGF1ZGlvOjotd2Via2l0LW1l ZGlhLWNvbnRyb2xzLXBhbmVsLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCB7 CkBAIC02Myw3ICs2Myw2IEBAIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWUtZGlz cGxheS1jb250YWluZXIsIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyCiAgICAgLXdlYmtpdC1i b3gtYWxpZ246IGNlbnRlcjsKICAgICAtd2Via2l0LWJveC1wYWNrOiBqdXN0aWZ5OwogICAgIC13 ZWJraXQtYm94LWZsZXg6IDE7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDAsIDAsIDApOwog fQogCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1mdWxsc2NyZWVuLXBsYXktYnV0dG9u LCBhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1mdWxsc2NyZWVuLXBsYXktYnV0dG9uIHsK QEAgLTg4LDcgKzg3LDYgQEAgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZWxpbmUt Y29udGFpbmVyLCBhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy0KICAgICAtd2Via2l0LWJv eC1mbGV4OiAxOwogICAgIGhlaWdodDogYXV0bzsKICAgICB3aWR0aDogMTAwJTsKLSAgICBiYWNr Z3JvdW5kLWNvbG9yOiByZ2IoMCwgMCwgMCk7CiB9CiAKIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNv bnRyb2xzLWZ1bGxzY3JlZW4tY3VycmVudC10aW1lLWRpc3BsYXksIHZpZGVvOjotd2Via2l0LW1l ZGlhLWNvbnRyb2xzLWZ1bGxzY3JlZW4tY3VycmVudC10aW1lLWRpc3BsYXkgewpAQCAtMTAyLDcg KzEwMCw2IEBAIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJlbnQtdGltZS1kaXNw bGF5LCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9sCiAgICAgLXdlYmtpdC1ib3gtYWxpZ246 IGNlbnRlcjsKICAgICAtd2Via2l0LWJveC1wYWNrOiBlbmQ7CiAgICAgLXdlYmtpdC1ib3gtZmxl eDogMDsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMCwgMCwgMCk7CiAgICAgY29sb3I6ICNm YWZhZmE7CiB9CiAKQEAgLTExNyw4ICsxMTQsNyBAQCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy10aW1lLXJlbWFpbmluZy1kaXNwbGF5LCBhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cgog ICAgIC13ZWJraXQtYm94LWFsaWduOiBjZW50ZXI7CiAgICAgLXdlYmtpdC1ib3gtcGFjazogZW5k OwogICAgIC13ZWJraXQtYm94LWZsZXg6IDA7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDAs IDAsIDApOwotICAgIGNvbG9yOiAjZmFmYWZhOworICAgIGNvbG9yOiByZ2IoMTI1LCAxMjUsIDEy NSk7CiB9CiAKIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWZ1bGxzY3JlZW4tdGltZWxp bmUsIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWZ1bGxzY3JlZW4tdGltZWxpbmUgewpA QCAtMTY1LDcgKzE2MSw3IEBAIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1z bGlkZXItY29udGFpbmVyIHsKICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CiAgICAgbGVmdDogMHB4 OwogICAgIHJpZ2h0OiAwcHg7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDAsMCwwKTsKKyAg ICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDM4LCAzOCwgMzgsIDAuOCk7CiB9CiAKIHZpZGVvOjot d2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXItY29udGFpbmVyIHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhlbWVCbGFja0Jl cnJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhlbWVC bGFja0JlcnJ5LmNwcAppbmRleCA4OWI0NDA3YmIyN2ZmYzRiNzk3MGUwOTk5OGRjMjk4YzZmNjEz MDVkLi5mMDVkYTAyM2FmZDNhYzEwYTIzZWQ5YzAyYjkxNWQ0OTUwZTRiMTVlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJy eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVt ZUJsYWNrQmVycnkuY3BwCkBAIC0xMDgzLDggKzEwODMsMTQgQEAgYm9vbCBSZW5kZXJUaGVtZUJs YWNrQmVycnk6OnBhaW50TWVkaWFTbGlkZXJUaHVtYihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29u c3QgUGEKIAogICAgIHJldHVybiB0cnVlOwogI2Vsc2UgLy8gR0wgcmVuZGVyZXIKKyAgICBzdGF0 aWMgSW1hZ2UqIGRpc2FibGVkTWVkaWFTbGlkZXJUaHVtYiA9IEltYWdlOjpsb2FkUGxhdGZvcm1S ZXNvdXJjZSgiY29yZV9zbGlkZXJfaGFuZGxlX2Rpc2FibGVkIikubGVha1JlZigpOworICAgIHN0 YXRpYyBJbWFnZSogcHJlc3NlZE1lZGlhU2xpZGVyVGh1bWIgPSBJbWFnZTo6bG9hZFBsYXRmb3Jt UmVzb3VyY2UoImNvcmVfc2xpZGVyX2hhbmRsZV9wcmVzc2VkIikubGVha1JlZigpOwogICAgIHN0 YXRpYyBJbWFnZSogbWVkaWFTbGlkZXJUaHVtYiA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJj ZSgiY29yZV9tZWRpYV9oYW5kbGUiKS5sZWFrUmVmKCk7CiAKKyAgICBpZiAoIWlzRW5hYmxlZChv YmplY3QpKQorICAgICAgICByZXR1cm4gcGFpbnRNZWRpYUJ1dHRvbihwYWludEluZm8uY29udGV4 dCwgcmVjdCwgZGlzYWJsZWRNZWRpYVNsaWRlclRodW1iKTsKKyAgICBpZiAoaXNQcmVzc2VkKG9i amVjdCkgfHwgaXNIb3ZlcmVkKG9iamVjdCkgfHwgaXNGb2N1c2VkKG9iamVjdCkpCisgICAgICAg IHJldHVybiBwYWludE1lZGlhQnV0dG9uKHBhaW50SW5mby5jb250ZXh0LCByZWN0LCBwcmVzc2Vk TWVkaWFTbGlkZXJUaHVtYik7CiAgICAgcmV0dXJuIHBhaW50TWVkaWFCdXR0b24ocGFpbnRJbmZv LmNvbnRleHQsIHJlY3QsIG1lZGlhU2xpZGVyVGh1bWIpOwogI2VuZGlmIC8vIFVTRShTS0lBKQog I2Vsc2UKQEAgLTExMTMsMTMgKzExMTksMjYgQEAgYm9vbCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6 OnBhaW50TWVkaWFWb2x1bWVTbGlkZXJUcmFjayhSZW5kZXJPYmplY3QqIG9iamVjdCwgY28KICAg ICBJbnRSZWN0IHJlY3QyKHgsIHksIHcsIGgpOwogICAgIEludFJlY3Qgdm9sdW1lUmVjdCh4LCB5 LCBjZWlsKHcgKiB2b2x1bWUpLCBoKTsKIAorI2lmIFVTRShTS0lBKQogICAgIC8vIFRoaXMgaXMg dG8gcGFpbnQgbWFpbiB2b2x1bWUgc2xpZGVyIGJhci4KICAgICBib29sIHJlc3VsdCA9IHBhaW50 U2xpZGVyVHJhY2tSZWN0KG9iamVjdCwgcGFpbnRJbmZvLCByZWN0MiwgQ29sb3IobWVkaWFTbGlk ZXJUcmFja091dGxpbmUpLnJnYigpLCBDb2xvcihtZWRpYVNsaWRlclRyYWNrT3V0bGluZSkucmdi KCksIHJhbmdlU2xpZGVyUmVndWxhclRvcCwgcmFuZ2VTbGlkZXJSZWd1bGFyVG9wKTsKIAogICAg IGlmICh2b2x1bWUgPiAwKSB7CiAgICAgICAgIC8vIFRoaXMgaXMgdG8gcGFpbnQgdm9sdW1lIGJh ciAobGVmdCBvZiB2b2x1bWUgc2xpZGVyIHRodW1iKSB1c2luZyBzZWxlY3Rpb24gY29sb3IuCi0g ICAgICAgIHBhaW50U2xpZGVyVHJhY2tSZWN0KG9iamVjdCwgcGFpbnRJbmZvLCB2b2x1bWVSZWN0 LCBDb2xvcihtZWRpYVNsaWRlclRyYWNrT3V0bGluZSkucmdiKCksIENvbG9yKG1lZGlhU2xpZGVy VHJhY2tPdXRsaW5lKS5yZ2IoKSwgc2VsZWN0aW9uLCBzZWxlY3Rpb24pOworICAgICAgICByZXN1 bHQgfD0gcGFpbnRTbGlkZXJUcmFja1JlY3Qob2JqZWN0LCBwYWludEluZm8sIHZvbHVtZVJlY3Qs IENvbG9yKG1lZGlhU2xpZGVyVHJhY2tPdXRsaW5lKS5yZ2IoKSwgQ29sb3IobWVkaWFTbGlkZXJU cmFja091dGxpbmUpLnJnYigpLCBzZWxlY3Rpb24sIHNlbGVjdGlvbik7CisgICAgfQorI2Vsc2Ug Ly8gR0wgcmVuZGVyZXIKKyAgICBzdGF0aWMgSW1hZ2UqIHZvbHVtZUJhY2tncm91bmQgPSBJbWFn ZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoImNvcmVfc2xpZGVyX3ZpZGVvX2JnIikubGVha1JlZigp OworICAgIHN0YXRpYyBJbWFnZSogdm9sdW1lQmFyID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291 cmNlKCJjb3JlX3NsaWRlcl9wbGF5ZWRfYmciKS5sZWFrUmVmKCk7CisKKyAgICAvLyBUaGlzIGlz IHRvIHBhaW50IG1haW4gdm9sdW1lIHNsaWRlciBiYXIuCisgICAgYm9vbCByZXN1bHQgPSBwYWlu dFNsaWRlclRyYWNrUmVjdChvYmplY3QsIHBhaW50SW5mbywgcmVjdDIsIHZvbHVtZUJhY2tncm91 bmQpOworCisgICAgaWYgKHZvbHVtZSA+IDApIHsKKyAgICAgICAgLy8gVGhpcyBpcyB0byBwYWlu dCB2b2x1bWUgYmFyIChsZWZ0IG9mIHZvbHVtZSBzbGlkZXIgdGh1bWIpIHVzaW5nIHNlbGVjdGlv biBjb2xvci4KKyAgICAgICAgcmVzdWx0IHw9IHBhaW50U2xpZGVyVHJhY2tSZWN0KG9iamVjdCwg cGFpbnRJbmZvLCB2b2x1bWVSZWN0LCB2b2x1bWVCYXIpOwogICAgIH0KKyNlbmRpZiAvLyBVU0Uo U0tJQSkKICAgICByZXR1cm4gcmVzdWx0OwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0ob2JqZWN0 KTsK