129276 2014-02-24 16:33:29 -0800 Use RetainPtrs for two WKContentView data members 2014-02-24 18:54:12 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser benjamin enrica simon.fraser thorton oldest_to_newest 984105 0 simon.fraser 2014-02-24 16:33:29 -0800 Use RetainPtrs for two WKContentView data members 984108 1 225103 simon.fraser 2014-02-24 16:35:45 -0800 Created attachment 225103 Patch 984109 2 simon.fraser 2014-02-24 16:36:09 -0800 Depends on earlier patch. 984140 3 225109 simon.fraser 2014-02-24 18:40:23 -0800 Created attachment 225109 Patch 984144 4 225109 benjamin 2014-02-24 18:42:41 -0800 Comment on attachment 225109 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225109&action=review > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h:113 > @property (nonatomic, readonly) BOOL isEditable; > +@property (readonly, nonatomic) const WebKit::InteractionInformationAtPosition& positionInformation; > +@property (readonly, nonatomic) const WebKit::WKAutoCorrectionData& autocorrectionData; Switch nonatomic and readonly here for consistency? > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:188 > + [_formAccessoryView release]; _formAccessoryView = nil; 984150 5 simon.fraser 2014-02-24 18:54:12 -0800 https://trac.webkit.org/r164622 225103 2014-02-24 16:35:45 -0800 2014-02-24 18:40:21 -0800 Patch bug-129276-20140224163540.patch text/plain 5241 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOWJjYzFkZTZmZGQ4MGI0 NTJiZGVkMjBjZDc0Y2FkYjMwOGU5MDI1ZC4uY2QwYTM0MzE5MDM1NzE5NzEyZjMyNGFjNzJiYTMz NzEwNTQ0ZGFiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDE0LTAyLTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFVzZSBSZXRhaW5Q dHJzIGZvciB0d28gV0tDb250ZW50VmlldyBkYXRhIG1lbWJlcnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTI3NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhlIFVJVGV4dElucHV0VHJh aXRzIHdlcmUgbGVha2VkLiBGaXggd2l0aCBSZXRhaW5QdHIgZ29vZG5lc3MuCisgICAgICAgIAor ICAgICAgICBSZW5hbWUgdGhlIG9ic2N1cmUgX2FjY2Vzc29yeSB0byBfZm9ybUFjY2Vzc29yeVZp ZXcgYW5kCisgICAgICAgIG1ha2UgaXQgYSBSZXRhaW5QdHIuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVu dFZpZXdJbnRlcmFjdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGNsZWFudXBJbnRlcmFj dGlvbl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGlucHV0QWNjZXNzb3J5Vmlld10pOgor ICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF91cGRhdGVBY2Nlc3NvcnldKToKKyAgICAgICAgKC1b V0tDb250ZW50VmlldyB0ZXh0SW5wdXRUcmFpdHNdKToKKworMjAxNC0wMi0yNCAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBSZW1vdmUgV0tJbnRlcmFj dGlvblZpZXcsIG1vdmUgY29kZSBpbnRvIFdLQ29udGVudFZpZXcKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTI3NQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5oCmluZGV4IDg2MjBmOTUyYTYxMzVkYTliYjEw YzdkZThkM2Y3ZjBiYTY5ZGFjNTkuLjkyYTBhMTk4NWMyY2Y3Yzg3M2RhZGVlY2E1YmM2MzIzNTdl NjNjZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5o CkBAIC04MSw5ICs4MSwxMCBAQCBzdHJ1Y3QgV2ViUGFnZUNvbmZpZ3VyYXRpb247CiAgICAgUmV0 YWluUHRyPFVJV0tUZXh0SW50ZXJhY3Rpb25Bc3Npc3RhbnQ+IF90ZXh0U2VsZWN0aW9uQXNzaXN0 YW50OwogICAgIFJldGFpblB0cjxVSVdLU2VsZWN0aW9uQXNzaXN0YW50PiBfd2ViU2VsZWN0aW9u QXNzaXN0YW50OwogCi0gICAgVUlUZXh0SW5wdXRUcmFpdHMgKl90cmFpdHM7CisgICAgUmV0YWlu UHRyPFVJVGV4dElucHV0VHJhaXRzPiBfdHJhaXRzOworCiAgICAgQk9PTCBfaXNFZGl0YWJsZTsK LSAgICBVSVdlYkZvcm1BY2Nlc3NvcnkgKl9hY2Nlc3Nvcnk7CisgICAgUmV0YWluUHRyPFVJV2Vi Rm9ybUFjY2Vzc29yeT4gX2Zvcm1BY2Nlc3NvcnlWaWV3OwogICAgIGlkIDxVSVRleHRJbnB1dERl bGVnYXRlPiBfaW5wdXREZWxlZ2F0ZTsKICAgICBCT09MIF9zaG93aW5nVGV4dFN0eWxlT3B0aW9u czsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLmgKaW5kZXggOGFkOGZmNjNiODFmMzY2ZGUyMTMxZTIyOTQ0ZmVjY2E5 Yzk2ZTFmMC4uZDgxNTQ1ODU1YWMzYjYzNWI3ODA5NTY3YmFhN2U0MzMyNjc2NDUxZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5oCkBAIC02Niw2ICs2Niw4IEBAIHN0cnVjdCBXZWJLaXQ6OldLQXV0b0NvcnJlY3Rp b25EYXRhIHsKIEBpbnRlcmZhY2UgV0tDb250ZW50VmlldyAoV0tJbnRlcmFjdGlvbikgPFVJR2Vz dHVyZVJlY29nbml6ZXJEZWxlZ2F0ZSwgVUlXZWJUb3VjaEV2ZW50c0dlc3R1cmVSZWNvZ25pemVy RGVsZWdhdGUsIFVJVGV4dElucHV0UHJpdmF0ZSwgVUlXZWJGb3JtQWNjZXNzb3J5RGVsZWdhdGUs IFVJV0tJbnRlcmFjdGlvblZpZXdQcm90b2NvbD4KIAogQHByb3BlcnR5IChub25hdG9taWMsIHJl YWRvbmx5KSBCT09MIGlzRWRpdGFibGU7CitAcHJvcGVydHkgKHJlYWRvbmx5LCBub25hdG9taWMp IFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24qIHBvc2l0aW9uSW5mb3Jt YXRpb247CitAcHJvcGVydHkgKHJlYWRvbmx5LCBub25hdG9taWMpIFdlYktpdDo6V0tBdXRvQ29y cmVjdGlvbkRhdGEgKmF1dG9jb3JyZWN0aW9uRGF0YTsKIAogLSAodm9pZClzZXR1cEludGVyYWN0 aW9uOwogLSAodm9pZCljbGVhbnVwSW50ZXJhY3Rpb247CkBAIC04Niw3ICs4OCw0IEBAIHN0cnVj dCBXZWJLaXQ6OldLQXV0b0NvcnJlY3Rpb25EYXRhIHsKIC0gKHZvaWQpX2RpZEVuZFNjcm9sbGlu Z09yWm9vbWluZzsKIC0gKHZvaWQpX2RpZFVwZGF0ZUJsb2NrU2VsZWN0aW9uV2l0aFRvdWNoOihX ZWJLaXQ6OldLU2VsZWN0aW9uVG91Y2gpdG91Y2ggd2l0aEZsYWdzOihXZWJLaXQ6OldLU2VsZWN0 aW9uRmxhZ3MpZmxhZ3MgZ3Jvd1RocmVzaG9sZDooQ0dGbG9hdClncm93VGhyZXNob2xkIHNocmlu a1RocmVzaG9sZDooQ0dGbG9hdClzaHJpbmtUaHJlc2hvbGQ7CiAKLUBwcm9wZXJ0eSAocmVhZG9u bHksIG5vbmF0b21pYykgV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbiog cG9zaXRpb25JbmZvcm1hdGlvbjsKLUBwcm9wZXJ0eSAocmVhZG9ubHksIG5vbmF0b21pYykgV2Vi S2l0OjpXS0F1dG9Db3JyZWN0aW9uRGF0YSAqYXV0b2NvcnJlY3Rpb25EYXRhOwotCiBAZW5kCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tCmluZGV4IDg5NzYwMzkxZDYwOTVmYzA0YjMxMmQxMzg0NzFkZTM4MzcyNmRi ZDYuLjJjMTZmMzQ5NmZlYmIxNDUwNWRlZTY3ZjZjZDIyMDY4OGZjMGY3ZWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tCkBAIC0xODYsNyArMTg2LDcgQEAgLSAodm9pZCljbGVhbnVwSW50ZXJhY3Rpb24KICAg ICBbX2xvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVyIHNldERlbGVnYXRlOm5pbF07CiAgICAgW190 d29GaW5nZXJQYW5HZXN0dXJlUmVjb2duaXplciBzZXREZWxlZ2F0ZTpuaWxdOwogCi0gICAgW19h Y2Nlc3NvcnkgcmVsZWFzZV07CisgICAgW19mb3JtQWNjZXNzb3J5VmlldyByZWxlYXNlXTsKIH0K IAogLSAoSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24qKXBvc2l0aW9uSW5mb3JtYXRp b24KQEAgLTY3OCwxMiArNjc4LDEyIEBAIC0gKFVJVmlldyAqKWlucHV0QWNjZXNzb3J5Vmlldwog ICAgIGlmICghX2lzRWRpdGFibGUpCiAgICAgICAgIHJldHVybiBuaWw7CiAgICAgCi0gICAgaWYg KCFfYWNjZXNzb3J5KSB7Ci0gICAgICAgIF9hY2Nlc3NvcnkgPSBbW1VJV2ViRm9ybUFjY2Vzc29y eSBhbGxvY10gaW5pdF07Ci0gICAgICAgIF9hY2Nlc3NvcnkuZGVsZWdhdGUgPSBzZWxmOworICAg IGlmICghX2Zvcm1BY2Nlc3NvcnlWaWV3KSB7CisgICAgICAgIF9mb3JtQWNjZXNzb3J5VmlldyA9 IGFkb3B0TlMoW1tVSVdlYkZvcm1BY2Nlc3NvcnkgYWxsb2NdIGluaXRdKTsKKyAgICAgICAgW19m b3JtQWNjZXNzb3J5VmlldyBzZXREZWxlZ2F0ZTpzZWxmXTsKICAgICB9CiAgICAgCi0gICAgcmV0 dXJuIF9hY2Nlc3Nvcnk7CisgICAgcmV0dXJuIF9mb3JtQWNjZXNzb3J5Vmlldy5nZXQoKTsKIH0K IAogLSAoTlNBcnJheSAqKXN1cHBvcnRlZFBhc3RlYm9hcmRUeXBlc0ZvckN1cnJlbnRTZWxlY3Rp b24KQEAgLTEyMzEsMTAgKzEyMzEsMTAgQEAgLSAodm9pZClhY2Nlc3NvcnlDbGVhcgogLSAodm9p ZClfdXBkYXRlQWNjZXNzb3J5CiB7CiAgICAgLy8gRklYTUU6IFdlIG5lZWQgdG8gaW5pdGlhbGl6 ZSB3aXRoIHZhbHVlcyBmcm9tIHRoZSBXZWJQcm9jZXNzLgotICAgIF9hY2Nlc3NvcnkubmV4dEVu YWJsZWQgPSBZRVM7Ci0gICAgX2FjY2Vzc29yeS5wcmV2aW91c0VuYWJsZWQgPSBZRVM7CisgICAg W19mb3JtQWNjZXNzb3J5VmlldyBzZXROZXh0RW5hYmxlZDpZRVNdOworICAgIFtfZm9ybUFjY2Vz c29yeVZpZXcgc2V0UHJldmlvdXNFbmFibGVkOllFU107CiAgICAgCi0gICAgW19hY2Nlc3Nvcnkg c2V0Q2xlYXJWaXNpYmxlOk5PXTsKKyAgICBbX2Zvcm1BY2Nlc3NvcnlWaWV3IHNldENsZWFyVmlz aWJsZTpOT107CiAKICAgICAvLyBGSVhNRTogaGlkZSBvciBzaG93IHRoZSBBdXRvRmlsbCBidXR0 b24gYXMgbmVlZGVkLgogfQpAQCAtMTQxNSw4ICsxNDE1LDggQEAgLSAoQk9PTCloYXNUZXh0CiAt IChVSVRleHRJbnB1dFRyYWl0cyAqKXRleHRJbnB1dFRyYWl0cwogewogICAgIGlmICghX3RyYWl0 cykKLSAgICAgICAgX3RyYWl0cyA9IFtbVUlUZXh0SW5wdXRUcmFpdHMgYWxsb2NdIGluaXRdOwot ICAgIHJldHVybiBfdHJhaXRzOworICAgICAgICBfdHJhaXRzID0gYWRvcHROUyhbW1VJVGV4dElu cHV0VHJhaXRzIGFsbG9jXSBpbml0XSk7CisgICAgcmV0dXJuIF90cmFpdHMuZ2V0KCk7CiB9CiAK IC0gKFVJVGV4dEludGVyYWN0aW9uQXNzaXN0YW50ICopaW50ZXJhY3Rpb25Bc3Npc3RhbnQK 225109 2014-02-24 18:40:23 -0800 2014-02-24 18:42:41 -0800 Patch bug-129276-20140224184017.patch text/plain 6002 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggM2JkMDEzZWRhNjllOWNk NThhNGVjMDM1ZGE0YjllMGU4MGNjZmFlYS4uOWY2YjQ0MjYzMTkyODNiODhjNzUyMDA3ZmYwOTIw MjA0MzA5YTA5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE0LTAyLTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFVzZSBSZXRhaW5Q dHJzIGZvciB0d28gV0tDb250ZW50VmlldyBkYXRhIG1lbWJlcnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTI3NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhlIFVJVGV4dElucHV0VHJh aXRzIHdlcmUgbGVha2VkLiBGaXggd2l0aCBSZXRhaW5QdHIgZ29vZG5lc3MuCisgICAgICAgIAor ICAgICAgICBSZW5hbWUgdGhlIG9ic2N1cmUgX2FjY2Vzc29yeSB0byBfZm9ybUFjY2Vzc29yeVZp ZXcgYW5kCisgICAgICAgIG1ha2UgaXQgYSBSZXRhaW5QdHIuCisgICAgICAgIAorICAgICAgICBS ZWFycmFuZ2UgdGhlIGRhdGEgbWVtYmVycyBvZiB0aGUgV0tDb250ZW50VmlldyBjbGFzcyBleHRl bnNpb24KKyAgICAgICAgZm9yIGJldHRlciBwYWNraW5nIGFuZCByZWFkYWJpbGl0eS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcg Y2xlYW51cEludGVyYWN0aW9uXSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgaW5wdXRBY2Nl c3NvcnlWaWV3XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3VwZGF0ZUFjY2Vzc29yeV0p OgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHRleHRJbnB1dFRyYWl0c10pOgorCisyMDE0LTAy LTI0ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFJl bW92ZSBXS0ludGVyYWN0aW9uVmlldywgbW92ZSBjb2RlIGludG8gV0tDb250ZW50VmlldwogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5Mjc1CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5oCmluZGV4IDY0OTJmMDJiNTAxYTZjNGExOWMxMzE0YjQ0OTk5MTRmZjE1ZGFlZTQu LjFkZDMzYTc4NmEyNjM4YTA5YjlkMGQ1MDQ4ZTU0NjFkM2Q5OGQ2NTcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u aApAQCAtNzEsNiArNzEsNyBAQCBzdHJ1Y3QgV0tBdXRvQ29ycmVjdGlvbkRhdGEgewogCiBAaW50 ZXJmYWNlIFdLQ29udGVudFZpZXcgKCkgewogICAgIFJldGFpblB0cjxVSVdlYlRvdWNoRXZlbnRz R2VzdHVyZVJlY29nbml6ZXI+IF90b3VjaEV2ZW50R2VzdHVyZVJlY29nbml6ZXI7CisKICAgICBC T09MIF9jYW5TZW5kVG91Y2hFdmVudHNBc3luY2hyb25vdXNseTsKICAgICB1bnNpZ25lZCBfbmF0 aXZlV2ViVG91Y2hFdmVudFVuaXF1ZUlkQmVpbmdTZW50U3luY2hyb25vdXNseTsKIApAQCAtODQs MjAgKzg1LDIzIEBAIHN0cnVjdCBXS0F1dG9Db3JyZWN0aW9uRGF0YSB7CiAgICAgUmV0YWluUHRy PFVJV0tUZXh0SW50ZXJhY3Rpb25Bc3Npc3RhbnQ+IF90ZXh0U2VsZWN0aW9uQXNzaXN0YW50Owog ICAgIFJldGFpblB0cjxVSVdLU2VsZWN0aW9uQXNzaXN0YW50PiBfd2ViU2VsZWN0aW9uQXNzaXN0 YW50OwogCi0gICAgVUlUZXh0SW5wdXRUcmFpdHMgKl90cmFpdHM7Ci0gICAgQk9PTCBfaXNFZGl0 YWJsZTsKLSAgICBVSVdlYkZvcm1BY2Nlc3NvcnkgKl9hY2Nlc3Nvcnk7CisgICAgUmV0YWluUHRy PFVJVGV4dElucHV0VHJhaXRzPiBfdHJhaXRzOworICAgIFJldGFpblB0cjxVSVdlYkZvcm1BY2Nl c3Nvcnk+IF9mb3JtQWNjZXNzb3J5VmlldzsKKyAgICBSZXRhaW5QdHI8X1VJSGlnaGxpZ2h0Vmll dz4gX2hpZ2hsaWdodFZpZXc7CisgICAgUmV0YWluUHRyPE5TU3RyaW5nPiBfbWFya2VkVGV4dDsK KyAgICBSZXRhaW5QdHI8V0tBY3Rpb25TaGVldEFzc2lzdGFudD4gX2FjdGlvblNoZWV0QXNzaXN0 YW50OworCiAgICAgaWQgPFVJVGV4dElucHV0RGVsZWdhdGU+IF9pbnB1dERlbGVnYXRlOwotICAg IEJPT0wgX3Nob3dpbmdUZXh0U3R5bGVPcHRpb25zOwogCi0gICAgUmV0YWluUHRyPF9VSUhpZ2hs aWdodFZpZXc+IF9oaWdobGlnaHRWaWV3OwogICAgIHVpbnQ2NF90IF9sYXRlc3RUYXBIaWdobGln aHRJRDsKLSAgICBCT09MIF9pc1RhcEhpZ2hsaWdodElEVmFsaWQ7CisKICAgICBXZWJLaXQ6OldL QXV0b0NvcnJlY3Rpb25EYXRhIF9hdXRvY29ycmVjdGlvbkRhdGE7Ci0gICAgUmV0YWluUHRyPE5T U3RyaW5nPiBfbWFya2VkVGV4dDsKICAgICBXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25B dFBvc2l0aW9uIF9wb3NpdGlvbkluZm9ybWF0aW9uOworCisgICAgQk9PTCBfaXNFZGl0YWJsZTsK KyAgICBCT09MIF9zaG93aW5nVGV4dFN0eWxlT3B0aW9uczsKICAgICBCT09MIF9oYXNWYWxpZFBv c2l0aW9uSW5mb3JtYXRpb247Ci0gICAgUmV0YWluUHRyPFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQ+ IF9hY3Rpb25TaGVldEFzc2lzdGFudDsKKyAgICBCT09MIF9pc1RhcEhpZ2hsaWdodElEVmFsaWQ7 CiB9CiAKIEBlbmQKQEAgLTEwNSw2ICsxMDksOCBAQCBzdHJ1Y3QgV0tBdXRvQ29ycmVjdGlvbkRh dGEgewogQGludGVyZmFjZSBXS0NvbnRlbnRWaWV3IChXS0ludGVyYWN0aW9uKSA8VUlHZXN0dXJl UmVjb2duaXplckRlbGVnYXRlLCBVSVdlYlRvdWNoRXZlbnRzR2VzdHVyZVJlY29nbml6ZXJEZWxl Z2F0ZSwgVUlUZXh0SW5wdXRQcml2YXRlLCBVSVdlYkZvcm1BY2Nlc3NvcnlEZWxlZ2F0ZSwgVUlX S0ludGVyYWN0aW9uVmlld1Byb3RvY29sPgogCiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9u bHkpIEJPT0wgaXNFZGl0YWJsZTsKK0Bwcm9wZXJ0eSAocmVhZG9ubHksIG5vbmF0b21pYykgY29u c3QgV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbiYgcG9zaXRpb25JbmZv cm1hdGlvbjsKK0Bwcm9wZXJ0eSAocmVhZG9ubHksIG5vbmF0b21pYykgY29uc3QgV2ViS2l0OjpX S0F1dG9Db3JyZWN0aW9uRGF0YSYgYXV0b2NvcnJlY3Rpb25EYXRhOwogCiAtICh2b2lkKXNldHVw SW50ZXJhY3Rpb247CiAtICh2b2lkKWNsZWFudXBJbnRlcmFjdGlvbjsKQEAgLTEyNSw3ICsxMzEs NCBAQCBzdHJ1Y3QgV0tBdXRvQ29ycmVjdGlvbkRhdGEgewogLSAodm9pZClfZGlkRW5kU2Nyb2xs aW5nT3Jab29taW5nOwogLSAodm9pZClfZGlkVXBkYXRlQmxvY2tTZWxlY3Rpb25XaXRoVG91Y2g6 KFdlYktpdDo6V0tTZWxlY3Rpb25Ub3VjaCl0b3VjaCB3aXRoRmxhZ3M6KFdlYktpdDo6V0tTZWxl Y3Rpb25GbGFncylmbGFncyBncm93VGhyZXNob2xkOihDR0Zsb2F0KWdyb3dUaHJlc2hvbGQgc2hy aW5rVGhyZXNob2xkOihDR0Zsb2F0KXNocmlua1RocmVzaG9sZDsKIAotQHByb3BlcnR5IChyZWFk b25seSwgbm9uYXRvbWljKSBjb25zdCBXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBv c2l0aW9uJiBwb3NpdGlvbkluZm9ybWF0aW9uOwotQHByb3BlcnR5IChyZWFkb25seSwgbm9uYXRv bWljKSBjb25zdCBXZWJLaXQ6OldLQXV0b0NvcnJlY3Rpb25EYXRhJiBhdXRvY29ycmVjdGlvbkRh dGE7Ci0KIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggZTFlODA3ODRhMTdhYzljZWI4NDVlMzBk ZTE0NzM1ZjhhNTMzMmVkZS4uZTVlZDlmMWQyOGE1NWIwOTJiMTQ1MDZkNzFkOGYwNDU2ZWQ2Nzc4 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTE4NSw3ICsxODUsNyBAQCAtICh2b2lkKWNsZWFudXBJ bnRlcmFjdGlvbgogICAgIFtfbG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIgc2V0RGVsZWdhdGU6 bmlsXTsKICAgICBbX3R3b0ZpbmdlclBhbkdlc3R1cmVSZWNvZ25pemVyIHNldERlbGVnYXRlOm5p bF07CiAKLSAgICBbX2FjY2Vzc29yeSByZWxlYXNlXTsKKyAgICBbX2Zvcm1BY2Nlc3NvcnlWaWV3 IHJlbGVhc2VdOwogfQogCiAtIChjb25zdCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlv biYpcG9zaXRpb25JbmZvcm1hdGlvbgpAQCAtNjc3LDEyICs2NzcsMTIgQEAgLSAoVUlWaWV3ICop aW5wdXRBY2Nlc3NvcnlWaWV3CiAgICAgaWYgKCFfaXNFZGl0YWJsZSkKICAgICAgICAgcmV0dXJu IG5pbDsKICAgICAKLSAgICBpZiAoIV9hY2Nlc3NvcnkpIHsKLSAgICAgICAgX2FjY2Vzc29yeSA9 IFtbVUlXZWJGb3JtQWNjZXNzb3J5IGFsbG9jXSBpbml0XTsKLSAgICAgICAgX2FjY2Vzc29yeS5k ZWxlZ2F0ZSA9IHNlbGY7CisgICAgaWYgKCFfZm9ybUFjY2Vzc29yeVZpZXcpIHsKKyAgICAgICAg X2Zvcm1BY2Nlc3NvcnlWaWV3ID0gYWRvcHROUyhbW1VJV2ViRm9ybUFjY2Vzc29yeSBhbGxvY10g aW5pdF0pOworICAgICAgICBbX2Zvcm1BY2Nlc3NvcnlWaWV3IHNldERlbGVnYXRlOnNlbGZdOwog ICAgIH0KICAgICAKLSAgICByZXR1cm4gX2FjY2Vzc29yeTsKKyAgICByZXR1cm4gX2Zvcm1BY2Nl c3NvcnlWaWV3LmdldCgpOwogfQogCiAtIChOU0FycmF5ICopc3VwcG9ydGVkUGFzdGVib2FyZFR5 cGVzRm9yQ3VycmVudFNlbGVjdGlvbgpAQCAtMTIyNiwxMCArMTIyNiwxMCBAQCAtICh2b2lkKWFj Y2Vzc29yeUNsZWFyCiAtICh2b2lkKV91cGRhdGVBY2Nlc3NvcnkKIHsKICAgICAvLyBGSVhNRTog V2UgbmVlZCB0byBpbml0aWFsaXplIHdpdGggdmFsdWVzIGZyb20gdGhlIFdlYlByb2Nlc3MuCi0g ICAgX2FjY2Vzc29yeS5uZXh0RW5hYmxlZCA9IFlFUzsKLSAgICBfYWNjZXNzb3J5LnByZXZpb3Vz RW5hYmxlZCA9IFlFUzsKKyAgICBbX2Zvcm1BY2Nlc3NvcnlWaWV3IHNldE5leHRFbmFibGVkOllF U107CisgICAgW19mb3JtQWNjZXNzb3J5VmlldyBzZXRQcmV2aW91c0VuYWJsZWQ6WUVTXTsKICAg ICAKLSAgICBbX2FjY2Vzc29yeSBzZXRDbGVhclZpc2libGU6Tk9dOworICAgIFtfZm9ybUFjY2Vz c29yeVZpZXcgc2V0Q2xlYXJWaXNpYmxlOk5PXTsKIAogICAgIC8vIEZJWE1FOiBoaWRlIG9yIHNo b3cgdGhlIEF1dG9GaWxsIGJ1dHRvbiBhcyBuZWVkZWQuCiB9CkBAIC0xNDEwLDggKzE0MTAsOCBA QCAtIChCT09MKWhhc1RleHQKIC0gKFVJVGV4dElucHV0VHJhaXRzICopdGV4dElucHV0VHJhaXRz CiB7CiAgICAgaWYgKCFfdHJhaXRzKQotICAgICAgICBfdHJhaXRzID0gW1tVSVRleHRJbnB1dFRy YWl0cyBhbGxvY10gaW5pdF07Ci0gICAgcmV0dXJuIF90cmFpdHM7CisgICAgICAgIF90cmFpdHMg PSBhZG9wdE5TKFtbVUlUZXh0SW5wdXRUcmFpdHMgYWxsb2NdIGluaXRdKTsKKyAgICByZXR1cm4g X3RyYWl0cy5nZXQoKTsKIH0KIAogLSAoVUlUZXh0SW50ZXJhY3Rpb25Bc3Npc3RhbnQgKilpbnRl cmFjdGlvbkFzc2lzdGFudAo=