117758 2013-06-18 14:48:21 -0700 Make it possible to set a minimum height for auto-layout 2013-06-18 15:02:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue oldest_to_newest 901535 0 andersca 2013-06-18 14:48:21 -0700 Make it possible to set a minimum height for auto-layout 901537 1 204946 andersca 2013-06-18 14:50:44 -0700 Created attachment 204946 Patch 901540 2 204946 thorton 2013-06-18 14:53:12 -0700 Comment on attachment 204946 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204946&action=review > Source/WebKit2/ChangeLog:50 > + * Shared/WebPageCreationParameters.cpp: > + (WebKit::WebPageCreationParameters::encode): > + (WebKit::WebPageCreationParameters::decode): > + * Shared/WebPageCreationParameters.h: > + * UIProcess/API/mac/WKView.mm: > + (-[WKView _setIntrinsicContentSize:]): > + (-[WKView minimumLayoutWidth]): > + (-[WKView setMinimumLayoutWidth:]): > + (-[WKView minimumWidthForAutoLayout]): > + (-[WKView setMinimumWidthForAutoLayout:]): > + (-[WKView minimumSizeForAutoLayout]): > + (-[WKView setMinimumSizeForAutoLayout:]): > + * UIProcess/API/mac/WKViewPrivate.h: > + * UIProcess/DrawingAreaProxy.h: > + (WebKit::DrawingAreaProxy::minimumLayoutSizeDidChange): > + * UIProcess/WebPageProxy.cpp: > + (WebKit::WebPageProxy::WebPageProxy): > + (WebKit::WebPageProxy::creationParameters): > + (WebKit::WebPageProxy::setMinimumLayoutSize): > + * UIProcess/WebPageProxy.h: > + (WebKit::WebPageProxy::minimumLayoutSize): > + * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h: > + * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm: > + (WebKit::TiledCoreAnimationDrawingAreaProxy::TiledCoreAnimationDrawingAreaProxy): > + (WebKit::TiledCoreAnimationDrawingAreaProxy::minimumLayoutSizeDidChange): > + (WebKit::TiledCoreAnimationDrawingAreaProxy::didUpdateGeometry): > + (WebKit::TiledCoreAnimationDrawingAreaProxy::intrinsicContentSizeDidChange): > + (WebKit::TiledCoreAnimationDrawingAreaProxy::sendUpdateGeometry): > + * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: > + (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage): > + * WebProcess/WebPage/WebPage.cpp: > + (WebKit::WebPage::WebPage): > + (WebKit::WebPage::setMinimumLayoutSize): > + * WebProcess/WebPage/WebPage.h: > + (WebKit::WebPage::minimumLayoutSize): > + * WebProcess/WebPage/WebPage.messages.in: > + * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm: > + (WebKit::TiledCoreAnimationDrawingArea::mainFrameContentSizeChanged): > + (WebKit::TiledCoreAnimationDrawingArea::updateGeometry): Yikes. 901543 3 commit-queue 2013-06-18 14:54:01 -0700 Attachment 204946 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/Shared/WebPageCreationParameters.cpp', u'Source/WebKit2/Shared/WebPageCreationParameters.h', u'Source/WebKit2/UIProcess/API/mac/WKView.mm', u'Source/WebKit2/UIProcess/API/mac/WKViewPrivate.h', u'Source/WebKit2/UIProcess/DrawingAreaProxy.h', u'Source/WebKit2/UIProcess/WebPageProxy.cpp', u'Source/WebKit2/UIProcess/WebPageProxy.h', u'Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h', u'Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm', u'Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp', u'Source/WebKit2/WebProcess/WebPage/WebPage.cpp', u'Source/WebKit2/WebProcess/WebPage/WebPage.h', u'Source/WebKit2/WebProcess/WebPage/WebPage.messages.in', u'Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm']" exit_code: 1 Source/WebKit2/UIProcess/API/mac/WKViewPrivate.h:63: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 1 in 15 files If any of these errors are false positives, please file a bug against check-webkit-style. 901544 4 andersca 2013-06-18 15:02:04 -0700 Committed r151701: <http://trac.webkit.org/changeset/151701> 204946 2013-06-18 14:50:44 -0700 2013-06-18 14:53:12 -0700 Patch bug-117758-20130618144857.patch text/plain 23628 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNjk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTFhOWJmNTRkNzU3Yzg2 NTY3ZGM5NDk1OWRmMzBmZGY3ODBhN2E2Mi4uODdkZGM4Yzk4Y2VkY2ZmZjUwNWVmNzMzYWJmOWEz YWNhNWQ1ZWQwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0IEBACisyMDEzLTA2LTE4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBpdCBwb3Nz aWJsZSB0byBzZXQgYSBtaW5pbXVtIGhlaWdodCBmb3IgYXV0by1sYXlvdXQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzc1OAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vMTI4NDkwODA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ2hhbmdlIGEgYnVuY2ggb2YgbWluaW11bUxheW91dFdpZHRoIGRlY2xh cmF0aW9ucyB0byBtaW5pbXVtTGF5b3V0U2l6ZSBhbmQgYWRkIGEgbmV3IG1pbmltdW1MYXlvdXRT aXplIHByb3BlcnR5LgorICAgICAgICBJZiBtaW5pbXVtTGF5b3V0U2l6ZS5oZWlnaHQgaXMgZ3Jl YXRlciB0aGFuIHplcm8sIHVzZSBpdCB0byBzZXQgdGhlIG1pbmltdW0gbGF5b3V0IHNpemUgb24g dGhlIGZyYW1lIHZpZXcuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1l dGVycy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVu Y29kZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29k ZSk6CisgICAgICAgICogU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBfc2V0 SW50cmluc2ljQ29udGVudFNpemU6XSk6CisgICAgICAgICgtW1dLVmlldyBtaW5pbXVtTGF5b3V0 V2lkdGhdKToKKyAgICAgICAgKC1bV0tWaWV3IHNldE1pbmltdW1MYXlvdXRXaWR0aDpdKToKKyAg ICAgICAgKC1bV0tWaWV3IG1pbmltdW1XaWR0aEZvckF1dG9MYXlvdXRdKToKKyAgICAgICAgKC1b V0tWaWV3IHNldE1pbmltdW1XaWR0aEZvckF1dG9MYXlvdXQ6XSk6CisgICAgICAgICgtW1dLVmll dyBtaW5pbXVtU2l6ZUZvckF1dG9MYXlvdXRdKToKKyAgICAgICAgKC1bV0tWaWV3IHNldE1pbmlt dW1TaXplRm9yQXV0b0xheW91dDpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1Zp ZXdQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaDoKKyAg ICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eTo6bWluaW11bUxheW91dFNpemVEaWRDaGFu Z2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpzZXRNaW5pbXVtTGF5b3V0U2l6ZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6Om1pbmltdW1MYXlvdXRTaXpl KToKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh UHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhUHJveHkubW06CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhUHJveHk6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkpOgorICAgICAg ICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5OjptaW5pbXVtTGF5 b3V0U2l6ZURpZENoYW5nZSk6CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhUHJveHk6OmRpZFVwZGF0ZUdlb21ldHJ5KToKKyAgICAgICAgKFdlYktpdDo6VGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eTo6aW50cmluc2ljQ29udGVudFNpemVEaWRD aGFuZ2UpOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVBy b3h5OjpzZW5kVXBkYXRlR2VvbWV0cnkpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFt ZUxvYWRlckNsaWVudDo6dHJhbnNpdGlvblRvQ29tbWl0dGVkRm9yTmV3UGFnZSk6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlOjpXZWJQYWdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0TWluaW11bUxheW91 dFNpemUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2U6Om1pbmltdW1MYXlvdXRTaXplKToKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2Vi S2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6bWFpbkZyYW1lQ29udGVudFNpemVD aGFuZ2VkKToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6 OnVwZGF0ZUdlb21ldHJ5KToKKwogMjAxMy0wNi0xOCAgUm9nZXIgRm9uZyAgPHJvZ2VyX2ZvbmdA YXBwbGUuY29tPgogCiAgICAgICAgIFJlLWltcGxlbWVudCBXZWJGcmFtZU5ldHdvcmtpbmdDb250 ZXh0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBh cmFtZXRlcnMuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnMuY3BwCmluZGV4IGE1NTliYmI5NjU1Nzg4MDFhNTNiNGUyMWMzY2FkOGZlNjhhNWRjMTcu LjlhZTNiYjE1OTAwZjIwYmVkYzcxNTlhZTNlZmVlMmJiNGQ1YTM4MTkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKQEAgLTU5 LDcgKzU5LDcgQEAgdm9pZCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUoQ29yZUlQ Qzo6QXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIgPDwgZGV2aWNl U2NhbGVGYWN0b3I7CiAgICAgZW5jb2RlciA8PCBtZWRpYVZvbHVtZTsKICAgICBlbmNvZGVyIDw8 IG1heVN0YXJ0TWVkaWFXaGVuSW5XaW5kb3c7Ci0gICAgZW5jb2RlciA8PCBtaW5pbXVtTGF5b3V0 V2lkdGg7CisgICAgZW5jb2RlciA8PCBtaW5pbXVtTGF5b3V0U2l6ZTsKIAogI2lmIFBMQVRGT1JN KE1BQykKICAgICBlbmNvZGVyLmVuY29kZUVudW0obGF5ZXJIb3N0aW5nTW9kZSk7CkBAIC0xMjEs NyArMTIxLDcgQEAgYm9vbCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoQ29yZUlQ Qzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBXZWJQYWcKICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5tYXlTdGFydE1lZGlhV2hlbklu V2luZG93KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUo cGFyYW1ldGVycy5taW5pbXVtTGF5b3V0V2lkdGgpKQorICAgIGlmICghZGVjb2Rlci5kZWNvZGUo cGFyYW1ldGVycy5taW5pbXVtTGF5b3V0U2l6ZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAg ICAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBh Z2VDcmVhdGlvblBhcmFtZXRlcnMuaAppbmRleCAxZjIzMzE5YWIyYjU4YjY2ODdlOWUyYTQ2N2Mw NWZjMDViMzRkNDVlLi43Njc2ZjIwZmQ3NTU2YTRhZmZmN2YzZGMxNTEzMmYzODU5ODcxMWMwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVy cy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz LmgKQEAgLTg5LDcgKzg5LDcgQEAgc3RydWN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgewog ICAgIGZsb2F0IG1lZGlhVm9sdW1lOwogICAgIGJvb2wgbWF5U3RhcnRNZWRpYVdoZW5JbldpbmRv dzsKIAotICAgIGZsb2F0IG1pbmltdW1MYXlvdXRXaWR0aDsKKyAgICBXZWJDb3JlOjpJbnRTaXpl IG1pbmltdW1MYXlvdXRTaXplOwogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIExheWVySG9zdGlu Z01vZGUgbGF5ZXJIb3N0aW5nTW9kZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvbWFjL1dLVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFj L1dLVmlldy5tbQppbmRleCBiNWRlY2M4OThhNjhmNjY2OWRkZjg3NWQyYmYzYTdjOTI5Yjk2Yjk5 Li44M2MyM2JmYzIwODcwNjA4YjBhMTZhMTZiYjNhNTc3MjlmMWUyZTY1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCkBAIC0zMDM1LDcgKzMwMzUsNyBAQCBz dGF0aWMgTlNTdHJpbmcgKnBhdGhXaXRoVW5pcXVlRmlsZW5hbWVGb3JQYXRoKE5TU3RyaW5nICpw YXRoKQogICAgIC8vIHNvIHRoYXQgYXV0b2xheW91dCB3aWxsIGtub3cgdG8gcHJvdmlkZSBzcGFj ZSBmb3IgdXMuCiAKICAgICBOU1NpemUgaW50cmluc2ljQ29udGVudFNpemVBY2tub3dsZWRnaW5n RmxleGlibGVXaWR0aCA9IGludHJpbnNpY0NvbnRlbnRTaXplOwotICAgIGlmIChpbnRyaW5zaWND b250ZW50U2l6ZS53aWR0aCA8IF9kYXRhLT5fcGFnZS0+bWluaW11bUxheW91dFdpZHRoKCkpCisg ICAgaWYgKGludHJpbnNpY0NvbnRlbnRTaXplLndpZHRoIDwgX2RhdGEtPl9wYWdlLT5taW5pbXVt TGF5b3V0U2l6ZSgpLndpZHRoKCkpCiAgICAgICAgIGludHJpbnNpY0NvbnRlbnRTaXplQWNrbm93 bGVkZ2luZ0ZsZXhpYmxlV2lkdGgud2lkdGggPSBOU1ZpZXdOb0luc3RyaW5zaWNNZXRyaWM7CiAK ICAgICBfZGF0YS0+X2ludHJpbnNpY0NvbnRlbnRTaXplID0gaW50cmluc2ljQ29udGVudFNpemVB Y2tub3dsZWRnaW5nRmxleGlibGVXaWR0aDsKQEAgLTMyNzcsMTEgKzMyNzcsMTEgQEAgc3RhdGlj IE5TU3RyaW5nICpwYXRoV2l0aFVuaXF1ZUZpbGVuYW1lRm9yUGF0aChOU1N0cmluZyAqcGF0aCkK ICAgICBzdGF0aWMgQk9PTCBsb2dnZWREZXByZWNhdGlvbldhcm5pbmcgPSBOTzsKIAogICAgIGlm ICghbG9nZ2VkRGVwcmVjYXRpb25XYXJuaW5nKSB7Ci0gICAgICAgIE5TTG9nKEAiUGxlYXNlIHVz ZSBtaW5pbXVtV2lkdGhGb3JBdXRvTGF5b3V0IGluc3RlYWQgb2YgbWluaW11bUxheW91dFdpZHRo LiIpOworICAgICAgICBOU0xvZyhAIlBsZWFzZSB1c2UgbWluaW11bVNpemVGb3JBdXRvTGF5b3V0 IGluc3RlYWQgb2YgbWluaW11bUxheW91dFdpZHRoLiIpOwogICAgICAgICBsb2dnZWREZXByZWNh dGlvbldhcm5pbmcgPSBZRVM7CiAgICAgfQogCi0gICAgcmV0dXJuIF9kYXRhLT5fcGFnZS0+bWlu aW11bUxheW91dFdpZHRoKCk7CisgICAgcmV0dXJuIHNlbGYubWluaW11bVNpemVGb3JBdXRvTGF5 b3V0LndpZHRoOwogfQogCiAtICh2b2lkKXNldE1pbmltdW1MYXlvdXRXaWR0aDooQ0dGbG9hdClt aW5pbXVtTGF5b3V0V2lkdGgKQEAgLTMyODksNyArMzI4OSw3IEBAIHN0YXRpYyBOU1N0cmluZyAq cGF0aFdpdGhVbmlxdWVGaWxlbmFtZUZvclBhdGgoTlNTdHJpbmcgKnBhdGgpCiAgICAgc3RhdGlj IEJPT0wgbG9nZ2VkRGVwcmVjYXRpb25XYXJuaW5nID0gTk87CiAKICAgICBpZiAoIWxvZ2dlZERl cHJlY2F0aW9uV2FybmluZykgewotICAgICAgICBOU0xvZyhAIlBsZWFzZSB1c2UgbWluaW11bVdp ZHRoRm9yQXV0b0xheW91dCBpbnN0ZWFkIG9mIG1pbmltdW1MYXlvdXRXaWR0aC4iKTsKKyAgICAg ICAgTlNMb2coQCJQbGVhc2UgdXNlIHNldE1pbmltdW1TaXplRm9yQXV0b0xheW91dDogaW5zdGVh ZCBvZiBzZXRNaW5pbXVtTGF5b3V0V2lkdGg6LiIpOwogICAgICAgICBsb2dnZWREZXByZWNhdGlv bldhcm5pbmcgPSBZRVM7CiAgICAgfQogCkBAIC0zMjk4LDE0ICszMjk4LDM4IEBAIHN0YXRpYyBO U1N0cmluZyAqcGF0aFdpdGhVbmlxdWVGaWxlbmFtZUZvclBhdGgoTlNTdHJpbmcgKnBhdGgpCiAK IC0gKENHRmxvYXQpbWluaW11bVdpZHRoRm9yQXV0b0xheW91dAogewotICAgIHJldHVybiBfZGF0 YS0+X3BhZ2UtPm1pbmltdW1MYXlvdXRXaWR0aCgpOworICAgIHN0YXRpYyBCT09MIGxvZ2dlZERl cHJlY2F0aW9uV2FybmluZyA9IE5POworCisgICAgaWYgKCFsb2dnZWREZXByZWNhdGlvbldhcm5p bmcpIHsKKyAgICAgICAgTlNMb2coQCJQbGVhc2UgdXNlIG1pbmltdW1TaXplRm9yQXV0b0xheW91 dCBpbnN0ZWFkIG9mIG1pbmltdW1XaWR0aEZvckF1dG9MYXlvdXQuIik7CisgICAgICAgIGxvZ2dl ZERlcHJlY2F0aW9uV2FybmluZyA9IFlFUzsKKyAgICB9CisKKyAgICByZXR1cm4gc2VsZi5taW5p bXVtU2l6ZUZvckF1dG9MYXlvdXQud2lkdGg7CiB9CiAKIC0gKHZvaWQpc2V0TWluaW11bVdpZHRo Rm9yQXV0b0xheW91dDooQ0dGbG9hdCltaW5pbXVtTGF5b3V0V2lkdGgKIHsKLSAgICBCT09MIGV4 cGFuZHNUb0ZpdCA9IG1pbmltdW1MYXlvdXRXaWR0aCA+IDA7CisgICAgc3RhdGljIEJPT0wgbG9n Z2VkRGVwcmVjYXRpb25XYXJuaW5nID0gTk87CisKKyAgICBpZiAoIWxvZ2dlZERlcHJlY2F0aW9u V2FybmluZykgeworICAgICAgICBOU0xvZyhAIlBsZWFzZSB1c2Ugc2V0TWluaW11bVNpemVGb3JB dXRvTGF5b3V0OiBpbnN0ZWFkIG9mIHNldE1pbmltdW1XaWR0aEZvckF1dG9MYXlvdXQ6Iik7Cisg ICAgICAgIGxvZ2dlZERlcHJlY2F0aW9uV2FybmluZyA9IFlFUzsKKyAgICB9CisKKyAgICBzZWxm Lm1pbmltdW1TaXplRm9yQXV0b0xheW91dCA9IE5TTWFrZVNpemUobWluaW11bUxheW91dFdpZHRo LCBzZWxmLm1pbmltdW1TaXplRm9yQXV0b0xheW91dC5oZWlnaHQpOworfQorCistIChOU1NpemUp bWluaW11bVNpemVGb3JBdXRvTGF5b3V0Cit7CisgICAgcmV0dXJuIF9kYXRhLT5fcGFnZS0+bWlu aW11bUxheW91dFNpemUoKTsKK30KKworLSAodm9pZClzZXRNaW5pbXVtU2l6ZUZvckF1dG9MYXlv dXQ6KE5TU2l6ZSltaW5pbXVtU2l6ZUZvckF1dG9MYXlvdXQKK3sKKyAgICBCT09MIGV4cGFuZHNU b0ZpdCA9IG1pbmltdW1TaXplRm9yQXV0b0xheW91dC53aWR0aCA+IDA7CiAKLSAgICBfZGF0YS0+ X3BhZ2UtPnNldE1pbmltdW1MYXlvdXRXaWR0aChtaW5pbXVtTGF5b3V0V2lkdGgpOworICAgIF9k YXRhLT5fcGFnZS0+c2V0TWluaW11bUxheW91dFNpemUoSW50U2l6ZShtaW5pbXVtU2l6ZUZvckF1 dG9MYXlvdXQud2lkdGgsIG1pbmltdW1TaXplRm9yQXV0b0xheW91dC5oZWlnaHQpKTsKIAogICAg IFtzZWxmIHNldFNob3VsZENsaXBUb1Zpc2libGVSZWN0OmV4cGFuZHNUb0ZpdF07CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdQcml2YXRlLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdQcml2YXRlLmgKaW5kZXgg ZTFlMWJlOTY2MmIxNjdiNzY0YTA3OWU3NjI0MWE0YzU1ODM4ZTUyNi4uYTlmZjlkMzBmMmY5YzNh MDNmYzUxOGUzZDA2OGVlYTNlZTdlMTIwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9tYWMvV0tWaWV3UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvbWFjL1dLVmlld1ByaXZhdGUuaApAQCAtNjAsNiArNjAsNyBAQCB0eXBlZGVmIGVu dW0gewogCiBAcHJvcGVydHkgKHJlYWR3cml0ZSkgQ0dGbG9hdCBtaW5pbXVtTGF5b3V0V2lkdGg7 CiBAcHJvcGVydHkgKHJlYWR3cml0ZSkgQ0dGbG9hdCBtaW5pbXVtV2lkdGhGb3JBdXRvTGF5b3V0 OworQHByb3BlcnR5IChyZWFkd3JpdGUpIE5TU2l6ZSBtaW5pbXVtU2l6ZUZvckF1dG9MYXlvdXQ7 CiBAcHJvcGVydHkgKHJlYWR3cml0ZSkgQk9PTCBzaG91bGRDbGlwVG9WaXNpYmxlUmVjdDsKIAog QHByb3BlcnR5KGNvcHksIG5vbmF0b21pYykgTlNDb2xvciAqdW5kZXJsYXlDb2xvcjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmggYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCmluZGV4IDlmMzViM2RlNTJk OTIzNmY0NjY0ZWVmMjY2YzAyNWYwZjJmZDA1ZWQuLmUyNjBkYmM5NzVhYTc3NjUxMjU5MjRjNGU0 OWU1MTIyNWY5MjA2NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3 aW5nQXJlYVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVh UHJveHkuaApAQCAtNzEsNyArNzEsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHdhaXRG b3JQb3NzaWJsZUdlb21ldHJ5VXBkYXRlKGRvdWJsZSA9IGRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0 YXRlVGltZW91dCkgeyB9CiAKICAgICB2aXJ0dWFsIHZvaWQgY29sb3JTcGFjZURpZENoYW5nZSgp IHsgfQotICAgIHZpcnR1YWwgdm9pZCBtaW5pbXVtTGF5b3V0V2lkdGhEaWRDaGFuZ2UoKSB7IH0K KyAgICB2aXJ0dWFsIHZvaWQgbWluaW11bUxheW91dFNpemVEaWRDaGFuZ2UoKSB7IH0KIAogI2lm IFVTRShDT09SRElOQVRFRF9HUkFQSElDUykKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlVmlld3Bv cnQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMzRl NmJiODE1ZWJjMWU0YTdhNTgyZWEzODk4ZTQyMzA2NTRhZGU1YS4uNGQyMjFkNDE3NjRlODZiZjAz NDY2NWYzNzBmOWYzOTk3ZDNmYTQ4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAKQEAgLTMwNyw3ICszMDcsNiBAQCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94 eShQYWdlQ2xpZW50KiBwYWdlQ2xpZW50LCBQYXNzUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4gcAog ICAgICwgbV9yZW5kZXJUcmVlU2l6ZSgwKQogICAgICwgbV9zaG91bGRTZW5kRXZlbnRzU3luY2hy b25vdXNseShmYWxzZSkKICAgICAsIG1fc3VwcHJlc3NWaXNpYmlsaXR5VXBkYXRlcyhmYWxzZSkK LSAgICAsIG1fbWluaW11bUxheW91dFdpZHRoKDApCiAgICAgLCBtX21lZGlhVm9sdW1lKDEpCiAg ICAgLCBtX21heVN0YXJ0TWVkaWFXaGVuSW5XaW5kb3codHJ1ZSkKICAgICAsIG1fd2FpdGluZ0Zv ckRpZFVwZGF0ZUluV2luZG93U3RhdGUoZmFsc2UpCkBAIC0zOTkwLDcgKzM5ODksNyBAQCBXZWJQ YWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKCkg Y29uc3QKICAgICBwYXJhbWV0ZXJzLmRldmljZVNjYWxlRmFjdG9yID0gZGV2aWNlU2NhbGVGYWN0 b3IoKTsKICAgICBwYXJhbWV0ZXJzLm1lZGlhVm9sdW1lID0gbV9tZWRpYVZvbHVtZTsKICAgICBw YXJhbWV0ZXJzLm1heVN0YXJ0TWVkaWFXaGVuSW5XaW5kb3cgPSBtX21heVN0YXJ0TWVkaWFXaGVu SW5XaW5kb3c7Ci0gICAgcGFyYW1ldGVycy5taW5pbXVtTGF5b3V0V2lkdGggPSBtX21pbmltdW1M YXlvdXRXaWR0aDsKKyAgICBwYXJhbWV0ZXJzLm1pbmltdW1MYXlvdXRTaXplID0gbV9taW5pbXVt TGF5b3V0U2l6ZTsKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICBwYXJhbWV0ZXJzLmxheWVySG9z dGluZ01vZGUgPSBtX2xheWVySG9zdGluZ01vZGU7CkBAIC00MzcwLDIxICs0MzY5LDIxIEBAIHZv aWQgV2ViUGFnZVByb3h5OjpsaW5rQ2xpY2tlZChjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgV2Vi TW91c2VFdmVudCYgZXZlbnQpCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl OjpMaW5rQ2xpY2tlZCh1cmwsIGV2ZW50KSwgbV9wYWdlSUQsIDApOwogfQogCi12b2lkIFdlYlBh Z2VQcm94eTo6c2V0TWluaW11bUxheW91dFdpZHRoKGRvdWJsZSBtaW5pbXVtTGF5b3V0V2lkdGgp Cit2b2lkIFdlYlBhZ2VQcm94eTo6c2V0TWluaW11bUxheW91dFNpemUoY29uc3QgSW50U2l6ZSYg bWluaW11bUxheW91dFNpemUpCiB7Ci0gICAgaWYgKG1fbWluaW11bUxheW91dFdpZHRoID09IG1p bmltdW1MYXlvdXRXaWR0aCkKKyAgICBpZiAobV9taW5pbXVtTGF5b3V0U2l6ZSA9PSBtaW5pbXVt TGF5b3V0U2l6ZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9taW5pbXVtTGF5b3V0V2lkdGgg PSBtaW5pbXVtTGF5b3V0V2lkdGg7CisgICAgbV9taW5pbXVtTGF5b3V0U2l6ZSA9IG1pbmltdW1M YXlvdXRTaXplOwogCiAgICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAg IG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0TWluaW11bUxheW91dFdpZHRo KG1pbmltdW1MYXlvdXRXaWR0aCksIG1fcGFnZUlELCAwKTsKLSAgICBtX2RyYXdpbmdBcmVhLT5t aW5pbXVtTGF5b3V0V2lkdGhEaWRDaGFuZ2UoKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2U6OlNldE1pbmltdW1MYXlvdXRTaXplKG1pbmltdW1MYXlvdXRTaXplKSwgbV9w YWdlSUQsIDApOworICAgIG1fZHJhd2luZ0FyZWEtPm1pbmltdW1MYXlvdXRTaXplRGlkQ2hhbmdl KCk7CiAKICNpZiBQTEFURk9STShNQUMpCi0gICAgaWYgKG1fbWluaW11bUxheW91dFdpZHRoIDw9 IDApCisgICAgaWYgKG1fbWluaW11bUxheW91dFNpemUud2lkdGgoKSA8PSAwKQogICAgICAgICBp bnRyaW5zaWNDb250ZW50U2l6ZURpZENoYW5nZShJbnRTaXplKC0xLCAtMSkpOwogI2VuZGlmCiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggOWYwNDM2MTBjOTk1 ZDA2NjFkOWQyNjU0YzJlNDhmZGQyYjQ2MTdiMS4uNGRiNjJlOTFhMjJhODMxNjJhNjIxYzUxYzRk MjdkZjA2ZGE5YzU0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApA QCAtNzU3LDggKzc1Nyw4IEBAIHB1YmxpYzoKIAogICAgIGNvbnN0IFdlYkxvYWRlckNsaWVudCYg bG9hZGVyQ2xpZW50KCkgeyByZXR1cm4gbV9sb2FkZXJDbGllbnQ7IH0KIAotICAgIGRvdWJsZSBt aW5pbXVtTGF5b3V0V2lkdGgoKSBjb25zdCB7IHJldHVybiBtX21pbmltdW1MYXlvdXRXaWR0aDsg fQotICAgIHZvaWQgc2V0TWluaW11bUxheW91dFdpZHRoKGRvdWJsZSk7CisgICAgV2ViQ29yZTo6 SW50U2l6ZSBtaW5pbXVtTGF5b3V0U2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fbWluaW11bUxheW91 dFNpemU7IH0KKyAgICB2b2lkIHNldE1pbmltdW1MYXlvdXRTaXplKGNvbnN0IFdlYkNvcmU6Oklu dFNpemUmKTsKIAogICAgIGJvb2wgbWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZSgpIGNvbnN0IHsg cmV0dXJuIG1fbWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZTsgfQogICAgIHZvaWQgc2V0TWFpbkZy YW1lSW5WaWV3U291cmNlTW9kZShib29sKTsKQEAgLTEyNjEsNyArMTI2MSw3IEBAIHByaXZhdGU6 CiAgICAgYm9vbCBtX3Nob3VsZFNlbmRFdmVudHNTeW5jaHJvbm91c2x5OwogCiAgICAgYm9vbCBt X3N1cHByZXNzVmlzaWJpbGl0eVVwZGF0ZXM7Ci0gICAgZmxvYXQgbV9taW5pbXVtTGF5b3V0V2lk dGg7CisgICAgV2ViQ29yZTo6SW50U2l6ZSBtX21pbmltdW1MYXlvdXRTaXplOwogCiAgICAgZmxv YXQgbV9tZWRpYVZvbHVtZTsKICAgICBib29sIG1fbWF5U3RhcnRNZWRpYVdoZW5JbldpbmRvdzsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWFQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9UaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5LmgKaW5kZXggNTAxOGJiZTg4OWRiZDljZGI3 ZmEyNjhiMWEwZWIzMGM5MjcyMTlhOS4uYWQxMDQzYjRiMjlhYTYyYzYzMDA3NzFiYzRjYTFkYjE2 Y2I0NTVhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9UaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5LmgKQEAgLTQ4LDcgKzQ4 LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgc2l6ZURpZENoYW5nZSgpIE9WRVJSSURF OwogICAgIHZpcnR1YWwgdm9pZCB3YWl0Rm9yUG9zc2libGVHZW9tZXRyeVVwZGF0ZShkb3VibGUg dGltZW91dCA9IGRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlVGltZW91dCkgT1ZFUlJJREU7CiAg ICAgdmlydHVhbCB2b2lkIGNvbG9yU3BhY2VEaWRDaGFuZ2UoKSBPVkVSUklERTsKLSAgICB2aXJ0 dWFsIHZvaWQgbWluaW11bUxheW91dFdpZHRoRGlkQ2hhbmdlKCkgT1ZFUlJJREU7CisgICAgdmly dHVhbCB2b2lkIG1pbmltdW1MYXlvdXRTaXplRGlkQ2hhbmdlKCkgT1ZFUlJJREU7CiAKICAgICB2 aXJ0dWFsIHZvaWQgZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSh1aW50NjRfdCBiYWNr aW5nU3RvcmVTdGF0ZUlELCBjb25zdCBMYXllclRyZWVDb250ZXh0JikgT1ZFUlJJREU7CiAgICAg dmlydHVhbCB2b2lkIGV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSh1aW50NjRfdCBiYWNr aW5nU3RvcmVTdGF0ZUlELCBjb25zdCBVcGRhdGVJbmZvJikgT1ZFUlJJREU7CkBAIC02Nyw4ICs2 Nyw4IEBAIHByaXZhdGU6CiAgICAgV2ViQ29yZTo6SW50U2l6ZSBtX2xhc3RTZW50U2l6ZTsKICAg ICBXZWJDb3JlOjpJbnRTaXplIG1fbGFzdFNlbnRMYXllclBvc2l0aW9uOwogCi0gICAgLy8gVGhl IGxhc3QgbWluaW11bSBsYXlvdXQgd2lkdGggd2Ugc2VudCB0byB0aGUgd2ViIHByb2Nlc3MuCi0g ICAgZG91YmxlIG1fbGFzdFNlbnRNaW5pbXVtTGF5b3V0V2lkdGg7CisgICAgLy8gVGhlIGxhc3Qg bWluaW11bSBsYXlvdXQgc2l6ZSB3ZSBzZW50IHRvIHRoZSB3ZWIgcHJvY2Vzcy4KKyAgICBXZWJD b3JlOjpJbnRTaXplIG1fbGFzdFNlbnRNaW5pbXVtTGF5b3V0U2l6ZTsKIH07CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9U aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Lm1tCmluZGV4IGUz YjU3YmZlOTRiODRiMThhMTExNjkxYWE1ZDU1MDQ2NTBhMmY0ZTEuLjk3Mzc2OGRmOTVlOTI4ZWQ2 Zjc2NDQ5OTBkYzUwODdmZGI5ZDE5MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJv eHkubW0KQEAgLTQ3LDcgKzQ3LDYgQEAgUGFzc093blB0cjxUaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYVByb3h5PiBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3gKIFRpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh UHJveHkoV2ViUGFnZVByb3h5KiB3ZWJQYWdlUHJveHkpCiAgICAgOiBEcmF3aW5nQXJlYVByb3h5 KERyYXdpbmdBcmVhVHlwZVRpbGVkQ29yZUFuaW1hdGlvbiwgd2ViUGFnZVByb3h5KQogICAgICwg bV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVHZW9tZXRyeShmYWxzZSkKLSAgICAsIG1fbGFzdFNlbnRN aW5pbXVtTGF5b3V0V2lkdGgoMCkKIHsKIH0KIApAQCAtMTAyLDcgKzEwMSw3IEBAIHZvaWQgVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eTo6Y29sb3JTcGFjZURpZENoYW5nZSgpCiAg ICAgbV93ZWJQYWdlUHJveHktPnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6 OlNldENvbG9yU3BhY2UobV93ZWJQYWdlUHJveHktPmNvbG9yU3BhY2UoKSksIG1fd2ViUGFnZVBy b3h5LT5wYWdlSUQoKSk7CiB9CiAKLXZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQ cm94eTo6bWluaW11bUxheW91dFdpZHRoRGlkQ2hhbmdlKCkKK3ZvaWQgVGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWFQcm94eTo6bWluaW11bUxheW91dFNpemVEaWRDaGFuZ2UoKQogewogICAg IGlmICghbV93ZWJQYWdlUHJveHktPmlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMTM3 LDE3ICsxMzYsMTcgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Ojpk aWRVcGRhdGVHZW9tZXRyeSgpCiAKICAgICBtX2lzV2FpdGluZ0ZvckRpZFVwZGF0ZUdlb21ldHJ5 ID0gZmFsc2U7CiAKLSAgICBkb3VibGUgbWluaW11bUxheW91dFdpZHRoID0gbV93ZWJQYWdlUHJv eHktPm1pbmltdW1MYXlvdXRXaWR0aCgpOworICAgIEludFNpemUgbWluaW11bUxheW91dFNpemUg PSBtX3dlYlBhZ2VQcm94eS0+bWluaW11bUxheW91dFNpemUoKTsKIAogICAgIC8vIElmIHRoZSBX S1ZpZXcgd2FzIHJlc2l6ZWQgd2hpbGUgd2Ugd2VyZSB3YWl0aW5nIGZvciBhIERpZFVwZGF0ZUdl b21ldHJ5IHJlcGx5IGZyb20gdGhlIHdlYiBwcm9jZXNzLAogICAgIC8vIHdlIG5lZWQgdG8gcmVz ZW5kIHRoZSBuZXcgc2l6ZSBoZXJlLgotICAgIGlmIChtX2xhc3RTZW50U2l6ZSAhPSBtX3NpemUg fHwgbV9sYXN0U2VudExheWVyUG9zaXRpb24gIT0gbV9sYXllclBvc2l0aW9uIHx8IG1fbGFzdFNl bnRNaW5pbXVtTGF5b3V0V2lkdGggIT0gbWluaW11bUxheW91dFdpZHRoKQorICAgIGlmIChtX2xh c3RTZW50U2l6ZSAhPSBtX3NpemUgfHwgbV9sYXN0U2VudExheWVyUG9zaXRpb24gIT0gbV9sYXll clBvc2l0aW9uIHx8IG1fbGFzdFNlbnRNaW5pbXVtTGF5b3V0U2l6ZSAhPSBtaW5pbXVtTGF5b3V0 U2l6ZSkKICAgICAgICAgc2VuZFVwZGF0ZUdlb21ldHJ5KCk7CiB9CiAKIHZvaWQgVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eTo6aW50cmluc2ljQ29udGVudFNpemVEaWRDaGFuZ2Uo Y29uc3QgSW50U2l6ZSYgbmV3SW50cmluc2ljQ29udGVudFNpemUpCiB7Ci0gICAgaWYgKG1fd2Vi UGFnZVByb3h5LT5taW5pbXVtTGF5b3V0V2lkdGgoKSA+IDApCisgICAgaWYgKG1fd2ViUGFnZVBy b3h5LT5taW5pbXVtTGF5b3V0U2l6ZSgpLndpZHRoKCkgPiAwKQogICAgICAgICBtX3dlYlBhZ2VQ cm94eS0+aW50cmluc2ljQ29udGVudFNpemVEaWRDaGFuZ2UobmV3SW50cmluc2ljQ29udGVudFNp emUpOwogfQogCkBAIC0xNTUsNyArMTU0LDcgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYVByb3h5OjpzZW5kVXBkYXRlR2VvbWV0cnkoKQogewogICAgIEFTU0VSVCghbV9pc1dh aXRpbmdGb3JEaWRVcGRhdGVHZW9tZXRyeSk7CiAKLSAgICBtX2xhc3RTZW50TWluaW11bUxheW91 dFdpZHRoID0gbV93ZWJQYWdlUHJveHktPm1pbmltdW1MYXlvdXRXaWR0aCgpOworICAgIG1fbGFz dFNlbnRNaW5pbXVtTGF5b3V0U2l6ZSA9IG1fd2ViUGFnZVByb3h5LT5taW5pbXVtTGF5b3V0U2l6 ZSgpOwogICAgIG1fbGFzdFNlbnRTaXplID0gbV9zaXplOwogICAgIG1fbGFzdFNlbnRMYXllclBv c2l0aW9uID0gbV9sYXllclBvc2l0aW9uOwogICAgIG1fd2ViUGFnZVByb3h5LT5wcm9jZXNzKCkt PnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpVcGRhdGVHZW9tZXRyeShtX3NpemUsIG1fbGF5 ZXJQb3NpdGlvbiksIG1fd2ViUGFnZVByb3h5LT5wYWdlSUQoKSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVM b2FkZXJDbGllbnQuY3BwCmluZGV4IGNkOTM5ZDFjYTgwYzYyNzc0OTFmZTVhYjZlOTA0MmU1MzA4 M2IwZjguLjIyYjVjNTBjM2U4MjdmOGQzMDkxMjg0MTI2NmY0YzU4OWE3ZDIxNDMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk ZXJDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBAIC0xMjM3LDEwICsxMjM3LDExIEBAIHZvaWQg V2ViRnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UoKQog ICAgICAgICBJbnRTaXplKCksIGN1cnJlbnRGaXhlZFZpc2libGVDb250ZW50UmVjdCwgc2hvdWxk VXNlRml4ZWRMYXlvdXQsCiAgICAgICAgIGRlZmF1bHRTY3JvbGxiYXJNb2RlLCAvKiBsb2NrICov IHNob3VsZEhpZGVTY3JvbGxiYXJzLCBkZWZhdWx0U2Nyb2xsYmFyTW9kZSwgLyogbG9jayAqLyBz aG91bGRIaWRlU2Nyb2xsYmFycyk7CiAKLSAgICBpbnQgbWluaW11bUxheW91dFdpZHRoID0gd2Vi UGFnZS0+bWluaW11bUxheW91dFdpZHRoKCk7Ci0gICAgaW50IG1heGltdW1TaXplID0gc3RkOjpu dW1lcmljX2xpbWl0czxpbnQ+OjptYXgoKTsKLSAgICBpZiAobWluaW11bUxheW91dFdpZHRoKQot ICAgICAgICBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+dmlldygpLT5lbmFibGVBdXRvU2l6ZU1vZGUo dHJ1ZSwgSW50U2l6ZShtaW5pbXVtTGF5b3V0V2lkdGgsIDEpLCBJbnRTaXplKG1heGltdW1TaXpl LCBtYXhpbXVtU2l6ZSkpOworICAgIGlmIChpbnQgbWluaW11bUxheW91dFdpZHRoID0gd2ViUGFn ZS0+bWluaW11bUxheW91dFNpemUoKS53aWR0aCgpKSB7CisgICAgICAgIGludCBtaW5pbXVtTGF5 b3V0SGVpZ2h0ID0gc3RkOjptYXgod2ViUGFnZS0+bWluaW11bUxheW91dFNpemUoKS5oZWlnaHQo KSwgMSk7CisgICAgICAgIGludCBtYXhpbXVtU2l6ZSA9IHN0ZDo6bnVtZXJpY19saW1pdHM8aW50 Pjo6bWF4KCk7CisgICAgICAgIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT52aWV3KCktPmVuYWJsZUF1 dG9TaXplTW9kZSh0cnVlLCBJbnRTaXplKG1pbmltdW1MYXlvdXRXaWR0aCwgbWluaW11bUxheW91 dEhlaWdodCksIEludFNpemUobWF4aW11bVNpemUsIG1heGltdW1TaXplKSk7CisgICAgfQogCiAg ICAgbV9mcmFtZS0+Y29yZUZyYW1lKCktPnZpZXcoKS0+c2V0UHJvaGliaXRzU2Nyb2xsaW5nKHNo b3VsZERpc2FibGVTY3JvbGxpbmcpOwogICAgIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT52aWV3KCkt PnNldFZpc3VhbFVwZGF0ZXNBbGxvd2VkQnlDbGllbnQoIXdlYlBhZ2UtPnNob3VsZEV4dGVuZElu Y3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb24oKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMTI2MDBlN2U2NGUyNzkxNTkyZjc3ZGQ0 NWNjZjk2NmUwN2ZkZmM0Ny4uNjdlNjgyZjU2OGE4NDI1Y2E1Mzc5OTAxYzNjYTNhYmFhNDQyNjgx NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApA QCAtMjc4LDcgKzI3OCw2IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBjb25z dCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogICAgICwgbV9jYW5TaG9y dENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMoZmFsc2UpCiAgICAgLCBtX251bVdoZWVsRXZl bnRIYW5kbGVycygwKQogICAgICwgbV9jYWNoZWRQYWdlQ291bnQoMCkKLSAgICAsIG1fbWluaW11 bUxheW91dFdpZHRoKDApCiAjaWYgRU5BQkxFKENPTlRFWFRfTUVOVVMpCiAgICAgLCBtX2lzU2hv d2luZ0NvbnRleHRNZW51KGZhbHNlKQogI2VuZGlmCkBAIC0zNzksNyArMzc4LDcgQEAgV2ViUGFn ZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIGNvbnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnMmIHBhcmFtZXRlcnMpCiAKICAgICBzZXRJc0luV2luZG93KHBhcmFtZXRlcnMuaXNJbldpbmRv dyk7CiAKLSAgICBzZXRNaW5pbXVtTGF5b3V0V2lkdGgocGFyYW1ldGVycy5taW5pbXVtTGF5b3V0 V2lkdGgpOworICAgIHNldE1pbmltdW1MYXlvdXRTaXplKHBhcmFtZXRlcnMubWluaW11bUxheW91 dFNpemUpOwogCiAgICAgbV91c2VyQWdlbnQgPSBwYXJhbWV0ZXJzLnVzZXJBZ2VudDsKIApAQCAt Mzk1NCwxOSArMzk1MywyMyBAQCB2b2lkIFdlYlBhZ2U6OnNldE1haW5GcmFtZUluVmlld1NvdXJj ZU1vZGUoYm9vbCBpblZpZXdTb3VyY2VNb2RlKQogICAgIG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUo KS0+c2V0SW5WaWV3U291cmNlTW9kZShpblZpZXdTb3VyY2VNb2RlKTsKIH0KIAotdm9pZCBXZWJQ YWdlOjpzZXRNaW5pbXVtTGF5b3V0V2lkdGgoZG91YmxlIG1pbmltdW1MYXlvdXRXaWR0aCkKK3Zv aWQgV2ViUGFnZTo6c2V0TWluaW11bUxheW91dFNpemUoY29uc3QgSW50U2l6ZSYgbWluaW11bUxh eW91dFNpemUpCiB7Ci0gICAgaWYgKG1fbWluaW11bUxheW91dFdpZHRoID09IG1pbmltdW1MYXlv dXRXaWR0aCkKKyAgICBpZiAobV9taW5pbXVtTGF5b3V0U2l6ZSA9PSBtaW5pbXVtTGF5b3V0U2l6 ZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9taW5pbXVtTGF5b3V0V2lkdGggPSBtaW5pbXVt TGF5b3V0V2lkdGg7CisgICAgbV9taW5pbXVtTGF5b3V0U2l6ZSA9IG1pbmltdW1MYXlvdXRTaXpl OworICAgIGlmIChtaW5pbXVtTGF5b3V0U2l6ZS53aWR0aCgpIDw9IDApIHsKKyAgICAgICAgY29y ZVBhZ2UoKS0+bWFpbkZyYW1lKCktPnZpZXcoKS0+ZW5hYmxlQXV0b1NpemVNb2RlKGZhbHNlLCBJ bnRTaXplKCksIEludFNpemUoKSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpbnQg bWluaW11bUxheW91dFdpZHRoID0gbWluaW11bUxheW91dFNpemUud2lkdGgoKTsKKyAgICBpbnQg bWluaW11bUxheW91dEhlaWdodCA9IHN0ZDo6bWF4KG1pbmltdW1MYXlvdXRTaXplLmhlaWdodCgp LCAxKTsKIAogICAgIGludCBtYXhpbXVtU2l6ZSA9IHN0ZDo6bnVtZXJpY19saW1pdHM8aW50Pjo6 bWF4KCk7CiAKLSAgICBpZiAobWluaW11bUxheW91dFdpZHRoID4gMCkKLSAgICAgICAgY29yZVBh Z2UoKS0+bWFpbkZyYW1lKCktPnZpZXcoKS0+ZW5hYmxlQXV0b1NpemVNb2RlKHRydWUsIEludFNp emUobWluaW11bUxheW91dFdpZHRoLCAxKSwgSW50U2l6ZShtYXhpbXVtU2l6ZSwgbWF4aW11bVNp emUpKTsKLSAgICBlbHNlCi0gICAgICAgIGNvcmVQYWdlKCktPm1haW5GcmFtZSgpLT52aWV3KCkt PmVuYWJsZUF1dG9TaXplTW9kZShmYWxzZSwgSW50U2l6ZSgpLCBJbnRTaXplKCkpOworICAgIGNv cmVQYWdlKCktPm1haW5GcmFtZSgpLT52aWV3KCktPmVuYWJsZUF1dG9TaXplTW9kZSh0cnVlLCBJ bnRTaXplKG1pbmltdW1MYXlvdXRXaWR0aCwgbWluaW11bUxheW91dEhlaWdodCksIEludFNpemUo bWF4aW11bVNpemUsIG1heGltdW1TaXplKSk7CiB9CiAKIGJvb2wgV2ViUGFnZTo6aXNTbWFydElu c2VydERlbGV0ZUVuYWJsZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmgKaW5kZXggYTA2YzZhN2YzNWM4YmZmNzMwZDI1MWI4Mjk0ZjI0ZWIyYzU0OTJjYS4u N2JkZjA2OWNjMGIwMDYxM2I2MThkMThmODBkNDMwZjJlZTVjODk0MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC02NDEsOCArNjQxLDggQEAgcHVi bGljOgogCiAgICAgYm9vbCBtYWluRnJhbWVJc1Njcm9sbGFibGUoKSBjb25zdCB7IHJldHVybiBt X21haW5GcmFtZUlzU2Nyb2xsYWJsZTsgfQogCi0gICAgdm9pZCBzZXRNaW5pbXVtTGF5b3V0V2lk dGgoZG91YmxlKTsKLSAgICBkb3VibGUgbWluaW11bUxheW91dFdpZHRoKCkgY29uc3QgeyByZXR1 cm4gbV9taW5pbXVtTGF5b3V0V2lkdGg7IH0KKyAgICB2b2lkIHNldE1pbmltdW1MYXlvdXRTaXpl KGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKKyAgICBXZWJDb3JlOjpJbnRTaXplIG1pbmltdW1M YXlvdXRTaXplKCkgY29uc3QgeyByZXR1cm4gbV9taW5pbXVtTGF5b3V0U2l6ZTsgfQogCiAgICAg Ym9vbCBjYW5TaG93TUlNRVR5cGUoY29uc3QgU3RyaW5nJiBNSU1FVHlwZSkgY29uc3Q7CiAKQEAg LTEwMDQsNyArMTAwNCw3IEBAIHByaXZhdGU6CiAKICAgICB1bnNpZ25lZCBtX2NhY2hlZFBhZ2VD b3VudDsKIAotICAgIGRvdWJsZSBtX21pbmltdW1MYXlvdXRXaWR0aDsKKyAgICBXZWJDb3JlOjpJ bnRTaXplIG1fbWluaW11bUxheW91dFNpemU7CiAKICNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykK ICAgICBib29sIG1faXNTaG93aW5nQ29udGV4dE1lbnU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCmluZGV4IDQ3YTY3Yjk2 MjhhNTdhZmM0ZmU4MWE1MGQ1YjRkOWNhMmNmY2Y3YTEuLjI1ZWJkODY4OGI2MjI1MTlmNGQ3ZDIz ZGJhMTQyZjhiYTNiMTM5OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCkBAIC0yOTAsNyArMjkwLDcgQEAgbWVzc2Fn ZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNlaXZlciB7CiAgICAgSW5zZXJ0RGljdGF0ZWRUZXh0KFdU Rjo6U3RyaW5nIHRleHQsIHVpbnQ2NF90IHJlcGxhY2VtZW50UmFuZ2VTdGFydCwgdWludDY0X3Qg cmVwbGFjZW1lbnRSYW5nZUVuZCwgV1RGOjpWZWN0b3I8V2ViQ29yZTo6RGljdGF0aW9uQWx0ZXJu YXRpdmU+IGRpY3RhdGlvbkFsdGVybmF0aXZlcykgLT4gKGJvb2wgaGFuZGxlZCwgV2ViS2l0OjpF ZGl0b3JTdGF0ZSBuZXdTdGF0ZSkKICNlbmRpZgogCi0gICAgU2V0TWluaW11bUxheW91dFdpZHRo KGRvdWJsZSBtaW5pbXVtTGF5b3V0V2lkdGgpCisgICAgU2V0TWluaW11bUxheW91dFNpemUoV2Vi Q29yZTo6SW50U2l6ZSBtaW5pbXVtTGF5b3V0U2l6ZSkKIAogI2lmIFBMQVRGT1JNKEVGTCkKICAg ICBDb25maXJtQ29tcG9zaXRpb24oV1RGOjpTdHJpbmcgY29tcG9zaXRpb25TdHJpbmcpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFu aW1hdGlvbkRyYXdpbmdBcmVhLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQppbmRleCA1YWY5YzlhZTY4ZTRh N2FhZjg1MzkwZjkxOTJjZDlmZDRjODU5MWE5Li4yNGNkOWEwYzlhZTc5OGM1NTM2YTI3YjQ5Zjk4 MjZjYWQ2YThiN2M1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEu bW0KQEAgLTI1Myw3ICsyNTMsNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh Ojp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBXZWJQcmVmZXJlbmNlc1N0b3JlJgogCiB2b2lkIFRp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjptYWluRnJhbWVDb250ZW50U2l6ZUNoYW5nZWQo Y29uc3QgSW50U2l6ZSYpCiB7Ci0gICAgaWYgKCFtX3dlYlBhZ2UtPm1pbmltdW1MYXlvdXRXaWR0 aCgpKQorICAgIGlmICghbV93ZWJQYWdlLT5taW5pbXVtTGF5b3V0U2l6ZSgpLndpZHRoKCkpCiAg ICAgICAgIHJldHVybjsKIAogICAgIGlmIChtX2luVXBkYXRlR2VvbWV0cnkpCkBAIC00MjQsMTIg KzQyNCwxMiBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRhdGVHZW9t ZXRyeShjb25zdCBJbnRTaXplJiB2aWV3U2l6ZSwgY29ucwogICAgIEludFNpemUgc2l6ZSA9IHZp ZXdTaXplOwogICAgIEludFNpemUgY29udGVudFNpemUgPSBJbnRTaXplKC0xLCAtMSk7CiAKLSAg ICBpZiAoIW1fd2ViUGFnZS0+bWluaW11bUxheW91dFdpZHRoKCkpCisgICAgaWYgKCFtX3dlYlBh Z2UtPm1pbmltdW1MYXlvdXRTaXplKCkud2lkdGgoKSkKICAgICAgICAgbV93ZWJQYWdlLT5zZXRT aXplKHNpemUpOwogCiAgICAgbV93ZWJQYWdlLT5sYXlvdXRJZk5lZWRlZCgpOwogCi0gICAgaWYg KG1fd2ViUGFnZS0+bWluaW11bUxheW91dFdpZHRoKCkpIHsKKyAgICBpZiAobV93ZWJQYWdlLT5t aW5pbXVtTGF5b3V0U2l6ZSgpLndpZHRoKCkpIHsKICAgICAgICAgY29udGVudFNpemUgPSBtX3dl YlBhZ2UtPm1haW5XZWJGcmFtZSgpLT5jb250ZW50Qm91bmRzKCkuc2l6ZSgpOwogICAgICAgICBz aXplID0gY29udGVudFNpemU7CiAgICAgfQpAQCAtNDU3LDcgKzQ1Nyw3IEBAIHZvaWQgVGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZUdlb21ldHJ5KGNvbnN0IEludFNpemUmIHZp ZXdTaXplLCBjb25zCiAKICAgICBtX3dlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVh UHJveHk6OkRpZFVwZGF0ZUdlb21ldHJ5KCkpOwogCi0gICAgaWYgKG1fd2ViUGFnZS0+bWluaW11 bUxheW91dFdpZHRoKCkgJiYgIW1fdXBkYXRlSW50cmluc2ljQ29udGVudFNpemVUaW1lci5pc0Fj dGl2ZSgpKQorICAgIGlmIChtX3dlYlBhZ2UtPm1pbmltdW1MYXlvdXRTaXplKCkud2lkdGgoKSAm JiAhbV91cGRhdGVJbnRyaW5zaWNDb250ZW50U2l6ZVRpbWVyLmlzQWN0aXZlKCkpCiAgICAgICAg IG1fdXBkYXRlSW50cmluc2ljQ29udGVudFNpemVUaW1lci5zdGFydE9uZVNob3QoMCk7CiAKICAg ICBtX2luVXBkYXRlR2VvbWV0cnkgPSBmYWxzZTsK