134751 2014-07-08 19:31:10 -0700 [iOS][WK2] subviews of the unscaled view drift out during CA animations 2014-07-09 12:48:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin commit-queue enrica oldest_to_newest 1021267 0 benjamin 2014-07-08 19:31:10 -0700 [iOS][WK2] subviews of the unscaled view drift out during CA animations 1021281 1 234618 benjamin 2014-07-08 21:20:32 -0700 Created attachment 234618 Patch 1021283 2 commit-queue 2014-07-08 21:24:56 -0700 Attachment 234618 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:356: More than one command on the same line [whitespace/newline] [4] ERROR: Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:356: Missing space before { [whitespace/braces] [5] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1021297 3 234618 benjamin 2014-07-08 23:17:39 -0700 Comment on attachment 234618 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=234618&action=review > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:350 > + if ([UIView _isInAnimationBlock] && _page->editorState().selectionIsNone && ![_highlightView superview]) { For landing, I'll remove [_highlightView superview] and do [self _cancelInteraction] instead. Otherwise the tap highlight animation can still cause the ugly caret issue. 1021422 4 234618 benjamin 2014-07-09 12:25:51 -0700 Comment on attachment 234618 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=234618&action=review > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h:104 > + RetainPtr<UIView> _unscaledView; Fixme: Simon would prefer the name interactionViewsContainerView. 1021423 5 234618 enrica 2014-07-09 12:28:28 -0700 Comment on attachment 234618 Patch Looks good to me. 1021429 6 benjamin 2014-07-09 12:48:10 -0700 Committed r170926: <http://trac.webkit.org/changeset/170926> 234618 2014-07-08 21:20:32 -0700 2014-07-09 12:28:28 -0700 Patch bug-134751-20140708212009.patch text/plain 13647 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwODkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTExZTRiOTJhMTE5Yjli YjczZGY3OWE5NGQzNGMyZmZkMzQzNjE2Zi4uYTdiMzQ5Y2ZjMDAzOTFhNzZkMmE4OTkzYmRhYmEx ZmY1YWQ3NDYyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE0LTA3LTA4ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g c3Vidmlld3Mgb2YgdGhlIHVuc2NhbGVkIHZpZXcgZHJpZnQgb3V0IGR1cmluZyBDQSBhbmltYXRp b25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ3 NTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCBp cyBub3QgcG9zc2libGUgdG8gYW5pbWF0ZSB0aGUgV0tDb250ZW50VmlldyBhbmQgdGhlIGludmVy c2UgdmlldyBpbiBzdWNoIGEgd2F5CisgICAgICAgIHRoYXQgdGhlIGNvbWJpbmVkIG1hdHJpeCBy ZW1haW4gdGhlIGlkZW50aXR5IGZvciBldmVyeSBmcmFtZSBvZiB0aGUgYW5pbWF0aW9uLgorCisg ICAgICAgIFRoaXMgcGF0Y2ggc29sdmVzIHRoZSBpc3N1ZSBieSBtb3ZpbmcgdGhlIHVuc2NhbGVk IHZpZXcgYXMgYSBzaWJsaW5nIG9mIFdLQ29udGVudFZpZXcKKyAgICAgICAgaW5zdGVhZCBvZiBh IGNoaWxkIHNvIHRoYXQgd2UgZG8gbm90IG5lZWQgdG8gdXBkYXRlIHR3byBzY2FsZXMgc2ltdWx0 YW5lb3VzbHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToK KyAgICAgICAgKC1bV0tXZWJWaWV3IGluaXRXaXRoRnJhbWU6Y29uZmlndXJhdGlvbjpdKToKKyAg ICAgICAgKC1bV0tXZWJWaWV3IF9wcm9jZXNzRGlkRXhpdF0pOgorICAgICAgICAoLVtXS1dlYlZp ZXcgX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZUNoYW5nZWRUYXJnZXRUb1NjYWxlOnBvc2l0aW9uOl0p OgorICAgICAgICBTZXQgdGhlIHogc2NhbGUgdG8gMSBvciBubyBjb29yZGluYXRlIHRyYW5zZm9y bSB3aWxsIHdvcmsgd2l0aCB0aGlzIHZpZXcuCisKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9iZWdp bkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0ZXM6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfZW5k QW5pbWF0ZWRSZXNpemVdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcu bW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgZGlkVXBkYXRlVmlzaWJsZVJlY3Q6dW5vYnNj dXJlZFJlY3Q6dW5vYnNjdXJlZFJlY3RJblNjcm9sbFZpZXdDb29yZGluYXRlczpzY2FsZTptaW5p bXVtU2NhbGU6aW5TdGFibGVTdGF0ZTppc0NoYW5naW5nT2JzY3VyZWRJbnNldHNJbnRlcmFjdGl2 ZWx5Ol0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06 CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgc2V0dXBJbnRlcmFjdGlvbl0pOgorICAgICAgICBT aW5jZSB3ZSBuZWVkIHRvIG9ic2VydmUgY2hhbmdlcyBpbnNpZGUgdGhlIGFuaW1hdGlvbiBibG9j aywgdGhlIGNvZGUgbm93IHVzZSBLVk8gdG8gb2JzZXJ2ZSBjaGFuZ2VzIG9mIHNjYWxlLgorCisg ICAgICAgICgtW1dLQ29udGVudFZpZXcgY2xlYW51cEludGVyYWN0aW9uXSk6CisgICAgICAgICgt W1dLQ29udGVudFZpZXcgdW5zY2FsZWRWaWV3XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcg aW52ZXJzZVNjYWxlXSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgb2JzZXJ2ZVZhbHVlRm9y S2V5UGF0aDpvZk9iamVjdDpjaGFuZ2U6Y29udGV4dDpdKToKKyAgICAgICAgV2UgdXBkYXRlIHRo ZSB1dGlsaXR5IHZpZXdzIGFzIHVzdWFsLiBUaGUgZXh0cmEgYml0cyBoZXJlIGFyZSB0byBkZWFs IHdpdGggdmlld3MgY29taW5nIGluIGR1cmluZyBhbiBhbmltYXRpb24uCisKKyAgICAgICAgSWYg YSBuZXcgdXRpbGl0eSB2aWV3IGNvbWVzIGluIGR1cmluZyBhIHNjYWxpbmcgYW5pbWF0aW9uLCB3 ZSBkbyBub3Qgd2FudCB0byBzdGFydCBhIG5ldyBhbmltYXRpb24gd2l0aCB0aGUgc2FtZSBjdXJ2 ZQorICAgICAgICB0byBlbmQgdXAgYXQgdGhlIHJpZ2h0IHBsYWNlLiBUbyBhdm9pZCBhbnkgaXNz dWUsIHdlIGp1c3QgaGlkZSB0aGUgdmlldyB1bnRpbCB0aGUgYW5pbWF0aW9uIGlzIGZpbmlzaGVk LgorCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgaGl0VGVzdDp3aXRoRXZlbnQ6XSk6CisgICAg ICAgICgtW1dLQ29udGVudFZpZXcgX3Nob3dUYXBIaWdobGlnaHRdKToKKyAgICAgICAgKC1bV0tD b250ZW50VmlldyBfdXBkYXRlVW5zY2FsZWRWaWV3XSk6IERlbGV0ZWQuCisKIDIwMTQtMDctMDgg IFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgV0tQcm9j ZXNzUG9vbENvbmZpZ3VyYXRpb25Qcml2YXRlJ3MgbWF4aW11bVByb2Nlc3NDb3VudCBwcm9wZXJ0 eSBoYXMgbm8gZWZmZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tCmluZGV4IGIxNWY4NThiOWMzYjNmODRhY2NmYWQxOTFkOWFhMzU0NTIxYWNh OTYuLmM1NjkxM2I0MTVmYzlhZGZhMDZiOWFjZjZjNGU4ZTNmMzkzNzc5ODggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC0yODgsNiAr Mjg4LDcgQEAgc3RhdGljIGludDMyX3QgZGV2aWNlT3JpZW50YXRpb24oKQogICAgIFtfY29udGVu dFZpZXcgbGF5ZXJdLmFuY2hvclBvaW50ID0gQ0dQb2ludFplcm87CiAgICAgW19jb250ZW50Vmll dyBzZXRGcmFtZTpib3VuZHNdOwogICAgIFtfc2Nyb2xsVmlldyBhZGRTdWJ2aWV3Ol9jb250ZW50 Vmlldy5nZXQoKV07CisgICAgW19zY3JvbGxWaWV3IGFkZFN1YnZpZXc6W19jb250ZW50VmlldyB1 bnNjYWxlZFZpZXddXTsKICAgICBfdmlld3BvcnRNZXRhVGFnV2lkdGggPSAtMTsKIAogICAgIFtz ZWxmIF9mcmFtZU9yQm91bmRzQ2hhbmdlZF07CkBAIC02MDUsNiArNjA2LDcgQEAgc3RhdGljIENH U2l6ZSByb3VuZFNjcm9sbFZpZXdDb250ZW50U2l6ZShjb25zdCBXZWJLaXQ6OldlYlBhZ2VQcm94 eSYgcGFnZSwgQ0dTaXoKICAgICAgICAgX2N1c3RvbUNvbnRlbnRGaXhlZE92ZXJsYXlWaWV3ID0g YWRvcHROUyhbW1VJVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpzZWxmLmJvdW5kc10pOwogICAg ICAgICBbX2N1c3RvbUNvbnRlbnRGaXhlZE92ZXJsYXlWaWV3IHNldFVzZXJJbnRlcmFjdGlvbkVu YWJsZWQ6Tk9dOwogCisgICAgICAgIFtbX2NvbnRlbnRWaWV3IHVuc2NhbGVkVmlld10gcmVtb3Zl RnJvbVN1cGVydmlld107CiAgICAgICAgIFtfY29udGVudFZpZXcgcmVtb3ZlRnJvbVN1cGVydmll d107CiAgICAgICAgIFtfc2Nyb2xsVmlldyBhZGRTdWJ2aWV3Ol9jdXN0b21Db250ZW50Vmlldy5n ZXQoKV07CiAgICAgICAgIFtzZWxmIGFkZFN1YnZpZXc6X2N1c3RvbUNvbnRlbnRGaXhlZE92ZXJs YXlWaWV3LmdldCgpXTsKQEAgLTYxOSw2ICs2MjEsNyBAQCBzdGF0aWMgQ0dTaXplIHJvdW5kU2Ny b2xsVmlld0NvbnRlbnRTaXplKGNvbnN0IFdlYktpdDo6V2ViUGFnZVByb3h5JiBwYWdlLCBDR1Np egogICAgICAgICBfY3VzdG9tQ29udGVudEZpeGVkT3ZlcmxheVZpZXcgPSBudWxscHRyOwogCiAg ICAgICAgIFtfc2Nyb2xsVmlldyBhZGRTdWJ2aWV3Ol9jb250ZW50Vmlldy5nZXQoKV07CisgICAg ICAgIFtfc2Nyb2xsVmlldyBhZGRTdWJ2aWV3OltfY29udGVudFZpZXcgdW5zY2FsZWRWaWV3XV07 CiAgICAgICAgIFtfc2Nyb2xsVmlldyBzZXRDb250ZW50U2l6ZTpyb3VuZFNjcm9sbFZpZXdDb250 ZW50U2l6ZSgqX3BhZ2UsIFtfY29udGVudFZpZXcgZnJhbWVdLnNpemUpXTsKIAogICAgICAgICBb X2N1c3RvbUNvbnRlbnRGaXhlZE92ZXJsYXlWaWV3IHNldEZyYW1lOnNlbGYuYm91bmRzXTsKQEAg LTcxOCw2ICs3MjEsNyBAQCBzdGF0aWMgQ0dGbG9hdCBjb250ZW50Wm9vbVNjYWxlKFdLV2ViVmll dyogd2ViVmlldykKICAgICBpZiAoIV9jdXN0b21Db250ZW50VmlldyAmJiBfaXNBbmltYXRpbmdS ZXNpemUpIHsKICAgICAgICAgTlNVSW50ZWdlciBpbmRleE9mUmVzaXplQW5pbWF0aW9uVmlldyA9 IFtbX3Njcm9sbFZpZXcgc3Vidmlld3NdIGluZGV4T2ZPYmplY3Q6X3Jlc2l6ZUFuaW1hdGlvblZp ZXcuZ2V0KCldOwogICAgICAgICBbX3Njcm9sbFZpZXcgaW5zZXJ0U3VidmlldzpfY29udGVudFZp ZXcuZ2V0KCkgYXRJbmRleDppbmRleE9mUmVzaXplQW5pbWF0aW9uVmlld107CisgICAgICAgIFtf c2Nyb2xsVmlldyBpbnNlcnRTdWJ2aWV3OltfY29udGVudFZpZXcgdW5zY2FsZWRWaWV3XSBhdElu ZGV4OmluZGV4T2ZSZXNpemVBbmltYXRpb25WaWV3ICsgMV07CiAgICAgICAgIFtfcmVzaXplQW5p bWF0aW9uVmlldyByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKICAgICAgICAgX3Jlc2l6ZUFuaW1hdGlv blZpZXcgPSBuaWw7CiAKQEAgLTgzOCw3ICs4NDIsNyBAQCBzdGF0aWMgdm9pZCBjaGFuZ2VDb250 ZW50T2Zmc2V0Qm91bmRlZEluVmFsaWRSYW5nZShVSVNjcm9sbFZpZXcgKnNjcm9sbFZpZXcsIFdl YgogICAgICAgICBDR0Zsb2F0IGFuaW1hdGluZ1NjYWxlVGFyZ2V0ID0gW1tfcmVzaXplQW5pbWF0 aW9uVmlldyBsYXllcl0gdHJhbnNmb3JtXS5tMTE7CiAgICAgICAgIGRvdWJsZSBjdXJyZW50VGFy Z2V0U2NhbGUgPSBhbmltYXRpbmdTY2FsZVRhcmdldCAqIFtbX2NvbnRlbnRWaWV3IGxheWVyXSB0 cmFuc2Zvcm1dLm0xMTsKICAgICAgICAgZG91YmxlIHNjYWxlID0gbmV3U2NhbGUgLyBjdXJyZW50 VGFyZ2V0U2NhbGU7Ci0gICAgICAgIF9yZXNpemVBbmltYXRpb25UcmFuc2Zvcm1BZGp1c3RtZW50 cyA9IENBVHJhbnNmb3JtM0RNYWtlU2NhbGUoc2NhbGUsIHNjYWxlLCAwKTsKKyAgICAgICAgX3Jl c2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1lbnRzID0gQ0FUcmFuc2Zvcm0zRE1ha2VTY2Fs ZShzY2FsZSwgc2NhbGUsIDEpOwogCiAgICAgICAgIENHUG9pbnQgbmV3Q29udGVudE9mZnNldCA9 IFtzZWxmIF9hZGp1c3RlZENvbnRlbnRPZmZzZXQ6Q0dQb2ludE1ha2UobmV3U2Nyb2xsUG9zaXRp b24ueCAqIG5ld1NjYWxlLCBuZXdTY3JvbGxQb3NpdGlvbi55ICogbmV3U2NhbGUpXTsKICAgICAg ICAgQ0dQb2ludCBjdXJyZW50Q29udGVudE9mZnNldCA9IFtfc2Nyb2xsVmlldyBjb250ZW50T2Zm c2V0XTsKQEAgLTIxMDEsNiArMjEwNSw3IEBAIHN0YXRpYyBpbmxpbmUgV2ViS2l0OjpGaW5kT3B0 aW9ucyB0b0ZpbmRPcHRpb25zKF9XS0ZpbmRPcHRpb25zIHdrRmluZE9wdGlvbnMpCiAgICAgX3Jl c2l6ZUFuaW1hdGlvblZpZXcgPSBhZG9wdE5TKFtbVUlWaWV3IGFsbG9jXSBpbml0XSk7CiAgICAg W19zY3JvbGxWaWV3IGluc2VydFN1YnZpZXc6X3Jlc2l6ZUFuaW1hdGlvblZpZXcuZ2V0KCkgYXRJ bmRleDppbmRleE9mQ29udGVudFZpZXddOwogICAgIFtfcmVzaXplQW5pbWF0aW9uVmlldyBhZGRT dWJ2aWV3Ol9jb250ZW50Vmlldy5nZXQoKV07CisgICAgW19yZXNpemVBbmltYXRpb25WaWV3IGFk ZFN1YnZpZXc6W19jb250ZW50VmlldyB1bnNjYWxlZFZpZXddXTsKIAogICAgIENHU2l6ZSBjb250 ZW50U2l6ZUluQ29udGVudFZpZXdDb29yZGluYXRlcyA9IFtfY29udGVudFZpZXcgYm91bmRzXS5z aXplOwogICAgIFtfc2Nyb2xsVmlldyBzZXRNaW5pbXVtWm9vbVNjYWxlOnN0ZDo6bWluKG5ld01p bmltdW1MYXlvdXRTaXplLndpZHRoKCkgLyBjb250ZW50U2l6ZUluQ29udGVudFZpZXdDb29yZGlu YXRlcy53aWR0aCwgW19zY3JvbGxWaWV3IG1pbmltdW1ab29tU2NhbGVdKV07CkBAIC0yMTU5LDYg KzIxNjQsNyBAQCBzdGF0aWMgaW5saW5lIFdlYktpdDo6RmluZE9wdGlvbnMgdG9GaW5kT3B0aW9u cyhfV0tGaW5kT3B0aW9ucyB3a0ZpbmRPcHRpb25zKQogCiAgICAgTlNVSW50ZWdlciBpbmRleE9m UmVzaXplQW5pbWF0aW9uVmlldyA9IFtbX3Njcm9sbFZpZXcgc3Vidmlld3NdIGluZGV4T2ZPYmpl Y3Q6X3Jlc2l6ZUFuaW1hdGlvblZpZXcuZ2V0KCldOwogICAgIFtfc2Nyb2xsVmlldyBpbnNlcnRT dWJ2aWV3Ol9jb250ZW50Vmlldy5nZXQoKSBhdEluZGV4OmluZGV4T2ZSZXNpemVBbmltYXRpb25W aWV3XTsKKyAgICBbX3Njcm9sbFZpZXcgaW5zZXJ0U3VidmlldzpbX2NvbnRlbnRWaWV3IHVuc2Nh bGVkVmlld10gYXRJbmRleDppbmRleE9mUmVzaXplQW5pbWF0aW9uVmlldyArIDFdOwogCiAgICAg Q0FMYXllciAqY29udGVudFZpZXdMYXllciA9IFtfY29udGVudFZpZXcgbGF5ZXJdOwogICAgIENH RmxvYXQgYWRqdXN0bWVudFNjYWxlID0gX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1l bnRzLm0xMTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5t bQppbmRleCA0ZGM0YzIyMWM3ZTk3Nzk4NzM5OGQ0Mzc2MTk1N2UyNzVhMzBmODVmLi43ODQ2NzM4 OTVkNDliYzJkNGM5N2ViMzk1NzliMzE3ZTA3Y2Y0ODQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCkBAIC01NzQsOCArNTc0LDYgQEAgc3RhdGlj IHZvaWQgbGF5ZXJQYXRoKENBU2hhcGVMYXllciAqbGF5ZXIsIGNvbnN0IEZsb2F0UXVhZCYgb3V0 ZXJRdWFkKQogLSAodm9pZClkaWRVcGRhdGVWaXNpYmxlUmVjdDooQ0dSZWN0KXZpc2libGVSZWN0 IHVub2JzY3VyZWRSZWN0OihDR1JlY3QpdW5vYnNjdXJlZFJlY3QgdW5vYnNjdXJlZFJlY3RJblNj cm9sbFZpZXdDb29yZGluYXRlczooQ0dSZWN0KXVub2JzY3VyZWRSZWN0SW5TY3JvbGxWaWV3Q29v cmRpbmF0ZXMKICAgICBzY2FsZTooQ0dGbG9hdCl6b29tU2NhbGUgbWluaW11bVNjYWxlOihDR0Zs b2F0KW1pbmltdW1TY2FsZSBpblN0YWJsZVN0YXRlOihCT09MKWlzU3RhYmxlU3RhdGUgaXNDaGFu Z2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVseTooQk9PTClpc0NoYW5naW5nT2JzY3VyZWRJ bnNldHNJbnRlcmFjdGl2ZWx5CiB7Ci0gICAgZG91YmxlIG9sZERpc3BsYXllZENvbnRlbnRTY2Fs ZSA9IF9wYWdlLT5kaXNwbGF5ZWRDb250ZW50U2NhbGUoKTsKLQogICAgIGRvdWJsZSB0aW1lc3Rh bXAgPSBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKTsKICAgICBIaXN0b3JpY2FsVmVsb2Np dHlEYXRhOjpWZWxvY2l0eURhdGEgdmVsb2NpdHlEYXRhOwogICAgIGlmICghaXNTdGFibGVTdGF0 ZSkKQEAgLTU5Myw5ICs1OTEsNiBAQCBzdGF0aWMgdm9pZCBsYXllclBhdGgoQ0FTaGFwZUxheWVy ICpsYXllciwgY29uc3QgRmxvYXRRdWFkJiBvdXRlclF1YWQpCiAKICAgICBpZiAoYXV0byBkcmF3 aW5nQXJlYSA9IF9wYWdlLT5kcmF3aW5nQXJlYSgpKQogICAgICAgICBkcmF3aW5nQXJlYS0+dXBk YXRlRGVidWdJbmRpY2F0b3IoKTsKLQotICAgIGlmICghd2l0aGluRXBzaWxvbihvbGREaXNwbGF5 ZWRDb250ZW50U2NhbGUsIHpvb21TY2FsZSkpCi0gICAgICAgIFtzZWxmIF91cGRhdGVVbnNjYWxl ZFZpZXddOwogICAgICAgICAKICAgICBbc2VsZiB1cGRhdGVGaXhlZENsaXBwaW5nVmlldzpmaXhl ZFBvc2l0aW9uUmVjdF07CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAppbmRleCBkNDBhNTU2NDliZTM3NzgxODYx MzQ3MzVkNzNhNDhhY2VhMDg4MzFlLi4wYzA1ZWM0NDRkMjQ2OGQyNmE1ZTkwNTlhYjZjMzRhYmQ1 OGQ5N2ViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVu dFZpZXdJbnRlcmFjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLmgKQEAgLTEwMSw3ICsxMDEsNyBAQCBzdHJ1Y3QgV0tBdXRv Q29ycmVjdGlvbkRhdGEgewogICAgIFJldGFpblB0cjxVSVRleHRJbnB1dFRyYWl0cz4gX3RyYWl0 czsKICAgICBSZXRhaW5QdHI8VUlXZWJGb3JtQWNjZXNzb3J5PiBfZm9ybUFjY2Vzc29yeVZpZXc7 CiAgICAgUmV0YWluUHRyPF9VSUhpZ2hsaWdodFZpZXc+IF9oaWdobGlnaHRWaWV3OwotICAgIFJl dGFpblB0cjxVSVZpZXc+IF9pbnZlcnNlU2NhbGVSb290VmlldzsKKyAgICBSZXRhaW5QdHI8VUlW aWV3PiBfdW5zY2FsZWRWaWV3OwogICAgIFJldGFpblB0cjxOU1N0cmluZz4gX21hcmtlZFRleHQ7 CiAgICAgUmV0YWluUHRyPFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQ+IF9hY3Rpb25TaGVldEFzc2lz dGFudDsKICAgICBSZXRhaW5QdHI8V0tBaXJQbGF5Um91dGVQaWNrZXI+IF9haXJQbGF5Um91dGVQ aWNrZXI7CkBAIC0xODEsNyArMTgxLDYgQEAgc3RydWN0IFdLQXV0b0NvcnJlY3Rpb25EYXRhIHsK IC0gKHZvaWQpYWNjZXNzb3J5RG9uZTsKIC0gKHZvaWQpX2RpZEhhbmRsZUtleUV2ZW50OihXZWJJ T1NFdmVudCAqKWV2ZW50OwogLSAoVmVjdG9yPFdlYktpdDo6T3B0aW9uSXRlbT4mKSBhc3Npc3Rl ZE5vZGVTZWxlY3RPcHRpb25zOwotLSAodm9pZClfdXBkYXRlVW5zY2FsZWRWaWV3OwogLSAodm9p ZClfZW5hYmxlSW5zcGVjdG9yTm9kZVNlYXJjaDsKIC0gKHZvaWQpX2Rpc2FibGVJbnNwZWN0b3JO b2RlU2VhcmNoOwogQGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCA4YWNkMmQ5ZGEyNDc2NDdiOGM2 NjJkZDUzOWUzMGViZWM3NWJlNTNiLi42OWRlZWFjOGYzMzhmZTBmYzEzNDFkNDg3NDUxMmM1OTEy ZjJjZWIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVu dFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtMTM4LDYgKzEzOCwxMCBAQCBjb25zdCBDR0Zs b2F0IG1pbmltdW1UYXBIaWdobGlnaHRSYWRpdXMgPSAyLjA7CiAtICh2b2lkKWRpZEhhbmRsZVdl YktleUV2ZW50OwogQGVuZAogCitAaW50ZXJmYWNlIFVJVmlldyAoVUlWaWV3SW50ZXJuYWxIYWNr KQorKyAoQk9PTClfYWRkQ29tcGxldGlvbjoodm9pZCheKShCT09MKSljb21wbGV0aW9uOworQGVu ZAorCiBAaW50ZXJmYWNlIFdLRm9ybUlucHV0U2Vzc2lvbiA6IE5TT2JqZWN0IDxfV0tGb3JtSW5w dXRTZXNzaW9uPgogCiAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhDb250ZW50VmlldzooV0tDb250 ZW50VmlldyAqKXZpZXcgdXNlck9iamVjdDooTlNPYmplY3QgPE5TU2VjdXJlQ29kaW5nPiAqKXVz ZXJPYmplY3Q7CkBAIC0yMTIsMTQgKzIxNiwxMyBAQCBzdGF0aWMgVUlXZWJTZWxlY3Rpb25Nb2Rl IHRvVUlXZWJTZWxlY3Rpb25Nb2RlKFdLU2VsZWN0aW9uR3JhbnVsYXJpdHkgZ3JhbnVsYXJpdAog CiAtICh2b2lkKXNldHVwSW50ZXJhY3Rpb24KIHsKLSAgICBpZiAoIV9pbnZlcnNlU2NhbGVSb290 VmlldykgewotICAgICAgICBfaW52ZXJzZVNjYWxlUm9vdFZpZXcgPSBhZG9wdE5TKFtbVUlWaWV3 IGFsbG9jXSBpbml0XSk7Ci0gICAgICAgIFtfaW52ZXJzZVNjYWxlUm9vdFZpZXcgc2V0T3BhcXVl Ok5PXTsKLSAgICAgICAgW19pbnZlcnNlU2NhbGVSb290VmlldyBsYXllcl0uYW5jaG9yUG9pbnQg PSBDR1BvaW50TWFrZSgwLCAwKTsKKyAgICBpZiAoIV91bnNjYWxlZFZpZXcpIHsKKyAgICAgICAg X3Vuc2NhbGVkVmlldyA9IGFkb3B0TlMoW1tVSVZpZXcgYWxsb2NdIGluaXRdKTsKKyAgICAgICAg W191bnNjYWxlZFZpZXcgc2V0T3BhcXVlOk5PXTsKKyAgICAgICAgW191bnNjYWxlZFZpZXcgbGF5 ZXJdLmFuY2hvclBvaW50ID0gQ0dQb2ludFplcm87CiAgICAgfQotICAgIFtzZWxmIGFkZFN1YnZp ZXc6X2ludmVyc2VTY2FsZVJvb3RWaWV3LmdldCgpXTsKLSAgICBDR0Zsb2F0IGludmVyc2VTY2Fs ZSA9IDEgLyBbW3NlbGYgbGF5ZXJdIHRyYW5zZm9ybV0ubTExOwotICAgIFtfaW52ZXJzZVNjYWxl Um9vdFZpZXcgc2V0VHJhbnNmb3JtOkNHQWZmaW5lVHJhbnNmb3JtTWFrZVNjYWxlKGludmVyc2VT Y2FsZSwgaW52ZXJzZVNjYWxlKV07CisgICAgW191bnNjYWxlZFZpZXcgc2V0SGlkZGVuOk5PXTsK KyAgICBbc2VsZi5sYXllciBhZGRPYnNlcnZlcjpzZWxmIGZvcktleVBhdGg6QCJ0cmFuc2Zvcm0i IG9wdGlvbnM6TlNLZXlWYWx1ZU9ic2VydmluZ09wdGlvbkluaXRpYWwgY29udGV4dDpuaWxdOwog CiAgICAgX3RvdWNoRXZlbnRHZXN0dXJlUmVjb2duaXplciA9IGFkb3B0TlMoW1tVSVdlYlRvdWNo RXZlbnRzR2VzdHVyZVJlY29nbml6ZXIgYWxsb2NdIGluaXRXaXRoVGFyZ2V0OnNlbGYgYWN0aW9u OkBzZWxlY3Rvcihfd2ViVG91Y2hFdmVudHNSZWNvZ25pemVkOikgdG91Y2hEZWxlZ2F0ZTpzZWxm XSk7CiAgICAgW190b3VjaEV2ZW50R2VzdHVyZVJlY29nbml6ZXIgc2V0RGVsZWdhdGU6c2VsZl07 CkBAIC0yNzMsNyArMjc2LDggQEAgc3RhdGljIFVJV2ViU2VsZWN0aW9uTW9kZSB0b1VJV2ViU2Vs ZWN0aW9uTW9kZShXS1NlbGVjdGlvbkdyYW51bGFyaXR5IGdyYW51bGFyaXQKICAgICBbX2Zvcm1J bnB1dFNlc3Npb24gaW52YWxpZGF0ZV07CiAgICAgX2Zvcm1JbnB1dFNlc3Npb24gPSBuaWw7CiAg ICAgW19oaWdobGlnaHRWaWV3IHJlbW92ZUZyb21TdXBlcnZpZXddOwotICAgIFtfaW52ZXJzZVNj YWxlUm9vdFZpZXcgcmVtb3ZlRnJvbVN1cGVydmlld107CisgICAgW3NlbGYubGF5ZXIgcmVtb3Zl T2JzZXJ2ZXI6c2VsZiBmb3JLZXlQYXRoOkAidHJhbnNmb3JtIl07CisgICAgW191bnNjYWxlZFZp ZXcgc2V0SGlkZGVuOllFU107CiAgICAgW190b3VjaEV2ZW50R2VzdHVyZVJlY29nbml6ZXIgc2V0 RGVsZWdhdGU6bmlsXTsKICAgICBbc2VsZiByZW1vdmVHZXN0dXJlUmVjb2duaXplcjpfdG91Y2hF dmVudEdlc3R1cmVSZWNvZ25pemVyLmdldCgpXTsKIApAQCAtMzMwLDE4ICszMzQsMjggQEAgc3Rh dGljIFVJV2ViU2VsZWN0aW9uTW9kZSB0b1VJV2ViU2VsZWN0aW9uTW9kZShXS1NlbGVjdGlvbkdy YW51bGFyaXR5IGdyYW51bGFyaXQKIAogLSAoVUlWaWV3Kil1bnNjYWxlZFZpZXcKIHsKLSAgICBy ZXR1cm4gX2ludmVyc2VTY2FsZVJvb3RWaWV3LmdldCgpOworICAgIHJldHVybiBfdW5zY2FsZWRW aWV3LmdldCgpOwogfQogCiAtIChDR0Zsb2F0KWludmVyc2VTY2FsZQogewotICAgIHJldHVybiBb W19pbnZlcnNlU2NhbGVSb290VmlldyBsYXllcl0gdHJhbnNmb3JtXS5tMTE7CisgICAgcmV0dXJu IDEgLyBbW3NlbGYgbGF5ZXJdIHRyYW5zZm9ybV0ubTExOwogfQogCi0tICh2b2lkKV91cGRhdGVV bnNjYWxlZFZpZXcKKy0gKHZvaWQpb2JzZXJ2ZVZhbHVlRm9yS2V5UGF0aDooTlNTdHJpbmcgKilr ZXlQYXRoIG9mT2JqZWN0OihpZClvYmplY3QgY2hhbmdlOihOU0RpY3Rpb25hcnkgKiljaGFuZ2Ug Y29udGV4dDoodm9pZCAqKWNvbnRleHQKIHsKLSAgICBDR0Zsb2F0IGludmVyc2VTY2FsZSA9IDEg LyBbW3NlbGYgbGF5ZXJdIHRyYW5zZm9ybV0ubTExOwotICAgIFtfaW52ZXJzZVNjYWxlUm9vdFZp ZXcgc2V0VHJhbnNmb3JtOkNHQWZmaW5lVHJhbnNmb3JtTWFrZVNjYWxlKGludmVyc2VTY2FsZSwg aW52ZXJzZVNjYWxlKV07CisgICAgQVNTRVJUKFtrZXlQYXRoIGlzRXF1YWxUb1N0cmluZzpAInRy YW5zZm9ybSJdKTsKKyAgICBBU1NFUlQob2JqZWN0ID09IHNlbGYubGF5ZXIpOworCisgICAgaWYg KFtVSVZpZXcgX2lzSW5BbmltYXRpb25CbG9ja10gJiYgX3BhZ2UtPmVkaXRvclN0YXRlKCkuc2Vs ZWN0aW9uSXNOb25lICYmICFbX2hpZ2hsaWdodFZpZXcgc3VwZXJ2aWV3XSkgeworICAgICAgICAv LyBJZiB0aGUgdXRpbGl0eSB2aWV3cyBhcmUgbm90IGFscmVhZHkgdmlzaWJsZSwgd2UgZG9uJ3Qg d2FudCB0aGVtIHRvIGJlY29tZSB2aXNpYmxlIGR1cmluZyB0aGUgYW5pbWF0aW9uIHNpbmNlCisg ICAgICAgIC8vIHRoZXkgY291bGQgbm90IHN0YXJ0IGZyb20gYSByZWFzb25hYmxlIHN0YXRlLgor ICAgICAgICAvLyBUaGlzIGlzIG5vdCBwZXJmZWN0IHNpbmNlIHZpZXdzIGNvdWxkIGFsc28gZ2V0 IHVwZGF0ZWQgZHVyaW5nIHRoZSBhbmltYXRpb24sIGluIHByYWN0aWNlIHRoaXMgaXMgcmFyZSBh bmQgdGhlIGVuZCBzdGF0ZQorICAgICAgICAvLyByZW1haW5zIGNvcnJlY3QuCisgICAgICAgIFtf dW5zY2FsZWRWaWV3IHNldEhpZGRlbjpZRVNdOworICAgICAgICBbVUlWaWV3IF9hZGRDb21wbGV0 aW9uOl4oQk9PTCl7IFtfdW5zY2FsZWRWaWV3IHNldEhpZGRlbjpOT107IH1dOworICAgIH0KKwog ICAgIF9zZWxlY3Rpb25OZWVkc1VwZGF0ZSA9IFlFUzsKICAgICBbc2VsZiBfdXBkYXRlQ2hhbmdl ZFNlbGVjdGlvbl07CiAgICAgW3NlbGYgX3VwZGF0ZVRhcEhpZ2hsaWdodF07CkBAIC0zNjksNyAr MzgzLDcgQEAgc3RhdGljIFVJV2ViU2VsZWN0aW9uTW9kZSB0b1VJV2ViU2VsZWN0aW9uTW9kZShX S1NlbGVjdGlvbkdyYW51bGFyaXR5IGdyYW51bGFyaXQKIAogLSAoVUlWaWV3ICopaGl0VGVzdDoo Q0dQb2ludClwb2ludCB3aXRoRXZlbnQ6KDo6VUlFdmVudCAqKWV2ZW50CiB7Ci0gICAgZm9yIChV SVZpZXcgKnN1YlZpZXcgaW4gW19pbnZlcnNlU2NhbGVSb290Vmlldy5nZXQoKSBzdWJ2aWV3c10p IHsKKyAgICBmb3IgKFVJVmlldyAqc3ViVmlldyBpbiBbX3Vuc2NhbGVkVmlldy5nZXQoKSBzdWJ2 aWV3c10pIHsKICAgICAgICAgVUlWaWV3ICpoaXRWaWV3ID0gW3N1YlZpZXcgaGl0VGVzdDpbc3Vi VmlldyBjb252ZXJ0UG9pbnQ6cG9pbnQgZnJvbVZpZXc6c2VsZl0gd2l0aEV2ZW50OmV2ZW50XTsK ICAgICAgICAgaWYgKGhpdFZpZXcpCiAgICAgICAgICAgICByZXR1cm4gaGl0VmlldzsKQEAgLTU4 NCw3ICs1OTgsNyBAQCBzdGF0aWMgTlNWYWx1ZSAqbnNTaXplRm9yVGFwSGlnaGxpZ2h0Qm9yZGVy UmFkaXVzKFdlYkNvcmU6OkludFNpemUgYm9yZGVyUmFkaXVzKQogICAgICAgICBbX2hpZ2hsaWdo dFZpZXcgc2V0Q29ybmVyUmFkaXVzOm1pbmltdW1UYXBIaWdobGlnaHRSYWRpdXNdOwogICAgIH0K ICAgICBbX2hpZ2hsaWdodFZpZXcgbGF5ZXJdLm9wYWNpdHkgPSAxOwotICAgIFtfaW52ZXJzZVNj YWxlUm9vdFZpZXcgYWRkU3VidmlldzpfaGlnaGxpZ2h0Vmlldy5nZXQoKV07CisgICAgW191bnNj YWxlZFZpZXcgYWRkU3VidmlldzpfaGlnaGxpZ2h0Vmlldy5nZXQoKV07CiAgICAgW3NlbGYgX3Vw ZGF0ZVRhcEhpZ2hsaWdodF07CiB9CiAK