135332 2014-07-27 20:21:07 -0700 [Mac, iOS] Paint-on closed captions get out-of-order in Safari 2014-08-06 17:47:24 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 135680 1 bfulgham bfulgham bfulgham calvaris commit-queue eric.carlson esprehn+autocc glenn gyuyoung.kim jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1025089 0 bfulgham 2014-07-27 20:21:07 -0700 If you attempt to watch media that contains roll-up style 608 closed captions, they will show up out-of-order and be very difficult to follow. Example: 1. Navigate to the KTVU live stream at <http://bcoveliveios-i.akamaihd.net/hls/live/207145/374678397001/KTVU_NEWSCAST/index.m3u8> 2. Click the Subtitles button in the playback controls and choose Unknown CC from the pop-up menu Close captions appear, but the text wraps in a weird way and often two captions are present at the same time, displayed out of order. 1025090 1 bfulgham 2014-07-27 20:21:22 -0700 <rdar://problem/15317278> 1025092 2 bfulgham 2014-07-27 20:27:03 -0700 This bug came about partially because of my changes this year to reduce flickering (by keeping the CSS boxes around longer when the caption is only changing its end time, rather than tearing down and rebuilding caption boxes several times a second), and partially due to the tension between the WebVTT "boxes in boxes" layout algorithm (which tends to want to push new captions UP in the hierarchy), while roll-up captions want new content to be at the bottom of the caption box. I had to make two changes: 1. When the number of active captions on the screen grows, we want to throw away the existing CSS boxes and build new ones, so that the newest caption can be placed at the bottom of the caption block, which the older captions are 'pushed up' to the top. 2. The ordering of captions needed to be adjusted so that the order of active captions places the newer captions at handled first during layout. Previously, older captions would be drawn to screen first, and newer captions would bubble up towards the top. This change shouldn't affect most captions, since we typically use pop-on captions (which don't suffer from any of these problems). More complicated caption layout is generally accompanied with positioning information, which will override the simple ordering logic. 1025093 3 235588 bfulgham 2014-07-27 20:56:54 -0700 Created attachment 235588 Patch 1025098 4 235590 bfulgham 2014-07-27 22:11:03 -0700 Created attachment 235590 Patch 1025099 5 235590 bfulgham 2014-07-27 22:13:26 -0700 Comment on attachment 235590 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=235590&action=review > Source/WebCore/html/shadow/MediaControlElements.cpp:1312 > + removeChildren(); It's possible we might only want this behavior on Mac/iOS, but I imagine other platforms will have a similar problem with roll-up captions. > Source/WebCore/html/track/TextTrackCue.cpp:203 > + return startTime() > other->startTime(); Alternatively, this special Generic behavior could be in TextTrackGenericCue, instead of calling this base class method. > Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:80 > +extern "C" { This section is some kind of line-ending foo. I made no changes to these structs. 1025139 6 235596 bfulgham 2014-07-28 09:04:45 -0700 Created attachment 235596 Re-Upload to allow EWS runs 1025141 7 235596 bfulgham 2014-07-28 09:06:34 -0700 Comment on attachment 235596 Re-Upload to allow EWS runs View in context: https://bugs.webkit.org/attachment.cgi?id=235596&action=review > Source/WebCore/html/track/TextTrackCue.cpp:203 > + return startTime() > other->startTime(); I'm not sure if this should just be in TextTrackCueGeneric. If it is, we have to bypass calling into this base class entirely, because the base class will return early with 'true' for roll-up cases that we need to treat as 'false'. 1025202 8 235596 jer.noble 2014-07-28 13:21:41 -0700 Comment on attachment 235596 Re-Upload to allow EWS runs View in context: https://bugs.webkit.org/attachment.cgi?id=235596&action=review >> Source/WebCore/html/track/TextTrackCue.cpp:203 >> + return startTime() > other->startTime(); > > I'm not sure if this should just be in TextTrackCueGeneric. If it is, we have to bypass calling into this base class entirely, because the base class will return early with 'true' for roll-up cases that we need to treat as 'false'. Yes, I think this would be best put into the Generic class. Other than that, r+. 1025222 9 235614 bfulgham 2014-07-28 14:00:32 -0700 Created attachment 235614 Patch (Remarking as r+) 1025223 10 bfulgham 2014-07-28 14:01:07 -0700 (In reply to comment #8) > (From update of attachment 235596 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=235596&action=review > > >> Source/WebCore/html/track/TextTrackCue.cpp:203 > >> + return startTime() > other->startTime(); > > > > I'm not sure if this should just be in TextTrackCueGeneric. If it is, we have to bypass calling into this base class entirely, because the base class will return early with 'true' for roll-up cases that we need to treat as 'false'. > > Yes, I think this would be best put into the Generic class. Other than that, r+. Done. I'm uploading a revised patch to get EWS coverage. 1025241 11 235614 bfulgham 2014-07-28 14:58:03 -0700 Comment on attachment 235614 Patch (Remarking as r+) Jer approved this patch in person. 1025243 12 bfulgham 2014-07-28 14:59:52 -0700 Committed in r171700. <http://trac.webkit.org/changeset/171700> 235588 2014-07-27 20:56:54 -0700 2014-07-27 22:11:00 -0700 Patch bug-135332-20140727205642.patch text/plain 9553 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MTY3MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA3LTI3ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWMsIGlPU10gUGFpbnQt b24gY2xvc2VkIGNhcHRpb25zIGdldCBvdXQtb2Ytb3JkZXIgaW4gU2FmYXJpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzUzMzIKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzE1MzE3Mjc4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6 dXBkYXRlRGlzcGxheSk6IElmIHRoZQorICAgICAgICBudW1iZXIgb2YgYWN0aXZlIGN1ZXMgaXMg Z3JlYXRlciB0aGFuIHRoZSBjdXJyZW50IHNldCBvZiBDU1MgYm94ZXMgcmVwcmVzZW50aW5nCisg ICAgICAgIHRoZSBjdWVzLCB0aHJvdyBhd2F5IHRoZSBDU1MgYm94ZXMgYW5kIHJlLWxheW91dCBh bGwgdGhlIGN1ZXMuCisgICAgICAgICogaHRtbC90cmFjay9JbmJhbmRHZW5lcmljVGV4dFRyYWNr LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkluYmFuZEdlbmVyaWNUZXh0VHJhY2s6OmFkZEdlbmVy aWNDdWUpOiBBZGQgc29tZSBsb2dnaW5nLgorICAgICAgICAoV2ViQ29yZTo6SW5iYW5kR2VuZXJp Y1RleHRUcmFjazo6cmVtb3ZlR2VuZXJpY0N1ZSk6IERpdHRvLgorICAgICAgICAqIGh0bWwvdHJh Y2svVGV4dFRyYWNrQ3VlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFja0N1ZTo6aXNP cmRlcmVkQmVmb3JlKTogUmV2aXNlIG9yZGVyaW5nIHJ1bGVzIHNvIHRoYXQgd2UgcHV0CisgICAg ICAgIG5ld2VyIGN1ZXMgZWFybGllciBpbiB0aGUgbGF5b3V0IG9yZGVyIHNvIHRoZXkgYXJlIGRy YXduIHRvd2FyZHMgdGhlIGJvdHRvbQorICAgICAgICBvZiB0aGUgc2NyZWVuLgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZG LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nl c3NBdHRyaWJ1dGVkU3RyaW5ncyk6IEFkanVzdCBsb2dnaW5nCisgICAgICAgIG1lc3NhZ2VzLgor ICAgICAgICAoV2ViQ29yZTo6SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cmVtb3ZlQ29tcGxl dGVkQ3Vlcyk6IEFkZCBsb2dnaW5nLgorCiAyMDE0LTA3LTI3ICBCcnVubyBkZSBPbGl2ZWlyYSBB YmluYWRlciAgPGJydW5vLmRAcGFydG5lci5zYW1zdW5nLmNvbT4KIAogICAgICAgICBTdXBwb3J0 IGZvciA6ZW5hYmxlZCBzZWxlY3RvciBvbiBBbmNob3IgJiBBcmVhIGVsZW1lbnRzCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMu Y3BwCShyZXZpc2lvbiAxNzE2NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRp YUNvbnRyb2xFbGVtZW50cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyLDYgKzQyLDcgQEAKICNp bmNsdWRlICJJbWFnZUJ1ZmZlci5oIgogI2luY2x1ZGUgIkxhbmd1YWdlLmgiCiAjaW5jbHVkZSAi TG9jYWxpemVkU3RyaW5ncy5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJNZWRp YUNvbnRyb2xzLmgiCiAjaW5jbHVkZSAiUGFnZUdyb3VwLmgiCiAjaW5jbHVkZSAiUmVuZGVyTGF5 ZXIuaCIKQEAgLTEzMDMsNiArMTMwNCwxMyBAQCB2b2lkIE1lZGlhQ29udHJvbFRleHRUcmFja0Nv bnRhaW5lckVsZW1lCiAgICAgLy8gd2l0aGluIHRoZSBUZXh0VHJhY2tDdWUgaW5zdGFuY2UgaXRz ZWxmLiBJZiBwYXJhbWV0ZXJzIG9mIHRoZSBjdWUgY2hhbmdlLAogICAgIC8vIHRoZSBkaXNwbGF5 IHRyZWUgaXMgY2xlYXJlZC4KIAorICAgIC8vIElmIHRoZSBudW1iZXIgb2YgQ1NTIGJveGVzIGlu IHRoZSBvdXRwdXQgaXMgbGVzcyB0aGFuIHRoZSBudW1iZXIgb2YgY3VlcworICAgIC8vIHdlIHdp c2ggdG8gcmVuZGVyIChlLmcuLCB3ZSBhcmUgYWRkaW5nIGFub3RoZXIgY3VlIGluIGEgc2V0IG9m IHJvbGwtdXAKKyAgICAvLyBjdWVzKSwgcmVtb3ZlIGFsbCB0aGUgZXhpc3RpbmcgQ1NTIGJveGVz IHJlcHJlc2VudGluZyB0aGUgY3VlcyBhbmQgcmUtYWRkCisgICAgLy8gdGhlbSBzbyB0aGF0IHRo ZSBuZXcgY3VlIGlzIGF0IHRoZSBib3R0b20uCisgICAgaWYgKGNoaWxkTm9kZUNvdW50KCkgPCBh Y3RpdmVDdWVzLnNpemUoKSkKKyAgICAgICAgcmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAKICAgICAv LyAxMC4gRm9yIGVhY2ggdGV4dCB0cmFjayBjdWUgY3VlIGluIGN1ZXMgdGhhdCBoYXMgbm90IHll dCBoYWQKICAgICAvLyBjb3JyZXNwb25kaW5nIENTUyBib3hlcyBhZGRlZCB0byBvdXRwdXQsIGlu IHRleHQgdHJhY2sgY3VlIG9yZGVyLCBydW4gdGhlCiAgICAgLy8gZm9sbG93aW5nIHN1YnN0ZXBz OgpAQCAtMTMyMCw2ICsxMzI4LDggQEAgdm9pZCBNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWlu ZXJFbGVtZQogICAgICAgICBpZiAoIWN1ZS0+dHJhY2soKSB8fCAhY3VlLT50cmFjaygpLT5pc1Jl bmRlcmVkKCkgfHwgIWN1ZS0+aXNBY3RpdmUoKSB8fCBjdWUtPnRleHQoKS5pc0VtcHR5KCkpCiAg ICAgICAgICAgICBjb250aW51ZTsKIAorICAgICAgICBMT0coTWVkaWEsICJNZWRpYUNvbnRyb2xU ZXh0VHJhY2tDb250YWluZXJFbGVtZW50Ojp1cGRhdGVEaXNwbGF5KCVwKSAtIGFkZGluZyBhbmQg cG9zaXRpb25pbmcgY3VlICMlenU6IFwiJXNcIiwgc3RhcnQ9JS4yZiwgZW5kPSUuMmYsIGxpbmU9 JS4yZiIsIHRoaXMsIGksIGN1ZS0+dGV4dCgpLnV0ZjgoKS5kYXRhKCksIGN1ZS0+c3RhcnRUaW1l KCksIGN1ZS0+ZW5kVGltZSgpLCBjdWUtPmxpbmUoKSk7CisKICAgICAgICAgUmVmUHRyPFZUVEN1 ZUJveD4gZGlzcGxheUJveCA9IGN1ZS0+Z2V0RGlzcGxheVRyZWUobV92aWRlb0Rpc3BsYXlTaXpl LnNpemUoKSk7CiAjaWYgRU5BQkxFKFdFQlZUVF9SRUdJT05TKQogICAgICAgICBpZiAoY3VlLT50 cmFjaygpLT5tb2RlKCkgPT0gVGV4dFRyYWNrOjpkaXNhYmxlZEtleXdvcmQoKSkKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svSW5iYW5kR2VuZXJpY1RleHRUcmFjay5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9JbmJhbmRHZW5lcmljVGV4dFRyYWNr LmNwcAkocmV2aXNpb24gMTcxNjQ0KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9JbmJh bmRHZW5lcmljVGV4dFRyYWNrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYwLDYgKzE2MCw4IEBA IHZvaWQgSW5iYW5kR2VuZXJpY1RleHRUcmFjazo6YWRkR2VuZXJpY0MKICAgICAgICAgcmV0dXJu OwogICAgIH0KIAorICAgIExPRyhNZWRpYSwgIkluYmFuZEdlbmVyaWNUZXh0VHJhY2s6OmFkZEdl bmVyaWNDdWUgYWRkZWQgY3VlOiBzdGFydD0lLjJmLCBlbmQ9JS4yZiwgY29udGVudD1cIiVzXCJc biIsIGN1ZURhdGEtPnN0YXJ0VGltZSgpLCBjdWVEYXRhLT5lbmRUaW1lKCksIGN1ZURhdGEtPmNv bnRlbnQoKS51dGY4KCkuZGF0YSgpKTsKKwogICAgIGlmIChjdWVEYXRhLT5zdGF0dXMoKSAhPSBH ZW5lcmljQ3VlRGF0YTo6Q29tcGxldGUpCiAgICAgICAgIG1fY3VlTWFwLmFkZChjdWVEYXRhLmdl dCgpLCBjdWUuZ2V0KCkpOwogCkBAIC0xODQsOCArMTg2LDEwIEBAIHZvaWQgSW5iYW5kR2VuZXJp Y1RleHRUcmFjazo6cmVtb3ZlR2VuZXIKICAgICBpZiAoY3VlKSB7CiAgICAgICAgIExPRyhNZWRp YSwgIkluYmFuZEdlbmVyaWNUZXh0VHJhY2s6OnJlbW92ZUdlbmVyaWNDdWUgcmVtb3ZpbmcgY3Vl OiBzdGFydD0lLjJmLCBlbmQ9JS4yZiwgY29udGVudD1cIiVzXCJcbiIsIGN1ZURhdGEtPnN0YXJ0 VGltZSgpLCBjdWVEYXRhLT5lbmRUaW1lKCksIGN1ZURhdGEtPmNvbnRlbnQoKS51dGY4KCkuZGF0 YSgpKTsKICAgICAgICAgcmVtb3ZlQ3VlKGN1ZS5nZXQoKSwgSUdOT1JFX0VYQ0VQVElPTik7Ci0g ICAgfSBlbHNlCisgICAgfSBlbHNlIHsKKyAgICAgICAgTE9HKE1lZGlhLCAiSW5iYW5kR2VuZXJp Y1RleHRUcmFjazo6cmVtb3ZlR2VuZXJpY0N1ZSBVTkFCTEUgdG8gZmluZCBjdWU6IHN0YXJ0PSUu MmYsIGVuZD0lLjJmLCBjb250ZW50PVwiJXNcIlxuIiwgY3VlRGF0YS0+c3RhcnRUaW1lKCksIGN1 ZURhdGEtPmVuZFRpbWUoKSwgY3VlRGF0YS0+Y29udGVudCgpLnV0ZjgoKS5kYXRhKCkpOwogICAg ICAgICBtX2N1ZU1hcC5yZW1vdmUoY3VlRGF0YSk7CisgICAgfQogfQogCiB2b2lkIEluYmFuZEdl bmVyaWNUZXh0VHJhY2s6OnJlbW92ZUN1ZShUZXh0VHJhY2tDdWUqIGN1ZSwgRXhjZXB0aW9uQ29k ZSYgZWMpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWUuY3Bw CShyZXZpc2lvbiAxNzE2NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFj a0N1ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5OSw3ICsxOTksNyBAQCB2b2lkIFRleHRUcmFj a0N1ZTo6c2V0SXNBY3RpdmUoYm9vbCBhY3RpCiAKIGJvb2wgVGV4dFRyYWNrQ3VlOjppc09yZGVy ZWRCZWZvcmUoY29uc3QgVGV4dFRyYWNrQ3VlKiBvdGhlcikgY29uc3QKIHsKLSAgICByZXR1cm4g c3RhcnRUaW1lKCkgPCBvdGhlci0+c3RhcnRUaW1lKCkgfHwgKHN0YXJ0VGltZSgpID09IG90aGVy LT5zdGFydFRpbWUoKSAmJiBlbmRUaW1lKCkgPiBvdGhlci0+ZW5kVGltZSgpKTsKKyAgICByZXR1 cm4gc3RhcnRUaW1lKCkgPiBvdGhlci0+c3RhcnRUaW1lKCkgfHwgKHN0YXJ0VGltZSgpID09IG90 aGVyLT5zdGFydFRpbWUoKSAmJiBlbmRUaW1lKCkgPiBvdGhlci0+ZW5kVGltZSgpKTsKIH0KIAog Ym9vbCBUZXh0VHJhY2tDdWU6OmN1ZUNvbnRlbnRzTWF0Y2goY29uc3QgVGV4dFRyYWNrQ3VlJiBj dWUpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0luYmFuZFRleHRUcmFja1By aXZhdGVBVkYuY3BwCShyZXZpc2lvbiAxNzE2NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTc2LDI0ICs3NiwyMiBAQCB0eXBlZGVmIHN0cnVjdCBPcGFxdWVDTUJs b2NrQnVmZmVyKiBDTUJsCiB0eXBlZGVmIGNvbnN0IHN0cnVjdCBvcGFxdWVDTUZvcm1hdERlc2Ny aXB0aW9uKiBDTUZvcm1hdERlc2NyaXB0aW9uUmVmOwogdHlwZWRlZiBzdHJ1Y3Qgb3BhcXVlQ01T YW1wbGVCdWZmZXIqIENNU2FtcGxlQnVmZmVyUmVmOwogCi0jaWZuZGVmIENNU0FNUExFQlVGRkVS X0gNCi1leHRlcm4gIkMiIHsNCisjaWZuZGVmIENNU0FNUExFQlVGRkVSX0gKK2V4dGVybiAiQyIg ewogI3ByYWdtYSBwYWNrKHB1c2gsIDQpCiAjaWZuZGVmIENNVElNRV9ICi0gICAgdHlwZWRlZiBz dHJ1Y3QNCi0gICAgew0KLSAgICAgICAgaW50NjRfdCB2YWx1ZTsNCi0gICAgICAgIGludDMyX3Qg dGltZXNjYWxlOw0KLSAgICAgICAgdWludDMyX3QgZmxhZ3M7DQotICAgICAgICBpbnQ2NF90IGVw b2NoOw0KKyAgICB0eXBlZGVmIHN0cnVjdCB7CisgICAgICAgIGludDY0X3QgdmFsdWU7CisgICAg ICAgIGludDMyX3QgdGltZXNjYWxlOworICAgICAgICB1aW50MzJfdCBmbGFnczsKKyAgICAgICAg aW50NjRfdCBlcG9jaDsKICAgICB9IENNVGltZTsKICNlbmRpZgogCi0gICAgdHlwZWRlZiBzdHJ1 Y3QNCi0gICAgew0KLSAgICAgICAgQ01UaW1lIGR1cmF0aW9uOw0KLSAgICAgICAgQ01UaW1lIHBy ZXNlbnRhdGlvblRpbWVTdGFtcDsNCi0gICAgICAgIENNVGltZSBkZWNvZGVUaW1lU3RhbXA7DQor ICAgIHR5cGVkZWYgc3RydWN0IHsKKyAgICAgICAgQ01UaW1lIGR1cmF0aW9uOworICAgICAgICBD TVRpbWUgcHJlc2VudGF0aW9uVGltZVN0YW1wOworICAgICAgICBDTVRpbWUgZGVjb2RlVGltZVN0 YW1wOwogICAgIH0gQ01TYW1wbGVUaW1pbmdJbmZvOwogI3ByYWdtYSBwYWNrKHBvcCkKIH0KQEAg LTQ3Nyw3ICs0NzUsNyBAQCB2b2lkIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NB CiAgICAgICAgICAgICAgICAgICAgIGlmICghYXJyaXZpbmdDdWUtPmRvZXNFeHRlbmRDdWVEYXRh KCpjdWVEYXRhKSkKICAgICAgICAgICAgICAgICAgICAgICAgIG5vbkV4dGVuc2lvbkN1ZXMuYXBw ZW5kKGFycml2aW5nQ3VlKTsKICAgICAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgICAgICAgICAgTE9HKE1lZGlhLCAiSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cHJvY2Vz c0N1ZSglcCkgLSBmb3VuZCBhbiBleHRlbnNpb24gY3VlIChcIiVzXCIpIGZvciB0aW1lID0gJS4y ZiwgcG9zaXRpb24gPSAgJS4yZiwgbGluZSA9ICAlLjJmIiwgdGhpcywgYXJyaXZpbmdDdWUtPmNv bnRlbnQoKS51dGY4KCkuZGF0YSgpLCBhcnJpdmluZ0N1ZS0+c3RhcnRUaW1lKCksIGFycml2aW5n Q3VlLT5wb3NpdGlvbigpLCBhcnJpdmluZ0N1ZS0+bGluZSgpKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIExPRyhNZWRpYSwgIkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NDdWUo JXApIC0gZm91bmQgYW4gZXh0ZW5zaW9uIGN1ZSAoXCIlc1wiKSBmb3IgdGltZSA9ICUuMmYsIGVu ZCA9ICUuMmYsIHBvc2l0aW9uID0gICUuMmYsIGxpbmUgPSAgJS4yZiIsIHRoaXMsIGFycml2aW5n Q3VlLT5jb250ZW50KCkudXRmOCgpLmRhdGEoKSwgYXJyaXZpbmdDdWUtPnN0YXJ0VGltZSgpLCBh cnJpdmluZ0N1ZS0+ZW5kVGltZSgpLCBhcnJpdmluZ0N1ZS0+cG9zaXRpb24oKSwgYXJyaXZpbmdD dWUtPmxpbmUoKSk7CiAgICAgICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAgICAgYm9vbCBj dXJyZW50Q3VlSXNFeHRlbmRlZCA9IChhcnJpdmluZ0N1ZXMuc2l6ZSgpICE9IG5vbkV4dGVuc2lv bkN1ZXMuc2l6ZSgpKTsKQEAgLTQ5MSw3ICs0ODksNyBAQCB2b2lkIEluYmFuZFRleHRUcmFja1By aXZhdGVBVkY6OnByb2Nlc3NBCiAgICAgICAgICAgICAgICAgICAgIGN1ZURhdGEtPnNldEVuZFRp bWUobV9jdXJyZW50Q3VlRW5kVGltZSk7CiAgICAgICAgICAgICAgICAgICAgIGN1ZURhdGEtPnNl dFN0YXR1cyhHZW5lcmljQ3VlRGF0YTo6Q29tcGxldGUpOwogCi0gICAgICAgICAgICAgICAgICAg IExPRyhNZWRpYSwgIkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NDdWUoJXApIC0g dXBkYXRpbmcgY3VlOiBzdGFydD0lLjJmLCBlbmQ9JS4yZiwgY29udGVudD1cIiVzXCIiLCB0aGlz LCBjdWVEYXRhLT5zdGFydFRpbWUoKSwgbV9jdXJyZW50Q3VlRW5kVGltZSwgY3VlRGF0YS0+Y29u dGVudCgpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICAgICAgICAgICAgICBMT0coTWVkaWEsICJJ bmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQ3VlKCVwKSAtIHVwZGF0aW5nIGN1ZSBc IiVzXCI6IHN0YXJ0PSUuMmYsIGVuZD0lLjJmIiwgdGhpcywgY3VlRGF0YS0+Y29udGVudCgpLnV0 ZjgoKS5kYXRhKCksIGN1ZURhdGEtPnN0YXJ0VGltZSgpLCBtX2N1cnJlbnRDdWVFbmRUaW1lKTsK ICAgICAgICAgICAgICAgICAgICAgY2xpZW50KCktPnVwZGF0ZUdlbmVyaWNDdWUodGhpcywgY3Vl RGF0YS5nZXQoKSk7CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAg ICAgLy8gV2UgaGF2ZSB0byBhc3N1bWUgdGhhdCB0aGUgaW1wbGljaXQgZHVyYXRpb24gaXMgaW52 YWxpZCBmb3IgY3VlcyBkZWxpdmVyZWQgZHVyaW5nIGEgc2VlayBiZWNhdXNlIHRoZSBBVkYgZGVj b2RlIHBpcGVsaW5lIG1heSBub3QKQEAgLTUxNCw3ICs1MTIsNyBAQCB2b2lkIEluYmFuZFRleHRU cmFja1ByaXZhdGVBVkY6OnByb2Nlc3NBCiAKICAgICAgICAgbV9jdWVzLmFwcGVuZChjdWVEYXRh KTsKICAgICAgICAgCi0gICAgICAgIExPRyhNZWRpYSwgIkluYmFuZFRleHRUcmFja1ByaXZhdGVB VkY6OnByb2Nlc3NDdWUoJXApIC0gYWRkaW5nIGN1ZSBmb3IgdGltZSA9ICUuMmYsIHBvc2l0aW9u ID0gICUuMmYsIGxpbmUgPSAgJS4yZiIsIHRoaXMsIGN1ZURhdGEtPnN0YXJ0VGltZSgpLCBjdWVE YXRhLT5wb3NpdGlvbigpLCBjdWVEYXRhLT5saW5lKCkpOworICAgICAgICBMT0coTWVkaWEsICJJ bmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQ3VlKCVwKSAtIGFkZGluZyBjdWUgXCIl c1wiIGZvciB0aW1lID0gJS4yZiwgZW5kID0gJS4yZiwgcG9zaXRpb24gPSAgJS4yZiwgbGluZSA9 ICAlLjJmIiwgdGhpcywgY3VlRGF0YS0+Y29udGVudCgpLnV0ZjgoKS5kYXRhKCksIGN1ZURhdGEt PnN0YXJ0VGltZSgpLCBjdWVEYXRhLT5lbmRUaW1lKCksIGN1ZURhdGEtPnBvc2l0aW9uKCksIGN1 ZURhdGEtPmxpbmUoKSk7CiAKICAgICAgICAgY2xpZW50KCktPmFkZEdlbmVyaWNDdWUodGhpcywg Y3VlRGF0YS5yZWxlYXNlKCkpOwogICAgIH0KQEAgLTU0NSw2ICs1NDMsOCBAQCB2b2lkIEluYmFu ZFRleHRUcmFja1ByaXZhdGVBVkY6OnJlbW92ZUNvCiAgICAgICAgICAgICBpZiAobV9jdWVzW2N1 cnJlbnRDdWVdLT5zdGF0dXMoKSAhPSBHZW5lcmljQ3VlRGF0YTo6Q29tcGxldGUpCiAgICAgICAg ICAgICAgICAgY29udGludWU7CiAKKyAgICAgICAgICAgIExPRyhNZWRpYSwgIkluYmFuZFRleHRU cmFja1ByaXZhdGVBVkY6OnJlbW92ZUNvbXBsZXRlZEN1ZXMoJXApIC0gcmVtb3ZpbmcgY3VlIFwi JXNcIjogc3RhcnQ9JS4yZiwgZW5kPSUuMmYiLCB0aGlzLCBtX2N1ZXNbY3VycmVudEN1ZV0tPmNv bnRlbnQoKS51dGY4KCkuZGF0YSgpLCBtX2N1ZXNbY3VycmVudEN1ZV0tPnN0YXJ0VGltZSgpLCBt X2N1ZXNbY3VycmVudEN1ZV0tPmVuZFRpbWUoKSk7CisKICAgICAgICAgICAgIG1fY3Vlcy5yZW1v dmUoY3VycmVudEN1ZSk7CiAgICAgICAgIH0KICAgICB9Cg== 235590 2014-07-27 22:11:03 -0700 2014-07-28 09:04:42 -0700 Patch bug-135332-20140727221049.patch text/plain 9461 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MTY3MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA3LTI3ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWMsIGlPU10gUGFpbnQt b24gY2xvc2VkIGNhcHRpb25zIGdldCBvdXQtb2Ytb3JkZXIgaW4gU2FmYXJpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzUzMzIKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzE1MzE3Mjc4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6 dXBkYXRlRGlzcGxheSk6IElmIHRoZQorICAgICAgICBudW1iZXIgb2YgYWN0aXZlIGN1ZXMgaXMg Z3JlYXRlciB0aGFuIHRoZSBjdXJyZW50IHNldCBvZiBDU1MgYm94ZXMgcmVwcmVzZW50aW5nCisg ICAgICAgIHRoZSBjdWVzLCB0aHJvdyBhd2F5IHRoZSBDU1MgYm94ZXMgYW5kIHJlLWxheW91dCBh bGwgdGhlIGN1ZXMuCisgICAgICAgICogaHRtbC90cmFjay9JbmJhbmRHZW5lcmljVGV4dFRyYWNr LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkluYmFuZEdlbmVyaWNUZXh0VHJhY2s6OmFkZEdlbmVy aWNDdWUpOiBBZGQgc29tZSBsb2dnaW5nLgorICAgICAgICAoV2ViQ29yZTo6SW5iYW5kR2VuZXJp Y1RleHRUcmFjazo6cmVtb3ZlR2VuZXJpY0N1ZSk6IERpdHRvLgorICAgICAgICAqIGh0bWwvdHJh Y2svVGV4dFRyYWNrQ3VlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFja0N1ZTo6aXNP cmRlcmVkQmVmb3JlKTogUmV2aXNlIG9yZGVyaW5nIHJ1bGVzIHNvIHRoYXQgd2UgcHV0CisgICAg ICAgIG5ld2VyIGN1ZXMgZWFybGllciBpbiB0aGUgbGF5b3V0IG9yZGVyIHNvIHRoZXkgYXJlIGRy YXduIHRvd2FyZHMgdGhlIGJvdHRvbQorICAgICAgICBvZiB0aGUgc2NyZWVuLgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZG LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nl c3NBdHRyaWJ1dGVkU3RyaW5ncyk6IEFkanVzdCBsb2dnaW5nCisgICAgICAgIG1lc3NhZ2VzLgor ICAgICAgICAoV2ViQ29yZTo6SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cmVtb3ZlQ29tcGxl dGVkQ3Vlcyk6IEFkZCBsb2dnaW5nLgorCiAyMDE0LTA3LTI3ICBCcnVubyBkZSBPbGl2ZWlyYSBB YmluYWRlciAgPGJydW5vLmRAcGFydG5lci5zYW1zdW5nLmNvbT4KIAogICAgICAgICBTdXBwb3J0 IGZvciA6ZW5hYmxlZCBzZWxlY3RvciBvbiBBbmNob3IgJiBBcmVhIGVsZW1lbnRzCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMu Y3BwCShyZXZpc2lvbiAxNzE2NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRp YUNvbnRyb2xFbGVtZW50cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyLDYgKzQyLDcgQEAKICNp bmNsdWRlICJJbWFnZUJ1ZmZlci5oIgogI2luY2x1ZGUgIkxhbmd1YWdlLmgiCiAjaW5jbHVkZSAi TG9jYWxpemVkU3RyaW5ncy5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJNZWRp YUNvbnRyb2xzLmgiCiAjaW5jbHVkZSAiUGFnZUdyb3VwLmgiCiAjaW5jbHVkZSAiUmVuZGVyTGF5 ZXIuaCIKQEAgLTEzMDMsNiArMTMwNCwxMyBAQCB2b2lkIE1lZGlhQ29udHJvbFRleHRUcmFja0Nv bnRhaW5lckVsZW1lCiAgICAgLy8gd2l0aGluIHRoZSBUZXh0VHJhY2tDdWUgaW5zdGFuY2UgaXRz ZWxmLiBJZiBwYXJhbWV0ZXJzIG9mIHRoZSBjdWUgY2hhbmdlLAogICAgIC8vIHRoZSBkaXNwbGF5 IHRyZWUgaXMgY2xlYXJlZC4KIAorICAgIC8vIElmIHRoZSBudW1iZXIgb2YgQ1NTIGJveGVzIGlu IHRoZSBvdXRwdXQgaXMgbGVzcyB0aGFuIHRoZSBudW1iZXIgb2YgY3VlcworICAgIC8vIHdlIHdp c2ggdG8gcmVuZGVyIChlLmcuLCB3ZSBhcmUgYWRkaW5nIGFub3RoZXIgY3VlIGluIGEgc2V0IG9m IHJvbGwtdXAKKyAgICAvLyBjdWVzKSwgcmVtb3ZlIGFsbCB0aGUgZXhpc3RpbmcgQ1NTIGJveGVz IHJlcHJlc2VudGluZyB0aGUgY3VlcyBhbmQgcmUtYWRkCisgICAgLy8gdGhlbSBzbyB0aGF0IHRo ZSBuZXcgY3VlIGlzIGF0IHRoZSBib3R0b20uCisgICAgaWYgKGNoaWxkTm9kZUNvdW50KCkgPCBh Y3RpdmVDdWVzLnNpemUoKSkKKyAgICAgICAgcmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAKICAgICAv LyAxMC4gRm9yIGVhY2ggdGV4dCB0cmFjayBjdWUgY3VlIGluIGN1ZXMgdGhhdCBoYXMgbm90IHll dCBoYWQKICAgICAvLyBjb3JyZXNwb25kaW5nIENTUyBib3hlcyBhZGRlZCB0byBvdXRwdXQsIGlu IHRleHQgdHJhY2sgY3VlIG9yZGVyLCBydW4gdGhlCiAgICAgLy8gZm9sbG93aW5nIHN1YnN0ZXBz OgpAQCAtMTMyMCw2ICsxMzI4LDggQEAgdm9pZCBNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWlu ZXJFbGVtZQogICAgICAgICBpZiAoIWN1ZS0+dHJhY2soKSB8fCAhY3VlLT50cmFjaygpLT5pc1Jl bmRlcmVkKCkgfHwgIWN1ZS0+aXNBY3RpdmUoKSB8fCBjdWUtPnRleHQoKS5pc0VtcHR5KCkpCiAg ICAgICAgICAgICBjb250aW51ZTsKIAorICAgICAgICBMT0coTWVkaWEsICJNZWRpYUNvbnRyb2xU ZXh0VHJhY2tDb250YWluZXJFbGVtZW50Ojp1cGRhdGVEaXNwbGF5KCVwKSAtIGFkZGluZyBhbmQg cG9zaXRpb25pbmcgY3VlICMlenU6IFwiJXNcIiwgc3RhcnQ9JS4yZiwgZW5kPSUuMmYsIGxpbmU9 JS4yZiIsIHRoaXMsIGksIGN1ZS0+dGV4dCgpLnV0ZjgoKS5kYXRhKCksIGN1ZS0+c3RhcnRUaW1l KCksIGN1ZS0+ZW5kVGltZSgpLCBjdWUtPmxpbmUoKSk7CisKICAgICAgICAgUmVmUHRyPFZUVEN1 ZUJveD4gZGlzcGxheUJveCA9IGN1ZS0+Z2V0RGlzcGxheVRyZWUobV92aWRlb0Rpc3BsYXlTaXpl LnNpemUoKSk7CiAjaWYgRU5BQkxFKFdFQlZUVF9SRUdJT05TKQogICAgICAgICBpZiAoY3VlLT50 cmFjaygpLT5tb2RlKCkgPT0gVGV4dFRyYWNrOjpkaXNhYmxlZEtleXdvcmQoKSkKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svSW5iYW5kR2VuZXJpY1RleHRUcmFjay5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9JbmJhbmRHZW5lcmljVGV4dFRyYWNr LmNwcAkocmV2aXNpb24gMTcxNjQ0KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9JbmJh bmRHZW5lcmljVGV4dFRyYWNrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYwLDYgKzE2MCw4IEBA IHZvaWQgSW5iYW5kR2VuZXJpY1RleHRUcmFjazo6YWRkR2VuZXJpY0MKICAgICAgICAgcmV0dXJu OwogICAgIH0KIAorICAgIExPRyhNZWRpYSwgIkluYmFuZEdlbmVyaWNUZXh0VHJhY2s6OmFkZEdl bmVyaWNDdWUgYWRkZWQgY3VlOiBzdGFydD0lLjJmLCBlbmQ9JS4yZiwgY29udGVudD1cIiVzXCJc biIsIGN1ZURhdGEtPnN0YXJ0VGltZSgpLCBjdWVEYXRhLT5lbmRUaW1lKCksIGN1ZURhdGEtPmNv bnRlbnQoKS51dGY4KCkuZGF0YSgpKTsKKwogICAgIGlmIChjdWVEYXRhLT5zdGF0dXMoKSAhPSBH ZW5lcmljQ3VlRGF0YTo6Q29tcGxldGUpCiAgICAgICAgIG1fY3VlTWFwLmFkZChjdWVEYXRhLmdl dCgpLCBjdWUuZ2V0KCkpOwogCkBAIC0xODQsOCArMTg2LDEwIEBAIHZvaWQgSW5iYW5kR2VuZXJp Y1RleHRUcmFjazo6cmVtb3ZlR2VuZXIKICAgICBpZiAoY3VlKSB7CiAgICAgICAgIExPRyhNZWRp YSwgIkluYmFuZEdlbmVyaWNUZXh0VHJhY2s6OnJlbW92ZUdlbmVyaWNDdWUgcmVtb3ZpbmcgY3Vl OiBzdGFydD0lLjJmLCBlbmQ9JS4yZiwgY29udGVudD1cIiVzXCJcbiIsIGN1ZURhdGEtPnN0YXJ0 VGltZSgpLCBjdWVEYXRhLT5lbmRUaW1lKCksIGN1ZURhdGEtPmNvbnRlbnQoKS51dGY4KCkuZGF0 YSgpKTsKICAgICAgICAgcmVtb3ZlQ3VlKGN1ZS5nZXQoKSwgSUdOT1JFX0VYQ0VQVElPTik7Ci0g ICAgfSBlbHNlCisgICAgfSBlbHNlIHsKKyAgICAgICAgTE9HKE1lZGlhLCAiSW5iYW5kR2VuZXJp Y1RleHRUcmFjazo6cmVtb3ZlR2VuZXJpY0N1ZSBVTkFCTEUgdG8gZmluZCBjdWU6IHN0YXJ0PSUu MmYsIGVuZD0lLjJmLCBjb250ZW50PVwiJXNcIlxuIiwgY3VlRGF0YS0+c3RhcnRUaW1lKCksIGN1 ZURhdGEtPmVuZFRpbWUoKSwgY3VlRGF0YS0+Y29udGVudCgpLnV0ZjgoKS5kYXRhKCkpOwogICAg ICAgICBtX2N1ZU1hcC5yZW1vdmUoY3VlRGF0YSk7CisgICAgfQogfQogCiB2b2lkIEluYmFuZEdl bmVyaWNUZXh0VHJhY2s6OnJlbW92ZUN1ZShUZXh0VHJhY2tDdWUqIGN1ZSwgRXhjZXB0aW9uQ29k ZSYgZWMpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWUuY3Bw CShyZXZpc2lvbiAxNzE2NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFj a0N1ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5OSw2ICsxOTksOSBAQCB2b2lkIFRleHRUcmFj a0N1ZTo6c2V0SXNBY3RpdmUoYm9vbCBhY3RpCiAKIGJvb2wgVGV4dFRyYWNrQ3VlOjppc09yZGVy ZWRCZWZvcmUoY29uc3QgVGV4dFRyYWNrQ3VlKiBvdGhlcikgY29uc3QKIHsKKyAgICBpZiAoY3Vl VHlwZSgpID09IEdlbmVyaWMpCisgICAgICAgIHJldHVybiBzdGFydFRpbWUoKSA+IG90aGVyLT5z dGFydFRpbWUoKTsKKwogICAgIHJldHVybiBzdGFydFRpbWUoKSA8IG90aGVyLT5zdGFydFRpbWUo KSB8fCAoc3RhcnRUaW1lKCkgPT0gb3RoZXItPnN0YXJ0VGltZSgpICYmIGVuZFRpbWUoKSA+IG90 aGVyLT5lbmRUaW1lKCkpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0luYmFu ZFRleHRUcmFja1ByaXZhdGVBVkYuY3BwCShyZXZpc2lvbiAxNzE2NDQpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0 ZUFWRi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc2LDI0ICs3NiwyNCBAQCB0eXBlZGVmIHN0cnVj dCBPcGFxdWVDTUJsb2NrQnVmZmVyKiBDTUJsCiB0eXBlZGVmIGNvbnN0IHN0cnVjdCBvcGFxdWVD TUZvcm1hdERlc2NyaXB0aW9uKiBDTUZvcm1hdERlc2NyaXB0aW9uUmVmOwogdHlwZWRlZiBzdHJ1 Y3Qgb3BhcXVlQ01TYW1wbGVCdWZmZXIqIENNU2FtcGxlQnVmZmVyUmVmOwogCi0jaWZuZGVmIENN U0FNUExFQlVGRkVSX0gNCi1leHRlcm4gIkMiIHsNCisjaWZuZGVmIENNU0FNUExFQlVGRkVSX0gK K2V4dGVybiAiQyIgewogI3ByYWdtYSBwYWNrKHB1c2gsIDQpCiAjaWZuZGVmIENNVElNRV9ICi0g ICAgdHlwZWRlZiBzdHJ1Y3QNCi0gICAgew0KLSAgICAgICAgaW50NjRfdCB2YWx1ZTsNCi0gICAg ICAgIGludDMyX3QgdGltZXNjYWxlOw0KLSAgICAgICAgdWludDMyX3QgZmxhZ3M7DQotICAgICAg ICBpbnQ2NF90IGVwb2NoOw0KKyAgICB0eXBlZGVmIHN0cnVjdAorICAgIHsKKyAgICAgICAgaW50 NjRfdCB2YWx1ZTsKKyAgICAgICAgaW50MzJfdCB0aW1lc2NhbGU7CisgICAgICAgIHVpbnQzMl90 IGZsYWdzOworICAgICAgICBpbnQ2NF90IGVwb2NoOwogICAgIH0gQ01UaW1lOwogI2VuZGlmCiAK LSAgICB0eXBlZGVmIHN0cnVjdA0KLSAgICB7DQotICAgICAgICBDTVRpbWUgZHVyYXRpb247DQot ICAgICAgICBDTVRpbWUgcHJlc2VudGF0aW9uVGltZVN0YW1wOw0KLSAgICAgICAgQ01UaW1lIGRl Y29kZVRpbWVTdGFtcDsNCisgICAgdHlwZWRlZiBzdHJ1Y3QKKyAgICB7CisgICAgICAgIENNVGlt ZSBkdXJhdGlvbjsKKyAgICAgICAgQ01UaW1lIHByZXNlbnRhdGlvblRpbWVTdGFtcDsKKyAgICAg ICAgQ01UaW1lIGRlY29kZVRpbWVTdGFtcDsKICAgICB9IENNU2FtcGxlVGltaW5nSW5mbzsKICNw cmFnbWEgcGFjayhwb3ApCiB9CkBAIC00NzcsNyArNDc3LDcgQEAgdm9pZCBJbmJhbmRUZXh0VHJh Y2tQcml2YXRlQVZGOjpwcm9jZXNzQQogICAgICAgICAgICAgICAgICAgICBpZiAoIWFycml2aW5n Q3VlLT5kb2VzRXh0ZW5kQ3VlRGF0YSgqY3VlRGF0YSkpCiAgICAgICAgICAgICAgICAgICAgICAg ICBub25FeHRlbnNpb25DdWVzLmFwcGVuZChhcnJpdmluZ0N1ZSk7CiAgICAgICAgICAgICAgICAg ICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgICAgIExPRyhNZWRpYSwgIkluYmFuZFRleHRU cmFja1ByaXZhdGVBVkY6OnByb2Nlc3NDdWUoJXApIC0gZm91bmQgYW4gZXh0ZW5zaW9uIGN1ZSAo XCIlc1wiKSBmb3IgdGltZSA9ICUuMmYsIHBvc2l0aW9uID0gICUuMmYsIGxpbmUgPSAgJS4yZiIs IHRoaXMsIGFycml2aW5nQ3VlLT5jb250ZW50KCkudXRmOCgpLmRhdGEoKSwgYXJyaXZpbmdDdWUt PnN0YXJ0VGltZSgpLCBhcnJpdmluZ0N1ZS0+cG9zaXRpb24oKSwgYXJyaXZpbmdDdWUtPmxpbmUo KSk7CisgICAgICAgICAgICAgICAgICAgICAgICBMT0coTWVkaWEsICJJbmJhbmRUZXh0VHJhY2tQ cml2YXRlQVZGOjpwcm9jZXNzQ3VlKCVwKSAtIGZvdW5kIGFuIGV4dGVuc2lvbiBjdWUgKFwiJXNc IikgZm9yIHRpbWUgPSAlLjJmLCBlbmQgPSAlLjJmLCBwb3NpdGlvbiA9ICAlLjJmLCBsaW5lID0g ICUuMmYiLCB0aGlzLCBhcnJpdmluZ0N1ZS0+Y29udGVudCgpLnV0ZjgoKS5kYXRhKCksIGFycml2 aW5nQ3VlLT5zdGFydFRpbWUoKSwgYXJyaXZpbmdDdWUtPmVuZFRpbWUoKSwgYXJyaXZpbmdDdWUt PnBvc2l0aW9uKCksIGFycml2aW5nQ3VlLT5saW5lKCkpOwogICAgICAgICAgICAgICAgIH0KIAog ICAgICAgICAgICAgICAgIGJvb2wgY3VycmVudEN1ZUlzRXh0ZW5kZWQgPSAoYXJyaXZpbmdDdWVz LnNpemUoKSAhPSBub25FeHRlbnNpb25DdWVzLnNpemUoKSk7CkBAIC00OTEsNyArNDkxLDcgQEAg dm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQQogICAgICAgICAgICAgICAg ICAgICBjdWVEYXRhLT5zZXRFbmRUaW1lKG1fY3VycmVudEN1ZUVuZFRpbWUpOwogICAgICAgICAg ICAgICAgICAgICBjdWVEYXRhLT5zZXRTdGF0dXMoR2VuZXJpY0N1ZURhdGE6OkNvbXBsZXRlKTsK IAotICAgICAgICAgICAgICAgICAgICBMT0coTWVkaWEsICJJbmJhbmRUZXh0VHJhY2tQcml2YXRl QVZGOjpwcm9jZXNzQ3VlKCVwKSAtIHVwZGF0aW5nIGN1ZTogc3RhcnQ9JS4yZiwgZW5kPSUuMmYs IGNvbnRlbnQ9XCIlc1wiIiwgdGhpcywgY3VlRGF0YS0+c3RhcnRUaW1lKCksIG1fY3VycmVudEN1 ZUVuZFRpbWUsIGN1ZURhdGEtPmNvbnRlbnQoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAg ICAgICAgICAgTE9HKE1lZGlhLCAiSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cHJvY2Vzc0N1 ZSglcCkgLSB1cGRhdGluZyBjdWUgXCIlc1wiOiBzdGFydD0lLjJmLCBlbmQ9JS4yZiIsIHRoaXMs IGN1ZURhdGEtPmNvbnRlbnQoKS51dGY4KCkuZGF0YSgpLCBjdWVEYXRhLT5zdGFydFRpbWUoKSwg bV9jdXJyZW50Q3VlRW5kVGltZSk7CiAgICAgICAgICAgICAgICAgICAgIGNsaWVudCgpLT51cGRh dGVHZW5lcmljQ3VlKHRoaXMsIGN1ZURhdGEuZ2V0KCkpOwogICAgICAgICAgICAgICAgIH0gZWxz ZSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIFdlIGhhdmUgdG8gYXNzdW1lIHRoYXQgdGhlIGlt cGxpY2l0IGR1cmF0aW9uIGlzIGludmFsaWQgZm9yIGN1ZXMgZGVsaXZlcmVkIGR1cmluZyBhIHNl ZWsgYmVjYXVzZSB0aGUgQVZGIGRlY29kZSBwaXBlbGluZSBtYXkgbm90CkBAIC01MTQsNyArNTE0 LDcgQEAgdm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQQogCiAgICAgICAg IG1fY3Vlcy5hcHBlbmQoY3VlRGF0YSk7CiAgICAgICAgIAotICAgICAgICBMT0coTWVkaWEsICJJ bmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQ3VlKCVwKSAtIGFkZGluZyBjdWUgZm9y IHRpbWUgPSAlLjJmLCBwb3NpdGlvbiA9ICAlLjJmLCBsaW5lID0gICUuMmYiLCB0aGlzLCBjdWVE YXRhLT5zdGFydFRpbWUoKSwgY3VlRGF0YS0+cG9zaXRpb24oKSwgY3VlRGF0YS0+bGluZSgpKTsK KyAgICAgICAgTE9HKE1lZGlhLCAiSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cHJvY2Vzc0N1 ZSglcCkgLSBhZGRpbmcgY3VlIFwiJXNcIiBmb3IgdGltZSA9ICUuMmYsIGVuZCA9ICUuMmYsIHBv c2l0aW9uID0gICUuMmYsIGxpbmUgPSAgJS4yZiIsIHRoaXMsIGN1ZURhdGEtPmNvbnRlbnQoKS51 dGY4KCkuZGF0YSgpLCBjdWVEYXRhLT5zdGFydFRpbWUoKSwgY3VlRGF0YS0+ZW5kVGltZSgpLCBj dWVEYXRhLT5wb3NpdGlvbigpLCBjdWVEYXRhLT5saW5lKCkpOwogCiAgICAgICAgIGNsaWVudCgp LT5hZGRHZW5lcmljQ3VlKHRoaXMsIGN1ZURhdGEucmVsZWFzZSgpKTsKICAgICB9CkBAIC01NDUs NiArNTQ1LDggQEAgdm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpyZW1vdmVDbwogICAg ICAgICAgICAgaWYgKG1fY3Vlc1tjdXJyZW50Q3VlXS0+c3RhdHVzKCkgIT0gR2VuZXJpY0N1ZURh dGE6OkNvbXBsZXRlKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCisgICAgICAgICAgICBM T0coTWVkaWEsICJJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpyZW1vdmVDb21wbGV0ZWRDdWVz KCVwKSAtIHJlbW92aW5nIGN1ZSBcIiVzXCI6IHN0YXJ0PSUuMmYsIGVuZD0lLjJmIiwgdGhpcywg bV9jdWVzW2N1cnJlbnRDdWVdLT5jb250ZW50KCkudXRmOCgpLmRhdGEoKSwgbV9jdWVzW2N1cnJl bnRDdWVdLT5zdGFydFRpbWUoKSwgbV9jdWVzW2N1cnJlbnRDdWVdLT5lbmRUaW1lKCkpOworCiAg ICAgICAgICAgICBtX2N1ZXMucmVtb3ZlKGN1cnJlbnRDdWUpOwogICAgICAgICB9CiAgICAgfQo= 235596 2014-07-28 09:04:45 -0700 2014-07-28 14:00:27 -0700 Re-Upload to allow EWS runs bug-135332-20140728090431.patch text/plain 8500 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MTY3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA3LTI3ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWMsIGlPU10gUGFpbnQt b24gY2xvc2VkIGNhcHRpb25zIGdldCBvdXQtb2Ytb3JkZXIgaW4gU2FmYXJpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzUzMzIKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzE1MzE3Mjc4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6 dXBkYXRlRGlzcGxheSk6IElmIHRoZQorICAgICAgICBudW1iZXIgb2YgYWN0aXZlIGN1ZXMgaXMg Z3JlYXRlciB0aGFuIHRoZSBjdXJyZW50IHNldCBvZiBDU1MgYm94ZXMgcmVwcmVzZW50aW5nCisg ICAgICAgIHRoZSBjdWVzLCB0aHJvdyBhd2F5IHRoZSBDU1MgYm94ZXMgYW5kIHJlLWxheW91dCBh bGwgdGhlIGN1ZXMuCisgICAgICAgICogaHRtbC90cmFjay9JbmJhbmRHZW5lcmljVGV4dFRyYWNr LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkluYmFuZEdlbmVyaWNUZXh0VHJhY2s6OmFkZEdlbmVy aWNDdWUpOiBBZGQgc29tZSBsb2dnaW5nLgorICAgICAgICAoV2ViQ29yZTo6SW5iYW5kR2VuZXJp Y1RleHRUcmFjazo6cmVtb3ZlR2VuZXJpY0N1ZSk6IERpdHRvLgorICAgICAgICAqIGh0bWwvdHJh Y2svVGV4dFRyYWNrQ3VlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFja0N1ZTo6aXNP cmRlcmVkQmVmb3JlKTogUmV2aXNlIG9yZGVyaW5nIHJ1bGVzIHNvIHRoYXQgd2UgcHV0CisgICAg ICAgIG5ld2VyIGN1ZXMgZWFybGllciBpbiB0aGUgbGF5b3V0IG9yZGVyIHNvIHRoZXkgYXJlIGRy YXduIHRvd2FyZHMgdGhlIGJvdHRvbQorICAgICAgICBvZiB0aGUgc2NyZWVuLgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZG LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nl c3NBdHRyaWJ1dGVkU3RyaW5ncyk6IEFkanVzdCBsb2dnaW5nCisgICAgICAgIG1lc3NhZ2VzLgor ICAgICAgICAoV2ViQ29yZTo6SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cmVtb3ZlQ29tcGxl dGVkQ3Vlcyk6IEFkZCBsb2dnaW5nLgorCiAyMDE0LTA3LTI4ICBCcmVudCBGdWxnaGFtICA8YmZ1 bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgJ21lcmdlJyBmaXguCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVu dHMuY3BwCShyZXZpc2lvbiAxNzE2NzgpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9N ZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyLDYgKzQyLDcgQEAK ICNpbmNsdWRlICJJbWFnZUJ1ZmZlci5oIgogI2luY2x1ZGUgIkxhbmd1YWdlLmgiCiAjaW5jbHVk ZSAiTG9jYWxpemVkU3RyaW5ncy5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJN ZWRpYUNvbnRyb2xzLmgiCiAjaW5jbHVkZSAiUGFnZUdyb3VwLmgiCiAjaW5jbHVkZSAiUmVuZGVy TGF5ZXIuaCIKQEAgLTEzMDMsNiArMTMwNCwxMyBAQCB2b2lkIE1lZGlhQ29udHJvbFRleHRUcmFj a0NvbnRhaW5lckVsZW1lCiAgICAgLy8gd2l0aGluIHRoZSBUZXh0VHJhY2tDdWUgaW5zdGFuY2Ug aXRzZWxmLiBJZiBwYXJhbWV0ZXJzIG9mIHRoZSBjdWUgY2hhbmdlLAogICAgIC8vIHRoZSBkaXNw bGF5IHRyZWUgaXMgY2xlYXJlZC4KIAorICAgIC8vIElmIHRoZSBudW1iZXIgb2YgQ1NTIGJveGVz IGluIHRoZSBvdXRwdXQgaXMgbGVzcyB0aGFuIHRoZSBudW1iZXIgb2YgY3VlcworICAgIC8vIHdl IHdpc2ggdG8gcmVuZGVyIChlLmcuLCB3ZSBhcmUgYWRkaW5nIGFub3RoZXIgY3VlIGluIGEgc2V0 IG9mIHJvbGwtdXAKKyAgICAvLyBjdWVzKSwgcmVtb3ZlIGFsbCB0aGUgZXhpc3RpbmcgQ1NTIGJv eGVzIHJlcHJlc2VudGluZyB0aGUgY3VlcyBhbmQgcmUtYWRkCisgICAgLy8gdGhlbSBzbyB0aGF0 IHRoZSBuZXcgY3VlIGlzIGF0IHRoZSBib3R0b20uCisgICAgaWYgKGNoaWxkTm9kZUNvdW50KCkg PCBhY3RpdmVDdWVzLnNpemUoKSkKKyAgICAgICAgcmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAKICAg ICAvLyAxMC4gRm9yIGVhY2ggdGV4dCB0cmFjayBjdWUgY3VlIGluIGN1ZXMgdGhhdCBoYXMgbm90 IHlldCBoYWQKICAgICAvLyBjb3JyZXNwb25kaW5nIENTUyBib3hlcyBhZGRlZCB0byBvdXRwdXQs IGluIHRleHQgdHJhY2sgY3VlIG9yZGVyLCBydW4gdGhlCiAgICAgLy8gZm9sbG93aW5nIHN1YnN0 ZXBzOgpAQCAtMTMyMCw2ICsxMzI4LDggQEAgdm9pZCBNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250 YWluZXJFbGVtZQogICAgICAgICBpZiAoIWN1ZS0+dHJhY2soKSB8fCAhY3VlLT50cmFjaygpLT5p c1JlbmRlcmVkKCkgfHwgIWN1ZS0+aXNBY3RpdmUoKSB8fCBjdWUtPnRleHQoKS5pc0VtcHR5KCkp CiAgICAgICAgICAgICBjb250aW51ZTsKIAorICAgICAgICBMT0coTWVkaWEsICJNZWRpYUNvbnRy b2xUZXh0VHJhY2tDb250YWluZXJFbGVtZW50Ojp1cGRhdGVEaXNwbGF5KCVwKSAtIGFkZGluZyBh bmQgcG9zaXRpb25pbmcgY3VlICMlenU6IFwiJXNcIiwgc3RhcnQ9JS4yZiwgZW5kPSUuMmYsIGxp bmU9JS4yZiIsIHRoaXMsIGksIGN1ZS0+dGV4dCgpLnV0ZjgoKS5kYXRhKCksIGN1ZS0+c3RhcnRU aW1lKCksIGN1ZS0+ZW5kVGltZSgpLCBjdWUtPmxpbmUoKSk7CisKICAgICAgICAgUmVmUHRyPFZU VEN1ZUJveD4gZGlzcGxheUJveCA9IGN1ZS0+Z2V0RGlzcGxheVRyZWUobV92aWRlb0Rpc3BsYXlT aXplLnNpemUoKSk7CiAjaWYgRU5BQkxFKFdFQlZUVF9SRUdJT05TKQogICAgICAgICBpZiAoY3Vl LT50cmFjaygpLT5tb2RlKCkgPT0gVGV4dFRyYWNrOjpkaXNhYmxlZEtleXdvcmQoKSkKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svSW5iYW5kR2VuZXJpY1RleHRUcmFjay5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9JbmJhbmRHZW5lcmljVGV4dFRy YWNrLmNwcAkocmV2aXNpb24gMTcxNjc4KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9J bmJhbmRHZW5lcmljVGV4dFRyYWNrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYwLDYgKzE2MCw4 IEBAIHZvaWQgSW5iYW5kR2VuZXJpY1RleHRUcmFjazo6YWRkR2VuZXJpY0MKICAgICAgICAgcmV0 dXJuOwogICAgIH0KIAorICAgIExPRyhNZWRpYSwgIkluYmFuZEdlbmVyaWNUZXh0VHJhY2s6OmFk ZEdlbmVyaWNDdWUgYWRkZWQgY3VlOiBzdGFydD0lLjJmLCBlbmQ9JS4yZiwgY29udGVudD1cIiVz XCJcbiIsIGN1ZURhdGEtPnN0YXJ0VGltZSgpLCBjdWVEYXRhLT5lbmRUaW1lKCksIGN1ZURhdGEt PmNvbnRlbnQoKS51dGY4KCkuZGF0YSgpKTsKKwogICAgIGlmIChjdWVEYXRhLT5zdGF0dXMoKSAh PSBHZW5lcmljQ3VlRGF0YTo6Q29tcGxldGUpCiAgICAgICAgIG1fY3VlTWFwLmFkZChjdWVEYXRh LmdldCgpLCBjdWUuZ2V0KCkpOwogCkBAIC0xODQsOCArMTg2LDEwIEBAIHZvaWQgSW5iYW5kR2Vu ZXJpY1RleHRUcmFjazo6cmVtb3ZlR2VuZXIKICAgICBpZiAoY3VlKSB7CiAgICAgICAgIExPRyhN ZWRpYSwgIkluYmFuZEdlbmVyaWNUZXh0VHJhY2s6OnJlbW92ZUdlbmVyaWNDdWUgcmVtb3Zpbmcg Y3VlOiBzdGFydD0lLjJmLCBlbmQ9JS4yZiwgY29udGVudD1cIiVzXCJcbiIsIGN1ZURhdGEtPnN0 YXJ0VGltZSgpLCBjdWVEYXRhLT5lbmRUaW1lKCksIGN1ZURhdGEtPmNvbnRlbnQoKS51dGY4KCku ZGF0YSgpKTsKICAgICAgICAgcmVtb3ZlQ3VlKGN1ZS5nZXQoKSwgSUdOT1JFX0VYQ0VQVElPTik7 Ci0gICAgfSBlbHNlCisgICAgfSBlbHNlIHsKKyAgICAgICAgTE9HKE1lZGlhLCAiSW5iYW5kR2Vu ZXJpY1RleHRUcmFjazo6cmVtb3ZlR2VuZXJpY0N1ZSBVTkFCTEUgdG8gZmluZCBjdWU6IHN0YXJ0 PSUuMmYsIGVuZD0lLjJmLCBjb250ZW50PVwiJXNcIlxuIiwgY3VlRGF0YS0+c3RhcnRUaW1lKCks IGN1ZURhdGEtPmVuZFRpbWUoKSwgY3VlRGF0YS0+Y29udGVudCgpLnV0ZjgoKS5kYXRhKCkpOwog ICAgICAgICBtX2N1ZU1hcC5yZW1vdmUoY3VlRGF0YSk7CisgICAgfQogfQogCiB2b2lkIEluYmFu ZEdlbmVyaWNUZXh0VHJhY2s6OnJlbW92ZUN1ZShUZXh0VHJhY2tDdWUqIGN1ZSwgRXhjZXB0aW9u Q29kZSYgZWMpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWUu Y3BwCShyZXZpc2lvbiAxNzE2NzgpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRU cmFja0N1ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5OSw2ICsxOTksOSBAQCB2b2lkIFRleHRU cmFja0N1ZTo6c2V0SXNBY3RpdmUoYm9vbCBhY3RpCiAKIGJvb2wgVGV4dFRyYWNrQ3VlOjppc09y ZGVyZWRCZWZvcmUoY29uc3QgVGV4dFRyYWNrQ3VlKiBvdGhlcikgY29uc3QKIHsKKyAgICBpZiAo Y3VlVHlwZSgpID09IEdlbmVyaWMpCisgICAgICAgIHJldHVybiBzdGFydFRpbWUoKSA+IG90aGVy LT5zdGFydFRpbWUoKTsKKwogICAgIHJldHVybiBzdGFydFRpbWUoKSA8IG90aGVyLT5zdGFydFRp bWUoKSB8fCAoc3RhcnRUaW1lKCkgPT0gb3RoZXItPnN0YXJ0VGltZSgpICYmIGVuZFRpbWUoKSA+ IG90aGVyLT5lbmRUaW1lKCkpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0lu YmFuZFRleHRUcmFja1ByaXZhdGVBVkYuY3BwCShyZXZpc2lvbiAxNzE2NzgpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJp dmF0ZUFWRi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3NSw3ICs0NzUsNyBAQCB2b2lkIEluYmFu ZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NBCiAgICAgICAgICAgICAgICAgICAgIGlmICgh YXJyaXZpbmdDdWUtPmRvZXNFeHRlbmRDdWVEYXRhKCpjdWVEYXRhKSkKICAgICAgICAgICAgICAg ICAgICAgICAgIG5vbkV4dGVuc2lvbkN1ZXMuYXBwZW5kKGFycml2aW5nQ3VlKTsKICAgICAgICAg ICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICAgICAgTE9HKE1lZGlhLCAiSW5i YW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cHJvY2Vzc0N1ZSglcCkgLSBmb3VuZCBhbiBleHRlbnNp b24gY3VlIChcIiVzXCIpIGZvciB0aW1lID0gJS4yZiwgcG9zaXRpb24gPSAgJS4yZiwgbGluZSA9 ICAlLjJmIiwgdGhpcywgYXJyaXZpbmdDdWUtPmNvbnRlbnQoKS51dGY4KCkuZGF0YSgpLCBhcnJp dmluZ0N1ZS0+c3RhcnRUaW1lKCksIGFycml2aW5nQ3VlLT5wb3NpdGlvbigpLCBhcnJpdmluZ0N1 ZS0+bGluZSgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIExPRyhNZWRpYSwgIkluYmFuZFRl eHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NDdWUoJXApIC0gZm91bmQgYW4gZXh0ZW5zaW9uIGN1 ZSAoXCIlc1wiKSBmb3IgdGltZSA9ICUuMmYsIGVuZCA9ICUuMmYsIHBvc2l0aW9uID0gICUuMmYs IGxpbmUgPSAgJS4yZiIsIHRoaXMsIGFycml2aW5nQ3VlLT5jb250ZW50KCkudXRmOCgpLmRhdGEo KSwgYXJyaXZpbmdDdWUtPnN0YXJ0VGltZSgpLCBhcnJpdmluZ0N1ZS0+ZW5kVGltZSgpLCBhcnJp dmluZ0N1ZS0+cG9zaXRpb24oKSwgYXJyaXZpbmdDdWUtPmxpbmUoKSk7CiAgICAgICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICAgICAgYm9vbCBjdXJyZW50Q3VlSXNFeHRlbmRlZCA9IChhcnJp dmluZ0N1ZXMuc2l6ZSgpICE9IG5vbkV4dGVuc2lvbkN1ZXMuc2l6ZSgpKTsKQEAgLTQ4OSw3ICs0 ODksNyBAQCB2b2lkIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NBCiAgICAgICAg ICAgICAgICAgICAgIGN1ZURhdGEtPnNldEVuZFRpbWUobV9jdXJyZW50Q3VlRW5kVGltZSk7CiAg ICAgICAgICAgICAgICAgICAgIGN1ZURhdGEtPnNldFN0YXR1cyhHZW5lcmljQ3VlRGF0YTo6Q29t cGxldGUpOwogCi0gICAgICAgICAgICAgICAgICAgIExPRyhNZWRpYSwgIkluYmFuZFRleHRUcmFj a1ByaXZhdGVBVkY6OnByb2Nlc3NDdWUoJXApIC0gdXBkYXRpbmcgY3VlOiBzdGFydD0lLjJmLCBl bmQ9JS4yZiwgY29udGVudD1cIiVzXCIiLCB0aGlzLCBjdWVEYXRhLT5zdGFydFRpbWUoKSwgbV9j dXJyZW50Q3VlRW5kVGltZSwgY3VlRGF0YS0+Y29udGVudCgpLnV0ZjgoKS5kYXRhKCkpOworICAg ICAgICAgICAgICAgICAgICBMT0coTWVkaWEsICJJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpw cm9jZXNzQ3VlKCVwKSAtIHVwZGF0aW5nIGN1ZSBcIiVzXCI6IHN0YXJ0PSUuMmYsIGVuZD0lLjJm IiwgdGhpcywgY3VlRGF0YS0+Y29udGVudCgpLnV0ZjgoKS5kYXRhKCksIGN1ZURhdGEtPnN0YXJ0 VGltZSgpLCBtX2N1cnJlbnRDdWVFbmRUaW1lKTsKICAgICAgICAgICAgICAgICAgICAgY2xpZW50 KCktPnVwZGF0ZUdlbmVyaWNDdWUodGhpcywgY3VlRGF0YS5nZXQoKSk7CiAgICAgICAgICAgICAg ICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgLy8gV2UgaGF2ZSB0byBhc3N1bWUgdGhh dCB0aGUgaW1wbGljaXQgZHVyYXRpb24gaXMgaW52YWxpZCBmb3IgY3VlcyBkZWxpdmVyZWQgZHVy aW5nIGEgc2VlayBiZWNhdXNlIHRoZSBBVkYgZGVjb2RlIHBpcGVsaW5lIG1heSBub3QKQEAgLTUx Miw3ICs1MTIsNyBAQCB2b2lkIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NBCiAK ICAgICAgICAgbV9jdWVzLmFwcGVuZChjdWVEYXRhKTsKICAgICAgICAgCi0gICAgICAgIExPRyhN ZWRpYSwgIkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NDdWUoJXApIC0gYWRkaW5n IGN1ZSBmb3IgdGltZSA9ICUuMmYsIHBvc2l0aW9uID0gICUuMmYsIGxpbmUgPSAgJS4yZiIsIHRo aXMsIGN1ZURhdGEtPnN0YXJ0VGltZSgpLCBjdWVEYXRhLT5wb3NpdGlvbigpLCBjdWVEYXRhLT5s aW5lKCkpOworICAgICAgICBMT0coTWVkaWEsICJJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpw cm9jZXNzQ3VlKCVwKSAtIGFkZGluZyBjdWUgXCIlc1wiIGZvciB0aW1lID0gJS4yZiwgZW5kID0g JS4yZiwgcG9zaXRpb24gPSAgJS4yZiwgbGluZSA9ICAlLjJmIiwgdGhpcywgY3VlRGF0YS0+Y29u dGVudCgpLnV0ZjgoKS5kYXRhKCksIGN1ZURhdGEtPnN0YXJ0VGltZSgpLCBjdWVEYXRhLT5lbmRU aW1lKCksIGN1ZURhdGEtPnBvc2l0aW9uKCksIGN1ZURhdGEtPmxpbmUoKSk7CiAKICAgICAgICAg Y2xpZW50KCktPmFkZEdlbmVyaWNDdWUodGhpcywgY3VlRGF0YS5yZWxlYXNlKCkpOwogICAgIH0K QEAgLTU0Myw2ICs1NDMsOCBAQCB2b2lkIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnJlbW92 ZUNvCiAgICAgICAgICAgICBpZiAobV9jdWVzW2N1cnJlbnRDdWVdLT5zdGF0dXMoKSAhPSBHZW5l cmljQ3VlRGF0YTo6Q29tcGxldGUpCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAKKyAgICAg ICAgICAgIExPRyhNZWRpYSwgIkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnJlbW92ZUNvbXBs ZXRlZEN1ZXMoJXApIC0gcmVtb3ZpbmcgY3VlIFwiJXNcIjogc3RhcnQ9JS4yZiwgZW5kPSUuMmYi LCB0aGlzLCBtX2N1ZXNbY3VycmVudEN1ZV0tPmNvbnRlbnQoKS51dGY4KCkuZGF0YSgpLCBtX2N1 ZXNbY3VycmVudEN1ZV0tPnN0YXJ0VGltZSgpLCBtX2N1ZXNbY3VycmVudEN1ZV0tPmVuZFRpbWUo KSk7CisKICAgICAgICAgICAgIG1fY3Vlcy5yZW1vdmUoY3VycmVudEN1ZSk7CiAgICAgICAgIH0K ICAgICB9Cg== 235614 2014-07-28 14:00:32 -0700 2014-07-28 14:58:03 -0700 Patch (Remarking as r+) bug-135332-20140728140018.patch text/plain 9097 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MTY3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA3LTI3ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWMsIGlPU10gUGFpbnQt b24gY2xvc2VkIGNhcHRpb25zIGdldCBvdXQtb2Ytb3JkZXIgaW4gU2FmYXJpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzUzMzIKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzE1MzE3Mjc4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6 dXBkYXRlRGlzcGxheSk6IElmIHRoZQorICAgICAgICBudW1iZXIgb2YgYWN0aXZlIGN1ZXMgaXMg Z3JlYXRlciB0aGFuIHRoZSBjdXJyZW50IHNldCBvZiBDU1MgYm94ZXMgcmVwcmVzZW50aW5nCisg ICAgICAgIHRoZSBjdWVzLCB0aHJvdyBhd2F5IHRoZSBDU1MgYm94ZXMgYW5kIHJlLWxheW91dCBh bGwgdGhlIGN1ZXMuCisgICAgICAgICogaHRtbC90cmFjay9JbmJhbmRHZW5lcmljVGV4dFRyYWNr LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkluYmFuZEdlbmVyaWNUZXh0VHJhY2s6OmFkZEdlbmVy aWNDdWUpOiBBZGQgc29tZSBsb2dnaW5nLgorICAgICAgICAoV2ViQ29yZTo6SW5iYW5kR2VuZXJp Y1RleHRUcmFjazo6cmVtb3ZlR2VuZXJpY0N1ZSk6IERpdHRvLgorICAgICAgICAqIGh0bWwvdHJh Y2svVGV4dFRyYWNrQ3VlR2VuZXJpYy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0VHJhY2tD dWVHZW5lcmljOjppc09yZGVyZWRCZWZvcmUpOiBSZXZpc2Ugb3JkZXJpbmcgcnVsZXMgc28gdGhh dCB3ZSBwdXQKKyAgICAgICAgbmV3ZXIgY3VlcyBlYXJsaWVyIGluIHRoZSBsYXlvdXQgb3JkZXIg c28gdGhleSBhcmUgZHJhd24gdG93YXJkcyB0aGUgYm90dG9tCisgICAgICAgIG9mIHRoZSBzY3Jl ZW4uIE9ubHkgZG8gdGhpcyBmb3IgR2VuZXJpYyBjYXB0aW9ucy4KKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQXR0cmli dXRlZFN0cmluZ3MpOiBBZGp1c3QgbG9nZ2luZworICAgICAgICBtZXNzYWdlcy4KKyAgICAgICAg KFdlYkNvcmU6OkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnJlbW92ZUNvbXBsZXRlZEN1ZXMp OiBBZGQgbG9nZ2luZy4KKwogMjAxNC0wNy0yOCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFw cGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkICdtZXJnZScgZml4LgpJbmRleDogU291cmNl L1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcAko cmV2aXNpb24gMTcxNjc4KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250 cm9sRWxlbWVudHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Miw2ICs0Miw3IEBACiAjaW5jbHVk ZSAiSW1hZ2VCdWZmZXIuaCIKICNpbmNsdWRlICJMYW5ndWFnZS5oIgogI2luY2x1ZGUgIkxvY2Fs aXplZFN0cmluZ3MuaCIKKyNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiTWVkaWFDb250 cm9scy5oIgogI2luY2x1ZGUgIlBhZ2VHcm91cC5oIgogI2luY2x1ZGUgIlJlbmRlckxheWVyLmgi CkBAIC0xMzAzLDYgKzEzMDQsMTMgQEAgdm9pZCBNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWlu ZXJFbGVtZQogICAgIC8vIHdpdGhpbiB0aGUgVGV4dFRyYWNrQ3VlIGluc3RhbmNlIGl0c2VsZi4g SWYgcGFyYW1ldGVycyBvZiB0aGUgY3VlIGNoYW5nZSwKICAgICAvLyB0aGUgZGlzcGxheSB0cmVl IGlzIGNsZWFyZWQuCiAKKyAgICAvLyBJZiB0aGUgbnVtYmVyIG9mIENTUyBib3hlcyBpbiB0aGUg b3V0cHV0IGlzIGxlc3MgdGhhbiB0aGUgbnVtYmVyIG9mIGN1ZXMKKyAgICAvLyB3ZSB3aXNoIHRv IHJlbmRlciAoZS5nLiwgd2UgYXJlIGFkZGluZyBhbm90aGVyIGN1ZSBpbiBhIHNldCBvZiByb2xs LXVwCisgICAgLy8gY3VlcyksIHJlbW92ZSBhbGwgdGhlIGV4aXN0aW5nIENTUyBib3hlcyByZXBy ZXNlbnRpbmcgdGhlIGN1ZXMgYW5kIHJlLWFkZAorICAgIC8vIHRoZW0gc28gdGhhdCB0aGUgbmV3 IGN1ZSBpcyBhdCB0aGUgYm90dG9tLgorICAgIGlmIChjaGlsZE5vZGVDb3VudCgpIDwgYWN0aXZl Q3Vlcy5zaXplKCkpCisgICAgICAgIHJlbW92ZUNoaWxkcmVuKCk7CisgICAgCiAgICAgLy8gMTAu IEZvciBlYWNoIHRleHQgdHJhY2sgY3VlIGN1ZSBpbiBjdWVzIHRoYXQgaGFzIG5vdCB5ZXQgaGFk CiAgICAgLy8gY29ycmVzcG9uZGluZyBDU1MgYm94ZXMgYWRkZWQgdG8gb3V0cHV0LCBpbiB0ZXh0 IHRyYWNrIGN1ZSBvcmRlciwgcnVuIHRoZQogICAgIC8vIGZvbGxvd2luZyBzdWJzdGVwczoKQEAg LTEzMjAsNiArMTMyOCw4IEBAIHZvaWQgTWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxl bWUKICAgICAgICAgaWYgKCFjdWUtPnRyYWNrKCkgfHwgIWN1ZS0+dHJhY2soKS0+aXNSZW5kZXJl ZCgpIHx8ICFjdWUtPmlzQWN0aXZlKCkgfHwgY3VlLT50ZXh0KCkuaXNFbXB0eSgpKQogICAgICAg ICAgICAgY29udGludWU7CiAKKyAgICAgICAgTE9HKE1lZGlhLCAiTWVkaWFDb250cm9sVGV4dFRy YWNrQ29udGFpbmVyRWxlbWVudDo6dXBkYXRlRGlzcGxheSglcCkgLSBhZGRpbmcgYW5kIHBvc2l0 aW9uaW5nIGN1ZSAjJXp1OiBcIiVzXCIsIHN0YXJ0PSUuMmYsIGVuZD0lLjJmLCBsaW5lPSUuMmYi LCB0aGlzLCBpLCBjdWUtPnRleHQoKS51dGY4KCkuZGF0YSgpLCBjdWUtPnN0YXJ0VGltZSgpLCBj dWUtPmVuZFRpbWUoKSwgY3VlLT5saW5lKCkpOworCiAgICAgICAgIFJlZlB0cjxWVFRDdWVCb3g+ IGRpc3BsYXlCb3ggPSBjdWUtPmdldERpc3BsYXlUcmVlKG1fdmlkZW9EaXNwbGF5U2l6ZS5zaXpl KCkpOwogI2lmIEVOQUJMRShXRUJWVFRfUkVHSU9OUykKICAgICAgICAgaWYgKGN1ZS0+dHJhY2so KS0+bW9kZSgpID09IFRleHRUcmFjazo6ZGlzYWJsZWRLZXl3b3JkKCkpCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9odG1sL3RyYWNrL0luYmFuZEdlbmVyaWNUZXh0VHJhY2suY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svSW5iYW5kR2VuZXJpY1RleHRUcmFjay5jcHAJ KHJldmlzaW9uIDE3MTY3OCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svSW5iYW5kR2Vu ZXJpY1RleHRUcmFjay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2MCw2ICsxNjAsOCBAQCB2b2lk IEluYmFuZEdlbmVyaWNUZXh0VHJhY2s6OmFkZEdlbmVyaWNDCiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKKyAgICBMT0coTWVkaWEsICJJbmJhbmRHZW5lcmljVGV4dFRyYWNrOjphZGRHZW5lcmlj Q3VlIGFkZGVkIGN1ZTogc3RhcnQ9JS4yZiwgZW5kPSUuMmYsIGNvbnRlbnQ9XCIlc1wiXG4iLCBj dWVEYXRhLT5zdGFydFRpbWUoKSwgY3VlRGF0YS0+ZW5kVGltZSgpLCBjdWVEYXRhLT5jb250ZW50 KCkudXRmOCgpLmRhdGEoKSk7CisKICAgICBpZiAoY3VlRGF0YS0+c3RhdHVzKCkgIT0gR2VuZXJp Y0N1ZURhdGE6OkNvbXBsZXRlKQogICAgICAgICBtX2N1ZU1hcC5hZGQoY3VlRGF0YS5nZXQoKSwg Y3VlLmdldCgpKTsKIApAQCAtMTg0LDggKzE4NiwxMCBAQCB2b2lkIEluYmFuZEdlbmVyaWNUZXh0 VHJhY2s6OnJlbW92ZUdlbmVyCiAgICAgaWYgKGN1ZSkgewogICAgICAgICBMT0coTWVkaWEsICJJ bmJhbmRHZW5lcmljVGV4dFRyYWNrOjpyZW1vdmVHZW5lcmljQ3VlIHJlbW92aW5nIGN1ZTogc3Rh cnQ9JS4yZiwgZW5kPSUuMmYsIGNvbnRlbnQ9XCIlc1wiXG4iLCBjdWVEYXRhLT5zdGFydFRpbWUo KSwgY3VlRGF0YS0+ZW5kVGltZSgpLCBjdWVEYXRhLT5jb250ZW50KCkudXRmOCgpLmRhdGEoKSk7 CiAgICAgICAgIHJlbW92ZUN1ZShjdWUuZ2V0KCksIElHTk9SRV9FWENFUFRJT04pOwotICAgIH0g ZWxzZQorICAgIH0gZWxzZSB7CisgICAgICAgIExPRyhNZWRpYSwgIkluYmFuZEdlbmVyaWNUZXh0 VHJhY2s6OnJlbW92ZUdlbmVyaWNDdWUgVU5BQkxFIHRvIGZpbmQgY3VlOiBzdGFydD0lLjJmLCBl bmQ9JS4yZiwgY29udGVudD1cIiVzXCJcbiIsIGN1ZURhdGEtPnN0YXJ0VGltZSgpLCBjdWVEYXRh LT5lbmRUaW1lKCksIGN1ZURhdGEtPmNvbnRlbnQoKS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAg bV9jdWVNYXAucmVtb3ZlKGN1ZURhdGEpOworICAgIH0KIH0KIAogdm9pZCBJbmJhbmRHZW5lcmlj VGV4dFRyYWNrOjpyZW1vdmVDdWUoVGV4dFRyYWNrQ3VlKiBjdWUsIEV4Y2VwdGlvbkNvZGUmIGVj KQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWVHZW5lcmljLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZUdl bmVyaWMuY3BwCShyZXZpc2lvbiAxNzE2NzgpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNr L1RleHRUcmFja0N1ZUdlbmVyaWMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMDIsOSArMjAyLDYg QEAgYm9vbCBUZXh0VHJhY2tDdWVHZW5lcmljOjpkb2VzRXh0ZW5kQ3VlKAogCiBib29sIFRleHRU cmFja0N1ZUdlbmVyaWM6OmlzT3JkZXJlZEJlZm9yZShjb25zdCBUZXh0VHJhY2tDdWUqIHRoYXQp IGNvbnN0CiB7Ci0gICAgaWYgKFZUVEN1ZTo6aXNPcmRlcmVkQmVmb3JlKHRoYXQpKQotICAgICAg ICByZXR1cm4gdHJ1ZTsKLQogICAgIGlmICh0aGF0LT5jdWVUeXBlKCkgPT0gR2VuZXJpYyAmJiBz dGFydFRpbWUoKSA9PSB0aGF0LT5zdGFydFRpbWUoKSAmJiBlbmRUaW1lKCkgPT0gdGhhdC0+ZW5k VGltZSgpKSB7CiAgICAgICAgIC8vIEZ1cnRoZXIgb3JkZXIgZ2VuZXJpYyBjdWVzIGJ5IHRoZWly IGNhbGN1bGF0ZWQgbGluZSB2YWx1ZS4KICAgICAgICAgc3RkOjpwYWlyPGRvdWJsZSwgZG91Ymxl PiB0aGlzUG9zaXRpb24gPSBnZXRQb3NpdGlvbkNvb3JkaW5hdGVzKCk7CkBAIC0yMTIsNyArMjA5 LDEwIEBAIGJvb2wgVGV4dFRyYWNrQ3VlR2VuZXJpYzo6aXNPcmRlcmVkQmVmb3IKICAgICAgICAg cmV0dXJuIHRoaXNQb3NpdGlvbi5zZWNvbmQgPiB0aGF0UG9zaXRpb24uc2Vjb25kIHx8ICh0aGlz UG9zaXRpb24uc2Vjb25kID09IHRoYXRQb3NpdGlvbi5zZWNvbmQgJiYgdGhpc1Bvc2l0aW9uLmZp cnN0IDwgdGhhdFBvc2l0aW9uLmZpcnN0KTsKICAgICB9CiAKLSAgICByZXR1cm4gZmFsc2U7Cisg ICAgaWYgKHRoYXQtPmN1ZVR5cGUoKSA9PSBHZW5lcmljKQorICAgICAgICByZXR1cm4gc3RhcnRU aW1lKCkgPiB0aGF0LT5zdGFydFRpbWUoKTsKKyAgICAKKyAgICByZXR1cm4gVlRUQ3VlOjppc09y ZGVyZWRCZWZvcmUodGhhdCk7CiB9CiAgICAgCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4 dFRyYWNrUHJpdmF0ZUFWRi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0luYmFuZFRleHRUcmFja1ByaXZhdGVBVkYuY3BwCShy ZXZpc2lvbiAxNzE2NzgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQ3NSw3ICs0NzUsNyBAQCB2b2lkIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NB CiAgICAgICAgICAgICAgICAgICAgIGlmICghYXJyaXZpbmdDdWUtPmRvZXNFeHRlbmRDdWVEYXRh KCpjdWVEYXRhKSkKICAgICAgICAgICAgICAgICAgICAgICAgIG5vbkV4dGVuc2lvbkN1ZXMuYXBw ZW5kKGFycml2aW5nQ3VlKTsKICAgICAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgICAgICAgICAgTE9HKE1lZGlhLCAiSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cHJvY2Vz c0N1ZSglcCkgLSBmb3VuZCBhbiBleHRlbnNpb24gY3VlIChcIiVzXCIpIGZvciB0aW1lID0gJS4y ZiwgcG9zaXRpb24gPSAgJS4yZiwgbGluZSA9ICAlLjJmIiwgdGhpcywgYXJyaXZpbmdDdWUtPmNv bnRlbnQoKS51dGY4KCkuZGF0YSgpLCBhcnJpdmluZ0N1ZS0+c3RhcnRUaW1lKCksIGFycml2aW5n Q3VlLT5wb3NpdGlvbigpLCBhcnJpdmluZ0N1ZS0+bGluZSgpKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIExPRyhNZWRpYSwgIkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NDdWUo JXApIC0gZm91bmQgYW4gZXh0ZW5zaW9uIGN1ZSAoXCIlc1wiKSBmb3IgdGltZSA9ICUuMmYsIGVu ZCA9ICUuMmYsIHBvc2l0aW9uID0gICUuMmYsIGxpbmUgPSAgJS4yZiIsIHRoaXMsIGFycml2aW5n Q3VlLT5jb250ZW50KCkudXRmOCgpLmRhdGEoKSwgYXJyaXZpbmdDdWUtPnN0YXJ0VGltZSgpLCBh cnJpdmluZ0N1ZS0+ZW5kVGltZSgpLCBhcnJpdmluZ0N1ZS0+cG9zaXRpb24oKSwgYXJyaXZpbmdD dWUtPmxpbmUoKSk7CiAgICAgICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAgICAgYm9vbCBj dXJyZW50Q3VlSXNFeHRlbmRlZCA9IChhcnJpdmluZ0N1ZXMuc2l6ZSgpICE9IG5vbkV4dGVuc2lv bkN1ZXMuc2l6ZSgpKTsKQEAgLTQ4OSw3ICs0ODksNyBAQCB2b2lkIEluYmFuZFRleHRUcmFja1By aXZhdGVBVkY6OnByb2Nlc3NBCiAgICAgICAgICAgICAgICAgICAgIGN1ZURhdGEtPnNldEVuZFRp bWUobV9jdXJyZW50Q3VlRW5kVGltZSk7CiAgICAgICAgICAgICAgICAgICAgIGN1ZURhdGEtPnNl dFN0YXR1cyhHZW5lcmljQ3VlRGF0YTo6Q29tcGxldGUpOwogCi0gICAgICAgICAgICAgICAgICAg IExPRyhNZWRpYSwgIkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NDdWUoJXApIC0g dXBkYXRpbmcgY3VlOiBzdGFydD0lLjJmLCBlbmQ9JS4yZiwgY29udGVudD1cIiVzXCIiLCB0aGlz LCBjdWVEYXRhLT5zdGFydFRpbWUoKSwgbV9jdXJyZW50Q3VlRW5kVGltZSwgY3VlRGF0YS0+Y29u dGVudCgpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICAgICAgICAgICAgICBMT0coTWVkaWEsICJJ bmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQ3VlKCVwKSAtIHVwZGF0aW5nIGN1ZSBc IiVzXCI6IHN0YXJ0PSUuMmYsIGVuZD0lLjJmIiwgdGhpcywgY3VlRGF0YS0+Y29udGVudCgpLnV0 ZjgoKS5kYXRhKCksIGN1ZURhdGEtPnN0YXJ0VGltZSgpLCBtX2N1cnJlbnRDdWVFbmRUaW1lKTsK ICAgICAgICAgICAgICAgICAgICAgY2xpZW50KCktPnVwZGF0ZUdlbmVyaWNDdWUodGhpcywgY3Vl RGF0YS5nZXQoKSk7CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAg ICAgLy8gV2UgaGF2ZSB0byBhc3N1bWUgdGhhdCB0aGUgaW1wbGljaXQgZHVyYXRpb24gaXMgaW52 YWxpZCBmb3IgY3VlcyBkZWxpdmVyZWQgZHVyaW5nIGEgc2VlayBiZWNhdXNlIHRoZSBBVkYgZGVj b2RlIHBpcGVsaW5lIG1heSBub3QKQEAgLTUxMiw3ICs1MTIsNyBAQCB2b2lkIEluYmFuZFRleHRU cmFja1ByaXZhdGVBVkY6OnByb2Nlc3NBCiAKICAgICAgICAgbV9jdWVzLmFwcGVuZChjdWVEYXRh KTsKICAgICAgICAgCi0gICAgICAgIExPRyhNZWRpYSwgIkluYmFuZFRleHRUcmFja1ByaXZhdGVB VkY6OnByb2Nlc3NDdWUoJXApIC0gYWRkaW5nIGN1ZSBmb3IgdGltZSA9ICUuMmYsIHBvc2l0aW9u ID0gICUuMmYsIGxpbmUgPSAgJS4yZiIsIHRoaXMsIGN1ZURhdGEtPnN0YXJ0VGltZSgpLCBjdWVE YXRhLT5wb3NpdGlvbigpLCBjdWVEYXRhLT5saW5lKCkpOworICAgICAgICBMT0coTWVkaWEsICJJ bmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQ3VlKCVwKSAtIGFkZGluZyBjdWUgXCIl c1wiIGZvciB0aW1lID0gJS4yZiwgZW5kID0gJS4yZiwgcG9zaXRpb24gPSAgJS4yZiwgbGluZSA9 ICAlLjJmIiwgdGhpcywgY3VlRGF0YS0+Y29udGVudCgpLnV0ZjgoKS5kYXRhKCksIGN1ZURhdGEt PnN0YXJ0VGltZSgpLCBjdWVEYXRhLT5lbmRUaW1lKCksIGN1ZURhdGEtPnBvc2l0aW9uKCksIGN1 ZURhdGEtPmxpbmUoKSk7CiAKICAgICAgICAgY2xpZW50KCktPmFkZEdlbmVyaWNDdWUodGhpcywg Y3VlRGF0YS5yZWxlYXNlKCkpOwogICAgIH0KQEAgLTU0Myw2ICs1NDMsOCBAQCB2b2lkIEluYmFu ZFRleHRUcmFja1ByaXZhdGVBVkY6OnJlbW92ZUNvCiAgICAgICAgICAgICBpZiAobV9jdWVzW2N1 cnJlbnRDdWVdLT5zdGF0dXMoKSAhPSBHZW5lcmljQ3VlRGF0YTo6Q29tcGxldGUpCiAgICAgICAg ICAgICAgICAgY29udGludWU7CiAKKyAgICAgICAgICAgIExPRyhNZWRpYSwgIkluYmFuZFRleHRU cmFja1ByaXZhdGVBVkY6OnJlbW92ZUNvbXBsZXRlZEN1ZXMoJXApIC0gcmVtb3ZpbmcgY3VlIFwi JXNcIjogc3RhcnQ9JS4yZiwgZW5kPSUuMmYiLCB0aGlzLCBtX2N1ZXNbY3VycmVudEN1ZV0tPmNv bnRlbnQoKS51dGY4KCkuZGF0YSgpLCBtX2N1ZXNbY3VycmVudEN1ZV0tPnN0YXJ0VGltZSgpLCBt X2N1ZXNbY3VycmVudEN1ZV0tPmVuZFRpbWUoKSk7CisKICAgICAgICAgICAgIG1fY3Vlcy5yZW1v dmUoY3VycmVudEN1ZSk7CiAgICAgICAgIH0KICAgICB9Cg==