119910 2013-08-16 13:20:25 -0700 [Windows] Update RenderMediaControls for new API 2013-08-16 14:44:30 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham bfulgham commit-queue eric.carlson esprehn+autocc glenn jer.noble kondapallykalyan oldest_to_newest 918093 0 bfulgham 2013-08-16 13:20:25 -0700 The RenderMediaControls::paintMediaControlsPart and RenderMediaControls::adjustMediaSliderThumbSize implementations need to be updated to match the new WebKitSystemInterface API for drawing rendering controls. 918108 1 208955 bfulgham 2013-08-16 14:05:38 -0700 Created attachment 208955 Patch 918112 2 208955 eric.carlson 2013-08-16 14:17:38 -0700 Comment on attachment 208955 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208955&action=review > Source/WebCore/rendering/RenderMediaControls.cpp:57 > +#if HAVE(AVCF_LEGIBLE_OUTPUT) // i.e., the new media controls > +#define wkHitTestMediaUIPart(part, bounds, point) WKHitTestMediaUIPart(part, bounds, point) > +#define wkMeasureMediaUIPart(part, bounds, naturalSize) WKMeasureMediaUIPart(part, bounds, naturalSize) > +#define wkDrawMediaUIPart(part, context, rect, state) WKDrawMediaUIPart(part, context, rect, state) > +#define wkDrawMediaSliderTrack(context, rect, timeLoaded, currentTime, duration, state) WKDrawMediaSliderTrack(context, rect, timeLoaded, currentTime, duration, state) > +#else > +// This is needed until WebKitSystemInterface is updated on the build machines > +#define wkHitTestMediaUIPart(part, bounds, point) WKHitTestMediaUIPart(part, WKMediaControllerThemeQuickTime, bounds, point) > +#define wkMeasureMediaUIPart(part, bounds, naturalSize) WKMeasureMediaUIPart(part, WKMediaControllerThemeQuickTime, bounds, naturalSize) > +#define wkDrawMediaUIPart(part, context, rect, state) WKDrawMediaUIPart(part, WKMediaControllerThemeQuickTime, context, rect, state) > +#define wkDrawMediaSliderTrack(context, rect, timeLoaded, currentTime, duration, state) WKDrawMediaSliderTrack(WKMediaControllerThemeQuickTime, context, rect, timeLoaded, currentTime, duration, state) > +#endif This might be slightly cleaner as inline functions instead of #defines. 918115 3 208960 bfulgham 2013-08-16 14:26:24 -0700 Created attachment 208960 Patch 918124 4 208960 eric.carlson 2013-08-16 14:42:00 -0700 Comment on attachment 208960 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208960&action=review Thank you! > Source/WebCore/rendering/RenderMediaControls.cpp:48 > +#if HAVE(AVCF_LEGIBLE_OUTPUT) // i.e., the new media controls The comment isn't necessary, here or in the other the functions. 918125 5 bfulgham 2013-08-16 14:44:30 -0700 Committed r154205: <http://trac.webkit.org/changeset/154205> 208955 2013-08-16 14:05:38 -0700 2013-08-16 14:26:22 -0700 Patch bug-119910-20130816140516.patch text/plain 10406 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDIwMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEzLTA4LTE2ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5kb3dzXSBVcGRhdGUg UmVuZGVyTWVkaWFDb250cm9scyBmb3IgbmV3IEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5OTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTWVkaWFDb250cm9scy5j cHA6IFVwZGF0ZSBjYWxscyB0byBXZWJLaXRTeXN0ZW1JbnRlcmZhY2UgZm9yCisgICAgICAgIHRo ZSBjaGFuZ2VkIEFQSS4KKwogMjAxMy0wOC0xNiAgQXJ1bnByYXNhZCBSYWprdW1hciAgPGFydXJh amt1QGNpc2NvLmNvbT4KIAogICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTE5Nzg1PiBS ZXBsYWNlIGN1cnJlbnRUaW1lKCkgd2l0aCBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKSBp biBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWFDb250 cm9scy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1l ZGlhQ29udHJvbHMuY3BwCShyZXZpc2lvbiAxNTQxOTQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTWVkaWFDb250cm9scy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzLDExICs0 MywxOCBAQAogCiAvLyBUaGUgV2luZG93cyB2ZXJzaW9uIG9mIFdLU0kgZGVmaW5lcyB0aGVzZSBm dW5jdGlvbnMgYXMgY2FwaXRhbGl6ZWQsIHdoaWxlIHRoZSBNYWMgdmVyc2lvbiBkZWZpbmVzIHRo ZW0gYXMgbG93ZXIgY2FzZS4KIC8vIEZJWE1FOiBJcyB0aGlzIG5lY2Vzc2FyeSBhbnltb3JlPwot I2RlZmluZSB3a01lZGlhQ29udHJvbGxlclRoZW1lQXZhaWxhYmxlKHRoZW1lU3R5bGUpIFdLTWVk aWFDb250cm9sbGVyVGhlbWVBdmFpbGFibGUodGhlbWVTdHlsZSkKLSNkZWZpbmUgd2tIaXRUZXN0 TWVkaWFVSVBhcnQocGFydCwgdGhlbWVTdHlsZSwgYm91bmRzLCBwb2ludCkgV0tIaXRUZXN0TWVk aWFVSVBhcnQocGFydCwgdGhlbWVTdHlsZSwgYm91bmRzLCBwb2ludCkKLSNkZWZpbmUgd2tNZWFz dXJlTWVkaWFVSVBhcnQocGFydCwgdGhlbWVTdHlsZSwgYm91bmRzLCBuYXR1cmFsU2l6ZSkgV0tN ZWFzdXJlTWVkaWFVSVBhcnQocGFydCwgdGhlbWVTdHlsZSwgYm91bmRzLCBuYXR1cmFsU2l6ZSkK LSNkZWZpbmUgd2tEcmF3TWVkaWFVSVBhcnQocGFydCwgdGhlbWVTdHlsZSwgY29udGV4dCwgcmVj dCwgc3RhdGUpIFdLRHJhd01lZGlhVUlQYXJ0KHBhcnQsIHRoZW1lU3R5bGUsIGNvbnRleHQsIHJl Y3QsIHN0YXRlKQotI2RlZmluZSB3a0RyYXdNZWRpYVNsaWRlclRyYWNrKHRoZW1lU3R5bGUsIGNv bnRleHQsIHJlY3QsIHRpbWVMb2FkZWQsIGN1cnJlbnRUaW1lLCBkdXJhdGlvbiwgc3RhdGUpIFdL RHJhd01lZGlhU2xpZGVyVHJhY2sodGhlbWVTdHlsZSwgY29udGV4dCwgcmVjdCwgdGltZUxvYWRl ZCwgY3VycmVudFRpbWUsIGR1cmF0aW9uLCBzdGF0ZSkKKyNpZiBIQVZFKEFWQ0ZfTEVHSUJMRV9P VVRQVVQpIC8vIGkuZS4sIHRoZSBuZXcgbWVkaWEgY29udHJvbHMKKyNkZWZpbmUgd2tIaXRUZXN0 TWVkaWFVSVBhcnQocGFydCwgYm91bmRzLCBwb2ludCkgV0tIaXRUZXN0TWVkaWFVSVBhcnQocGFy dCwgYm91bmRzLCBwb2ludCkKKyNkZWZpbmUgd2tNZWFzdXJlTWVkaWFVSVBhcnQocGFydCwgYm91 bmRzLCBuYXR1cmFsU2l6ZSkgV0tNZWFzdXJlTWVkaWFVSVBhcnQocGFydCwgYm91bmRzLCBuYXR1 cmFsU2l6ZSkKKyNkZWZpbmUgd2tEcmF3TWVkaWFVSVBhcnQocGFydCwgY29udGV4dCwgcmVjdCwg c3RhdGUpIFdLRHJhd01lZGlhVUlQYXJ0KHBhcnQsIGNvbnRleHQsIHJlY3QsIHN0YXRlKQorI2Rl ZmluZSB3a0RyYXdNZWRpYVNsaWRlclRyYWNrKGNvbnRleHQsIHJlY3QsIHRpbWVMb2FkZWQsIGN1 cnJlbnRUaW1lLCBkdXJhdGlvbiwgc3RhdGUpIFdLRHJhd01lZGlhU2xpZGVyVHJhY2soY29udGV4 dCwgcmVjdCwgdGltZUxvYWRlZCwgY3VycmVudFRpbWUsIGR1cmF0aW9uLCBzdGF0ZSkKKyNlbHNl CisvLyBUaGlzIGlzIG5lZWRlZCB1bnRpbCBXZWJLaXRTeXN0ZW1JbnRlcmZhY2UgaXMgdXBkYXRl ZCBvbiB0aGUgYnVpbGQgbWFjaGluZXMKKyNkZWZpbmUgd2tIaXRUZXN0TWVkaWFVSVBhcnQocGFy dCwgYm91bmRzLCBwb2ludCkgV0tIaXRUZXN0TWVkaWFVSVBhcnQocGFydCwgV0tNZWRpYUNvbnRy b2xsZXJUaGVtZVF1aWNrVGltZSwgYm91bmRzLCBwb2ludCkKKyNkZWZpbmUgd2tNZWFzdXJlTWVk aWFVSVBhcnQocGFydCwgYm91bmRzLCBuYXR1cmFsU2l6ZSkgV0tNZWFzdXJlTWVkaWFVSVBhcnQo cGFydCwgV0tNZWRpYUNvbnRyb2xsZXJUaGVtZVF1aWNrVGltZSwgYm91bmRzLCBuYXR1cmFsU2l6 ZSkKKyNkZWZpbmUgd2tEcmF3TWVkaWFVSVBhcnQocGFydCwgY29udGV4dCwgcmVjdCwgc3RhdGUp IFdLRHJhd01lZGlhVUlQYXJ0KHBhcnQsIFdLTWVkaWFDb250cm9sbGVyVGhlbWVRdWlja1RpbWUs IGNvbnRleHQsIHJlY3QsIHN0YXRlKQorI2RlZmluZSB3a0RyYXdNZWRpYVNsaWRlclRyYWNrKGNv bnRleHQsIHJlY3QsIHRpbWVMb2FkZWQsIGN1cnJlbnRUaW1lLCBkdXJhdGlvbiwgc3RhdGUpIFdL RHJhd01lZGlhU2xpZGVyVHJhY2soV0tNZWRpYUNvbnRyb2xsZXJUaGVtZVF1aWNrVGltZSwgY29u dGV4dCwgcmVjdCwgdGltZUxvYWRlZCwgY3VycmVudFRpbWUsIGR1cmF0aW9uLCBzdGF0ZSkKKyNl bmRpZgogCiAjZW5kaWYKICAKQEAgLTEwNiw3ICsxMTMsNyBAQCB2b2lkIFJlbmRlck1lZGlhQ29u dHJvbHM6OmFkanVzdE1lZGlhU2xpCiAgICAgfQogCiAgICAgQ0dTaXplIHNpemU7Ci0gICAgd2tN ZWFzdXJlTWVkaWFVSVBhcnQocGFydCwgV0tNZWRpYUNvbnRyb2xsZXJUaGVtZVF1aWNrVGltZSwg MCwgJnNpemUpOworICAgIHdrTWVhc3VyZU1lZGlhVUlQYXJ0KHBhcnQsIDAsICZzaXplKTsKIAog ICAgIGZsb2F0IHpvb21MZXZlbCA9IHN0eWxlLT5lZmZlY3RpdmVab29tKCk7CiAgICAgc3R5bGUt PnNldFdpZHRoKExlbmd0aChzdGF0aWNfY2FzdDxpbnQ+KHNpemUud2lkdGggKiB6b29tTGV2ZWwp LCBGaXhlZCkpOwpAQCAtMTE1LDcgKzEyMiw2IEBAIHZvaWQgUmVuZGVyTWVkaWFDb250cm9sczo6 YWRqdXN0TWVkaWFTbGkKIAogYm9vbCBSZW5kZXJNZWRpYUNvbnRyb2xzOjpwYWludE1lZGlhQ29u dHJvbHNQYXJ0KE1lZGlhQ29udHJvbEVsZW1lbnRUeXBlIHBhcnQsIFJlbmRlck9iamVjdCogbywg Y29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHIpCiB7Ci0gICAgc3Rh dGljIGNvbnN0IGludCB0aGVtZVN0eWxlID0gV0tNZWRpYUNvbnRyb2xsZXJUaGVtZVF1aWNrVGlt ZTsKICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoKnBhaW50SW5mby5j b250ZXh0KTsKIAogICAgIHN3aXRjaCAocGFydCkgewpAQCAtMTIzLDY5ICsxMjksNjkgQEAgYm9v bCBSZW5kZXJNZWRpYUNvbnRyb2xzOjpwYWludE1lZGlhQ29udAogICAgIGNhc2UgTWVkaWFFeGl0 RnVsbHNjcmVlbkJ1dHRvbjoKICAgICAgICAgaWYgKE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5CdXR0 b25FbGVtZW50KiBidG4gPSBzdGF0aWNfY2FzdDxNZWRpYUNvbnRyb2xGdWxsc2NyZWVuQnV0dG9u RWxlbWVudCo+KG8tPm5vZGUoKSkpIHsKICAgICAgICAgICAgIGJvb2wgZW50ZXJCdXR0b24gPSBi dG4tPmRpc3BsYXlUeXBlKCkgPT0gTWVkaWFFbnRlckZ1bGxzY3JlZW5CdXR0b247Ci0gICAgICAg ICAgICB3a0RyYXdNZWRpYVVJUGFydChlbnRlckJ1dHRvbiA/IFdLTWVkaWFVSVBhcnRGdWxsc2Ny ZWVuQnV0dG9uIDogV0tNZWRpYVVJUGFydEV4aXRGdWxsc2NyZWVuQnV0dG9uLCB0aGVtZVN0eWxl LCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIGRldGVybWluZVN0YXRl KG8pKTsKKyAgICAgICAgICAgIHdrRHJhd01lZGlhVUlQYXJ0KGVudGVyQnV0dG9uID8gV0tNZWRp YVVJUGFydEZ1bGxzY3JlZW5CdXR0b24gOiBXS01lZGlhVUlQYXJ0RXhpdEZ1bGxzY3JlZW5CdXR0 b24sIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgZGV0ZXJtaW5lU3Rh dGUobykpOwogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTWVkaWFTaG93Q2xv c2VkQ2FwdGlvbnNCdXR0b246CiAgICAgY2FzZSBNZWRpYUhpZGVDbG9zZWRDYXB0aW9uc0J1dHRv bjoKICAgICAgICAgaWYgKE1lZGlhQ29udHJvbFRvZ2dsZUNsb3NlZENhcHRpb25zQnV0dG9uRWxl bWVudCogYnRuID0gc3RhdGljX2Nhc3Q8TWVkaWFDb250cm9sVG9nZ2xlQ2xvc2VkQ2FwdGlvbnNC dXR0b25FbGVtZW50Kj4oby0+bm9kZSgpKSkgewogICAgICAgICAgICAgYm9vbCBjYXB0aW9uc1Zp c2libGUgPSBidG4tPmRpc3BsYXlUeXBlKCkgPT0gTWVkaWFIaWRlQ2xvc2VkQ2FwdGlvbnNCdXR0 b247Ci0gICAgICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChjYXB0aW9uc1Zpc2libGUgPyBXS01l ZGlhVUlQYXJ0SGlkZUNsb3NlZENhcHRpb25zQnV0dG9uIDogV0tNZWRpYVVJUGFydFNob3dDbG9z ZWRDYXB0aW9uc0J1dHRvbiwgdGhlbWVTdHlsZSwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3Jt Q29udGV4dCgpLCByLCBkZXRlcm1pbmVTdGF0ZShvKSk7CisgICAgICAgICAgICB3a0RyYXdNZWRp YVVJUGFydChjYXB0aW9uc1Zpc2libGUgPyBXS01lZGlhVUlQYXJ0SGlkZUNsb3NlZENhcHRpb25z QnV0dG9uIDogV0tNZWRpYVVJUGFydFNob3dDbG9zZWRDYXB0aW9uc0J1dHRvbiwgcGFpbnRJbmZv LmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBkZXRlcm1pbmVTdGF0ZShvKSk7CiAgICAg ICAgIH0KICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBNZWRpYU11dGVCdXR0b246CiAgICAgY2Fz ZSBNZWRpYVVuTXV0ZUJ1dHRvbjoKICAgICAgICAgaWYgKE1lZGlhQ29udHJvbE11dGVCdXR0b25F bGVtZW50KiBidG4gPSBzdGF0aWNfY2FzdDxNZWRpYUNvbnRyb2xNdXRlQnV0dG9uRWxlbWVudCo+ KG8tPm5vZGUoKSkpIHsKICAgICAgICAgICAgIGJvb2wgYXVkaW9FbmFibGVkID0gYnRuLT5kaXNw bGF5VHlwZSgpID09IE1lZGlhTXV0ZUJ1dHRvbjsKLSAgICAgICAgICAgIHdrRHJhd01lZGlhVUlQ YXJ0KGF1ZGlvRW5hYmxlZCA/IFdLTWVkaWFVSVBhcnRNdXRlQnV0dG9uIDogV0tNZWRpYVVJUGFy dFVuTXV0ZUJ1dHRvbiwgdGhlbWVTdHlsZSwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29u dGV4dCgpLCByLCBkZXRlcm1pbmVTdGF0ZShvKSk7CisgICAgICAgICAgICB3a0RyYXdNZWRpYVVJ UGFydChhdWRpb0VuYWJsZWQgPyBXS01lZGlhVUlQYXJ0TXV0ZUJ1dHRvbiA6IFdLTWVkaWFVSVBh cnRVbk11dGVCdXR0b24sIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwg ZGV0ZXJtaW5lU3RhdGUobykpOwogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2Ug TWVkaWFQYXVzZUJ1dHRvbjoKICAgICBjYXNlIE1lZGlhUGxheUJ1dHRvbjoKICAgICAgICAgaWYg KE1lZGlhQ29udHJvbFBsYXlCdXR0b25FbGVtZW50KiBidG4gPSBzdGF0aWNfY2FzdDxNZWRpYUNv bnRyb2xQbGF5QnV0dG9uRWxlbWVudCo+KG8tPm5vZGUoKSkpIHsKICAgICAgICAgICAgIGJvb2wg Y2FuUGxheSA9IGJ0bi0+ZGlzcGxheVR5cGUoKSA9PSBNZWRpYVBsYXlCdXR0b247Ci0gICAgICAg ICAgICB3a0RyYXdNZWRpYVVJUGFydChjYW5QbGF5ID8gV0tNZWRpYVVJUGFydFBsYXlCdXR0b24g OiBXS01lZGlhVUlQYXJ0UGF1c2VCdXR0b24sIHRoZW1lU3R5bGUsIHBhaW50SW5mby5jb250ZXh0 LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgZGV0ZXJtaW5lU3RhdGUobykpOworICAgICAgICAgICAg d2tEcmF3TWVkaWFVSVBhcnQoY2FuUGxheSA/IFdLTWVkaWFVSVBhcnRQbGF5QnV0dG9uIDogV0tN ZWRpYVVJUGFydFBhdXNlQnV0dG9uLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0 KCksIHIsIGRldGVybWluZVN0YXRlKG8pKTsKICAgICAgICAgfQogICAgICAgICBicmVhazsKICAg ICBjYXNlIE1lZGlhUmV3aW5kQnV0dG9uOgotICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChXS01l ZGlhVUlQYXJ0UmV3aW5kQnV0dG9uLCB0aGVtZVN0eWxlLCBwYWludEluZm8uY29udGV4dC0+cGxh dGZvcm1Db250ZXh0KCksIHIsIGRldGVybWluZVN0YXRlKG8pKTsKKyAgICAgICAgd2tEcmF3TWVk aWFVSVBhcnQoV0tNZWRpYVVJUGFydFJld2luZEJ1dHRvbiwgcGFpbnRJbmZvLmNvbnRleHQtPnBs YXRmb3JtQ29udGV4dCgpLCByLCBkZXRlcm1pbmVTdGF0ZShvKSk7CiAgICAgICAgIGJyZWFrOwog ICAgIGNhc2UgTWVkaWFSZXR1cm5Ub1JlYWx0aW1lQnV0dG9uOgotICAgICAgICB3a0RyYXdNZWRp YVVJUGFydChXS01lZGlhVUlQYXJ0U2Vla1RvUmVhbHRpbWVCdXR0b24sIHRoZW1lU3R5bGUsIHBh aW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgZGV0ZXJtaW5lU3RhdGUobykp OworICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChXS01lZGlhVUlQYXJ0U2Vla1RvUmVhbHRpbWVC dXR0b24sIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgZGV0ZXJtaW5l U3RhdGUobykpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIE1lZGlhU2Vla0JhY2tCdXR0b246 Ci0gICAgICAgIHdrRHJhd01lZGlhVUlQYXJ0KFdLTWVkaWFVSVBhcnRTZWVrQmFja0J1dHRvbiwg dGhlbWVTdHlsZSwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBkZXRl cm1pbmVTdGF0ZShvKSk7CisgICAgICAgIHdrRHJhd01lZGlhVUlQYXJ0KFdLTWVkaWFVSVBhcnRT ZWVrQmFja0J1dHRvbiwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBk ZXRlcm1pbmVTdGF0ZShvKSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTWVkaWFTZWVrRm9y d2FyZEJ1dHRvbjoKLSAgICAgICAgd2tEcmF3TWVkaWFVSVBhcnQoV0tNZWRpYVVJUGFydFNlZWtG b3J3YXJkQnV0dG9uLCB0aGVtZVN0eWxlLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250 ZXh0KCksIHIsIGRldGVybWluZVN0YXRlKG8pKTsKKyAgICAgICAgd2tEcmF3TWVkaWFVSVBhcnQo V0tNZWRpYVVJUGFydFNlZWtGb3J3YXJkQnV0dG9uLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZv cm1Db250ZXh0KCksIHIsIGRldGVybWluZVN0YXRlKG8pKTsKICAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBNZWRpYVNsaWRlcjogewogICAgICAgICBpZiAoSFRNTE1lZGlhRWxlbWVudCogbWVkaWFF bGVtZW50ID0gdG9QYXJlbnRNZWRpYUVsZW1lbnQobykpIHsKICAgICAgICAgICAgIEZsb2F0UmVj dCB1bnpvb21lZFJlY3QgPSBnZXRVbnpvb21lZFJlY3RBbmRBZGp1c3RDdXJyZW50Q29udGV4dChv LCBwYWludEluZm8sIHIpOwotICAgICAgICAgICAgd2tEcmF3TWVkaWFTbGlkZXJUcmFjayh0aGVt ZVN0eWxlLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHVuem9vbWVkUmVj dCwgbWVkaWFFbGVtZW50LT5wZXJjZW50TG9hZGVkKCkgKiBtZWRpYUVsZW1lbnQtPmR1cmF0aW9u KCksIG1lZGlhRWxlbWVudC0+Y3VycmVudFRpbWUoKSwgbWVkaWFFbGVtZW50LT5kdXJhdGlvbigp LCBkZXRlcm1pbmVTdGF0ZShvKSk7CisgICAgICAgICAgICB3a0RyYXdNZWRpYVNsaWRlclRyYWNr KHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgdW56b29tZWRSZWN0LCBtZWRp YUVsZW1lbnQtPnBlcmNlbnRMb2FkZWQoKSAqIG1lZGlhRWxlbWVudC0+ZHVyYXRpb24oKSwgbWVk aWFFbGVtZW50LT5jdXJyZW50VGltZSgpLCBtZWRpYUVsZW1lbnQtPmR1cmF0aW9uKCksIGRldGVy bWluZVN0YXRlKG8pKTsKICAgICAgICAgfQogICAgICAgICBicmVhazsKICAgICB9CiAgICAgY2Fz ZSBNZWRpYVNsaWRlclRodW1iOgotICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChXS01lZGlhVUlQ YXJ0VGltZWxpbmVTbGlkZXJUaHVtYiwgdGhlbWVTdHlsZSwgcGFpbnRJbmZvLmNvbnRleHQtPnBs YXRmb3JtQ29udGV4dCgpLCByLCBkZXRlcm1pbmVTdGF0ZShvKSk7CisgICAgICAgIHdrRHJhd01l ZGlhVUlQYXJ0KFdLTWVkaWFVSVBhcnRUaW1lbGluZVNsaWRlclRodW1iLCBwYWludEluZm8uY29u dGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIGRldGVybWluZVN0YXRlKG8pKTsKICAgICAgICAg YnJlYWs7CiAgICAgY2FzZSBNZWRpYVZvbHVtZVNsaWRlckNvbnRhaW5lcjoKLSAgICAgICAgd2tE cmF3TWVkaWFVSVBhcnQoV0tNZWRpYVVJUGFydFZvbHVtZVNsaWRlckNvbnRhaW5lciwgdGhlbWVT dHlsZSwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBkZXRlcm1pbmVT dGF0ZShvKSk7CisgICAgICAgIHdrRHJhd01lZGlhVUlQYXJ0KFdLTWVkaWFVSVBhcnRWb2x1bWVT bGlkZXJDb250YWluZXIsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwg ZGV0ZXJtaW5lU3RhdGUobykpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIE1lZGlhVm9sdW1l U2xpZGVyOgotICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChXS01lZGlhVUlQYXJ0Vm9sdW1lU2xp ZGVyLCB0aGVtZVN0eWxlLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIs IGRldGVybWluZVN0YXRlKG8pKTsKKyAgICAgICAgd2tEcmF3TWVkaWFVSVBhcnQoV0tNZWRpYVVJ UGFydFZvbHVtZVNsaWRlciwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCBy LCBkZXRlcm1pbmVTdGF0ZShvKSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTWVkaWFWb2x1 bWVTbGlkZXJUaHVtYjoKLSAgICAgICAgd2tEcmF3TWVkaWFVSVBhcnQoV0tNZWRpYVVJUGFydFZv bHVtZVNsaWRlclRodW1iLCB0aGVtZVN0eWxlLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1D b250ZXh0KCksIHIsIGRldGVybWluZVN0YXRlKG8pKTsKKyAgICAgICAgd2tEcmF3TWVkaWFVSVBh cnQoV0tNZWRpYVVJUGFydFZvbHVtZVNsaWRlclRodW1iLCBwYWludEluZm8uY29udGV4dC0+cGxh dGZvcm1Db250ZXh0KCksIHIsIGRldGVybWluZVN0YXRlKG8pKTsKICAgICAgICAgYnJlYWs7CiAg ICAgY2FzZSBNZWRpYUZ1bGxTY3JlZW5Wb2x1bWVTbGlkZXI6Ci0gICAgICAgIHdrRHJhd01lZGlh VUlQYXJ0KFdLTWVkaWFVSVBhcnRGdWxsU2NyZWVuVm9sdW1lU2xpZGVyLCB0aGVtZVN0eWxlLCBw YWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIGRldGVybWluZVN0YXRlKG8p KTsKKyAgICAgICAgd2tEcmF3TWVkaWFVSVBhcnQoV0tNZWRpYVVJUGFydEZ1bGxTY3JlZW5Wb2x1 bWVTbGlkZXIsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgZGV0ZXJt aW5lU3RhdGUobykpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIE1lZGlhRnVsbFNjcmVlblZv bHVtZVNsaWRlclRodW1iOgotICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChXS01lZGlhVUlQYXJ0 RnVsbFNjcmVlblZvbHVtZVNsaWRlclRodW1iLCB0aGVtZVN0eWxlLCBwYWludEluZm8uY29udGV4 dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIGRldGVybWluZVN0YXRlKG8pKTsKKyAgICAgICAgd2tE cmF3TWVkaWFVSVBhcnQoV0tNZWRpYVVJUGFydEZ1bGxTY3JlZW5Wb2x1bWVTbGlkZXJUaHVtYiwg cGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBkZXRlcm1pbmVTdGF0ZShv KSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTWVkaWFUaW1lbGluZUNvbnRhaW5lcjoKLSAg ICAgICAgd2tEcmF3TWVkaWFVSVBhcnQoV0tNZWRpYVVJUGFydEJhY2tncm91bmQsIHRoZW1lU3R5 bGUsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgZGV0ZXJtaW5lU3Rh dGUobykpOworICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChXS01lZGlhVUlQYXJ0QmFja2dyb3Vu ZCwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBkZXRlcm1pbmVTdGF0 ZShvKSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTWVkaWFDdXJyZW50VGltZURpc3BsYXk6 CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwo= 208960 2013-08-16 14:26:24 -0700 2013-08-16 14:42:00 -0700 Patch bug-119910-20130816142603.patch text/plain 10549 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDIwMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEzLTA4LTE2ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5kb3dzXSBVcGRhdGUg UmVuZGVyTWVkaWFDb250cm9scyBmb3IgbmV3IEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5OTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTWVkaWFDb250cm9scy5j cHA6IFVwZGF0ZSBjYWxscyB0byBXZWJLaXRTeXN0ZW1JbnRlcmZhY2UgZm9yCisgICAgICAgIHRo ZSBjaGFuZ2VkIEFQSS4KKwogMjAxMy0wOC0xNiAgQXJ1bnByYXNhZCBSYWprdW1hciAgPGFydXJh amt1QGNpc2NvLmNvbT4KIAogICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTE5Nzg1PiBS ZXBsYWNlIGN1cnJlbnRUaW1lKCkgd2l0aCBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKSBp biBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWFDb250 cm9scy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1l ZGlhQ29udHJvbHMuY3BwCShyZXZpc2lvbiAxNTQyMDIpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTWVkaWFDb250cm9scy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzLDExICs0 Myw0MSBAQAogCiAvLyBUaGUgV2luZG93cyB2ZXJzaW9uIG9mIFdLU0kgZGVmaW5lcyB0aGVzZSBm dW5jdGlvbnMgYXMgY2FwaXRhbGl6ZWQsIHdoaWxlIHRoZSBNYWMgdmVyc2lvbiBkZWZpbmVzIHRo ZW0gYXMgbG93ZXIgY2FzZS4KIC8vIEZJWE1FOiBJcyB0aGlzIG5lY2Vzc2FyeSBhbnltb3JlPwot I2RlZmluZSB3a01lZGlhQ29udHJvbGxlclRoZW1lQXZhaWxhYmxlKHRoZW1lU3R5bGUpIFdLTWVk aWFDb250cm9sbGVyVGhlbWVBdmFpbGFibGUodGhlbWVTdHlsZSkKLSNkZWZpbmUgd2tIaXRUZXN0 TWVkaWFVSVBhcnQocGFydCwgdGhlbWVTdHlsZSwgYm91bmRzLCBwb2ludCkgV0tIaXRUZXN0TWVk aWFVSVBhcnQocGFydCwgdGhlbWVTdHlsZSwgYm91bmRzLCBwb2ludCkKLSNkZWZpbmUgd2tNZWFz dXJlTWVkaWFVSVBhcnQocGFydCwgdGhlbWVTdHlsZSwgYm91bmRzLCBuYXR1cmFsU2l6ZSkgV0tN ZWFzdXJlTWVkaWFVSVBhcnQocGFydCwgdGhlbWVTdHlsZSwgYm91bmRzLCBuYXR1cmFsU2l6ZSkK LSNkZWZpbmUgd2tEcmF3TWVkaWFVSVBhcnQocGFydCwgdGhlbWVTdHlsZSwgY29udGV4dCwgcmVj dCwgc3RhdGUpIFdLRHJhd01lZGlhVUlQYXJ0KHBhcnQsIHRoZW1lU3R5bGUsIGNvbnRleHQsIHJl Y3QsIHN0YXRlKQotI2RlZmluZSB3a0RyYXdNZWRpYVNsaWRlclRyYWNrKHRoZW1lU3R5bGUsIGNv bnRleHQsIHJlY3QsIHRpbWVMb2FkZWQsIGN1cnJlbnRUaW1lLCBkdXJhdGlvbiwgc3RhdGUpIFdL RHJhd01lZGlhU2xpZGVyVHJhY2sodGhlbWVTdHlsZSwgY29udGV4dCwgcmVjdCwgdGltZUxvYWRl ZCwgY3VycmVudFRpbWUsIGR1cmF0aW9uLCBzdGF0ZSkKK2lubGluZSBib29sIHdrSGl0VGVzdE1l ZGlhVUlQYXJ0KGludCBwYXJ0LCBjb25zdCBDR1JlY3QmIGJvdW5kcywgY29uc3QgQ0dQb2ludCYg cG9pbnQpCit7CisjaWYgSEFWRShBVkNGX0xFR0lCTEVfT1VUUFVUKSAvLyBpLmUuLCB0aGUgbmV3 IG1lZGlhIGNvbnRyb2xzCisgICAgV0tIaXRUZXN0TWVkaWFVSVBhcnQocGFydCwgYm91bmRzLCBw b2ludCk7CisjZWxzZQorICAgIFdLSGl0VGVzdE1lZGlhVUlQYXJ0KHBhcnQsIFdLTWVkaWFDb250 cm9sbGVyVGhlbWVRdWlja1RpbWUsIGJvdW5kcywgcG9pbnQpOworI2VuZGlmCit9CisKK2lubGlu ZSB2b2lkIHdrTWVhc3VyZU1lZGlhVUlQYXJ0KGludCBwYXJ0LCBDR1JlY3QqIGJvdW5kcywgQ0dT aXplKiBuYXR1cmFsU2l6ZSkKK3sKKyNpZiBIQVZFKEFWQ0ZfTEVHSUJMRV9PVVRQVVQpIC8vIGku ZS4sIHRoZSBuZXcgbWVkaWEgY29udHJvbHMKKyAgICBXS01lYXN1cmVNZWRpYVVJUGFydChwYXJ0 LCBib3VuZHMsIG5hdHVyYWxTaXplKTsKKyNlbHNlCisgICAgV0tNZWFzdXJlTWVkaWFVSVBhcnQo cGFydCwgV0tNZWRpYUNvbnRyb2xsZXJUaGVtZVF1aWNrVGltZSwgYm91bmRzLCBuYXR1cmFsU2l6 ZSk7CisjZW5kaWYKK30KKworaW5saW5lIHZvaWQgd2tEcmF3TWVkaWFVSVBhcnQoaW50IHBhcnQs IENHQ29udGV4dFJlZiBjb250ZXh0LCBjb25zdCBDR1JlY3QmIHJlY3QsIHVuc2lnbmVkIHN0YXRl KQoreworI2lmIEhBVkUoQVZDRl9MRUdJQkxFX09VVFBVVCkgLy8gaS5lLiwgdGhlIG5ldyBtZWRp YSBjb250cm9scworICAgIFdLRHJhd01lZGlhVUlQYXJ0KHBhcnQsIGNvbnRleHQsIHJlY3QsIHN0 YXRlKTsKKyNlbHNlCisgICAgV0tEcmF3TWVkaWFVSVBhcnQocGFydCwgV0tNZWRpYUNvbnRyb2xs ZXJUaGVtZVF1aWNrVGltZSwgY29udGV4dCwgcmVjdCwgc3RhdGUpOworI2VuZGlmCit9CisKK2lu bGluZSB2b2lkIHdrRHJhd01lZGlhU2xpZGVyVHJhY2soQ0dDb250ZXh0UmVmIGNvbnRleHQsIGNv bnN0IENHUmVjdCYgcmVjdCwgZmxvYXQgdGltZUxvYWRlZCwgZmxvYXQgY3VycmVudFRpbWUsIGZs b2F0IGR1cmF0aW9uLCB1bnNpZ25lZCBzdGF0ZSkKK3sKKyNpZiBIQVZFKEFWQ0ZfTEVHSUJMRV9P VVRQVVQpIC8vIGkuZS4sIHRoZSBuZXcgbWVkaWEgY29udHJvbHMKKyAgICBXS0RyYXdNZWRpYVNs aWRlclRyYWNrKGNvbnRleHQsIHJlY3QsIHRpbWVMb2FkZWQsIGN1cnJlbnRUaW1lLCBkdXJhdGlv biwgc3RhdGUpOworI2Vsc2UKKyAgICBXS0RyYXdNZWRpYVNsaWRlclRyYWNrKFdLTWVkaWFDb250 cm9sbGVyVGhlbWVRdWlja1RpbWUsIGNvbnRleHQsIHJlY3QsIHRpbWVMb2FkZWQsIGN1cnJlbnRU aW1lLCBkdXJhdGlvbiwgc3RhdGUpOworI2VuZGlmCit9CiAKICNlbmRpZgogIApAQCAtMTA2LDcg KzEzNiw3IEBAIHZvaWQgUmVuZGVyTWVkaWFDb250cm9sczo6YWRqdXN0TWVkaWFTbGkKICAgICB9 CiAKICAgICBDR1NpemUgc2l6ZTsKLSAgICB3a01lYXN1cmVNZWRpYVVJUGFydChwYXJ0LCBXS01l ZGlhQ29udHJvbGxlclRoZW1lUXVpY2tUaW1lLCAwLCAmc2l6ZSk7CisgICAgd2tNZWFzdXJlTWVk aWFVSVBhcnQocGFydCwgMCwgJnNpemUpOwogCiAgICAgZmxvYXQgem9vbUxldmVsID0gc3R5bGUt PmVmZmVjdGl2ZVpvb20oKTsKICAgICBzdHlsZS0+c2V0V2lkdGgoTGVuZ3RoKHN0YXRpY19jYXN0 PGludD4oc2l6ZS53aWR0aCAqIHpvb21MZXZlbCksIEZpeGVkKSk7CkBAIC0xMTUsNyArMTQ1LDYg QEAgdm9pZCBSZW5kZXJNZWRpYUNvbnRyb2xzOjphZGp1c3RNZWRpYVNsaQogCiBib29sIFJlbmRl ck1lZGlhQ29udHJvbHM6OnBhaW50TWVkaWFDb250cm9sc1BhcnQoTWVkaWFDb250cm9sRWxlbWVu dFR5cGUgcGFydCwgUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywg Y29uc3QgSW50UmVjdCYgcikKIHsKLSAgICBzdGF0aWMgY29uc3QgaW50IHRoZW1lU3R5bGUgPSBX S01lZGlhQ29udHJvbGxlclRoZW1lUXVpY2tUaW1lOwogICAgIEdyYXBoaWNzQ29udGV4dFN0YXRl U2F2ZXIgc3RhdGVTYXZlcigqcGFpbnRJbmZvLmNvbnRleHQpOwogCiAgICAgc3dpdGNoIChwYXJ0 KSB7CkBAIC0xMjMsNjkgKzE1Miw2OSBAQCBib29sIFJlbmRlck1lZGlhQ29udHJvbHM6OnBhaW50 TWVkaWFDb250CiAgICAgY2FzZSBNZWRpYUV4aXRGdWxsc2NyZWVuQnV0dG9uOgogICAgICAgICBp ZiAoTWVkaWFDb250cm9sRnVsbHNjcmVlbkJ1dHRvbkVsZW1lbnQqIGJ0biA9IHN0YXRpY19jYXN0 PE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5CdXR0b25FbGVtZW50Kj4oby0+bm9kZSgpKSkgewogICAg ICAgICAgICAgYm9vbCBlbnRlckJ1dHRvbiA9IGJ0bi0+ZGlzcGxheVR5cGUoKSA9PSBNZWRpYUVu dGVyRnVsbHNjcmVlbkJ1dHRvbjsKLSAgICAgICAgICAgIHdrRHJhd01lZGlhVUlQYXJ0KGVudGVy QnV0dG9uID8gV0tNZWRpYVVJUGFydEZ1bGxzY3JlZW5CdXR0b24gOiBXS01lZGlhVUlQYXJ0RXhp dEZ1bGxzY3JlZW5CdXR0b24sIHRoZW1lU3R5bGUsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9y bUNvbnRleHQoKSwgciwgZGV0ZXJtaW5lU3RhdGUobykpOworICAgICAgICAgICAgd2tEcmF3TWVk aWFVSVBhcnQoZW50ZXJCdXR0b24gPyBXS01lZGlhVUlQYXJ0RnVsbHNjcmVlbkJ1dHRvbiA6IFdL TWVkaWFVSVBhcnRFeGl0RnVsbHNjcmVlbkJ1dHRvbiwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRm b3JtQ29udGV4dCgpLCByLCBkZXRlcm1pbmVTdGF0ZShvKSk7CiAgICAgICAgIH0KICAgICAgICAg YnJlYWs7CiAgICAgY2FzZSBNZWRpYVNob3dDbG9zZWRDYXB0aW9uc0J1dHRvbjoKICAgICBjYXNl IE1lZGlhSGlkZUNsb3NlZENhcHRpb25zQnV0dG9uOgogICAgICAgICBpZiAoTWVkaWFDb250cm9s VG9nZ2xlQ2xvc2VkQ2FwdGlvbnNCdXR0b25FbGVtZW50KiBidG4gPSBzdGF0aWNfY2FzdDxNZWRp YUNvbnRyb2xUb2dnbGVDbG9zZWRDYXB0aW9uc0J1dHRvbkVsZW1lbnQqPihvLT5ub2RlKCkpKSB7 CiAgICAgICAgICAgICBib29sIGNhcHRpb25zVmlzaWJsZSA9IGJ0bi0+ZGlzcGxheVR5cGUoKSA9 PSBNZWRpYUhpZGVDbG9zZWRDYXB0aW9uc0J1dHRvbjsKLSAgICAgICAgICAgIHdrRHJhd01lZGlh VUlQYXJ0KGNhcHRpb25zVmlzaWJsZSA/IFdLTWVkaWFVSVBhcnRIaWRlQ2xvc2VkQ2FwdGlvbnNC dXR0b24gOiBXS01lZGlhVUlQYXJ0U2hvd0Nsb3NlZENhcHRpb25zQnV0dG9uLCB0aGVtZVN0eWxl LCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIGRldGVybWluZVN0YXRl KG8pKTsKKyAgICAgICAgICAgIHdrRHJhd01lZGlhVUlQYXJ0KGNhcHRpb25zVmlzaWJsZSA/IFdL TWVkaWFVSVBhcnRIaWRlQ2xvc2VkQ2FwdGlvbnNCdXR0b24gOiBXS01lZGlhVUlQYXJ0U2hvd0Ns b3NlZENhcHRpb25zQnV0dG9uLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCks IHIsIGRldGVybWluZVN0YXRlKG8pKTsKICAgICAgICAgfQogICAgICAgICBicmVhazsKICAgICBj YXNlIE1lZGlhTXV0ZUJ1dHRvbjoKICAgICBjYXNlIE1lZGlhVW5NdXRlQnV0dG9uOgogICAgICAg ICBpZiAoTWVkaWFDb250cm9sTXV0ZUJ1dHRvbkVsZW1lbnQqIGJ0biA9IHN0YXRpY19jYXN0PE1l ZGlhQ29udHJvbE11dGVCdXR0b25FbGVtZW50Kj4oby0+bm9kZSgpKSkgewogICAgICAgICAgICAg Ym9vbCBhdWRpb0VuYWJsZWQgPSBidG4tPmRpc3BsYXlUeXBlKCkgPT0gTWVkaWFNdXRlQnV0dG9u OwotICAgICAgICAgICAgd2tEcmF3TWVkaWFVSVBhcnQoYXVkaW9FbmFibGVkID8gV0tNZWRpYVVJ UGFydE11dGVCdXR0b24gOiBXS01lZGlhVUlQYXJ0VW5NdXRlQnV0dG9uLCB0aGVtZVN0eWxlLCBw YWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIGRldGVybWluZVN0YXRlKG8p KTsKKyAgICAgICAgICAgIHdrRHJhd01lZGlhVUlQYXJ0KGF1ZGlvRW5hYmxlZCA/IFdLTWVkaWFV SVBhcnRNdXRlQnV0dG9uIDogV0tNZWRpYVVJUGFydFVuTXV0ZUJ1dHRvbiwgcGFpbnRJbmZvLmNv bnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBkZXRlcm1pbmVTdGF0ZShvKSk7CiAgICAgICAg IH0KICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBNZWRpYVBhdXNlQnV0dG9uOgogICAgIGNhc2Ug TWVkaWFQbGF5QnV0dG9uOgogICAgICAgICBpZiAoTWVkaWFDb250cm9sUGxheUJ1dHRvbkVsZW1l bnQqIGJ0biA9IHN0YXRpY19jYXN0PE1lZGlhQ29udHJvbFBsYXlCdXR0b25FbGVtZW50Kj4oby0+ bm9kZSgpKSkgewogICAgICAgICAgICAgYm9vbCBjYW5QbGF5ID0gYnRuLT5kaXNwbGF5VHlwZSgp ID09IE1lZGlhUGxheUJ1dHRvbjsKLSAgICAgICAgICAgIHdrRHJhd01lZGlhVUlQYXJ0KGNhblBs YXkgPyBXS01lZGlhVUlQYXJ0UGxheUJ1dHRvbiA6IFdLTWVkaWFVSVBhcnRQYXVzZUJ1dHRvbiwg dGhlbWVTdHlsZSwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBkZXRl cm1pbmVTdGF0ZShvKSk7CisgICAgICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChjYW5QbGF5ID8g V0tNZWRpYVVJUGFydFBsYXlCdXR0b24gOiBXS01lZGlhVUlQYXJ0UGF1c2VCdXR0b24sIHBhaW50 SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgZGV0ZXJtaW5lU3RhdGUobykpOwog ICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTWVkaWFSZXdpbmRCdXR0b246Ci0g ICAgICAgIHdrRHJhd01lZGlhVUlQYXJ0KFdLTWVkaWFVSVBhcnRSZXdpbmRCdXR0b24sIHRoZW1l U3R5bGUsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgZGV0ZXJtaW5l U3RhdGUobykpOworICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChXS01lZGlhVUlQYXJ0UmV3aW5k QnV0dG9uLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIGRldGVybWlu ZVN0YXRlKG8pKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBNZWRpYVJldHVyblRvUmVhbHRp bWVCdXR0b246Ci0gICAgICAgIHdrRHJhd01lZGlhVUlQYXJ0KFdLTWVkaWFVSVBhcnRTZWVrVG9S ZWFsdGltZUJ1dHRvbiwgdGhlbWVTdHlsZSwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29u dGV4dCgpLCByLCBkZXRlcm1pbmVTdGF0ZShvKSk7CisgICAgICAgIHdrRHJhd01lZGlhVUlQYXJ0 KFdLTWVkaWFVSVBhcnRTZWVrVG9SZWFsdGltZUJ1dHRvbiwgcGFpbnRJbmZvLmNvbnRleHQtPnBs YXRmb3JtQ29udGV4dCgpLCByLCBkZXRlcm1pbmVTdGF0ZShvKSk7CiAgICAgICAgIGJyZWFrOwog ICAgIGNhc2UgTWVkaWFTZWVrQmFja0J1dHRvbjoKLSAgICAgICAgd2tEcmF3TWVkaWFVSVBhcnQo V0tNZWRpYVVJUGFydFNlZWtCYWNrQnV0dG9uLCB0aGVtZVN0eWxlLCBwYWludEluZm8uY29udGV4 dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIGRldGVybWluZVN0YXRlKG8pKTsKKyAgICAgICAgd2tE cmF3TWVkaWFVSVBhcnQoV0tNZWRpYVVJUGFydFNlZWtCYWNrQnV0dG9uLCBwYWludEluZm8uY29u dGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIGRldGVybWluZVN0YXRlKG8pKTsKICAgICAgICAg YnJlYWs7CiAgICAgY2FzZSBNZWRpYVNlZWtGb3J3YXJkQnV0dG9uOgotICAgICAgICB3a0RyYXdN ZWRpYVVJUGFydChXS01lZGlhVUlQYXJ0U2Vla0ZvcndhcmRCdXR0b24sIHRoZW1lU3R5bGUsIHBh aW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgZGV0ZXJtaW5lU3RhdGUobykp OworICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChXS01lZGlhVUlQYXJ0U2Vla0ZvcndhcmRCdXR0 b24sIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgZGV0ZXJtaW5lU3Rh dGUobykpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIE1lZGlhU2xpZGVyOiB7CiAgICAgICAg IGlmIChIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSB0b1BhcmVudE1lZGlhRWxlbWVu dChvKSkgewogICAgICAgICAgICAgRmxvYXRSZWN0IHVuem9vbWVkUmVjdCA9IGdldFVuem9vbWVk UmVjdEFuZEFkanVzdEN1cnJlbnRDb250ZXh0KG8sIHBhaW50SW5mbywgcik7Ci0gICAgICAgICAg ICB3a0RyYXdNZWRpYVNsaWRlclRyYWNrKHRoZW1lU3R5bGUsIHBhaW50SW5mby5jb250ZXh0LT5w bGF0Zm9ybUNvbnRleHQoKSwgdW56b29tZWRSZWN0LCBtZWRpYUVsZW1lbnQtPnBlcmNlbnRMb2Fk ZWQoKSAqIG1lZGlhRWxlbWVudC0+ZHVyYXRpb24oKSwgbWVkaWFFbGVtZW50LT5jdXJyZW50VGlt ZSgpLCBtZWRpYUVsZW1lbnQtPmR1cmF0aW9uKCksIGRldGVybWluZVN0YXRlKG8pKTsKKyAgICAg ICAgICAgIHdrRHJhd01lZGlhU2xpZGVyVHJhY2socGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3Jt Q29udGV4dCgpLCB1bnpvb21lZFJlY3QsIG1lZGlhRWxlbWVudC0+cGVyY2VudExvYWRlZCgpICog bWVkaWFFbGVtZW50LT5kdXJhdGlvbigpLCBtZWRpYUVsZW1lbnQtPmN1cnJlbnRUaW1lKCksIG1l ZGlhRWxlbWVudC0+ZHVyYXRpb24oKSwgZGV0ZXJtaW5lU3RhdGUobykpOwogICAgICAgICB9CiAg ICAgICAgIGJyZWFrOwogICAgIH0KICAgICBjYXNlIE1lZGlhU2xpZGVyVGh1bWI6Ci0gICAgICAg IHdrRHJhd01lZGlhVUlQYXJ0KFdLTWVkaWFVSVBhcnRUaW1lbGluZVNsaWRlclRodW1iLCB0aGVt ZVN0eWxlLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIGRldGVybWlu ZVN0YXRlKG8pKTsKKyAgICAgICAgd2tEcmF3TWVkaWFVSVBhcnQoV0tNZWRpYVVJUGFydFRpbWVs aW5lU2xpZGVyVGh1bWIsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwg ZGV0ZXJtaW5lU3RhdGUobykpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIE1lZGlhVm9sdW1l U2xpZGVyQ29udGFpbmVyOgotICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChXS01lZGlhVUlQYXJ0 Vm9sdW1lU2xpZGVyQ29udGFpbmVyLCB0aGVtZVN0eWxlLCBwYWludEluZm8uY29udGV4dC0+cGxh dGZvcm1Db250ZXh0KCksIHIsIGRldGVybWluZVN0YXRlKG8pKTsKKyAgICAgICAgd2tEcmF3TWVk aWFVSVBhcnQoV0tNZWRpYVVJUGFydFZvbHVtZVNsaWRlckNvbnRhaW5lciwgcGFpbnRJbmZvLmNv bnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCByLCBkZXRlcm1pbmVTdGF0ZShvKSk7CiAgICAgICAg IGJyZWFrOwogICAgIGNhc2UgTWVkaWFWb2x1bWVTbGlkZXI6Ci0gICAgICAgIHdrRHJhd01lZGlh VUlQYXJ0KFdLTWVkaWFVSVBhcnRWb2x1bWVTbGlkZXIsIHRoZW1lU3R5bGUsIHBhaW50SW5mby5j b250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgZGV0ZXJtaW5lU3RhdGUobykpOworICAgICAg ICB3a0RyYXdNZWRpYVVJUGFydChXS01lZGlhVUlQYXJ0Vm9sdW1lU2xpZGVyLCBwYWludEluZm8u Y29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHIsIGRldGVybWluZVN0YXRlKG8pKTsKICAgICAg ICAgYnJlYWs7CiAgICAgY2FzZSBNZWRpYVZvbHVtZVNsaWRlclRodW1iOgotICAgICAgICB3a0Ry YXdNZWRpYVVJUGFydChXS01lZGlhVUlQYXJ0Vm9sdW1lU2xpZGVyVGh1bWIsIHRoZW1lU3R5bGUs IHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgZGV0ZXJtaW5lU3RhdGUo bykpOworICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChXS01lZGlhVUlQYXJ0Vm9sdW1lU2xpZGVy VGh1bWIsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgZGV0ZXJtaW5l U3RhdGUobykpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIE1lZGlhRnVsbFNjcmVlblZvbHVt ZVNsaWRlcjoKLSAgICAgICAgd2tEcmF3TWVkaWFVSVBhcnQoV0tNZWRpYVVJUGFydEZ1bGxTY3Jl ZW5Wb2x1bWVTbGlkZXIsIHRoZW1lU3R5bGUsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNv bnRleHQoKSwgciwgZGV0ZXJtaW5lU3RhdGUobykpOworICAgICAgICB3a0RyYXdNZWRpYVVJUGFy dChXS01lZGlhVUlQYXJ0RnVsbFNjcmVlblZvbHVtZVNsaWRlciwgcGFpbnRJbmZvLmNvbnRleHQt PnBsYXRmb3JtQ29udGV4dCgpLCByLCBkZXRlcm1pbmVTdGF0ZShvKSk7CiAgICAgICAgIGJyZWFr OwogICAgIGNhc2UgTWVkaWFGdWxsU2NyZWVuVm9sdW1lU2xpZGVyVGh1bWI6Ci0gICAgICAgIHdr RHJhd01lZGlhVUlQYXJ0KFdLTWVkaWFVSVBhcnRGdWxsU2NyZWVuVm9sdW1lU2xpZGVyVGh1bWIs IHRoZW1lU3R5bGUsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwgZGV0 ZXJtaW5lU3RhdGUobykpOworICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChXS01lZGlhVUlQYXJ0 RnVsbFNjcmVlblZvbHVtZVNsaWRlclRodW1iLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1D b250ZXh0KCksIHIsIGRldGVybWluZVN0YXRlKG8pKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2Fz ZSBNZWRpYVRpbWVsaW5lQ29udGFpbmVyOgotICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChXS01l ZGlhVUlQYXJ0QmFja2dyb3VuZCwgdGhlbWVTdHlsZSwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRm b3JtQ29udGV4dCgpLCByLCBkZXRlcm1pbmVTdGF0ZShvKSk7CisgICAgICAgIHdrRHJhd01lZGlh VUlQYXJ0KFdLTWVkaWFVSVBhcnRCYWNrZ3JvdW5kLCBwYWludEluZm8uY29udGV4dC0+cGxhdGZv cm1Db250ZXh0KCksIHIsIGRldGVybWluZVN0YXRlKG8pKTsKICAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBNZWRpYUN1cnJlbnRUaW1lRGlzcGxheToKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7Cg==