147797 2015-08-07 15:56:49 -0700 Media Session: generalize isFocusedContentMediaElementPlaying so it works with other playback attributes 2015-08-10 12:19:37 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 145411 1 mrajca webkit-unassigned conrad_shultz eric.carlson mrajca webkit-bug-importer oldest_to_newest 1115909 0 mrajca 2015-08-07 15:56:49 -0700 Media Session Focus manager's 'isFocusedContentMediaElementPlaying' method will be refactored to a more general 'valueForPlaybackAttribute' so it works with other attributes (IsNextTrackControlEnabled and IsPreviousTrackControlEnabled). 1115910 1 258538 mrajca 2015-08-07 15:58:55 -0700 Created attachment 258538 Patch 1116235 2 258538 mrajca 2015-08-10 10:30:02 -0700 Comment on attachment 258538 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258538&action=review > Source/WebKit2/UIProcess/WebMediaSessionFocusManager.h:35 > +#include <WebCore/MediaRemoteControls.h> I removed this include after sending out the patch since we don't need it here. 1116244 3 258538 simon.fraser 2015-08-10 10:50:38 -0700 Comment on attachment 258538 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258538&action=review > Source/WebKit2/UIProcess/WebMediaSessionFocusManager.h:66 > + HashMap<WKMediaSessionFocusManagerPlaybackAttribute, bool> m_playbackAttributes; Using a HashMap here is overkill, especially since you could put WKMediaSessionFocusManagerPlaybackAttribute into a bit mask. 1116249 4 258625 mrajca 2015-08-10 11:00:22 -0700 Created attachment 258625 Patch 1116250 5 mrajca 2015-08-10 11:00:46 -0700 (In reply to comment #3) > Comment on attachment 258538 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=258538&action=review > > > Source/WebKit2/UIProcess/WebMediaSessionFocusManager.h:66 > > + HashMap<WKMediaSessionFocusManagerPlaybackAttribute, bool> m_playbackAttributes; > > Using a HashMap here is overkill, especially since you could put > WKMediaSessionFocusManagerPlaybackAttribute into a bit mask. Switched over! 1116257 6 258625 simon.fraser 2015-08-10 11:13:37 -0700 Comment on attachment 258625 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258625&action=review > Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.h:44 > enum { > - IsPlaying = 1 << 0 > + IsPlaying = 1 << 0, > + IsPreviousTrackControlEnabled = 1 << 1, > + IsNextTrackControlEnabled = 1 << 2, > }; > typedef uint32_t WKMediaSessionFocusManagerPlaybackAttribute; This should be enum WKMediaSessionFocusManagerPlaybackAttribute { ... } typedef uint32_t WKMediaSessionFocusManagerPlaybackAttributes; > Source/WebKit2/UIProcess/WebMediaSessionFocusManager.h:65 > + WKMediaSessionFocusManagerPlaybackAttribute m_playbackAttributes { 0 }; WKMediaSessionFocusManagerPlaybackAttributes 1116267 7 258630 mrajca 2015-08-10 11:55:01 -0700 Created attachment 258630 Patch 1116268 8 mrajca 2015-08-10 11:57:50 -0700 (In reply to comment #6) > Comment on attachment 258625 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=258625&action=review > > > Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.h:44 > > enum { > > - IsPlaying = 1 << 0 > > + IsPlaying = 1 << 0, > > + IsPreviousTrackControlEnabled = 1 << 1, > > + IsNextTrackControlEnabled = 1 << 2, > > }; > > typedef uint32_t WKMediaSessionFocusManagerPlaybackAttribute; > > This should be enum WKMediaSessionFocusManagerPlaybackAttribute { ... } > typedef uint32_t WKMediaSessionFocusManagerPlaybackAttributes; > > > Source/WebKit2/UIProcess/WebMediaSessionFocusManager.h:65 > > + WKMediaSessionFocusManagerPlaybackAttribute m_playbackAttributes { 0 }; > > WKMediaSessionFocusManagerPlaybackAttributes Fixed. 1116272 9 258630 simon.fraser 2015-08-10 11:59:04 -0700 Comment on attachment 258630 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258630&action=review > Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.h:65 > +WK_EXPORT bool WKMediaSessionFocusManagerValueForPlaybackAttribute(WKMediaSessionFocusManagerRef manager, WKMediaSessionFocusManagerPlaybackAttribute attribute); No need to name the parameters here. 1116275 10 258633 mrajca 2015-08-10 12:05:42 -0700 Created attachment 258633 Patch 1116283 11 mrajca 2015-08-10 12:19:37 -0700 Committed r188218: <http://trac.webkit.org/changeset/188218> 258538 2015-08-07 15:58:55 -0700 2015-08-10 11:00:17 -0700 Patch bug-147797-20150807155844.patch text/plain 6151 mrajca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4MDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2Y2ZGZhOTg4MDdlYTFh ZmIzYjhkOTRlNTM3MmQ5NjM2MDE0OGU5ZS4uMGEyZmE1MmZkMWI5NjBhMTc4MTNhYjc2YzBlMzA1 YTVkNmIzYTBkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA4LTA3ICBNYXR0 IFJhamNhICA8bXJhamNhQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYSBTZXNzaW9uOiBnZW5l cmFsaXplIGlzRm9jdXNlZENvbnRlbnRNZWRpYUVsZW1lbnRQbGF5aW5nIHNvIGl0IHdvcmtzIHdp dGggb3RoZXIgcGxheWJhY2sgYXR0cmlidXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3Nzk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25Gb2N1 c01hbmFnZXIuY3BwOgorICAgICAgICAoV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJWYWx1ZUZv clBsYXliYWNrQXR0cmlidXRlKToKKyAgICAgICAgKFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2Vy SXNGb2N1c2VkQ29udGVudE1lZGlhRWxlbWVudFBsYXlpbmcpOiBEZWxldGVkLgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQy9XS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXI6OnZhbHVlRm9yUGxheWJhY2tBdHRyaWJ1 dGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXI6Om1lZGlh Q29udHJvbElzRW5hYmxlZERpZENoYW5nZSk6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhU2Vz c2lvbkZvY3VzTWFuYWdlcjo6aXNGb2N1c2VkQ29udGVudE1lZGlhRWxlbWVudFBsYXlpbmcpOiBE ZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXI6Om1l ZGlhRWxlbWVudElzUGxheWluZ0RpZENoYW5nZSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9j ZXNzL1dlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5oOgorCiAyMDE1LTA4LTA2ICBNYXR0IFJh amNhICA8bXJhamNhQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYSBTZXNzaW9uOiBub3RpZnkg Zm9jdXMgbWFuYWdlciBjbGllbnRzIHdoZW4gdGhlIHBsYXlpbmcgc3RhdGUgb2YgdGhlIGZvY3Vz ZWQgbWVkaWEgZWxlbWVudCBjaGFuZ2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmNwcAppbmRleCA1 OGRlNDEwMWMwYjI5MDcyYjIwMjEwNDljMWQyM2FhMWQ5Y2EyN2RlLi5kMmU5ZTc1ODgwYzZhYjg2 MjI0MzlkY2NmY2Q4ZDA3MzA0ZGI1NDRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5jcHAKQEAg LTUwLDEyICs1MCwxMyBAQCB2b2lkIFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyU2V0Q2xpZW50 KFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyUmVmIG1hbmFnZXIsCiAjZW5kaWYKIH0KIAotYm9v bCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlcklzRm9jdXNlZENvbnRlbnRNZWRpYUVsZW1lbnRQ bGF5aW5nKFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyUmVmIG1hbmFnZXIpCitib29sIFdLTWVk aWFTZXNzaW9uRm9jdXNNYW5hZ2VyVmFsdWVGb3JQbGF5YmFja0F0dHJpYnV0ZShXS01lZGlhU2Vz c2lvbkZvY3VzTWFuYWdlclJlZiBtYW5hZ2VyLCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclBs YXliYWNrQXR0cmlidXRlIGF0dHJpYnV0ZSkKIHsKICNpZiBFTkFCTEUoTUVESUFfU0VTU0lPTikK LSAgICByZXR1cm4gdG9JbXBsKG1hbmFnZXIpLT5pc0ZvY3VzZWRDb250ZW50TWVkaWFFbGVtZW50 UGxheWluZygpOworICAgIHJldHVybiB0b0ltcGwobWFuYWdlciktPnZhbHVlRm9yUGxheWJhY2tB dHRyaWJ1dGUoYXR0cmlidXRlKTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKG1hbmFnZXIpOwor ICAgIFVOVVNFRF9QQVJBTShhdHRyaWJ1dGUpOwogICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLTWVkaWFTZXNz aW9uRm9jdXNNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tNZWRp YVNlc3Npb25Gb2N1c01hbmFnZXIuaAppbmRleCA3N2QwOTIwZDI5YzU3NDNmYmFlMGYyZDM4ZmE1 YmJmMDMwZjAwMGE3Li5lYTY3Y2IyM2E5YTlkMjQ2NTk4MjNhNTY4N2NiMjY0ODU5ODJjMjNmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25G b2N1c01hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tNZWRp YVNlc3Npb25Gb2N1c01hbmFnZXIuaApAQCAtMzcsNyArMzcsOSBAQCBleHRlcm4gIkMiIHsKICNl bmRpZgogCiBlbnVtIHsKLSAgICBJc1BsYXlpbmcgPSAxIDw8IDAKKyAgICBJc1BsYXlpbmcgICAg ICAgICAgICAgICAgICAgICA9IDEgPDwgMCwKKyAgICBJc1ByZXZpb3VzVHJhY2tDb250cm9sRW5h YmxlZCA9IDEgPDwgMSwKKyAgICBJc05leHRUcmFja0NvbnRyb2xFbmFibGVkICAgICA9IDEgPDwg MiwKIH07CiB0eXBlZGVmIHVpbnQzMl90IFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyUGxheWJh Y2tBdHRyaWJ1dGU7CiAKQEAgLTYwLDcgKzYyLDcgQEAgV0tfRVhQT1JUIFdLVHlwZUlEIFdLTWVk aWFTZXNzaW9uRm9jdXNNYW5hZ2VyR2V0VHlwZUlEKCk7CiAKIFdLX0VYUE9SVCB2b2lkIFdLTWVk aWFTZXNzaW9uRm9jdXNNYW5hZ2VyU2V0Q2xpZW50KFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2Vy UmVmIG1hbmFnZXIsIGNvbnN0IFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyQ2xpZW50QmFzZSog Y2xpZW50KTsKIAotV0tfRVhQT1JUIGJvb2wgV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJJc0Zv Y3VzZWRDb250ZW50TWVkaWFFbGVtZW50UGxheWluZyhXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdl clJlZiBtYW5hZ2VyKTsKK1dLX0VYUE9SVCBib29sIFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2Vy VmFsdWVGb3JQbGF5YmFja0F0dHJpYnV0ZShXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclJlZiBt YW5hZ2VyLCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclBsYXliYWNrQXR0cmlidXRlIGF0dHJp YnV0ZSk7CiAKICNpZmRlZiBfX2NwbHVzcGx1cwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmNwcAppbmRleCAxZDgw ZTJkNzZmZmQwMTI4ZTRhY2FhYWJjNjEzMjJiMTE3NjlhOTVmLi42MTBlNDg3OTE5N2RlNWQ5Njg1 ODBjY2Y2MTJlODZmMTM1NDQ3MmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmNwcApAQCAtNjIsMTkgKzYyLDE5 IEBAIHZvaWQgV2ViTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyOjppbml0aWFsaXplQ2xpZW50KGNv bnN0IFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hCiAgICAgbV9jbGllbnQuaW5pdGlhbGl6ZShjbGll bnQpOwogfQogCi1ib29sIFdlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlcjo6aXNGb2N1c2VkQ29u dGVudE1lZGlhRWxlbWVudFBsYXlpbmcoKSBjb25zdAorYm9vbCBXZWJNZWRpYVNlc3Npb25Gb2N1 c01hbmFnZXI6OnZhbHVlRm9yUGxheWJhY2tBdHRyaWJ1dGUoV0tNZWRpYVNlc3Npb25Gb2N1c01h bmFnZXJQbGF5YmFja0F0dHJpYnV0ZSBhdHRyaWJ1dGUpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2Zv Y3VzZWRNZWRpYUVsZW1lbnQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHJldHVybiBt X2ZvY3VzZWRNZWRpYUVsZW1lbnRJc1BsYXlpbmc7CisgICAgcmV0dXJuIG1fcGxheWJhY2tBdHRy aWJ1dGVzLmdldChhdHRyaWJ1dGUpOwogfQogCiB2b2lkIFdlYk1lZGlhU2Vzc2lvbkZvY3VzTWFu YWdlcjo6bWVkaWFFbGVtZW50SXNQbGF5aW5nRGlkQ2hhbmdlKFdlYlBhZ2VQcm94eSogcHJveHks IHVpbnQ2NF90IGVsZW1lbnRJRCwgYm9vbCBpc1BsYXlpbmcpCiB7CiAgICAgaWYgKG1fZm9jdXNl ZE1lZGlhRWxlbWVudCkgewogICAgICAgICBpZiAocHJveHkgPT0gbV9mb2N1c2VkTWVkaWFFbGVt ZW50LT5maXJzdCAmJiBlbGVtZW50SUQgPT0gbV9mb2N1c2VkTWVkaWFFbGVtZW50LT5zZWNvbmQp IHsKLSAgICAgICAgICAgIG1fZm9jdXNlZE1lZGlhRWxlbWVudElzUGxheWluZyA9IGlzUGxheWlu ZzsKKyAgICAgICAgICAgIG1fcGxheWJhY2tBdHRyaWJ1dGVzLnNldChJc1BsYXlpbmcsIGlzUGxh eWluZyk7CiAgICAgICAgICAgICBtX2NsaWVudC5kaWRDaGFuZ2VQbGF5YmFja0F0dHJpYnV0ZSh0 aGlzLCBJc1BsYXlpbmcsIGlzUGxheWluZyk7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmgK aW5kZXggZWNmNTI0OTYzNTE4ZjQ3ZWNiZjA1MTA3YzcwYTBkMGM3NmUzYWUwMy4uZTMyN2JiMDYz MjExNDRiZTdmZWJiMWY1MTcxOWEyZTU5ZWEzMjg3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuaApAQCAtMzIsNiAr MzIsNyBAQAogI2luY2x1ZGUgIldlYkNvbnRleHRTdXBwbGVtZW50LmgiCiAjaW5jbHVkZSAiV2Vi TWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyQ2xpZW50LmgiCiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5 LmgiCisjaW5jbHVkZSA8V2ViQ29yZS9NZWRpYVJlbW90ZUNvbnRyb2xzLmg+CiAKIG5hbWVzcGFj ZSBXZWJLaXQgewogCkBAIC00NSw3ICs0Niw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgaW5pdGlh bGl6ZUNsaWVudChjb25zdCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlckNsaWVudEJhc2UqKTsK IAotICAgIGJvb2wgaXNGb2N1c2VkQ29udGVudE1lZGlhRWxlbWVudFBsYXlpbmcoKSBjb25zdDsK KyAgICBib29sIHZhbHVlRm9yUGxheWJhY2tBdHRyaWJ1dGUoV0tNZWRpYVNlc3Npb25Gb2N1c01h bmFnZXJQbGF5YmFja0F0dHJpYnV0ZSkgY29uc3Q7CiAgICAgdm9pZCBtZWRpYUVsZW1lbnRJc1Bs YXlpbmdEaWRDaGFuZ2UoV2ViUGFnZVByb3h5KiwgdWludDY0X3QsIGJvb2wpOwogCiAgICAgdm9p ZCBzZXRGb2N1c2VkTWVkaWFFbGVtZW50KFdlYlBhZ2VQcm94eSYsIHVpbnQ2NF90KTsKQEAgLTYy LDcgKzYzLDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgZGVyZWZXZWJDb250ZXh0U3Vw cGxlbWVudCgpIG92ZXJyaWRlOwogCiAgICAgc3RkOjp1bmlxdWVfcHRyPEZvY3VzZWRNZWRpYUVs ZW1lbnQ+IG1fZm9jdXNlZE1lZGlhRWxlbWVudDsKLSAgICBib29sIG1fZm9jdXNlZE1lZGlhRWxl bWVudElzUGxheWluZyB7IGZhbHNlIH07CisgICAgSGFzaE1hcDxXS01lZGlhU2Vzc2lvbkZvY3Vz TWFuYWdlclBsYXliYWNrQXR0cmlidXRlLCBib29sPiBtX3BsYXliYWNrQXR0cmlidXRlczsKICAg ICBXZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJDbGllbnQgbV9jbGllbnQ7CiB9OwogCg== 258625 2015-08-10 11:00:22 -0700 2015-08-10 11:54:58 -0700 Patch bug-147797-20150810110008.patch text/plain 6037 mrajca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4MDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2Y2ZGZhOTg4MDdlYTFh ZmIzYjhkOTRlNTM3MmQ5NjM2MDE0OGU5ZS4uMGEyZmE1MmZkMWI5NjBhMTc4MTNhYjc2YzBlMzA1 YTVkNmIzYTBkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA4LTA3ICBNYXR0 IFJhamNhICA8bXJhamNhQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYSBTZXNzaW9uOiBnZW5l cmFsaXplIGlzRm9jdXNlZENvbnRlbnRNZWRpYUVsZW1lbnRQbGF5aW5nIHNvIGl0IHdvcmtzIHdp dGggb3RoZXIgcGxheWJhY2sgYXR0cmlidXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3Nzk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25Gb2N1 c01hbmFnZXIuY3BwOgorICAgICAgICAoV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJWYWx1ZUZv clBsYXliYWNrQXR0cmlidXRlKToKKyAgICAgICAgKFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2Vy SXNGb2N1c2VkQ29udGVudE1lZGlhRWxlbWVudFBsYXlpbmcpOiBEZWxldGVkLgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQy9XS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXI6OnZhbHVlRm9yUGxheWJhY2tBdHRyaWJ1 dGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXI6Om1lZGlh Q29udHJvbElzRW5hYmxlZERpZENoYW5nZSk6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhU2Vz c2lvbkZvY3VzTWFuYWdlcjo6aXNGb2N1c2VkQ29udGVudE1lZGlhRWxlbWVudFBsYXlpbmcpOiBE ZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXI6Om1l ZGlhRWxlbWVudElzUGxheWluZ0RpZENoYW5nZSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9j ZXNzL1dlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5oOgorCiAyMDE1LTA4LTA2ICBNYXR0IFJh amNhICA8bXJhamNhQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYSBTZXNzaW9uOiBub3RpZnkg Zm9jdXMgbWFuYWdlciBjbGllbnRzIHdoZW4gdGhlIHBsYXlpbmcgc3RhdGUgb2YgdGhlIGZvY3Vz ZWQgbWVkaWEgZWxlbWVudCBjaGFuZ2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmNwcAppbmRleCA1 OGRlNDEwMWMwYjI5MDcyYjIwMjEwNDljMWQyM2FhMWQ5Y2EyN2RlLi5kMmU5ZTc1ODgwYzZhYjg2 MjI0MzlkY2NmY2Q4ZDA3MzA0ZGI1NDRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5jcHAKQEAg LTUwLDEyICs1MCwxMyBAQCB2b2lkIFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyU2V0Q2xpZW50 KFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyUmVmIG1hbmFnZXIsCiAjZW5kaWYKIH0KIAotYm9v bCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlcklzRm9jdXNlZENvbnRlbnRNZWRpYUVsZW1lbnRQ bGF5aW5nKFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyUmVmIG1hbmFnZXIpCitib29sIFdLTWVk aWFTZXNzaW9uRm9jdXNNYW5hZ2VyVmFsdWVGb3JQbGF5YmFja0F0dHJpYnV0ZShXS01lZGlhU2Vz c2lvbkZvY3VzTWFuYWdlclJlZiBtYW5hZ2VyLCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclBs YXliYWNrQXR0cmlidXRlIGF0dHJpYnV0ZSkKIHsKICNpZiBFTkFCTEUoTUVESUFfU0VTU0lPTikK LSAgICByZXR1cm4gdG9JbXBsKG1hbmFnZXIpLT5pc0ZvY3VzZWRDb250ZW50TWVkaWFFbGVtZW50 UGxheWluZygpOworICAgIHJldHVybiB0b0ltcGwobWFuYWdlciktPnZhbHVlRm9yUGxheWJhY2tB dHRyaWJ1dGUoYXR0cmlidXRlKTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKG1hbmFnZXIpOwor ICAgIFVOVVNFRF9QQVJBTShhdHRyaWJ1dGUpOwogICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLTWVkaWFTZXNz aW9uRm9jdXNNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tNZWRp YVNlc3Npb25Gb2N1c01hbmFnZXIuaAppbmRleCA3N2QwOTIwZDI5YzU3NDNmYmFlMGYyZDM4ZmE1 YmJmMDMwZjAwMGE3Li5lYTY3Y2IyM2E5YTlkMjQ2NTk4MjNhNTY4N2NiMjY0ODU5ODJjMjNmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25G b2N1c01hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tNZWRp YVNlc3Npb25Gb2N1c01hbmFnZXIuaApAQCAtMzcsNyArMzcsOSBAQCBleHRlcm4gIkMiIHsKICNl bmRpZgogCiBlbnVtIHsKLSAgICBJc1BsYXlpbmcgPSAxIDw8IDAKKyAgICBJc1BsYXlpbmcgICAg ICAgICAgICAgICAgICAgICA9IDEgPDwgMCwKKyAgICBJc1ByZXZpb3VzVHJhY2tDb250cm9sRW5h YmxlZCA9IDEgPDwgMSwKKyAgICBJc05leHRUcmFja0NvbnRyb2xFbmFibGVkICAgICA9IDEgPDwg MiwKIH07CiB0eXBlZGVmIHVpbnQzMl90IFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyUGxheWJh Y2tBdHRyaWJ1dGU7CiAKQEAgLTYwLDcgKzYyLDcgQEAgV0tfRVhQT1JUIFdLVHlwZUlEIFdLTWVk aWFTZXNzaW9uRm9jdXNNYW5hZ2VyR2V0VHlwZUlEKCk7CiAKIFdLX0VYUE9SVCB2b2lkIFdLTWVk aWFTZXNzaW9uRm9jdXNNYW5hZ2VyU2V0Q2xpZW50KFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2Vy UmVmIG1hbmFnZXIsIGNvbnN0IFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyQ2xpZW50QmFzZSog Y2xpZW50KTsKIAotV0tfRVhQT1JUIGJvb2wgV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJJc0Zv Y3VzZWRDb250ZW50TWVkaWFFbGVtZW50UGxheWluZyhXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdl clJlZiBtYW5hZ2VyKTsKK1dLX0VYUE9SVCBib29sIFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2Vy VmFsdWVGb3JQbGF5YmFja0F0dHJpYnV0ZShXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclJlZiBt YW5hZ2VyLCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclBsYXliYWNrQXR0cmlidXRlIGF0dHJp YnV0ZSk7CiAKICNpZmRlZiBfX2NwbHVzcGx1cwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmNwcAppbmRleCAxZDgw ZTJkNzZmZmQwMTI4ZTRhY2FhYWJjNjEzMjJiMTE3NjlhOTVmLi5kZGM0ODc1YjI0YmZlMzBkY2Zh NWU3YzIyOTQ1ZDNkZTU1N2I4MGMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmNwcApAQCAtNjIsMTkgKzYyLDIz IEBAIHZvaWQgV2ViTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyOjppbml0aWFsaXplQ2xpZW50KGNv bnN0IFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hCiAgICAgbV9jbGllbnQuaW5pdGlhbGl6ZShjbGll bnQpOwogfQogCi1ib29sIFdlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlcjo6aXNGb2N1c2VkQ29u dGVudE1lZGlhRWxlbWVudFBsYXlpbmcoKSBjb25zdAorYm9vbCBXZWJNZWRpYVNlc3Npb25Gb2N1 c01hbmFnZXI6OnZhbHVlRm9yUGxheWJhY2tBdHRyaWJ1dGUoV0tNZWRpYVNlc3Npb25Gb2N1c01h bmFnZXJQbGF5YmFja0F0dHJpYnV0ZSBhdHRyaWJ1dGUpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2Zv Y3VzZWRNZWRpYUVsZW1lbnQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHJldHVybiBt X2ZvY3VzZWRNZWRpYUVsZW1lbnRJc1BsYXlpbmc7CisgICAgcmV0dXJuIG1fcGxheWJhY2tBdHRy aWJ1dGVzICYgYXR0cmlidXRlOwogfQogCiB2b2lkIFdlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdl cjo6bWVkaWFFbGVtZW50SXNQbGF5aW5nRGlkQ2hhbmdlKFdlYlBhZ2VQcm94eSogcHJveHksIHVp bnQ2NF90IGVsZW1lbnRJRCwgYm9vbCBpc1BsYXlpbmcpCiB7CiAgICAgaWYgKG1fZm9jdXNlZE1l ZGlhRWxlbWVudCkgewogICAgICAgICBpZiAocHJveHkgPT0gbV9mb2N1c2VkTWVkaWFFbGVtZW50 LT5maXJzdCAmJiBlbGVtZW50SUQgPT0gbV9mb2N1c2VkTWVkaWFFbGVtZW50LT5zZWNvbmQpIHsK LSAgICAgICAgICAgIG1fZm9jdXNlZE1lZGlhRWxlbWVudElzUGxheWluZyA9IGlzUGxheWluZzsK KyAgICAgICAgICAgIGlmIChpc1BsYXlpbmcpCisgICAgICAgICAgICAgICAgbV9wbGF5YmFja0F0 dHJpYnV0ZXMgfD0gSXNQbGF5aW5nOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAg IG1fcGxheWJhY2tBdHRyaWJ1dGVzICY9IH5Jc1BsYXlpbmc7CisKICAgICAgICAgICAgIG1fY2xp ZW50LmRpZENoYW5nZVBsYXliYWNrQXR0cmlidXRlKHRoaXMsIElzUGxheWluZywgaXNQbGF5aW5n KTsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuaAppbmRleCBlY2Y1MjQ5NjM1MThmNDdlY2Jm MDUxMDdjNzBhMGQwYzc2ZTNhZTAzLi43NDEyYmVjNTI4MGRmOGMzNTRmNDA2OGJmOWUyM2I4NWYy NTU0ZGI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTWVkaWFTZXNz aW9uRm9jdXNNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYk1lZGlh U2Vzc2lvbkZvY3VzTWFuYWdlci5oCkBAIC00NSw3ICs0NSw3IEBAIHB1YmxpYzoKIAogICAgIHZv aWQgaW5pdGlhbGl6ZUNsaWVudChjb25zdCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlckNsaWVu dEJhc2UqKTsKIAotICAgIGJvb2wgaXNGb2N1c2VkQ29udGVudE1lZGlhRWxlbWVudFBsYXlpbmco KSBjb25zdDsKKyAgICBib29sIHZhbHVlRm9yUGxheWJhY2tBdHRyaWJ1dGUoV0tNZWRpYVNlc3Np b25Gb2N1c01hbmFnZXJQbGF5YmFja0F0dHJpYnV0ZSkgY29uc3Q7CiAgICAgdm9pZCBtZWRpYUVs ZW1lbnRJc1BsYXlpbmdEaWRDaGFuZ2UoV2ViUGFnZVByb3h5KiwgdWludDY0X3QsIGJvb2wpOwog CiAgICAgdm9pZCBzZXRGb2N1c2VkTWVkaWFFbGVtZW50KFdlYlBhZ2VQcm94eSYsIHVpbnQ2NF90 KTsKQEAgLTYyLDcgKzYyLDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgZGVyZWZXZWJD b250ZXh0U3VwcGxlbWVudCgpIG92ZXJyaWRlOwogCiAgICAgc3RkOjp1bmlxdWVfcHRyPEZvY3Vz ZWRNZWRpYUVsZW1lbnQ+IG1fZm9jdXNlZE1lZGlhRWxlbWVudDsKLSAgICBib29sIG1fZm9jdXNl ZE1lZGlhRWxlbWVudElzUGxheWluZyB7IGZhbHNlIH07CisgICAgV0tNZWRpYVNlc3Npb25Gb2N1 c01hbmFnZXJQbGF5YmFja0F0dHJpYnV0ZSBtX3BsYXliYWNrQXR0cmlidXRlcyB7IDAgfTsKICAg ICBXZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJDbGllbnQgbV9jbGllbnQ7CiB9OwogCg== 258630 2015-08-10 11:55:01 -0700 2015-08-10 12:05:38 -0700 Patch bug-147797-20150810115447.patch text/plain 6405 mrajca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4MDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2Y2ZGZhOTg4MDdlYTFh ZmIzYjhkOTRlNTM3MmQ5NjM2MDE0OGU5ZS4uMGEyZmE1MmZkMWI5NjBhMTc4MTNhYjc2YzBlMzA1 YTVkNmIzYTBkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA4LTA3ICBNYXR0 IFJhamNhICA8bXJhamNhQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYSBTZXNzaW9uOiBnZW5l cmFsaXplIGlzRm9jdXNlZENvbnRlbnRNZWRpYUVsZW1lbnRQbGF5aW5nIHNvIGl0IHdvcmtzIHdp dGggb3RoZXIgcGxheWJhY2sgYXR0cmlidXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3Nzk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25Gb2N1 c01hbmFnZXIuY3BwOgorICAgICAgICAoV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJWYWx1ZUZv clBsYXliYWNrQXR0cmlidXRlKToKKyAgICAgICAgKFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2Vy SXNGb2N1c2VkQ29udGVudE1lZGlhRWxlbWVudFBsYXlpbmcpOiBEZWxldGVkLgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQy9XS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXI6OnZhbHVlRm9yUGxheWJhY2tBdHRyaWJ1 dGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXI6Om1lZGlh Q29udHJvbElzRW5hYmxlZERpZENoYW5nZSk6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhU2Vz c2lvbkZvY3VzTWFuYWdlcjo6aXNGb2N1c2VkQ29udGVudE1lZGlhRWxlbWVudFBsYXlpbmcpOiBE ZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXI6Om1l ZGlhRWxlbWVudElzUGxheWluZ0RpZENoYW5nZSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9j ZXNzL1dlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5oOgorCiAyMDE1LTA4LTA2ICBNYXR0IFJh amNhICA8bXJhamNhQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYSBTZXNzaW9uOiBub3RpZnkg Zm9jdXMgbWFuYWdlciBjbGllbnRzIHdoZW4gdGhlIHBsYXlpbmcgc3RhdGUgb2YgdGhlIGZvY3Vz ZWQgbWVkaWEgZWxlbWVudCBjaGFuZ2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmNwcAppbmRleCA1 OGRlNDEwMWMwYjI5MDcyYjIwMjEwNDljMWQyM2FhMWQ5Y2EyN2RlLi5kMmU5ZTc1ODgwYzZhYjg2 MjI0MzlkY2NmY2Q4ZDA3MzA0ZGI1NDRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5jcHAKQEAg LTUwLDEyICs1MCwxMyBAQCB2b2lkIFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyU2V0Q2xpZW50 KFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyUmVmIG1hbmFnZXIsCiAjZW5kaWYKIH0KIAotYm9v bCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlcklzRm9jdXNlZENvbnRlbnRNZWRpYUVsZW1lbnRQ bGF5aW5nKFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyUmVmIG1hbmFnZXIpCitib29sIFdLTWVk aWFTZXNzaW9uRm9jdXNNYW5hZ2VyVmFsdWVGb3JQbGF5YmFja0F0dHJpYnV0ZShXS01lZGlhU2Vz c2lvbkZvY3VzTWFuYWdlclJlZiBtYW5hZ2VyLCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclBs YXliYWNrQXR0cmlidXRlIGF0dHJpYnV0ZSkKIHsKICNpZiBFTkFCTEUoTUVESUFfU0VTU0lPTikK LSAgICByZXR1cm4gdG9JbXBsKG1hbmFnZXIpLT5pc0ZvY3VzZWRDb250ZW50TWVkaWFFbGVtZW50 UGxheWluZygpOworICAgIHJldHVybiB0b0ltcGwobWFuYWdlciktPnZhbHVlRm9yUGxheWJhY2tB dHRyaWJ1dGUoYXR0cmlidXRlKTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKG1hbmFnZXIpOwor ICAgIFVOVVNFRF9QQVJBTShhdHRyaWJ1dGUpOwogICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLTWVkaWFTZXNz aW9uRm9jdXNNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tNZWRp YVNlc3Npb25Gb2N1c01hbmFnZXIuaAppbmRleCA3N2QwOTIwZDI5YzU3NDNmYmFlMGYyZDM4ZmE1 YmJmMDMwZjAwMGE3Li41ZWY1YTdmMGJjZGJhOTE3Y2I4Yzc2Mzk3ODgzODU1MGUzMDQ5Mzk1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25G b2N1c01hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tNZWRp YVNlc3Npb25Gb2N1c01hbmFnZXIuaApAQCAtMzYsMTAgKzM2LDEyIEBACiBleHRlcm4gIkMiIHsK ICNlbmRpZgogCi1lbnVtIHsKLSAgICBJc1BsYXlpbmcgPSAxIDw8IDAKK2VudW0gV0tNZWRpYVNl c3Npb25Gb2N1c01hbmFnZXJQbGF5YmFja0F0dHJpYnV0ZSB7CisgICAgSXNQbGF5aW5nICAgICAg ICAgICAgICAgICAgICAgPSAxIDw8IDAsCisgICAgSXNQcmV2aW91c1RyYWNrQ29udHJvbEVuYWJs ZWQgPSAxIDw8IDEsCisgICAgSXNOZXh0VHJhY2tDb250cm9sRW5hYmxlZCAgICAgPSAxIDw8IDIs CiB9OwotdHlwZWRlZiB1aW50MzJfdCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclBsYXliYWNr QXR0cmlidXRlOwordHlwZWRlZiB1aW50MzJfdCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclBs YXliYWNrQXR0cmlidXRlczsKIAogLy8gTWVkaWEgU2Vzc2lvbiBGb2N1cyBNYW5hZ2VyIENsaWVu dAogdHlwZWRlZiB2b2lkICgqV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJEaWRDaGFuZ2VQbGF5 YmFja0F0dHJpYnV0ZSkoV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJSZWYgbWFuYWdlciwgV0tN ZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJQbGF5YmFja0F0dHJpYnV0ZSBwbGF5YmFja0F0dHJpYnV0 ZSwgYm9vbCB2YWx1ZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CkBAIC02MCw3ICs2Miw3IEBA IFdLX0VYUE9SVCBXS1R5cGVJRCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlckdldFR5cGVJRCgp OwogCiBXS19FWFBPUlQgdm9pZCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclNldENsaWVudChX S01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclJlZiBtYW5hZ2VyLCBjb25zdCBXS01lZGlhU2Vzc2lv bkZvY3VzTWFuYWdlckNsaWVudEJhc2UqIGNsaWVudCk7CiAKLVdLX0VYUE9SVCBib29sIFdLTWVk aWFTZXNzaW9uRm9jdXNNYW5hZ2VySXNGb2N1c2VkQ29udGVudE1lZGlhRWxlbWVudFBsYXlpbmco V0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJSZWYgbWFuYWdlcik7CitXS19FWFBPUlQgYm9vbCBX S01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclZhbHVlRm9yUGxheWJhY2tBdHRyaWJ1dGUoV0tNZWRp YVNlc3Npb25Gb2N1c01hbmFnZXJSZWYgbWFuYWdlciwgV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFn ZXJQbGF5YmFja0F0dHJpYnV0ZSBhdHRyaWJ1dGUpOwogCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJNZWRpYVNlc3Npb25Gb2N1 c01hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYk1lZGlhU2Vzc2lvbkZv Y3VzTWFuYWdlci5jcHAKaW5kZXggMWQ4MGUyZDc2ZmZkMDEyOGU0YWNhYWFiYzYxMzIyYjExNzY5 YTk1Zi4uZGRjNDg3NWIyNGJmZTMwZGNmYTVlN2MyMjk0NWQzZGU1NTdiODBjMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYk1lZGlhU2Vzc2lvbkZvY3VzTWFu YWdlci5jcHAKQEAgLTYyLDE5ICs2MiwyMyBAQCB2b2lkIFdlYk1lZGlhU2Vzc2lvbkZvY3VzTWFu YWdlcjo6aW5pdGlhbGl6ZUNsaWVudChjb25zdCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYQogICAg IG1fY2xpZW50LmluaXRpYWxpemUoY2xpZW50KTsKIH0KIAotYm9vbCBXZWJNZWRpYVNlc3Npb25G b2N1c01hbmFnZXI6OmlzRm9jdXNlZENvbnRlbnRNZWRpYUVsZW1lbnRQbGF5aW5nKCkgY29uc3QK K2Jvb2wgV2ViTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyOjp2YWx1ZUZvclBsYXliYWNrQXR0cmli dXRlKFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyUGxheWJhY2tBdHRyaWJ1dGUgYXR0cmlidXRl KSBjb25zdAogewogICAgIGlmICghbV9mb2N1c2VkTWVkaWFFbGVtZW50KQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAKLSAgICByZXR1cm4gbV9mb2N1c2VkTWVkaWFFbGVtZW50SXNQbGF5aW5nOwor ICAgIHJldHVybiBtX3BsYXliYWNrQXR0cmlidXRlcyAmIGF0dHJpYnV0ZTsKIH0KIAogdm9pZCBX ZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXI6Om1lZGlhRWxlbWVudElzUGxheWluZ0RpZENoYW5n ZShXZWJQYWdlUHJveHkqIHByb3h5LCB1aW50NjRfdCBlbGVtZW50SUQsIGJvb2wgaXNQbGF5aW5n KQogewogICAgIGlmIChtX2ZvY3VzZWRNZWRpYUVsZW1lbnQpIHsKICAgICAgICAgaWYgKHByb3h5 ID09IG1fZm9jdXNlZE1lZGlhRWxlbWVudC0+Zmlyc3QgJiYgZWxlbWVudElEID09IG1fZm9jdXNl ZE1lZGlhRWxlbWVudC0+c2Vjb25kKSB7Ci0gICAgICAgICAgICBtX2ZvY3VzZWRNZWRpYUVsZW1l bnRJc1BsYXlpbmcgPSBpc1BsYXlpbmc7CisgICAgICAgICAgICBpZiAoaXNQbGF5aW5nKQorICAg ICAgICAgICAgICAgIG1fcGxheWJhY2tBdHRyaWJ1dGVzIHw9IElzUGxheWluZzsKKyAgICAgICAg ICAgIGVsc2UKKyAgICAgICAgICAgICAgICBtX3BsYXliYWNrQXR0cmlidXRlcyAmPSB+SXNQbGF5 aW5nOworCiAgICAgICAgICAgICBtX2NsaWVudC5kaWRDaGFuZ2VQbGF5YmFja0F0dHJpYnV0ZSh0 aGlzLCBJc1BsYXlpbmcsIGlzUGxheWluZyk7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmgK aW5kZXggZWNmNTI0OTYzNTE4ZjQ3ZWNiZjA1MTA3YzcwYTBkMGM3NmUzYWUwMy4uMjFlZTcyMTIw MzcwMmRhYjI0MTk2Mjg1MzIzZWQ5MTlhODc3ZGNiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuaApAQCAtNDUsNyAr NDUsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGluaXRpYWxpemVDbGllbnQoY29uc3QgV0tNZWRp YVNlc3Npb25Gb2N1c01hbmFnZXJDbGllbnRCYXNlKik7CiAKLSAgICBib29sIGlzRm9jdXNlZENv bnRlbnRNZWRpYUVsZW1lbnRQbGF5aW5nKCkgY29uc3Q7CisgICAgYm9vbCB2YWx1ZUZvclBsYXli YWNrQXR0cmlidXRlKFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyUGxheWJhY2tBdHRyaWJ1dGUp IGNvbnN0OwogICAgIHZvaWQgbWVkaWFFbGVtZW50SXNQbGF5aW5nRGlkQ2hhbmdlKFdlYlBhZ2VQ cm94eSosIHVpbnQ2NF90LCBib29sKTsKIAogICAgIHZvaWQgc2V0Rm9jdXNlZE1lZGlhRWxlbWVu dChXZWJQYWdlUHJveHkmLCB1aW50NjRfdCk7CkBAIC02Miw3ICs2Miw3IEBAIHByaXZhdGU6CiAg ICAgdmlydHVhbCB2b2lkIGRlcmVmV2ViQ29udGV4dFN1cHBsZW1lbnQoKSBvdmVycmlkZTsKIAog ICAgIHN0ZDo6dW5pcXVlX3B0cjxGb2N1c2VkTWVkaWFFbGVtZW50PiBtX2ZvY3VzZWRNZWRpYUVs ZW1lbnQ7Ci0gICAgYm9vbCBtX2ZvY3VzZWRNZWRpYUVsZW1lbnRJc1BsYXlpbmcgeyBmYWxzZSB9 OworICAgIFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyUGxheWJhY2tBdHRyaWJ1dGVzIG1fcGxh eWJhY2tBdHRyaWJ1dGVzIHsgMCB9OwogICAgIFdlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlckNs aWVudCBtX2NsaWVudDsKIH07CiAK 258633 2015-08-10 12:05:42 -0700 2015-08-10 12:13:55 -0700 Patch bug-147797-20150810120528.patch text/plain 6387 mrajca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4MDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2Y2ZGZhOTg4MDdlYTFh ZmIzYjhkOTRlNTM3MmQ5NjM2MDE0OGU5ZS4uMGEyZmE1MmZkMWI5NjBhMTc4MTNhYjc2YzBlMzA1 YTVkNmIzYTBkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA4LTA3ICBNYXR0 IFJhamNhICA8bXJhamNhQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYSBTZXNzaW9uOiBnZW5l cmFsaXplIGlzRm9jdXNlZENvbnRlbnRNZWRpYUVsZW1lbnRQbGF5aW5nIHNvIGl0IHdvcmtzIHdp dGggb3RoZXIgcGxheWJhY2sgYXR0cmlidXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3Nzk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25Gb2N1 c01hbmFnZXIuY3BwOgorICAgICAgICAoV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJWYWx1ZUZv clBsYXliYWNrQXR0cmlidXRlKToKKyAgICAgICAgKFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2Vy SXNGb2N1c2VkQ29udGVudE1lZGlhRWxlbWVudFBsYXlpbmcpOiBEZWxldGVkLgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQy9XS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXI6OnZhbHVlRm9yUGxheWJhY2tBdHRyaWJ1 dGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXI6Om1lZGlh Q29udHJvbElzRW5hYmxlZERpZENoYW5nZSk6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhU2Vz c2lvbkZvY3VzTWFuYWdlcjo6aXNGb2N1c2VkQ29udGVudE1lZGlhRWxlbWVudFBsYXlpbmcpOiBE ZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXI6Om1l ZGlhRWxlbWVudElzUGxheWluZ0RpZENoYW5nZSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9j ZXNzL1dlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5oOgorCiAyMDE1LTA4LTA2ICBNYXR0IFJh amNhICA8bXJhamNhQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYSBTZXNzaW9uOiBub3RpZnkg Zm9jdXMgbWFuYWdlciBjbGllbnRzIHdoZW4gdGhlIHBsYXlpbmcgc3RhdGUgb2YgdGhlIGZvY3Vz ZWQgbWVkaWEgZWxlbWVudCBjaGFuZ2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmNwcAppbmRleCA1 OGRlNDEwMWMwYjI5MDcyYjIwMjEwNDljMWQyM2FhMWQ5Y2EyN2RlLi5kMmU5ZTc1ODgwYzZhYjg2 MjI0MzlkY2NmY2Q4ZDA3MzA0ZGI1NDRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5jcHAKQEAg LTUwLDEyICs1MCwxMyBAQCB2b2lkIFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyU2V0Q2xpZW50 KFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyUmVmIG1hbmFnZXIsCiAjZW5kaWYKIH0KIAotYm9v bCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlcklzRm9jdXNlZENvbnRlbnRNZWRpYUVsZW1lbnRQ bGF5aW5nKFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyUmVmIG1hbmFnZXIpCitib29sIFdLTWVk aWFTZXNzaW9uRm9jdXNNYW5hZ2VyVmFsdWVGb3JQbGF5YmFja0F0dHJpYnV0ZShXS01lZGlhU2Vz c2lvbkZvY3VzTWFuYWdlclJlZiBtYW5hZ2VyLCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclBs YXliYWNrQXR0cmlidXRlIGF0dHJpYnV0ZSkKIHsKICNpZiBFTkFCTEUoTUVESUFfU0VTU0lPTikK LSAgICByZXR1cm4gdG9JbXBsKG1hbmFnZXIpLT5pc0ZvY3VzZWRDb250ZW50TWVkaWFFbGVtZW50 UGxheWluZygpOworICAgIHJldHVybiB0b0ltcGwobWFuYWdlciktPnZhbHVlRm9yUGxheWJhY2tB dHRyaWJ1dGUoYXR0cmlidXRlKTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKG1hbmFnZXIpOwor ICAgIFVOVVNFRF9QQVJBTShhdHRyaWJ1dGUpOwogICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLTWVkaWFTZXNz aW9uRm9jdXNNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tNZWRp YVNlc3Npb25Gb2N1c01hbmFnZXIuaAppbmRleCA3N2QwOTIwZDI5YzU3NDNmYmFlMGYyZDM4ZmE1 YmJmMDMwZjAwMGE3Li5kYjE1ZjM3MDRlMTA4ZDQxYTY4NWRlYjNjZjg0OGZhZTMxMjcxOGQ0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tNZWRpYVNlc3Npb25G b2N1c01hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tNZWRp YVNlc3Npb25Gb2N1c01hbmFnZXIuaApAQCAtMzYsMTAgKzM2LDEyIEBACiBleHRlcm4gIkMiIHsK ICNlbmRpZgogCi1lbnVtIHsKLSAgICBJc1BsYXlpbmcgPSAxIDw8IDAKK2VudW0gV0tNZWRpYVNl c3Npb25Gb2N1c01hbmFnZXJQbGF5YmFja0F0dHJpYnV0ZSB7CisgICAgSXNQbGF5aW5nICAgICAg ICAgICAgICAgICAgICAgPSAxIDw8IDAsCisgICAgSXNQcmV2aW91c1RyYWNrQ29udHJvbEVuYWJs ZWQgPSAxIDw8IDEsCisgICAgSXNOZXh0VHJhY2tDb250cm9sRW5hYmxlZCAgICAgPSAxIDw8IDIs CiB9OwotdHlwZWRlZiB1aW50MzJfdCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclBsYXliYWNr QXR0cmlidXRlOwordHlwZWRlZiB1aW50MzJfdCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclBs YXliYWNrQXR0cmlidXRlczsKIAogLy8gTWVkaWEgU2Vzc2lvbiBGb2N1cyBNYW5hZ2VyIENsaWVu dAogdHlwZWRlZiB2b2lkICgqV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJEaWRDaGFuZ2VQbGF5 YmFja0F0dHJpYnV0ZSkoV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJSZWYgbWFuYWdlciwgV0tN ZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJQbGF5YmFja0F0dHJpYnV0ZSBwbGF5YmFja0F0dHJpYnV0 ZSwgYm9vbCB2YWx1ZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CkBAIC02MCw3ICs2Miw3IEBA IFdLX0VYUE9SVCBXS1R5cGVJRCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlckdldFR5cGVJRCgp OwogCiBXS19FWFBPUlQgdm9pZCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclNldENsaWVudChX S01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclJlZiBtYW5hZ2VyLCBjb25zdCBXS01lZGlhU2Vzc2lv bkZvY3VzTWFuYWdlckNsaWVudEJhc2UqIGNsaWVudCk7CiAKLVdLX0VYUE9SVCBib29sIFdLTWVk aWFTZXNzaW9uRm9jdXNNYW5hZ2VySXNGb2N1c2VkQ29udGVudE1lZGlhRWxlbWVudFBsYXlpbmco V0tNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXJSZWYgbWFuYWdlcik7CitXS19FWFBPUlQgYm9vbCBX S01lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlclZhbHVlRm9yUGxheWJhY2tBdHRyaWJ1dGUoV0tNZWRp YVNlc3Npb25Gb2N1c01hbmFnZXJSZWYsIFdLTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyUGxheWJh Y2tBdHRyaWJ1dGUpOwogCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5jcHAKaW5k ZXggMWQ4MGUyZDc2ZmZkMDEyOGU0YWNhYWFiYzYxMzIyYjExNzY5YTk1Zi4uZGRjNDg3NWIyNGJm ZTMwZGNmYTVlN2MyMjk0NWQzZGU1NTdiODBjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5jcHAKQEAgLTYyLDE5 ICs2MiwyMyBAQCB2b2lkIFdlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlcjo6aW5pdGlhbGl6ZUNs aWVudChjb25zdCBXS01lZGlhU2Vzc2lvbkZvY3VzTWFuYQogICAgIG1fY2xpZW50LmluaXRpYWxp emUoY2xpZW50KTsKIH0KIAotYm9vbCBXZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXI6OmlzRm9j dXNlZENvbnRlbnRNZWRpYUVsZW1lbnRQbGF5aW5nKCkgY29uc3QKK2Jvb2wgV2ViTWVkaWFTZXNz aW9uRm9jdXNNYW5hZ2VyOjp2YWx1ZUZvclBsYXliYWNrQXR0cmlidXRlKFdLTWVkaWFTZXNzaW9u Rm9jdXNNYW5hZ2VyUGxheWJhY2tBdHRyaWJ1dGUgYXR0cmlidXRlKSBjb25zdAogewogICAgIGlm ICghbV9mb2N1c2VkTWVkaWFFbGVtZW50KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBy ZXR1cm4gbV9mb2N1c2VkTWVkaWFFbGVtZW50SXNQbGF5aW5nOworICAgIHJldHVybiBtX3BsYXli YWNrQXR0cmlidXRlcyAmIGF0dHJpYnV0ZTsKIH0KIAogdm9pZCBXZWJNZWRpYVNlc3Npb25Gb2N1 c01hbmFnZXI6Om1lZGlhRWxlbWVudElzUGxheWluZ0RpZENoYW5nZShXZWJQYWdlUHJveHkqIHBy b3h5LCB1aW50NjRfdCBlbGVtZW50SUQsIGJvb2wgaXNQbGF5aW5nKQogewogICAgIGlmIChtX2Zv Y3VzZWRNZWRpYUVsZW1lbnQpIHsKICAgICAgICAgaWYgKHByb3h5ID09IG1fZm9jdXNlZE1lZGlh RWxlbWVudC0+Zmlyc3QgJiYgZWxlbWVudElEID09IG1fZm9jdXNlZE1lZGlhRWxlbWVudC0+c2Vj b25kKSB7Ci0gICAgICAgICAgICBtX2ZvY3VzZWRNZWRpYUVsZW1lbnRJc1BsYXlpbmcgPSBpc1Bs YXlpbmc7CisgICAgICAgICAgICBpZiAoaXNQbGF5aW5nKQorICAgICAgICAgICAgICAgIG1fcGxh eWJhY2tBdHRyaWJ1dGVzIHw9IElzUGxheWluZzsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAg ICAgICAgICBtX3BsYXliYWNrQXR0cmlidXRlcyAmPSB+SXNQbGF5aW5nOworCiAgICAgICAgICAg ICBtX2NsaWVudC5kaWRDaGFuZ2VQbGF5YmFja0F0dHJpYnV0ZSh0aGlzLCBJc1BsYXlpbmcsIGlz UGxheWluZyk7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViTWVkaWFTZXNzaW9uRm9jdXNNYW5hZ2VyLmgKaW5kZXggZWNmNTI0OTYzNTE4 ZjQ3ZWNiZjA1MTA3YzcwYTBkMGM3NmUzYWUwMy4uMjFlZTcyMTIwMzcwMmRhYjI0MTk2Mjg1MzIz ZWQ5MTlhODc3ZGNiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYk1l ZGlhU2Vzc2lvbkZvY3VzTWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJNZWRpYVNlc3Npb25Gb2N1c01hbmFnZXIuaApAQCAtNDUsNyArNDUsNyBAQCBwdWJsaWM6CiAK ICAgICB2b2lkIGluaXRpYWxpemVDbGllbnQoY29uc3QgV0tNZWRpYVNlc3Npb25Gb2N1c01hbmFn ZXJDbGllbnRCYXNlKik7CiAKLSAgICBib29sIGlzRm9jdXNlZENvbnRlbnRNZWRpYUVsZW1lbnRQ bGF5aW5nKCkgY29uc3Q7CisgICAgYm9vbCB2YWx1ZUZvclBsYXliYWNrQXR0cmlidXRlKFdLTWVk aWFTZXNzaW9uRm9jdXNNYW5hZ2VyUGxheWJhY2tBdHRyaWJ1dGUpIGNvbnN0OwogICAgIHZvaWQg bWVkaWFFbGVtZW50SXNQbGF5aW5nRGlkQ2hhbmdlKFdlYlBhZ2VQcm94eSosIHVpbnQ2NF90LCBi b29sKTsKIAogICAgIHZvaWQgc2V0Rm9jdXNlZE1lZGlhRWxlbWVudChXZWJQYWdlUHJveHkmLCB1 aW50NjRfdCk7CkBAIC02Miw3ICs2Miw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRl cmVmV2ViQ29udGV4dFN1cHBsZW1lbnQoKSBvdmVycmlkZTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0 cjxGb2N1c2VkTWVkaWFFbGVtZW50PiBtX2ZvY3VzZWRNZWRpYUVsZW1lbnQ7Ci0gICAgYm9vbCBt X2ZvY3VzZWRNZWRpYUVsZW1lbnRJc1BsYXlpbmcgeyBmYWxzZSB9OworICAgIFdLTWVkaWFTZXNz aW9uRm9jdXNNYW5hZ2VyUGxheWJhY2tBdHRyaWJ1dGVzIG1fcGxheWJhY2tBdHRyaWJ1dGVzIHsg MCB9OwogICAgIFdlYk1lZGlhU2Vzc2lvbkZvY3VzTWFuYWdlckNsaWVudCBtX2NsaWVudDsKIH07 CiAK