139819 2014-12-19 10:44:40 -0800 [iOS] Log how often media element playback happens using FeatureCounter 2014-12-19 13:07:47 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez barraclough calvaris commit-queue eric.carlson esprehn+autocc glenn gyuyoung.kim jer.noble kling philipj sergio oldest_to_newest 1057068 0 cdumez 2014-12-19 10:44:40 -0800 Log how often media element playback happens using FeatureCounter. Radar: <rdar://problem/19309988> 1057072 1 243555 cdumez 2014-12-19 10:48:34 -0800 Created attachment 243555 Patch 1057077 2 243555 eric.carlson 2014-12-19 10:57:22 -0800 Comment on attachment 243555 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243555&action=review > Source/WebCore/html/HTMLMediaElement.cpp:4544 > + if (!currentMediaTime()) { > + // Log that a media element started playback. > + FEATURE_COUNTER_INCREMENT_KEY(document().page(), isVideo() ? FeatureCounterMediaPlayingVideoKey : FeatureCounterMediaPlayingAudioKey); > + } > + This will increment the counter every time a file loops or is rewound, so I think it is probably worth adding an instance variable to track the first time playback begins. 1057081 3 243555 cdumez 2014-12-19 11:00:18 -0800 Comment on attachment 243555 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243555&action=review >> Source/WebCore/html/HTMLMediaElement.cpp:4544 >> + > > This will increment the counter every time a file loops or is rewound, so I think it is probably worth adding an instance variable to track the first time playback begins. I thought about this case and thought it would be useful to log the case when we play the media again. In my opinion, playing a new media or playing the same media again is similar (in terms of power usage for e.g.). 1057094 4 eric.carlson 2014-12-19 11:13:43 -0800 (In reply to comment #3) > Comment on attachment 243555 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=243555&action=review > > >> Source/WebCore/html/HTMLMediaElement.cpp:4544 > >> + > > > > This will increment the counter every time a file loops or is rewound, so I think it is probably worth adding an instance variable to track the first time playback begins. > > I thought about this case and thought it would be useful to log the case > when we play the media again. In my opinion, playing a new media or playing > the same media again is similar (in terms of power usage for e.g.). OK. Probably worth adding a comment to that effect to avoid confusion. 1057107 5 cdumez 2014-12-19 11:31:20 -0800 (In reply to comment #4) > (In reply to comment #3) > > Comment on attachment 243555 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=243555&action=review > > > > >> Source/WebCore/html/HTMLMediaElement.cpp:4544 > > >> + > > > > > > This will increment the counter every time a file loops or is rewound, so I think it is probably worth adding an instance variable to track the first time playback begins. > > > > I thought about this case and thought it would be useful to log the case > > when we play the media again. In my opinion, playing a new media or playing > > the same media again is similar (in terms of power usage for e.g.). > > OK. Probably worth adding a comment to that effect to avoid confusion. I have just discussed this with Gavin and came to the conclusion that counting each media only once is more useful. We're also interested in the total number of media items (to get a ratio of total vs played). I'll update the patch accordingly. 1057117 6 243561 cdumez 2014-12-19 11:46:06 -0800 Created attachment 243561 Patch 1057118 7 commit-queue 2014-12-19 11:47:55 -0800 Attachment 243561 did not pass style-queue: ERROR: Source/WebCore/html/HTMLMediaElement.h:830: Please declare enum bitfields as unsigned integral types. [runtime/enum_bitfields] [5] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1057123 8 243561 eric.carlson 2014-12-19 11:57:13 -0800 Comment on attachment 243561 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243561&action=review > Source/WebCore/ChangeLog:16 > + (WebCore::HTMLMediaElement::parseAttribute): prepareChangeLog gets confused by some of the #if's in HTMLMediaElement.cpp and says every change is in HTMLMediaElement::parseAttribute. Can you change this to "WebCore::HTMLMediaElement::updatePlayState"? > Source/WebCore/html/HTMLVideoElement.cpp:59 > + > + // Log that we encountered a video element. > + FEATURE_COUNTER_INCREMENT_KEY(document.page(), FeatureCounterMediaVideoElementKey); I am not sure this count exactly what you want, because lots (and lots and lots) of pages create one or more temporary video/audio elements on page load to detect what media formats the browser supports. This is frequently done by libraries included by pages that don't have and audio or video to play. If you want to count the number of elements that are created that might play, I think it might make more sense to increment the count in HTMLMediaElement::loadResource where the src is set to a non-empty url. 1057124 9 cdumez 2014-12-19 11:58:53 -0800 (In reply to comment #8) > Comment on attachment 243561 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=243561&action=review > > > Source/WebCore/ChangeLog:16 > > + (WebCore::HTMLMediaElement::parseAttribute): > > prepareChangeLog gets confused by some of the #if's in HTMLMediaElement.cpp > and says every change is in HTMLMediaElement::parseAttribute. Can you change > this to "WebCore::HTMLMediaElement::updatePlayState"? Sure. > > Source/WebCore/html/HTMLVideoElement.cpp:59 > > + > > + // Log that we encountered a video element. > > + FEATURE_COUNTER_INCREMENT_KEY(document.page(), FeatureCounterMediaVideoElementKey); > > I am not sure this count exactly what you want, because lots (and lots and > lots) of pages create one or more temporary video/audio elements on page > load to detect what media formats the browser supports. This is frequently > done by libraries included by pages that don't have and audio or video to > play. If you want to count the number of elements that are created that > might play, I think it might make more sense to increment the count in > HTMLMediaElement::loadResource where the src is set to a non-empty url. Interesting, I did not know this. Thanks for catching it, I definitely need to update this then. 1057127 10 243562 cdumez 2014-12-19 12:10:25 -0800 Created attachment 243562 Patch 1057128 11 commit-queue 2014-12-19 12:11:29 -0800 Attachment 243562 did not pass style-queue: ERROR: Source/WebCore/html/HTMLMediaElement.h:830: Please declare enum bitfields as unsigned integral types. [runtime/enum_bitfields] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1057150 12 243562 commit-queue 2014-12-19 13:07:41 -0800 Comment on attachment 243562 Patch Clearing flags on attachment: 243562 Committed r177591: <http://trac.webkit.org/changeset/177591> 1057151 13 commit-queue 2014-12-19 13:07:47 -0800 All reviewed patches have been landed. Closing bug. 243555 2014-12-19 10:48:34 -0800 2014-12-19 11:46:02 -0800 Patch bug-139819-20141219104834.patch text/plain 3285 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2I4MzYxZmVmNGVjYWUw N2RmYjdjOWEzZTE0NmY3YWJhNTkxNGZlZS4uMTQ5NGI2ODEzYTBhMmJiYzZkMDE2MzNkNDM4NDhm NGU2MDQ0ZTFmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTEyLTE5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTG9nIGhvdyBvZnRl biBtZWRpYSBlbGVtZW50IHBsYXliYWNrIGhhcHBlbnMgdXNpbmcgRmVhdHVyZUNvdW50ZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTgxOQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMTkzMDk5ODg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTG9nIGhvdyBvZnRlbiBtZWRpYSBlbGVtZW50IHBsYXli YWNrIGhhcHBlbnMgdXNpbmcgRmVhdHVyZUNvdW50ZXIuIFdlCisgICAgICAgIGFsc28gZGlzdGlu Z3Vpc2ggVmlkZW8gYW5kIEF1ZGlvIGVsZW1lbnRzLiBXZSBvbmx5IGluY3JlbWVudCB0aGUKKyAg ICAgICAgY291bnRlciBpZiB0aGUgdmlkZW8gc3RhcnRzIHBsYXlpbmcgZnJvbSB0aGUgYmVnaW5u aW5nIHRvIGF2b2lkCisgICAgICAgIGluY3JlbWVudGluZyBtdWx0aXBsZSB0aW1lcyBpZiB0aGUg dXNlciBrZWVwcyBwYXVzaW5nIC8gcmVzdW1pbmcgdGhlCisgICAgICAgIG1lZGlhLgorCisgICAg ICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxN ZWRpYUVsZW1lbnQ6OnBhcnNlQXR0cmlidXRlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9GZWF0dXJl Q291bnRlcktleXMuaDoKKwogMjAxNC0xMi0xOSAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBw bGUuY29tPgogCiAgICAgICAgIFN3aXRjaCBmcm9tIHVzaW5nIFBMQVRGT1JNX05BTUUgdG8gU0RL IHNlbGVjdG9ycyBpbiBXZWJDb3JlLCBXZWJJbnNwZWN0b3JVSSwgV2ViS2l0LCBXZWJLaXQyCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCAxZGRmOTc2MWM5YzBk ODFmNTY5ZjEwNzg2MmEyODA4N2NiYTY2MDM4Li5lNjllNTlhNWU5YzFlMGJhOWE3ZjUzZmFmNGIz MzZiZDA5MGNiZGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVs ZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAK QEAgLTQ1LDYgKzQ1LDcgQEAKICNpbmNsdWRlICJFbGVtZW50SXRlcmF0b3IuaCIKICNpbmNsdWRl ICJFdmVudE5hbWVzLmgiCiAjaW5jbHVkZSAiRXhjZXB0aW9uQ29kZVBsYWNlaG9sZGVyLmgiCisj aW5jbHVkZSAiRmVhdHVyZUNvdW50ZXIuaCIKICNpbmNsdWRlICJGcmFtZUxvYWRlci5oIgogI2lu Y2x1ZGUgIkZyYW1lTG9hZGVyQ2xpZW50LmgiCiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCkBAIC00 NTM2LDYgKzQ1MzcsMTEgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVQbGF5U3RhdGUo KQogICAgICAgICAgICAgbV9wbGF5ZXItPnNldFJhdGUoZWZmZWN0aXZlUGxheWJhY2tSYXRlKCkp OwogICAgICAgICAgICAgbV9wbGF5ZXItPnNldE11dGVkKGVmZmVjdGl2ZU11dGVkKCkpOwogCisg ICAgICAgICAgICBpZiAoIWN1cnJlbnRNZWRpYVRpbWUoKSkgeworICAgICAgICAgICAgICAgIC8v IExvZyB0aGF0IGEgbWVkaWEgZWxlbWVudCBzdGFydGVkIHBsYXliYWNrLgorICAgICAgICAgICAg ICAgIEZFQVRVUkVfQ09VTlRFUl9JTkNSRU1FTlRfS0VZKGRvY3VtZW50KCkucGFnZSgpLCBpc1Zp ZGVvKCkgPyBGZWF0dXJlQ291bnRlck1lZGlhUGxheWluZ1ZpZGVvS2V5IDogRmVhdHVyZUNvdW50 ZXJNZWRpYVBsYXlpbmdBdWRpb0tleSk7CisgICAgICAgICAgICB9CisKICAgICAgICAgICAgIG1f cGxheWVyLT5wbGF5KCk7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vRmVhdHVyZUNvdW50ZXJLZXlzLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9G ZWF0dXJlQ291bnRlcktleXMuaAppbmRleCA2ZmYyMWMwNDQwMDJkMjU0ZDIwZGUwNmNlMjFhODY2 NTJhYTExZjE2Li4wMzc3MjAxZGFkM2JkZTcyNjIzNzY5MzAxMjYyODcwYjliZDFhMmFkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GZWF0dXJlQ291bnRlcktleXMuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GZWF0dXJlQ291bnRlcktleXMuaApAQCAtNzAsNiAr NzAsMTAgQEAgc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJDYWNoZWRSZXNvdXJjZVJl dmFsaWRhdGlvblJlYXNvbk5vU3RvcmVLZXlbXSA9ICIKIHN0YXRpYyBjb25zdCBjaGFyIEZlYXR1 cmVDb3VudGVyQ2FjaGVkUmVzb3VyY2VSZXZhbGlkYXRpb25SZWFzb25NdXN0UmV2YWxpZGF0ZUlz RXhwaXJlZEtleVtdID0gImNvbS5hcHBsZS5XZWJLaXQuY2FjaGVkUmVzb3VyY2VSZXZhbGlkYXRp b24ucmVhc29uLm11c3RSZXZhbGlkYXRlSXNFeHBpcmVkIjsKIHN0YXRpYyBjb25zdCBjaGFyIEZl YXR1cmVDb3VudGVyQ2FjaGVkUmVzb3VyY2VSZXZhbGlkYXRpb25SZWFzb25Jc0V4cGlyZWRLZXlb XSA9ICJjb20uYXBwbGUuV2ViS2l0LmNhY2hlZFJlc291cmNlUmV2YWxpZGF0aW9uLnJlYXNvbi5p c0V4cGlyZWQiOwogCisvLyBNZWRpYSBwbGF5YmFjay4KK3N0YXRpYyBjb25zdCBjaGFyIEZlYXR1 cmVDb3VudGVyTWVkaWFQbGF5aW5nVmlkZW9LZXlbXSA9ICJjb20uYXBwbGUuV2ViS2l0Lm1lZGlh UGxheWluZy52aWRlbyI7CitzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlck1lZGlhUGxh eWluZ0F1ZGlvS2V5W10gPSAiY29tLmFwcGxlLldlYktpdC5tZWRpYVBsYXlpbmcuYXVkaW8iOwor CiAvLyBOYXZpZ2F0aW9uIHR5cGVzLgogc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJO YXZpZ2F0aW9uU3RhbmRhcmRbXSA9ICJjb20uYXBwbGUuV2ViS2l0Lm5hdmlnYXRpb24uc3RhbmRh cmQiOwogc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJOYXZpZ2F0aW9uQmFja1tdID0g ImNvbS5hcHBsZS5XZWJLaXQubmF2aWdhdGlvbi5iYWNrIjsK 243561 2014-12-19 11:46:06 -0800 2014-12-19 12:10:19 -0800 Patch bug-139819-20141219114606.patch text/plain 6384 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzU3N2Y5ZWFhMmVjZjEw YTcwOTZlYzI0MWE2MjNmNzBlOWQ3OGFiYi4uODQ5ZjE0OWRiMjgxNWVmYmM0YmNjNTE3ZjZmZjc4 ZGRmYzk2ZDQ2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTEyLTE5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTG9nIGhvdyBvZnRl biBtZWRpYSBlbGVtZW50IHBsYXliYWNrIGhhcHBlbnMgdXNpbmcgRmVhdHVyZUNvdW50ZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTgxOQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMTkzMDk5ODg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTG9nIHVzaW5nIEZlYXR1cmVDb3VudGVyIGhvdyBvZnRl biB3ZSBlbmNvdW50ZXIgYXVkaW8gLyB2aWRlbyBlbGVtZW50cywKKyAgICAgICAgYW5kIGhvdyBv ZnRlbiB0aGV5IGVuZCB1cCBiZWluZyBwbGF5ZWQuCisKKyAgICAgICAgKiBodG1sL0hUTUxBdWRp b0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEF1ZGlvRWxlbWVudDo6SFRNTEF1 ZGlvRWxlbWVudCk6CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OkhUTUxNZWRpYUVsZW1lbnQpOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUpOgorICAgICAgICAq IGh0bWwvSFRNTE1lZGlhRWxlbWVudC5oOgorICAgICAgICAqIGh0bWwvSFRNTFZpZGVvRWxlbWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlkZW9FbGVtZW50OjpIVE1MVmlkZW9FbGVt ZW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9GZWF0dXJlQ291bnRlcktleXMuaDoKKwogMjAxNC0x Mi0xOSAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWJvdWhhbGxhd2FAYXBwbGUuY29tPgogCiAgICAg ICAgIE9ubHkgd2hlbiB0aGUgU1ZHIGlzIGlubGluZSBhbmQgb25seSB3aGVuIGEgc2hhcGUgaXMg cmVmZXJlbmNlZCBiZWZvcmUgaXQgaXMgZGVmaW5lZCwgdGhpcyBzaGFwZSB3aWxsIG5vdCBiZSBk cmF3bi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEF1ZGlvRWxlbWVudC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBdWRpb0VsZW1lbnQuY3BwCmluZGV4IDMzM2Qz MWY4N2E4ZjlmODRhNWViM2JmYzkwZTkwYTNjMDdkNTA4NzAuLjkyYmQ3NDMxNGU5NjA5NWJjMDYy ZDNkZGRhNjA5OGExNDI5YzkwNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TEF1ZGlvRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXVkaW9FbGVt ZW50LmNwcApAQCAtMjcsNiArMjcsNyBAQAogI2lmIEVOQUJMRShWSURFTykKICNpbmNsdWRlICJI VE1MQXVkaW9FbGVtZW50LmgiCiAKKyNpbmNsdWRlICJGZWF0dXJlQ291bnRlci5oIgogI2luY2x1 ZGUgIkhUTUxOYW1lcy5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0zNyw2ICszOCw5IEBA IEhUTUxBdWRpb0VsZW1lbnQ6OkhUTUxBdWRpb0VsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYg dGFnTmFtZSwgRG9jdW1lbnQmIGRvY3VtCiAgICAgOiBIVE1MTWVkaWFFbGVtZW50KHRhZ05hbWUs IGRvY3VtZW50LCBjcmVhdGVkQnlQYXJzZXIpCiB7CiAgICAgQVNTRVJUKGhhc1RhZ05hbWUoYXVk aW9UYWcpKTsKKworICAgIC8vIExvZyB0aGF0IHdlIGVuY291bnRlcmVkIGFuIGF1ZGlvIGVsZW1l bnQuCisgICAgRkVBVFVSRV9DT1VOVEVSX0lOQ1JFTUVOVF9LRVkoZG9jdW1lbnQucGFnZSgpLCBG ZWF0dXJlQ291bnRlck1lZGlhQXVkaW9FbGVtZW50S2V5KTsKIH0KIAogUmVmUHRyPEhUTUxBdWRp b0VsZW1lbnQ+IEhUTUxBdWRpb0VsZW1lbnQ6OmNyZWF0ZShjb25zdCBRdWFsaWZpZWROYW1lJiB0 YWdOYW1lLCBEb2N1bWVudCYgZG9jdW1lbnQsIGJvb2wgY3JlYXRlZEJ5UGFyc2VyKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggMWRkZjk3NjFjOWMwZDgxZjU2 OWYxMDc4NjJhMjgwODdjYmE2NjAzOC4uMTg1YjlhYTUwNGNhODc4NzA1NGVlNTk1NzlkNzQ5Y2Nk NTZlOWM5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC00 NSw2ICs0NSw3IEBACiAjaW5jbHVkZSAiRWxlbWVudEl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiRXZl bnROYW1lcy5oIgogI2luY2x1ZGUgIkV4Y2VwdGlvbkNvZGVQbGFjZWhvbGRlci5oIgorI2luY2x1 ZGUgIkZlYXR1cmVDb3VudGVyLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIKICNpbmNsdWRl ICJGcmFtZUxvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgIkZyYW1lVmlldy5oIgpAQCAtMjg5LDYg KzI5MCw3IEBAIEhUTUxNZWRpYUVsZW1lbnQ6OkhUTUxNZWRpYUVsZW1lbnQoY29uc3QgUXVhbGlm aWVkTmFtZSYgdGFnTmFtZSwgRG9jdW1lbnQmIGRvY3VtCiAgICAgLCBtX2FjdGlvbkFmdGVyU2Nh bihOb3RoaW5nKQogICAgICwgbV9zY2FuVHlwZShTY2FuKQogICAgICwgbV9zY2FuRGlyZWN0aW9u KEZvcndhcmQpCisgICAgLCBtX2ZpcnN0VGltZVBsYXlpbmcodHJ1ZSkKICAgICAsIG1fcGxheWlu ZyhmYWxzZSkKICAgICAsIG1faXNXYWl0aW5nVW50aWxNZWRpYUNhblN0YXJ0KGZhbHNlKQogICAg ICwgbV9zaG91bGREZWxheUxvYWRFdmVudChmYWxzZSkKQEAgLTQ1MzYsNiArNDUzOCwxMiBAQCB2 b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZVBsYXlTdGF0ZSgpCiAgICAgICAgICAgICBtX3Bs YXllci0+c2V0UmF0ZShlZmZlY3RpdmVQbGF5YmFja1JhdGUoKSk7CiAgICAgICAgICAgICBtX3Bs YXllci0+c2V0TXV0ZWQoZWZmZWN0aXZlTXV0ZWQoKSk7CiAKKyAgICAgICAgICAgIGlmIChtX2Zp cnN0VGltZVBsYXlpbmcpIHsKKyAgICAgICAgICAgICAgICAvLyBMb2cgdGhhdCBhIG1lZGlhIGVs ZW1lbnQgd2FzIHBsYXllZC4KKyAgICAgICAgICAgICAgICBGRUFUVVJFX0NPVU5URVJfSU5DUkVN RU5UX0tFWShkb2N1bWVudCgpLnBhZ2UoKSwgaXNWaWRlbygpID8gRmVhdHVyZUNvdW50ZXJNZWRp YVZpZGVvRWxlbWVudFBsYXllZEtleSA6IEZlYXR1cmVDb3VudGVyTWVkaWFBdWRpb0VsZW1lbnRQ bGF5ZWRLZXkpOworICAgICAgICAgICAgICAgIG1fZmlyc3RUaW1lUGxheWluZyA9IGZhbHNlOwor ICAgICAgICAgICAgfQorCiAgICAgICAgICAgICBtX3BsYXllci0+cGxheSgpOwogICAgICAgICB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oIGIv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKaW5kZXggMmM1N2M3NzBmNTBh NmZmZjVlYWE5MDBjOTIxNjRlNDY5N2RlMjIwOS4uYzAwNzE5N2IxYTk0ZGI4MWUyNzcwNDE2Mzc3 YTJiM2FhZjQ5MWYwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFF bGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKQEAg LTgyOCw2ICs4MjgsNyBAQCBwcml2YXRlOgogICAgIFNjYW5UeXBlIG1fc2NhblR5cGU7CiAgICAg U2NhbkRpcmVjdGlvbiBtX3NjYW5EaXJlY3Rpb247CiAKKyAgICBib29sIG1fZmlyc3RUaW1lUGxh eWluZyA6IDE7CiAgICAgYm9vbCBtX3BsYXlpbmcgOiAxOwogICAgIGJvb2wgbV9pc1dhaXRpbmdV bnRpbE1lZGlhQ2FuU3RhcnQgOiAxOwogICAgIGJvb2wgbV9zaG91bGREZWxheUxvYWRFdmVudCA6 IDE7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50LmNwcAppbmRleCAyOGIyY2Ix MzZmYzYwNzVhMDcxNGY1MWQ3ZTAwYzg4NzU3NGRkZDEyLi4wMDUyOGY2Mzc3ZjYwYTRjYmYxNGU0 ZDZiYjZlNjEyNGNjZTc3ZDRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxW aWRlb0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVu dC5jcHAKQEAgLTMyLDYgKzMyLDcgQEAKICNpbmNsdWRlICJDaHJvbWUuaCIKICNpbmNsdWRlICJD aHJvbWVDbGllbnQuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgorI2luY2x1ZGUgIkZlYXR1cmVD b3VudGVyLmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJIVE1MSW1hZ2VMb2FkZXIu aCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKQEAgLTUzLDYgKzU0LDkgQEAgaW5saW5lIEhUTUxW aWRlb0VsZW1lbnQ6OkhUTUxWaWRlb0VsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFt ZSwgRG9jdW1lbnQKICAgICBzZXRIYXNDdXN0b21TdHlsZVJlc29sdmVDYWxsYmFja3MoKTsKICAg ICBpZiAoZG9jdW1lbnQuc2V0dGluZ3MoKSkKICAgICAgICAgbV9kZWZhdWx0UG9zdGVyVVJMID0g ZG9jdW1lbnQuc2V0dGluZ3MoKS0+ZGVmYXVsdFZpZGVvUG9zdGVyVVJMKCk7CisKKyAgICAvLyBM b2cgdGhhdCB3ZSBlbmNvdW50ZXJlZCBhIHZpZGVvIGVsZW1lbnQuCisgICAgRkVBVFVSRV9DT1VO VEVSX0lOQ1JFTUVOVF9LRVkoZG9jdW1lbnQucGFnZSgpLCBGZWF0dXJlQ291bnRlck1lZGlhVmlk ZW9FbGVtZW50S2V5KTsKIH0KIAogUmVmUHRyPEhUTUxWaWRlb0VsZW1lbnQ+IEhUTUxWaWRlb0Vs ZW1lbnQ6OmNyZWF0ZShjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1lLCBEb2N1bWVudCYgZG9j dW1lbnQsIGJvb2wgY3JlYXRlZEJ5UGFyc2VyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vRmVhdHVyZUNvdW50ZXJLZXlzLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9G ZWF0dXJlQ291bnRlcktleXMuaAppbmRleCA2ZmYyMWMwNDQwMDJkMjU0ZDIwZGUwNmNlMjFhODY2 NTJhYTExZjE2Li4xOTJlZGQzOGJhOGYzYzljY2VlMjZlNWIwYzVhYWUxMmU1NGRiOTVlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GZWF0dXJlQ291bnRlcktleXMuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GZWF0dXJlQ291bnRlcktleXMuaApAQCAtNzAsNiAr NzAsMTIgQEAgc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJDYWNoZWRSZXNvdXJjZVJl dmFsaWRhdGlvblJlYXNvbk5vU3RvcmVLZXlbXSA9ICIKIHN0YXRpYyBjb25zdCBjaGFyIEZlYXR1 cmVDb3VudGVyQ2FjaGVkUmVzb3VyY2VSZXZhbGlkYXRpb25SZWFzb25NdXN0UmV2YWxpZGF0ZUlz RXhwaXJlZEtleVtdID0gImNvbS5hcHBsZS5XZWJLaXQuY2FjaGVkUmVzb3VyY2VSZXZhbGlkYXRp b24ucmVhc29uLm11c3RSZXZhbGlkYXRlSXNFeHBpcmVkIjsKIHN0YXRpYyBjb25zdCBjaGFyIEZl YXR1cmVDb3VudGVyQ2FjaGVkUmVzb3VyY2VSZXZhbGlkYXRpb25SZWFzb25Jc0V4cGlyZWRLZXlb XSA9ICJjb20uYXBwbGUuV2ViS2l0LmNhY2hlZFJlc291cmNlUmV2YWxpZGF0aW9uLnJlYXNvbi5p c0V4cGlyZWQiOwogCisvLyBNZWRpYSBwbGF5YmFjay4KK3N0YXRpYyBjb25zdCBjaGFyIEZlYXR1 cmVDb3VudGVyTWVkaWFWaWRlb0VsZW1lbnRLZXlbXSA9ICJjb20uYXBwbGUuV2ViS2l0Lm1lZGlh LnZpZGVvIjsKK3N0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyTWVkaWFBdWRpb0VsZW1l bnRLZXlbXSA9ICJjb20uYXBwbGUuV2ViS2l0Lm1lZGlhLmF1ZGlvIjsKK3N0YXRpYyBjb25zdCBj aGFyIEZlYXR1cmVDb3VudGVyTWVkaWFWaWRlb0VsZW1lbnRQbGF5ZWRLZXlbXSA9ICJjb20uYXBw bGUuV2ViS2l0Lm1lZGlhLnZpZGVvLnBsYXllZCI7CitzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJl Q291bnRlck1lZGlhQXVkaW9FbGVtZW50UGxheWVkS2V5W10gPSAiY29tLmFwcGxlLldlYktpdC5t ZWRpYS5hdWRpby5wbGF5ZWQiOworCiAvLyBOYXZpZ2F0aW9uIHR5cGVzLgogc3RhdGljIGNvbnN0 IGNoYXIgRmVhdHVyZUNvdW50ZXJOYXZpZ2F0aW9uU3RhbmRhcmRbXSA9ICJjb20uYXBwbGUuV2Vi S2l0Lm5hdmlnYXRpb24uc3RhbmRhcmQiOwogc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50 ZXJOYXZpZ2F0aW9uQmFja1tdID0gImNvbS5hcHBsZS5XZWJLaXQubmF2aWdhdGlvbi5iYWNrIjsK 243562 2014-12-19 12:10:25 -0800 2014-12-19 13:07:41 -0800 Patch bug-139819-20141219121024.patch text/plain 5355 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzU3N2Y5ZWFhMmVjZjEw YTcwOTZlYzI0MWE2MjNmNzBlOWQ3OGFiYi4uOGVjNTNlYzgyYTA2NjVhZmY3MzZjOGQ0MTY0ODg3 MTQxNzVjNWFmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE0LTEyLTE5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTG9nIGhvdyBvZnRl biBtZWRpYSBlbGVtZW50IHBsYXliYWNrIGhhcHBlbnMgdXNpbmcgRmVhdHVyZUNvdW50ZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTgxOQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMTkzMDk5ODg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJp YyBDYXJsc29uLgorCisgICAgICAgIExvZyB1c2luZyBGZWF0dXJlQ291bnRlciBob3cgb2Z0ZW4g d2Ugc3RhcnQgbG9hZGluZyBmb3IgYXVkaW8gLyB2aWRlbworICAgICAgICBlbGVtZW50cywgYW5k IGhvdyBvZnRlbiB0aGV5IGVuZCB1cCBiZWluZyBwbGF5ZWQuCisKKyAgICAgICAgKiBodG1sL0hU TUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6 SFRNTE1lZGlhRWxlbWVudCk6CisgICAgICAgIEFkZCBmbGFnIHRvIGlkZW50aWZ5IHdoZW4gYSBt ZWRpYSBlbGVtZW50IHN0YXJ0cyBwbGF5aW5nIGZvciB0aGUgZmlyc3QKKyAgICAgICAgdGltZS4K KworICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6bG9hZFJlc291cmNlKToKKyAg ICAgICAgTG9nIHdoZW4gYSBtZWRpYSBlbGVtZW50IHN0YXJ0cyBsb2FkaW5nLgorCisgICAgICAg IChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVQbGF5U3RhdGUpOgorICAgICAgICBM b2cgd2hlbiBhIG1lZGlhIGVsZW1lbnQgc3RhcnRzIHBsYXlpbmcgZm9yIHRoZSBmaXJzdCB0aW1l LgorCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50Lmg6CisgICAgICAgIEFkZCBmbGFn IHRvIGlkZW50aWZ5IHdoZW4gYSBtZWRpYSBlbGVtZW50IHN0YXJ0cyBwbGF5aW5nIGZvciB0aGUg Zmlyc3QKKyAgICAgICAgdGltZS4KKworICAgICAgICAqIHBsYXRmb3JtL0ZlYXR1cmVDb3VudGVy S2V5cy5oOgorICAgICAgICBBZGQgRmVhdHVyZUNvdW50ZXIga2V5cyBmb3IgSFRNTE1lZGlhRWxl bWVudCBsb2FkaW5nIC8gcGxheWJhY2suCisKIDIwMTQtMTItMTkgIFNhaWQgQWJvdS1IYWxsYXdh ICA8c2Fib3VoYWxsYXdhQGFwcGxlLmNvbT4KIAogICAgICAgICBPbmx5IHdoZW4gdGhlIFNWRyBp cyBpbmxpbmUgYW5kIG9ubHkgd2hlbiBhIHNoYXBlIGlzIHJlZmVyZW5jZWQgYmVmb3JlIGl0IGlz IGRlZmluZWQsIHRoaXMgc2hhcGUgd2lsbCBub3QgYmUgZHJhd24uCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCAxZGRmOTc2MWM5YzBkODFmNTY5ZjEwNzg2MmEy ODA4N2NiYTY2MDM4Li5hMzBiNmNiYWQ1Y2M4MjUwMDViZTE1YjJjN2FmYjg4OTJiNmVkOWI0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTQ1LDYgKzQ1LDcg QEAKICNpbmNsdWRlICJFbGVtZW50SXRlcmF0b3IuaCIKICNpbmNsdWRlICJFdmVudE5hbWVzLmgi CiAjaW5jbHVkZSAiRXhjZXB0aW9uQ29kZVBsYWNlaG9sZGVyLmgiCisjaW5jbHVkZSAiRmVhdHVy ZUNvdW50ZXIuaCIKICNpbmNsdWRlICJGcmFtZUxvYWRlci5oIgogI2luY2x1ZGUgIkZyYW1lTG9h ZGVyQ2xpZW50LmgiCiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCkBAIC0yODksNiArMjkwLDcgQEAg SFRNTE1lZGlhRWxlbWVudDo6SFRNTE1lZGlhRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiB0 YWdOYW1lLCBEb2N1bWVudCYgZG9jdW0KICAgICAsIG1fYWN0aW9uQWZ0ZXJTY2FuKE5vdGhpbmcp CiAgICAgLCBtX3NjYW5UeXBlKFNjYW4pCiAgICAgLCBtX3NjYW5EaXJlY3Rpb24oRm9yd2FyZCkK KyAgICAsIG1fZmlyc3RUaW1lUGxheWluZyh0cnVlKQogICAgICwgbV9wbGF5aW5nKGZhbHNlKQog ICAgICwgbV9pc1dhaXRpbmdVbnRpbE1lZGlhQ2FuU3RhcnQoZmFsc2UpCiAgICAgLCBtX3Nob3Vs ZERlbGF5TG9hZEV2ZW50KGZhbHNlKQpAQCAtMTE2MCw2ICsxMTYyLDEwIEBAIHZvaWQgSFRNTE1l ZGlhRWxlbWVudDo6bG9hZFJlc291cmNlKGNvbnN0IFVSTCYgaW5pdGlhbFVSTCwgQ29udGVudFR5 cGUmIGNvbnRlbnRUCiAgICAgICAgIH0KICAgICB9CiAKKyAgICAvLyBMb2cgdGhhdCB3ZSBzdGFy dGVkIGxvYWRpbmcgYSBtZWRpYSBlbGVtZW50LgorICAgIEZFQVRVUkVfQ09VTlRFUl9JTkNSRU1F TlRfS0VZKGRvY3VtZW50KCkucGFnZSgpLCBpc1ZpZGVvKCkgPyBGZWF0dXJlQ291bnRlck1lZGlh VmlkZW9FbGVtZW50TG9hZGluZ0tleSA6IEZlYXR1cmVDb3VudGVyTWVkaWFBdWRpb0VsZW1lbnRM b2FkaW5nS2V5KTsKKyAgICBtX2ZpcnN0VGltZVBsYXlpbmcgPSB0cnVlOworCiAgICAgLy8gU2V0 IG1fY3VycmVudFNyYyAqYmVmb3JlKiBjaGFuZ2luZyB0byB0aGUgY2FjaGUgdXJsLCB0aGUgZmFj dCB0aGF0IHdlIGFyZSBsb2FkaW5nIGZyb20gdGhlIGFwcAogICAgIC8vIGNhY2hlIGlzIGFuIGlu dGVybmFsIGRldGFpbCBub3QgZXhwb3NlZCB0aHJvdWdoIHRoZSBtZWRpYSBlbGVtZW50IEFQSS4K ICAgICBtX2N1cnJlbnRTcmMgPSB1cmw7CkBAIC00NTM2LDYgKzQ1NDIsMTIgQEAgdm9pZCBIVE1M TWVkaWFFbGVtZW50Ojp1cGRhdGVQbGF5U3RhdGUoKQogICAgICAgICAgICAgbV9wbGF5ZXItPnNl dFJhdGUoZWZmZWN0aXZlUGxheWJhY2tSYXRlKCkpOwogICAgICAgICAgICAgbV9wbGF5ZXItPnNl dE11dGVkKGVmZmVjdGl2ZU11dGVkKCkpOwogCisgICAgICAgICAgICBpZiAobV9maXJzdFRpbWVQ bGF5aW5nKSB7CisgICAgICAgICAgICAgICAgLy8gTG9nIHRoYXQgYSBtZWRpYSBlbGVtZW50IHdh cyBwbGF5ZWQuCisgICAgICAgICAgICAgICAgRkVBVFVSRV9DT1VOVEVSX0lOQ1JFTUVOVF9LRVko ZG9jdW1lbnQoKS5wYWdlKCksIGlzVmlkZW8oKSA/IEZlYXR1cmVDb3VudGVyTWVkaWFWaWRlb0Vs ZW1lbnRQbGF5ZWRLZXkgOiBGZWF0dXJlQ291bnRlck1lZGlhQXVkaW9FbGVtZW50UGxheWVkS2V5 KTsKKyAgICAgICAgICAgICAgICBtX2ZpcnN0VGltZVBsYXlpbmcgPSBmYWxzZTsKKyAgICAgICAg ICAgIH0KKwogICAgICAgICAgICAgbV9wbGF5ZXItPnBsYXkoKTsKICAgICAgICAgfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCmluZGV4IDJjNTdjNzcwZjUwYTZmZmY1ZWFh OTAwYzkyMTY0ZTQ2OTdkZTIyMDkuLmMwMDcxOTdiMWE5NGRiODFlMjc3MDQxNjM3N2EyYjNhYWY0 OTFmMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCkBAIC04MjgsNiAr ODI4LDcgQEAgcHJpdmF0ZToKICAgICBTY2FuVHlwZSBtX3NjYW5UeXBlOwogICAgIFNjYW5EaXJl Y3Rpb24gbV9zY2FuRGlyZWN0aW9uOwogCisgICAgYm9vbCBtX2ZpcnN0VGltZVBsYXlpbmcgOiAx OwogICAgIGJvb2wgbV9wbGF5aW5nIDogMTsKICAgICBib29sIG1faXNXYWl0aW5nVW50aWxNZWRp YUNhblN0YXJ0IDogMTsKICAgICBib29sIG1fc2hvdWxkRGVsYXlMb2FkRXZlbnQgOiAxOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vRmVhdHVyZUNvdW50ZXJLZXlzLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GZWF0dXJlQ291bnRlcktleXMuaAppbmRleCA2ZmYyMWMw NDQwMDJkMjU0ZDIwZGUwNmNlMjFhODY2NTJhYTExZjE2Li4yZDc3NjhkZTA2M2IxZjIzNzk1NWRk MjczZTdjNTE0YmU4MGYwYmJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9G ZWF0dXJlQ291bnRlcktleXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GZWF0dXJl Q291bnRlcktleXMuaApAQCAtNzAsNiArNzAsMTIgQEAgc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVy ZUNvdW50ZXJDYWNoZWRSZXNvdXJjZVJldmFsaWRhdGlvblJlYXNvbk5vU3RvcmVLZXlbXSA9ICIK IHN0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyQ2FjaGVkUmVzb3VyY2VSZXZhbGlkYXRp b25SZWFzb25NdXN0UmV2YWxpZGF0ZUlzRXhwaXJlZEtleVtdID0gImNvbS5hcHBsZS5XZWJLaXQu Y2FjaGVkUmVzb3VyY2VSZXZhbGlkYXRpb24ucmVhc29uLm11c3RSZXZhbGlkYXRlSXNFeHBpcmVk IjsKIHN0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyQ2FjaGVkUmVzb3VyY2VSZXZhbGlk YXRpb25SZWFzb25Jc0V4cGlyZWRLZXlbXSA9ICJjb20uYXBwbGUuV2ViS2l0LmNhY2hlZFJlc291 cmNlUmV2YWxpZGF0aW9uLnJlYXNvbi5pc0V4cGlyZWQiOwogCisvLyBNZWRpYSBwbGF5YmFjay4K K3N0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyTWVkaWFWaWRlb0VsZW1lbnRMb2FkaW5n S2V5W10gPSAiY29tLmFwcGxlLldlYktpdC5tZWRpYS52aWRlby5sb2FkaW5nIjsKK3N0YXRpYyBj b25zdCBjaGFyIEZlYXR1cmVDb3VudGVyTWVkaWFBdWRpb0VsZW1lbnRMb2FkaW5nS2V5W10gPSAi Y29tLmFwcGxlLldlYktpdC5tZWRpYS5hdWRpby5sb2FkaW5nIjsKK3N0YXRpYyBjb25zdCBjaGFy IEZlYXR1cmVDb3VudGVyTWVkaWFWaWRlb0VsZW1lbnRQbGF5ZWRLZXlbXSA9ICJjb20uYXBwbGUu V2ViS2l0Lm1lZGlhLnZpZGVvLnBsYXllZCI7CitzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291 bnRlck1lZGlhQXVkaW9FbGVtZW50UGxheWVkS2V5W10gPSAiY29tLmFwcGxlLldlYktpdC5tZWRp YS5hdWRpby5wbGF5ZWQiOworCiAvLyBOYXZpZ2F0aW9uIHR5cGVzLgogc3RhdGljIGNvbnN0IGNo YXIgRmVhdHVyZUNvdW50ZXJOYXZpZ2F0aW9uU3RhbmRhcmRbXSA9ICJjb20uYXBwbGUuV2ViS2l0 Lm5hdmlnYXRpb24uc3RhbmRhcmQiOwogc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJO YXZpZ2F0aW9uQmFja1tdID0gImNvbS5hcHBsZS5XZWJLaXQubmF2aWdhdGlvbi5iYWNrIjsK