173927 2017-06-28 09:25:00 -0700 [iOS DnD] [WK2] Dragged content flashes after the preview sets down when cancelling a drag 2017-06-28 16:38:53 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin commit-queue megan_gardner thorton webkit-bug-importer oldest_to_newest 1323554 0 wenson_hsieh 2017-06-28 09:25:00 -0700 <rdar://problem/33020792> 1323600 1 314039 wenson_hsieh 2017-06-28 10:42:52 -0700 Created attachment 314039 Patch 1323622 2 314039 wenson_hsieh 2017-06-28 11:36:59 -0700 Comment on attachment 314039 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314039&action=review > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:4611 > + RELEASE_LOG(DragAndDrop, "Drag lift completed with position: %tu", finalPosition); I didn't mean to include this logging (this information isn't very useful). I'll remove it. 1323643 3 314050 wenson_hsieh 2017-06-28 12:21:40 -0700 Created attachment 314050 Patch for landing 1323648 4 314050 commit-queue 2017-06-28 12:35:42 -0700 Comment on attachment 314050 Patch for landing Clearing flags on attachment: 314050 Committed r218885: <http://trac.webkit.org/changeset/218885> 1323698 5 wenson_hsieh 2017-06-28 15:39:13 -0700 Reopening for a followup to adjust for additional UIKit changes. 1323701 6 314061 wenson_hsieh 2017-06-28 15:41:20 -0700 Created attachment 314061 Adjust for UIKit changes 1323704 7 314061 thorton 2017-06-28 15:45:58 -0700 Comment on attachment 314061 Adjust for UIKit changes View in context: https://bugs.webkit.org/attachment.cgi?id=314061&action=review > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:4674 > + RetainPtr<WKContentView> protectedSelf(self); makeRetainPtr? protectedSelf = makeRetainPtr(self) 1323705 8 314061 wenson_hsieh 2017-06-28 15:50:29 -0700 Comment on attachment 314061 Adjust for UIKit changes View in context: https://bugs.webkit.org/attachment.cgi?id=314061&action=review >> Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:4674 >> + RetainPtr<WKContentView> protectedSelf(self); > > makeRetainPtr? protectedSelf = makeRetainPtr(self) 👍 protectedSelf = retainPtr(self) 1323735 9 wenson_hsieh 2017-06-28 16:38:53 -0700 Landed in <http://trac.webkit.org/r218899> 314039 2017-06-28 10:42:52 -0700 2017-06-28 11:42:23 -0700 Patch bug-173927-20170628104251.patch text/plain 5198 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4ODU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGYyNDdkNDRhNzdjYmMy MGI2NzJhZDUwOTExNTM1NmQ4M2YyNTYxNy4uYTE1NDY2YTBiNjk3ZDg4NjcyNWE2N2VjZDNhNWRi MTg5OWQ1YjVjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE3LTA2LTI4ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgRG5EXSBb V0syXSBEcmFnZ2VkIGNvbnRlbnQgZmxhc2hlcyBhZnRlciB0aGUgcHJldmlldyBzZXRzIGRvd24g d2hlbiBjYW5jZWxsaW5nIGEgZHJhZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTczOTI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzAyMDc5Mj4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGEg ZHJhZyBpcyBjYW5jZWxsZWQsIFVJS2l0IG5vcm1hbGx5IGFuaW1hdGVzIGZseS1iYWNrIGFuZCBz ZXQtZG93biBhbmltYXRpb25zIGJhY2stdG8tYmFjay4gSG93ZXZlciwgZm9yCisgICAgICAgIFdl YktpdDIsIHdlIG5lZWQgdG8gY2FsbCBvdXQgdG8gdGhlIHdlYiBwcm9jZXNzIGluIG9yZGVyIHRv IHRyaWdnZXIgYSByZXBhaW50IG9mIHRoZSBkcmFnZ2VkIGNvbnRlbnQgYXQgbm9ybWFsCisgICAg ICAgIG9wYWNpdHkgd2hlbiB0aGUgZHJhZyBjYW5jZWwgYW5pbWF0aW9uIGNvbXBsZXRlcy4gVGh1 cywgd2UgY2FuIGhvb2sgaW50byBVSUtpdCBTUEkgdG8gc3BsaXQgdGhlIGNhbmNlbGxhdGlvbgor ICAgICAgICBhbmltYXRpb24gaW50byB0d28gZGlzY3JldGUgcGhhc2VzOiB0aGUgZmx5LWJhY2sg YW5kIHRoZSBzZXQtZG93biAodGhlIGxhdHRlciBvZiB3aGljaCBtYXkgYmUgZGVmZXJyZWQgdXNp bmcgYQorICAgICAgICBjb21wbGV0aW9uIGJsb2NrKS4KKworICAgICAgICBUbyBkbyB0aGlzLCB3 ZSBpbXBsZW1lbnQgYSBuZXcgU1BJIGhvb2ssIF9kcmFnSW50ZXJhY3Rpb246aXRlbTpzaG91bGRE ZWxheVNldERvd25BbmltYXRpb25XaXRoQ29tcGxldGlvbjosIHRvCisgICAgICAgIGluZGljYXRl IHRoYXQgdGhlIHNldC1kb3duIHNob3VsZCBiZSBkZWZlcnJlZCwgYW5kIGNhbGwgdGhlIGNvbXBs ZXRpb24gYmxvY2sgYWZ0ZXIgdGhlIG5leHQgbGF5ZXIgdHJlZSBjb21taXQuCisgICAgICAgIFNp bmNlIC1zaG91bGREZWxheVNldERvd25BbmltYXRpb25XaXRoQ29tcGxldGlvbjogaXMgaW52b2tl ZCBhZnRlciB0aGUgVUlEcmFnQW5pbWF0aW5nIGNvbXBsZXRpb24gYmxvY2sgaW4KKyAgICAgICAg LXdpbGxBbmltYXRlQ2FuY2VsV2l0aEFuaW1hdG9yOiwgdGhpcyBsYXllciB0cmVlIGNvbW1pdCBp cyBndWFyYW50ZWVkIHRvIGNvbWUgYWZ0ZXIgd2UndmUgdG9sZCB0aGUgd2ViIHByb2Nlc3MKKyAg ICAgICAgdG8gcmVwYWludCBhdCBmdWxsIG9wYWNpdHkuCisKKyAgICAgICAgQWRkaXRpb25hbGx5 LCB0aGlzIHBhdGNoIGFsc28gYWNjb3VudHMgZm9yIGFkZGl0aW9uYWwgY2hhbmdlcyBpbiBVSUtp dC4gT25jZQorICAgICAgICAtc2hvdWxkRGVsYXlTZXREb3duQW5pbWF0aW9uV2l0aENvbXBsZXRp b246IGJlY29tZXMgYXZhaWxhYmxlLCAtc2Vzc2lvbkRpZEVuZDogd2lsbCBubyBsb25nZXIgYmUg aW52b2tlZCBhZnRlcgorICAgICAgICBhIGNhbmNlbGxlZCBkcmFnIGxpZnQgaWYgdGhlIHVzZXIg ZGlkIG5vdCBiZWdpbiBtb3ZpbmcuIFRoaXMgbWVhbnMgdGhhdCBvdXIgY2xlYW51cCBsb2dpYyBp biAtc2Vzc2lvbkRpZEVuZDoKKyAgICAgICAgd2lsbCBubyBsb25nZXIgYmUgZXhlY3V0ZWQgaW4g dGhpcyBjYXNlLCBsZWF2aW5nIHRoZSB2aWV3IHdpdGggYW4gaW5jb25zaXN0ZW50IGRyYWdnaW5n IHN0YXRlLiBUbyBmaXggdGhpcywgd2UKKyAgICAgICAgbmVlZCB0byBpbXBsZW1lbnQgLWRyYWdJ bnRlcmFjdGlvbjp3aWxsQW5pbWF0ZUxpZnRXaXRoQW5pbWF0b3I6c2Vzc2lvbjogdG8gcGVyZm9y bSBkcmFnIHNlc3Npb24gY2xlYW51cAorICAgICAgICBmb2xsb3dpbmcgYSBjYW5jZWxsZWQgZHJh ZyBsaWZ0LCBmb3Igd2hpY2ggdGhlIGRyYWcgYW5pbWF0b3IncyBmaW5hbCBwb3NpdGlvbiB3aWxs IGJlCisgICAgICAgIFVJVmlld0FuaW1hdGluZ1Bvc2l0aW9uU3RhcnQuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tD b250ZW50VmlldyBkcmFnSW50ZXJhY3Rpb246d2lsbEFuaW1hdGVMaWZ0V2l0aEFuaW1hdG9yOnNl c3Npb246XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2RyYWdJbnRlcmFjdGlvbjppdGVt OnNob3VsZERlbGF5U2V0RG93bkFuaW1hdGlvbldpdGhDb21wbGV0aW9uOl0pOgorCiAyMDE3LTA2 LTI3ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtp T1MgRG5EXSBTdXBwb3J0IGRyYWdnaW5nIG91dCBvZiBjb250ZW50ZWRpdGFibGUgYXJlYXMgd2l0 aG91dCBhIHByaW9yIHNlbGVjdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCAwMzViOGNmYzk1N2Yw YjMzMmMyZGFiMDg1NWYzNTMyMjQ3NjM5YWJmLi5kMTU2YTRjMmIyMWE1ZmJiYTlkN2EyMjI1YzFh YmU2M2Y3NzZhMTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtNDYwMyw2ICs0NjAzLDIyIEBAIC0g KFVJVGFyZ2V0ZWREcmFnUHJldmlldyAqKV9hcGlfZHJhZ0ludGVyYWN0aW9uOihVSURyYWdJbnRl cmFjdGlvbiAqKWludGVyYWN0aW9uCiAgICAgcmV0dXJuIHNlbGYuZHJhZ1ByZXZpZXdGb3JDdXJy ZW50RGF0YUludGVyYWN0aW9uU3RhdGUuYXV0b3JlbGVhc2UoKTsKIH0KIAorLSAodm9pZClkcmFn SW50ZXJhY3Rpb246KFVJRHJhZ0ludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gd2lsbEFuaW1hdGVM aWZ0V2l0aEFuaW1hdG9yOihpZCA8VUlEcmFnQW5pbWF0aW5nPilhbmltYXRvciBzZXNzaW9uOihp ZCA8VUlEcmFnU2Vzc2lvbj4pc2Vzc2lvbgoreworICAgIGF1dG8gYWRqdXN0ZWRPcmlnaW4gPSBf ZGF0YUludGVyYWN0aW9uU3RhdGUuYWRqdXN0ZWRPcmlnaW47CisgICAgUmV0YWluUHRyPFdLQ29u dGVudFZpZXc+IHByb3RlY3RlZFNlbGYoc2VsZik7CisgICAgW2FuaW1hdG9yIGFkZENvbXBsZXRp b246W3Nlc3Npb24sIGFkanVzdGVkT3JpZ2luLCBwcm90ZWN0ZWRTZWxmLCBwYWdlID0gX3BhZ2Vd IChVSVZpZXdBbmltYXRpbmdQb3NpdGlvbiBmaW5hbFBvc2l0aW9uKSB7CisgICAgICAgIFJFTEVB U0VfTE9HKERyYWdBbmREcm9wLCAiRHJhZyBsaWZ0IGNvbXBsZXRlZCB3aXRoIHBvc2l0aW9uOiAl dHUiLCBmaW5hbFBvc2l0aW9uKTsKKyAgICAgICAgaWYgKGZpbmFsUG9zaXRpb24gPT0gVUlWaWV3 QW5pbWF0aW5nUG9zaXRpb25TdGFydCkgeworICAgICAgICAgICAgUkVMRUFTRV9MT0coRHJhZ0Fu ZERyb3AsICJEcmFnIHNlc3Npb24gZW5kZWQgYXQgc3RhcnQ6ICVwIiwgc2Vzc2lvbik7CisgICAg ICAgICAgICAvLyBUaGUgbGlmdCB3YXMgY2FuY2VsZWQsIHNvIC1kcm9wSW50ZXJhY3Rpb246c2Vz c2lvbkRpZEVuZDogd2lsbCBuZXZlciBiZSBpbnZva2VkLiBUaGlzIGlzIHRoZSBsYXN0IGNoYW5j ZSB0byBjbGVhbiB1cC4KKyAgICAgICAgICAgIFtwcm90ZWN0ZWRTZWxmIGNsZWFuVXBEcmFnU291 cmNlU2Vzc2lvblN0YXRlXTsKKyAgICAgICAgICAgIGF1dG8gb3JpZ2luSW5XaW5kb3dDb29yZGlu YXRlcyA9IFtwcm90ZWN0ZWRTZWxmIGNvbnZlcnRQb2ludDphZGp1c3RlZE9yaWdpbiB0b1ZpZXc6 W3Byb3RlY3RlZFNlbGYgd2luZG93XV07CisgICAgICAgICAgICBwYWdlLT5kcmFnRW5kZWQocm91 bmRlZEludFBvaW50KGFkanVzdGVkT3JpZ2luKSwgcm91bmRlZEludFBvaW50KG9yaWdpbkluV2lu ZG93Q29vcmRpbmF0ZXMpLCBEcmFnT3BlcmF0aW9uTm9uZSk7CisgICAgICAgIH0KKyAgICB9XTsK K30KKwogLSAodm9pZClkcmFnSW50ZXJhY3Rpb246KFVJRHJhZ0ludGVyYWN0aW9uICopaW50ZXJh Y3Rpb24gc2Vzc2lvbldpbGxCZWdpbjooaWQgPFVJRHJhZ1Nlc3Npb24+KXNlc3Npb24KIHsKICAg ICBSRUxFQVNFX0xPRyhEcmFnQW5kRHJvcCwgIkRyYWcgc2Vzc2lvbiBiZWdpbm5pbmc6ICVwIiwg c2Vzc2lvbik7CkBAIC00NjQzLDYgKzQ2NTksMTQgQEAgLSAoVUlUYXJnZXRlZERyYWdQcmV2aWV3 ICopZHJhZ0ludGVyYWN0aW9uOihVSURyYWdJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHByZXYK ICAgICByZXR1cm4gc2VsZi5kcmFnUHJldmlld0ZvckN1cnJlbnREYXRhSW50ZXJhY3Rpb25TdGF0 ZS5hdXRvcmVsZWFzZSgpOwogfQogCistIChCT09MKV9kcmFnSW50ZXJhY3Rpb246KFVJRHJhZ0lu dGVyYWN0aW9uICopaW50ZXJhY3Rpb24gaXRlbTooVUlEcmFnSXRlbSAqKWl0ZW0gc2hvdWxkRGVs YXlTZXREb3duQW5pbWF0aW9uV2l0aENvbXBsZXRpb246KHZvaWQoXikodm9pZCkpY29tcGxldGlv bgoreworICAgIF9wYWdlLT5jYWxsQWZ0ZXJOZXh0UHJlc2VudGF0aW9uVXBkYXRlKFtjYXB0dXJl ZEJsb2NrID0gbWFrZUJsb2NrUHRyKGNvbXBsZXRpb24pXSAoQ2FsbGJhY2tCYXNlOjpFcnJvcikg eworICAgICAgICBjYXB0dXJlZEJsb2NrKCk7CisgICAgfSk7CisgICAgcmV0dXJuIFlFUzsKK30K KwogLSAodm9pZClfYXBpX2RyYWdJbnRlcmFjdGlvbjooVUlEcmFnSW50ZXJhY3Rpb24gKilpbnRl cmFjdGlvbiBpdGVtOihVSURyYWdJdGVtICopaXRlbSB3aWxsQW5pbWF0ZUNhbmNlbFdpdGhBbmlt YXRvcjooaWQgPFVJRHJhZ0FuaW1hdGluZz4pYW5pbWF0b3IKIHsKICAgICBbYW5pbWF0b3IgYWRk Q29tcGxldGlvbjpbcGFnZSA9IF9wYWdlXSAoVUlWaWV3QW5pbWF0aW5nUG9zaXRpb24gZmluYWxQ b3NpdGlvbikgewo= 314050 2017-06-28 12:21:40 -0700 2017-06-28 12:35:42 -0700 Patch for landing bug-173927-20170628122139.patch text/plain 5079 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4ODU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGYyNDdkNDRhNzdjYmMy MGI2NzJhZDUwOTExNTM1NmQ4M2YyNTYxNy4uNjFhMjMwMDlmYzMwZjg3NTk2NzdkMTM2ZjNkMGZi NzMzZjlmZDI2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE3LTA2LTI4ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgRG5EXSBb V0syXSBEcmFnZ2VkIGNvbnRlbnQgZmxhc2hlcyBhZnRlciB0aGUgcHJldmlldyBzZXRzIGRvd24g d2hlbiBjYW5jZWxsaW5nIGEgZHJhZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTczOTI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzAyMDc5Mj4K KworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIFdoZW4gYSBkcmFn IGlzIGNhbmNlbGxlZCwgVUlLaXQgbm9ybWFsbHkgYW5pbWF0ZXMgZmx5LWJhY2sgYW5kIHNldC1k b3duIGFuaW1hdGlvbnMgYmFjay10by1iYWNrLiBIb3dldmVyLCBmb3IKKyAgICAgICAgV2ViS2l0 Miwgd2UgbmVlZCB0byBjYWxsIG91dCB0byB0aGUgd2ViIHByb2Nlc3MgaW4gb3JkZXIgdG8gdHJp Z2dlciBhIHJlcGFpbnQgb2YgdGhlIGRyYWdnZWQgY29udGVudCBhdCBub3JtYWwKKyAgICAgICAg b3BhY2l0eSB3aGVuIHRoZSBkcmFnIGNhbmNlbCBhbmltYXRpb24gY29tcGxldGVzLiBUaHVzLCB3 ZSBjYW4gaG9vayBpbnRvIFVJS2l0IFNQSSB0byBzcGxpdCB0aGUgY2FuY2VsbGF0aW9uCisgICAg ICAgIGFuaW1hdGlvbiBpbnRvIHR3byBkaXNjcmV0ZSBwaGFzZXM6IHRoZSBmbHktYmFjayBhbmQg dGhlIHNldC1kb3duICh0aGUgbGF0dGVyIG9mIHdoaWNoIG1heSBiZSBkZWZlcnJlZCB1c2luZyBh CisgICAgICAgIGNvbXBsZXRpb24gYmxvY2spLgorCisgICAgICAgIFRvIGRvIHRoaXMsIHdlIGlt cGxlbWVudCBhIG5ldyBTUEkgaG9vaywgX2RyYWdJbnRlcmFjdGlvbjppdGVtOnNob3VsZERlbGF5 U2V0RG93bkFuaW1hdGlvbldpdGhDb21wbGV0aW9uOiwgdG8KKyAgICAgICAgaW5kaWNhdGUgdGhh dCB0aGUgc2V0LWRvd24gc2hvdWxkIGJlIGRlZmVycmVkLCBhbmQgY2FsbCB0aGUgY29tcGxldGlv biBibG9jayBhZnRlciB0aGUgbmV4dCBsYXllciB0cmVlIGNvbW1pdC4KKyAgICAgICAgU2luY2Ug LXNob3VsZERlbGF5U2V0RG93bkFuaW1hdGlvbldpdGhDb21wbGV0aW9uOiBpcyBpbnZva2VkIGFm dGVyIHRoZSBVSURyYWdBbmltYXRpbmcgY29tcGxldGlvbiBibG9jayBpbgorICAgICAgICAtd2ls bEFuaW1hdGVDYW5jZWxXaXRoQW5pbWF0b3I6LCB0aGlzIGxheWVyIHRyZWUgY29tbWl0IGlzIGd1 YXJhbnRlZWQgdG8gY29tZSBhZnRlciB3ZSd2ZSB0b2xkIHRoZSB3ZWIgcHJvY2VzcworICAgICAg ICB0byByZXBhaW50IGF0IGZ1bGwgb3BhY2l0eS4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28g YWNjb3VudHMgZm9yIGFkZGl0aW9uYWwgY2hhbmdlcyBpbiBVSUtpdC4gT25jZSAtc2hvdWxkRGVs YXlTZXREb3duQW5pbWF0aW9uV2l0aENvbXBsZXRpb246CisgICAgICAgIGJlY29tZXMgYXZhaWxh YmxlLCAtc2Vzc2lvbkRpZEVuZDogd2lsbCBubyBsb25nZXIgYmUgaW52b2tlZCBhZnRlciBhIGNh bmNlbGxlZCBkcmFnIGxpZnQgaWYgdGhlIHVzZXIgZGlkIG5vdAorICAgICAgICBiZWdpbiBtb3Zp bmcuIFRoaXMgbWVhbnMgdGhhdCBvdXIgY2xlYW51cCBsb2dpYyBpbiAtc2Vzc2lvbkRpZEVuZDog d2lsbCBubyBsb25nZXIgYmUgZXhlY3V0ZWQgaW4gdGhpcyBjYXNlLAorICAgICAgICBsZWF2aW5n IHRoZSB2aWV3IHdpdGggYW4gaW5jb25zaXN0ZW50IGRyYWdnaW5nIHN0YXRlLiBUbyBmaXggdGhp cywgd2UgbmVlZCB0byBpbXBsZW1lbnQKKyAgICAgICAgLWRyYWdJbnRlcmFjdGlvbjp3aWxsQW5p bWF0ZUxpZnRXaXRoQW5pbWF0b3I6c2Vzc2lvbjogdG8gcGVyZm9ybSBkcmFnIHNlc3Npb24gY2xl YW51cCBmb2xsb3dpbmcgYSBjYW5jZWxsZWQgZHJhZworICAgICAgICBsaWZ0LCBmb3Igd2hpY2gg dGhlIGRyYWcgYW5pbWF0b3IncyBmaW5hbCBwb3NpdGlvbiB3aWxsIGJlIFVJVmlld0FuaW1hdGlu Z1Bvc2l0aW9uU3RhcnQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBkcmFnSW50ZXJhY3Rpb246 d2lsbEFuaW1hdGVMaWZ0V2l0aEFuaW1hdG9yOnNlc3Npb246XSk6CisgICAgICAgICgtW1dLQ29u dGVudFZpZXcgX2RyYWdJbnRlcmFjdGlvbjppdGVtOnNob3VsZERlbGF5U2V0RG93bkFuaW1hdGlv bldpdGhDb21wbGV0aW9uOl0pOgorCiAyMDE3LTA2LTI3ICBXZW5zb24gSHNpZWggIDx3ZW5zb25f aHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1MgRG5EXSBTdXBwb3J0IGRyYWdnaW5nIG91 dCBvZiBjb250ZW50ZWRpdGFibGUgYXJlYXMgd2l0aG91dCBhIHByaW9yIHNlbGVjdGlvbgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJh Y3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbQppbmRleCAwMzViOGNmYzk1N2YwYjMzMmMyZGFiMDg1NWYzNTMyMjQ3NjM5YWJm Li5jYTUyZmM1YjUzZDE3YmY1M2ExMWExZTcyM2JhMjcyMWM5N2RkNTUxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQpAQCAtNDYwMyw2ICs0NjAzLDIxIEBAIC0gKFVJVGFyZ2V0ZWREcmFnUHJldmlldyAqKV9h cGlfZHJhZ0ludGVyYWN0aW9uOihVSURyYWdJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uCiAgICAg cmV0dXJuIHNlbGYuZHJhZ1ByZXZpZXdGb3JDdXJyZW50RGF0YUludGVyYWN0aW9uU3RhdGUuYXV0 b3JlbGVhc2UoKTsKIH0KIAorLSAodm9pZClkcmFnSW50ZXJhY3Rpb246KFVJRHJhZ0ludGVyYWN0 aW9uICopaW50ZXJhY3Rpb24gd2lsbEFuaW1hdGVMaWZ0V2l0aEFuaW1hdG9yOihpZCA8VUlEcmFn QW5pbWF0aW5nPilhbmltYXRvciBzZXNzaW9uOihpZCA8VUlEcmFnU2Vzc2lvbj4pc2Vzc2lvbgor eworICAgIGF1dG8gYWRqdXN0ZWRPcmlnaW4gPSBfZGF0YUludGVyYWN0aW9uU3RhdGUuYWRqdXN0 ZWRPcmlnaW47CisgICAgUmV0YWluUHRyPFdLQ29udGVudFZpZXc+IHByb3RlY3RlZFNlbGYoc2Vs Zik7CisgICAgW2FuaW1hdG9yIGFkZENvbXBsZXRpb246W3Nlc3Npb24sIGFkanVzdGVkT3JpZ2lu LCBwcm90ZWN0ZWRTZWxmLCBwYWdlID0gX3BhZ2VdIChVSVZpZXdBbmltYXRpbmdQb3NpdGlvbiBm aW5hbFBvc2l0aW9uKSB7CisgICAgICAgIGlmIChmaW5hbFBvc2l0aW9uID09IFVJVmlld0FuaW1h dGluZ1Bvc2l0aW9uU3RhcnQpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HKERyYWdBbmREcm9w LCAiRHJhZyBzZXNzaW9uIGVuZGVkIGF0IHN0YXJ0OiAlcCIsIHNlc3Npb24pOworICAgICAgICAg ICAgLy8gVGhlIGxpZnQgd2FzIGNhbmNlbGVkLCBzbyAtZHJvcEludGVyYWN0aW9uOnNlc3Npb25E aWRFbmQ6IHdpbGwgbmV2ZXIgYmUgaW52b2tlZC4gVGhpcyBpcyB0aGUgbGFzdCBjaGFuY2UgdG8g Y2xlYW4gdXAuCisgICAgICAgICAgICBbcHJvdGVjdGVkU2VsZiBjbGVhblVwRHJhZ1NvdXJjZVNl c3Npb25TdGF0ZV07CisgICAgICAgICAgICBhdXRvIG9yaWdpbkluV2luZG93Q29vcmRpbmF0ZXMg PSBbcHJvdGVjdGVkU2VsZiBjb252ZXJ0UG9pbnQ6YWRqdXN0ZWRPcmlnaW4gdG9WaWV3Oltwcm90 ZWN0ZWRTZWxmIHdpbmRvd11dOworICAgICAgICAgICAgcGFnZS0+ZHJhZ0VuZGVkKHJvdW5kZWRJ bnRQb2ludChhZGp1c3RlZE9yaWdpbiksIHJvdW5kZWRJbnRQb2ludChvcmlnaW5JbldpbmRvd0Nv b3JkaW5hdGVzKSwgRHJhZ09wZXJhdGlvbk5vbmUpOworICAgICAgICB9CisgICAgfV07Cit9CisK IC0gKHZvaWQpZHJhZ0ludGVyYWN0aW9uOihVSURyYWdJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9u IHNlc3Npb25XaWxsQmVnaW46KGlkIDxVSURyYWdTZXNzaW9uPilzZXNzaW9uCiB7CiAgICAgUkVM RUFTRV9MT0coRHJhZ0FuZERyb3AsICJEcmFnIHNlc3Npb24gYmVnaW5uaW5nOiAlcCIsIHNlc3Np b24pOwpAQCAtNDY0Myw2ICs0NjU4LDE0IEBAIC0gKFVJVGFyZ2V0ZWREcmFnUHJldmlldyAqKWRy YWdJbnRlcmFjdGlvbjooVUlEcmFnSW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBwcmV2CiAgICAg cmV0dXJuIHNlbGYuZHJhZ1ByZXZpZXdGb3JDdXJyZW50RGF0YUludGVyYWN0aW9uU3RhdGUuYXV0 b3JlbGVhc2UoKTsKIH0KIAorLSAoQk9PTClfZHJhZ0ludGVyYWN0aW9uOihVSURyYWdJbnRlcmFj dGlvbiAqKWludGVyYWN0aW9uIGl0ZW06KFVJRHJhZ0l0ZW0gKilpdGVtIHNob3VsZERlbGF5U2V0 RG93bkFuaW1hdGlvbldpdGhDb21wbGV0aW9uOih2b2lkKF4pKHZvaWQpKWNvbXBsZXRpb24KK3sK KyAgICBfcGFnZS0+Y2FsbEFmdGVyTmV4dFByZXNlbnRhdGlvblVwZGF0ZShbY2FwdHVyZWRCbG9j ayA9IG1ha2VCbG9ja1B0cihjb21wbGV0aW9uKV0gKENhbGxiYWNrQmFzZTo6RXJyb3IpIHsKKyAg ICAgICAgY2FwdHVyZWRCbG9jaygpOworICAgIH0pOworICAgIHJldHVybiBZRVM7Cit9CisKIC0g KHZvaWQpX2FwaV9kcmFnSW50ZXJhY3Rpb246KFVJRHJhZ0ludGVyYWN0aW9uICopaW50ZXJhY3Rp b24gaXRlbTooVUlEcmFnSXRlbSAqKWl0ZW0gd2lsbEFuaW1hdGVDYW5jZWxXaXRoQW5pbWF0b3I6 KGlkIDxVSURyYWdBbmltYXRpbmc+KWFuaW1hdG9yCiB7CiAgICAgW2FuaW1hdG9yIGFkZENvbXBs ZXRpb246W3BhZ2UgPSBfcGFnZV0gKFVJVmlld0FuaW1hdGluZ1Bvc2l0aW9uIGZpbmFsUG9zaXRp b24pIHsK 314061 2017-06-28 15:41:20 -0700 2017-06-28 15:45:58 -0700 Adjust for UIKit changes bug-173927-20170628154118.patch text/plain 4615 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4ODU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjFhMjMwMDlmYzMwZjg3 NTk2NzdkMTM2ZjNkMGZiNzMzZjlmZDI2ZC4uMjc1MDA5ZjkyNDdmMWQ2NjdiMjQzY2M3ZWE0NmJk ZTQwNGNhODdhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE3LTA2LTI4ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCisgICAgICAgIEZvbGxvd3VwIHRv IHIyMTg4ODU6IGFkanVzdCBmb3IgZnVydGhlciBVSUtpdCBTUEkgY2hhbmdlcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczOTI3CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8zMzAyMDc5Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBPbiBUb1QsIFVJS2l0IG5vdyBpbnZva2VzIC1fZHJhZ0ludGVyYWN0 aW9uOml0ZW06c2hvdWxkRGVsYXlTZXREb3duQW5pbWF0aW9uV2l0aENvbXBsZXRpb246IGJlZm9y ZSB0aGUKKyAgICAgICAgY29tcGxldGlvbiBibG9jayBvZiAtZHJhZ0ludGVyYWN0aW9uOndpbGxB bmltYXRlTGlmdFdpdGhBbmltYXRvcjpzZXNzaW9uOiBpcyBjYWxsZWQuIFRoaXMgbWVhbnMgd2Ug bm93IG5lZWQgdG8KKyAgICAgICAgc3RvcmUgdGhlIGNvbXBsZXRpb24gYmxvY2sgaW4gLXNob3Vs ZERlbGF5U2V0RG93bkFuaW1hdGlvbldpdGhDb21wbGV0aW9uOiBhbmQgd2FpdCB1bnRpbCB0aGUg VUlEcmFnQW5pbWF0aW5nCisgICAgICAgIGNvbXBsZXRpb24gYmxvY2sgaW4gLXdpbGxBbmltYXRl Q2FuY2VsV2l0aEFuaW1hdG9yOiBiZWZvcmUgaW52b2tpbmcgaXQuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IGNsZWFuVXBEcmFnU291cmNlU2Vzc2lvblN0YXRlXSk6CisKKyAgICAgICAgRW5zdXJlIHRo YXQgdGhlIHNldC1kb3duIGNvbXBsZXRpb24gYmxvY2sgaXMgaW52b2tlZCB3aGVuIGEgZHJhZyBz ZXNzaW9uIGVuZHMgKGUuZy4sIGlmIHRoZSB3ZWIgY29udGVudCBwcm9jZXNzCisgICAgICAgIGNy YXNoZXMpLgorCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2RyYWdJbnRlcmFjdGlvbjppdGVt OnNob3VsZERlbGF5U2V0RG93bkFuaW1hdGlvbldpdGhDb21wbGV0aW9uOl0pOgorICAgICAgICAo LVtXS0NvbnRlbnRWaWV3IF9hcGlfZHJhZ0ludGVyYWN0aW9uOml0ZW06d2lsbEFuaW1hdGVDYW5j ZWxXaXRoQW5pbWF0b3I6XSk6CisKKzIwMTctMDYtMjggIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9o c2llaEBhcHBsZS5jb20+CisKICAgICAgICAgW2lPUyBEbkRdIFtXSzJdIERyYWdnZWQgY29udGVu dCBmbGFzaGVzIGFmdGVyIHRoZSBwcmV2aWV3IHNldHMgZG93biB3aGVuIGNhbmNlbGxpbmcgYSBk cmFnCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM5 MjcKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMzMDIwNzkyPgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKaW5kZXgg MTJmYWM1ZTJlMTMwMzc5N2EwODA2MjlmN2ZmNmVmODM1ODU4MzI2Mi4uN2JkMWFjOGQ5MjZlNWEz Zjg5OTk3MjVmZTgyZDdjNzJkYjUyOWEyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCkBAIC0xMjgsNiArMTI4 LDcgQEAgc3RydWN0IFdLRGF0YUludGVyYWN0aW9uU3RhdGUgewogICAgIFJldGFpblB0cjxpZCA8 VUlEcmFnU2Vzc2lvbj4+IGRyYWdTZXNzaW9uOwogICAgIFJldGFpblB0cjxpZCA8VUlEcm9wU2Vz c2lvbj4+IGRyb3BTZXNzaW9uOwogICAgIEJsb2NrUHRyPHZvaWQoKT4gZHJhZ1N0YXJ0Q29tcGxl dGlvbkJsb2NrOworICAgIEJsb2NrUHRyPHZvaWQoKT4gZHJhZ0NhbmNlbFNldERvd25CbG9jazsK ICAgICBXZWJDb3JlOjpEcmFnU291cmNlQWN0aW9uIHNvdXJjZUFjdGlvbiB7IFdlYkNvcmU6OkRy YWdTb3VyY2VBY3Rpb25Ob25lIH07CiAKICAgICBTdHJpbmcgbGlua1RpdGxlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQppbmRleCBjYTUyZmM1YjUzZDE3YmY1M2ExMWExZTcyM2JhMjcyMWM5N2RkNTUxLi45MmQ4 MDI4YzNiY2M1NTA2OGE2MDc5MjBjZmRjM2U5Njc5ZjNlN2FlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpA QCAtNDM3NSw2ICs0Mzc1LDExIEBAIC0gKHZvaWQpY2xlYW5VcERyYWdTb3VyY2VTZXNzaW9uU3Rh dGUKICAgICAgICAgW1tXZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkIHNoYXJlZEluc3RhbmNlXSBz ZXRJdGVtUHJvdmlkZXJzOm5pbF07CiAgICAgfQogCisgICAgaWYgKGF1dG8gY29tcGxldGlvbkJs b2NrID0gX2RhdGFJbnRlcmFjdGlvblN0YXRlLmRyYWdDYW5jZWxTZXREb3duQmxvY2spIHsKKyAg ICAgICAgX2RhdGFJbnRlcmFjdGlvblN0YXRlLmRyYWdDYW5jZWxTZXREb3duQmxvY2sgPSBuaWw7 CisgICAgICAgIGNvbXBsZXRpb25CbG9jaygpOworICAgIH0KKwogICAgIGlmIChhdXRvIGNvbXBs ZXRpb25CbG9jayA9IF9kYXRhSW50ZXJhY3Rpb25TdGF0ZS5kcmFnU3RhcnRDb21wbGV0aW9uQmxv Y2spIHsKICAgICAgICAgLy8gSWYgdGhlIHByZXZpb3VzIGRyYWcgc2Vzc2lvbiBpcyBzdGlsbCBp bml0aWFsaXppbmcsIHdlIG5lZWQgdG8gZW5zdXJlIHRoYXQgaXRzIGNvbXBsZXRpb24gYmxvY2sg aXMgY2FsbGVkIHRvIHByZXZlbnQgVUlLaXQgZnJvbSBnZXR0aW5nIG91dCBvZiBzdGF0ZS4KICAg ICAgICAgX2RhdGFJbnRlcmFjdGlvblN0YXRlLmRyYWdTdGFydENvbXBsZXRpb25CbG9jayA9IG5p bDsKQEAgLTQ2NjAsMTYgKzQ2NjUsMjEgQEAgLSAoVUlUYXJnZXRlZERyYWdQcmV2aWV3ICopZHJh Z0ludGVyYWN0aW9uOihVSURyYWdJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHByZXYKIAogLSAo Qk9PTClfZHJhZ0ludGVyYWN0aW9uOihVSURyYWdJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIGl0 ZW06KFVJRHJhZ0l0ZW0gKilpdGVtIHNob3VsZERlbGF5U2V0RG93bkFuaW1hdGlvbldpdGhDb21w bGV0aW9uOih2b2lkKF4pKHZvaWQpKWNvbXBsZXRpb24KIHsKLSAgICBfcGFnZS0+Y2FsbEFmdGVy TmV4dFByZXNlbnRhdGlvblVwZGF0ZShbY2FwdHVyZWRCbG9jayA9IG1ha2VCbG9ja1B0cihjb21w bGV0aW9uKV0gKENhbGxiYWNrQmFzZTo6RXJyb3IpIHsKLSAgICAgICAgY2FwdHVyZWRCbG9jaygp OwotICAgIH0pOworICAgIF9kYXRhSW50ZXJhY3Rpb25TdGF0ZS5kcmFnQ2FuY2VsU2V0RG93bkJs b2NrID0gY29tcGxldGlvbjsKICAgICByZXR1cm4gWUVTOwogfQogCiAtICh2b2lkKV9hcGlfZHJh Z0ludGVyYWN0aW9uOihVSURyYWdJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIGl0ZW06KFVJRHJh Z0l0ZW0gKilpdGVtIHdpbGxBbmltYXRlQ2FuY2VsV2l0aEFuaW1hdG9yOihpZCA8VUlEcmFnQW5p bWF0aW5nPilhbmltYXRvcgogewotICAgIFthbmltYXRvciBhZGRDb21wbGV0aW9uOltwYWdlID0g X3BhZ2VdIChVSVZpZXdBbmltYXRpbmdQb3NpdGlvbiBmaW5hbFBvc2l0aW9uKSB7CisgICAgUmV0 YWluUHRyPFdLQ29udGVudFZpZXc+IHByb3RlY3RlZFNlbGYoc2VsZik7CisgICAgW2FuaW1hdG9y IGFkZENvbXBsZXRpb246W3Byb3RlY3RlZFNlbGYsIHBhZ2UgPSBfcGFnZV0gKFVJVmlld0FuaW1h dGluZ1Bvc2l0aW9uIGZpbmFsUG9zaXRpb24pIHsKICAgICAgICAgcGFnZS0+ZHJhZ0NhbmNlbGxl ZCgpOworICAgICAgICBpZiAoYXV0byBjb21wbGV0aW9uID0gcHJvdGVjdGVkU2VsZi0+X2RhdGFJ bnRlcmFjdGlvblN0YXRlLmRyYWdDYW5jZWxTZXREb3duQmxvY2spIHsKKyAgICAgICAgICAgIHBy b3RlY3RlZFNlbGYtPl9kYXRhSW50ZXJhY3Rpb25TdGF0ZS5kcmFnQ2FuY2VsU2V0RG93bkJsb2Nr ID0gbmlsOworICAgICAgICAgICAgcGFnZS0+Y2FsbEFmdGVyTmV4dFByZXNlbnRhdGlvblVwZGF0 ZShbY29tcGxldGlvbl0gKENhbGxiYWNrQmFzZTo6RXJyb3IpIHsKKyAgICAgICAgICAgICAgICBj b21wbGV0aW9uKCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQogICAgIH1dOwogfQogCg==