26900 2009-07-01 13:36:34 -0700 AX: Manual spell check with Command-; does not bring up suggestions 2009-07-01 15:01:32 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cfleizach webkit-unassigned oldest_to_newest 129353 0 cfleizach 2009-07-01 13:36:34 -0700 Manual spell check with Command-; whilst finding the mis spelled word does not bring up suggestions within the context menu. When on a mis spelled word with command-;, pressing Vo-Shift-M for the context menu does not result in any suggestions within the menu. 129370 1 32142 cfleizach 2009-07-01 14:39:50 -0700 Created attachment 32142 patch 129375 2 32142 bdakin 2009-07-01 14:45:47 -0700 Comment on attachment 32142 patch > +IntPoint AccessibilityRenderObject::clickPoint() const > +{ > + // if we're asked to perform a show menu on an editable web area, > + // the click point should be where the selection is > + if (isWebArea() && !isReadOnly()) { > + VisibleSelection visSelection = selection(); > + VisiblePositionRange range = VisiblePositionRange(visSelection.visibleStart(), visSelection.visibleEnd()); > + IntRect bounds = boundsForVisiblePositionRange(range); > +#if PLATFORM(MAC) > + bounds.setLocation(m_renderer->document()->view()->screenToContents(bounds.location())); > +#endif > + return IntPoint(bounds.x() + (bounds.width() / 2), bounds.y() - (bounds.height() / 2)); > + } > + > + return AccessibilityObject::clickPoint(); > +} This is just a style nit-pick, but how about you do the generic case as an early return like: if (!isWebArea() || isReadOnly()) return AccessibilityObject::clickPoint(); VisibleSelection visSelection = selection(); … r=me! 129378 3 cfleizach 2009-07-01 14:50:16 -0700 will fix... 129380 4 cfleizach 2009-07-01 15:01:32 -0700 http://trac.webkit.org/changeset/45452 32142 2009-07-01 14:39:50 -0700 2009-07-01 14:45:47 -0700 patch patch.txt text/plain 12563 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NTQ0NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMDctMDEgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBCdWcgMjY5MDA6IEFYOiBNYW51YWwgc3BlbGwgY2hlY2sgd2l0aCBDb21tYW5kLTsgZG9lcyBu b3QgYnJpbmcgdXAgc3VnZ2VzdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTI2OTAwCisKKyAgICAgICAgRWRpdGFibGUgd2ViIGFyZWFzIHNob3Vs ZCBoYXZlIGEgY2xpY2twb2ludCB0aGF0IHVzZXMgd2hlcmUgdGhlIHNlbGVjdGlvbiBpcy4KKwor ICAgICAgICBUZXN0OiBhY2Nlc3NpYmlsaXR5L2VkaXRhYmxlLXdlYmFyZWEtY29udGV4dC1tZW51 LXBvaW50Lmh0bWwKKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpjbGlja1Bv aW50KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Qu aDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ci5tbToKKyAgICAgICAgKC1bQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0 eUF0dHJpYnV0ZVZhbHVlOl0pOgorCiAyMDA5LTA3LTAxICBOaWtvbGFzIFppbW1lcm1hbm4gIDxu aWtvbGFzLnppbW1lcm1hbm5AdG9yY2htb2JpbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEdlb3JnZSBTdGFpa29zLgpJbmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eU9iamVjdC5oCShyZXZpc2lvbiA0NTQ0NCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTI4NSw3ICsyODUsNyBAQCBw dWJsaWM6CiAgICAgdmlydHVhbCBJbnRSZWN0IGJvdW5kaW5nQm94UmVjdCgpIGNvbnN0OwogICAg IHZpcnR1YWwgSW50UmVjdCBlbGVtZW50UmVjdCgpIGNvbnN0OwogICAgIHZpcnR1YWwgSW50U2l6 ZSBzaXplKCkgY29uc3Q7Ci0gICAgSW50UG9pbnQgY2xpY2tQb2ludCgpIGNvbnN0OworICAgIHZp cnR1YWwgSW50UG9pbnQgY2xpY2tQb2ludCgpIGNvbnN0OwogICAgIAogICAgIHZpcnR1YWwgS1VS TCB1cmwoKSBjb25zdDsKICAgICB2aXJ0dWFsIFBsYWluVGV4dFJhbmdlIHNlbGVjdGVkVGV4dFJh bmdlKCkgY29uc3Q7CkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCShyZXZpc2lvbiA0NTQ0NCkKKysrIFdlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTA2Myw2ICsxMDYzLDIzIEBAIEludFNpemUgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6 c2l6ZSgKICAgICByZXR1cm4gcmVjdC5zaXplKCk7CiB9CiAKK0ludFBvaW50IEFjY2Vzc2liaWxp dHlSZW5kZXJPYmplY3Q6OmNsaWNrUG9pbnQoKSBjb25zdAoreworICAgIC8vIGlmIHdlJ3JlIGFz a2VkIHRvIHBlcmZvcm0gYSBzaG93IG1lbnUgb24gYW4gZWRpdGFibGUgd2ViIGFyZWEsCisgICAg Ly8gdGhlIGNsaWNrIHBvaW50IHNob3VsZCBiZSB3aGVyZSB0aGUgc2VsZWN0aW9uIGlzCisgICAg aWYgKGlzV2ViQXJlYSgpICYmICFpc1JlYWRPbmx5KCkpIHsKKyAgICAgICAgVmlzaWJsZVNlbGVj dGlvbiB2aXNTZWxlY3Rpb24gPSBzZWxlY3Rpb24oKTsKKyAgICAgICAgVmlzaWJsZVBvc2l0aW9u UmFuZ2UgcmFuZ2UgPSBWaXNpYmxlUG9zaXRpb25SYW5nZSh2aXNTZWxlY3Rpb24udmlzaWJsZVN0 YXJ0KCksIHZpc1NlbGVjdGlvbi52aXNpYmxlRW5kKCkpOworICAgICAgICBJbnRSZWN0IGJvdW5k cyA9IGJvdW5kc0ZvclZpc2libGVQb3NpdGlvblJhbmdlKHJhbmdlKTsKKyNpZiBQTEFURk9STShN QUMpCisgICAgICAgIGJvdW5kcy5zZXRMb2NhdGlvbihtX3JlbmRlcmVyLT5kb2N1bWVudCgpLT52 aWV3KCktPnNjcmVlblRvQ29udGVudHMoYm91bmRzLmxvY2F0aW9uKCkpKTsKKyNlbmRpZiAgICAg ICAgCisgICAgICAgIHJldHVybiBJbnRQb2ludChib3VuZHMueCgpICsgKGJvdW5kcy53aWR0aCgp IC8gMiksIGJvdW5kcy55KCkgLSAoYm91bmRzLmhlaWdodCgpIC8gMikpOworICAgIH0KKworICAg IHJldHVybiBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpjbGlja1BvaW50KCk7Cit9CisgICAgCiBBY2Nl c3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjppbnRlcm5hbExpbmtF bGVtZW50KCkgY29uc3QKIHsKICAgICBFbGVtZW50KiBlbGVtZW50ID0gYW5jaG9yRWxlbWVudCgp OwpJbmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Qu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdC5oCShyZXZpc2lvbiA0NTQ0NCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTE0Nyw2ICsxNDcsNyBA QCBwdWJsaWM6CiAgICAgdmlydHVhbCBJbnRSZWN0IGJvdW5kaW5nQm94UmVjdCgpIGNvbnN0Owog ICAgIHZpcnR1YWwgSW50UmVjdCBlbGVtZW50UmVjdCgpIGNvbnN0OwogICAgIHZpcnR1YWwgSW50 U2l6ZSBzaXplKCkgY29uc3Q7CisgICAgdmlydHVhbCBJbnRQb2ludCBjbGlja1BvaW50KCkgY29u c3Q7CiAgICAgCiAgICAgdm9pZCBzZXRSZW5kZXJlcihSZW5kZXJPYmplY3QqIHJlbmRlcmVyKSB7 IG1fcmVuZGVyZXIgPSByZW5kZXJlcjsgfQogICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIoKSBj b25zdCB7IHJldHVybiBtX3JlbmRlcmVyOyB9CkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkv bWFjL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv YWNjZXNzaWJpbGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW0JKHJldmlzaW9u IDQ1NDQ0KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMTQ1OSw2ICsxNDU5LDEwIEBAIHN0YXRpYyBO U1N0cmluZyogcm9sZVZhbHVlVG9OU1N0cmluZyhBY2MKICAgICBpZiAoW2F0dHJpYnV0ZU5hbWUg aXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJpbGl0eUxhbmd1YWdlQXR0cmlidXRlXSkgCiAgICAg ICAgIHJldHVybiBtX29iamVjdC0+bGFuZ3VhZ2UoKTsKICAgICAKKyAgICAvLyB0aGlzIGlzIHVz ZWQgb25seSBieSBEdW1wUmVuZGVyVHJlZSBmb3IgdGVzdGluZworICAgIGlmIChbYXR0cmlidXRl TmFtZSBpc0VxdWFsVG9TdHJpbmc6QCJBWENsaWNrUG9pbnQiXSkKKyAgICAgICAgcmV0dXJuIFtO U1ZhbHVlIHZhbHVlV2l0aFBvaW50Om1fb2JqZWN0LT5jbGlja1BvaW50KCldOworICAgIAogICAg IHJldHVybiBuaWw7CiB9CiAKSW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ1NDQ0KQorKysgV2ViS2l0VG9v bHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDktMDctMDEg IENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKworICAgICAgICBCdWcgMjY5 MDA6IEFYOiBNYW51YWwgc3BlbGwgY2hlY2sgd2l0aCBDb21tYW5kLTsgZG9lcyBub3QgYnJpbmcg dXAgc3VnZ2VzdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI2OTAwCisKKyAgICAgICAgRXhwb3NlIHRoZSBhYmlsaXR5IHRvIGdldCB0aGUgY2xp Y2sgcG9pbnQgb2YgYW4gZWxlbWVudCB0aHJvdWdoIGFjY2Vzc2liaWxpdHkuCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9B Y2Nlc3NpYmlsaXR5VUlFbGVtZW50LmNwcDoKKyAgICAgICAgKGdldENsaWNrUG9pbnRYQ2FsbGJh Y2spOgorICAgICAgICAoZ2V0Q2xpY2tQb2ludFlDYWxsYmFjayk6CisgICAgICAgIChBY2Nlc3Np YmlsaXR5VUlFbGVtZW50OjpnZXRKU0NsYXNzKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9B Y2Nlc3NpYmlsaXR5VUlFbGVtZW50Lmg6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL0Fj Y2Vzc2liaWxpdHlVSUVsZW1lbnRNYWMubW06CisgICAgICAgIChBY2Nlc3NpYmlsaXR5VUlFbGVt ZW50OjpjbGlja1BvaW50WCk6CisgICAgICAgIChBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpjbGlj a1BvaW50WSk6CisKIDIwMDktMDYtMzAgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEphbiBBbG9uem8uCkluZGV4OiBXZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXRUb29scy9EdW1wUmVuZGVyVHJlZS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50LmNwcAkocmV2aXNp b24gNDU0NDQpCisrKyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9BY2Nlc3NpYmlsaXR5VUlF bGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjY4LDYgKzI2OCwxNiBAQCBzdGF0aWMgSlNW YWx1ZVJlZiBnZXRIZWlnaHRDYWxsYmFjayhKU0NvCiAgICAgcmV0dXJuIEpTVmFsdWVNYWtlTnVt YmVyKGNvbnRleHQsIHRvQVhFbGVtZW50KHRoaXNPYmplY3QpLT5oZWlnaHQoKSk7CiB9CiAKK3N0 YXRpYyBKU1ZhbHVlUmVmIGdldENsaWNrUG9pbnRYQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRl eHQsIEpTT2JqZWN0UmVmIHRoaXNPYmplY3QsIEpTU3RyaW5nUmVmIHByb3BlcnR5TmFtZSwgSlNW YWx1ZVJlZiogZXhjZXB0aW9uKQoreworICAgIHJldHVybiBKU1ZhbHVlTWFrZU51bWJlcihjb250 ZXh0LCB0b0FYRWxlbWVudCh0aGlzT2JqZWN0KS0+Y2xpY2tQb2ludFgoKSk7Cit9CisKK3N0YXRp YyBKU1ZhbHVlUmVmIGdldENsaWNrUG9pbnRZQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQs IEpTT2JqZWN0UmVmIHRoaXNPYmplY3QsIEpTU3RyaW5nUmVmIHByb3BlcnR5TmFtZSwgSlNWYWx1 ZVJlZiogZXhjZXB0aW9uKQoreworICAgIHJldHVybiBKU1ZhbHVlTWFrZU51bWJlcihjb250ZXh0 LCB0b0FYRWxlbWVudCh0aGlzT2JqZWN0KS0+Y2xpY2tQb2ludFkoKSk7Cit9CisKIHN0YXRpYyBK U1ZhbHVlUmVmIGdldEludFZhbHVlQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2Jq ZWN0UmVmIHRoaXNPYmplY3QsIEpTU3RyaW5nUmVmIHByb3BlcnR5TmFtZSwgSlNWYWx1ZVJlZiog ZXhjZXB0aW9uKQogewogICAgIHJldHVybiBKU1ZhbHVlTWFrZU51bWJlcihjb250ZXh0LCB0b0FY RWxlbWVudCh0aGlzT2JqZWN0KS0+aW50VmFsdWUoKSk7CkBAIC0zMjksNiArMzM5LDggQEAgSlND bGFzc1JlZiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpnZXRKUwogICAgICAgICB7ICJ5IiwgZ2V0 WUNhbGxiYWNrLCAwLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlB dHRyaWJ1dGVEb250RGVsZXRlIH0sCiAgICAgICAgIHsgIndpZHRoIiwgZ2V0V2lkdGhDYWxsYmFj aywgMCwga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmlidXRl RG9udERlbGV0ZSB9LAogICAgICAgICB7ICJoZWlnaHQiLCBnZXRIZWlnaHRDYWxsYmFjaywgMCwg a0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERl bGV0ZSB9LAorICAgICAgICB7ICJjbGlja1BvaW50WCIsIGdldENsaWNrUG9pbnRYQ2FsbGJhY2ss IDAsIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURv bnREZWxldGUgfSwKKyAgICAgICAgeyAiY2xpY2tQb2ludFkiLCBnZXRDbGlja1BvaW50WUNhbGxi YWNrLCAwLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlBdHRyaWJ1 dGVEb250RGVsZXRlIH0sCiAgICAgICAgIHsgImludFZhbHVlIiwgZ2V0SW50VmFsdWVDYWxsYmFj aywgMCwga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmlidXRl RG9udERlbGV0ZSB9LAogICAgICAgICB7ICJtaW5WYWx1ZSIsIGdldE1pblZhbHVlQ2FsbGJhY2ss IDAsIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURv bnREZWxldGUgfSwKICAgICAgICAgeyAibWF4VmFsdWUiLCBnZXRNYXhWYWx1ZUNhbGxiYWNrLCAw LCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250 RGVsZXRlIH0sCkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9BY2Nlc3NpYmlsaXR5 VUlFbGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvQWNj ZXNzaWJpbGl0eVVJRWxlbWVudC5oCShyZXZpc2lvbiA0NTQ0NCkKKysrIFdlYktpdFRvb2xzL0R1 bXBSZW5kZXJUcmVlL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAt OTMsNiArOTMsOCBAQCBwdWJsaWM6CiAgICAgSlNTdHJpbmdSZWYgc2VsZWN0ZWRUZXh0UmFuZ2Uo KTsKICAgICBib29sIHN1cHBvcnRzUHJlc3NBY3Rpb24oKTsKICAgICBib29sIGlzRW5hYmxlZCgp OworICAgIGRvdWJsZSBjbGlja1BvaW50WCgpOworICAgIGRvdWJsZSBjbGlja1BvaW50WSgpOwog CiAgICAgLy8gVGFibGUtc3BlY2lmaWMgYXR0cmlidXRlcwogICAgIEpTU3RyaW5nUmVmIGF0dHJp YnV0ZXNPZkNvbHVtbkhlYWRlcnMoKTsKSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVl L21hYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRv b2xzL0R1bXBSZW5kZXJUcmVlL21hYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50TWFjLm1tCShyZXZp c2lvbiA0NTQ0NCkKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9BY2Nlc3NpYmls aXR5VUlFbGVtZW50TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNDgsNiArMzQ4LDE4IEBAIGRv dWJsZSBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpoZWlnaHQoKQogICAgIHJldHVybiBzdGF0aWNf Y2FzdDxkb3VibGU+KFtzaXplVmFsdWUgc2l6ZVZhbHVlXS5oZWlnaHQpOwogfQogCitkb3VibGUg QWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6Y2xpY2tQb2ludFgoKQoreworICAgIE5TVmFsdWUqIHBv c2l0aW9uVmFsdWUgPSBbbV9lbGVtZW50IGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZTpAIkFY Q2xpY2tQb2ludCJdOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxkb3VibGU+KFtwb3NpdGlvblZh bHVlIHBvaW50VmFsdWVdLngpOyAgICAgICAgCit9CisKK2RvdWJsZSBBY2Nlc3NpYmlsaXR5VUlF bGVtZW50OjpjbGlja1BvaW50WSgpCit7CisgICAgTlNWYWx1ZSogcG9zaXRpb25WYWx1ZSA9IFtt X2VsZW1lbnQgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOkAiQVhDbGlja1BvaW50Il07Cisg ICAgcmV0dXJuIHN0YXRpY19jYXN0PGRvdWJsZT4oW3Bvc2l0aW9uVmFsdWUgcG9pbnRWYWx1ZV0u eCk7ICAgICAgICAgICAgCit9CisKIGRvdWJsZSBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjppbnRW YWx1ZSgpCiB7CiAgICAgaWQgdmFsdWUgPSBbbV9lbGVtZW50IGFjY2Vzc2liaWxpdHlBdHRyaWJ1 dGVWYWx1ZTpOU0FjY2Vzc2liaWxpdHlWYWx1ZUF0dHJpYnV0ZV07CkluZGV4OiBMYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lv biA0NTQ0NCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDA5LTA3LTAxICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVz dHMgZm9yIEJ1ZyAyNjkwMDogQVg6IE1hbnVhbCBzcGVsbCBjaGVjayB3aXRoIENvbW1hbmQtOyBk b2VzIG5vdCBicmluZyB1cCBzdWdnZXN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY5MDAKKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZWRp dGFibGUtd2ViYXJlYS1jb250ZXh0LW1lbnUtcG9pbnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBhY2Nlc3NpYmlsaXR5L2VkaXRhYmxlLXdlYmFyZWEtY29udGV4dC1tZW51LXBvaW50 Lmh0bWw6IEFkZGVkLgorCiAyMDA5LTA3LTAxICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuaWtvbGFz LnppbW1lcm1hbm5AdG9yY2htb2JpbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb3Jn ZSBTdGFpa29zLgpJbmRleDogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9lZGl0YWJsZS13ZWJh cmVhLWNvbnRleHQtbWVudS1wb2ludC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvYWNjZXNzaWJpbGl0eS9lZGl0YWJsZS13ZWJhcmVhLWNvbnRleHQtbWVudS1wb2ludC1l eHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2Vk aXRhYmxlLXdlYmFyZWEtY29udGV4dC1tZW51LXBvaW50LWV4cGVjdGVkLnR4dAkocmV2aXNpb24g MCkKQEAgLTAsMCArMSwxMSBAQAorVGhpcyB0ZXN0cyB0aGF0IHRoZSBjbGljayBwb2ludCwgdXNl ZCBmb3Igb3BlbmluZyBjb250ZXh0IG1lbnVzLCBjaGFuZ2VzIGJhc2VkIG9uIHRoZSBjdXJyZW50 IHNlbGVjdGlvbiBpbiBhbiBlZGl0YWJsZSB3ZWIgYXJlYS4gVGhpcyB0ZXN0cyB0aGF0IHRoZSBj bGljayBwb2ludCwgdXNlZCBmb3Igb3BlbmluZyBjb250ZXh0IG1lbnVzLCBjaGFuZ2VzIGJhc2Vk IG9uIHRoZSBjdXJyZW50IHNlbGVjdGlvbiBpbiBhbiBlZGl0YWJsZSB3ZWIgYXJlYS4KK1RoaXMg dGVzdHMgdGhhdCB0aGUgY2xpY2sgcG9pbnQsIHVzZWQgZm9yIG9wZW5pbmcgY29udGV4dCBtZW51 cywgY2hhbmdlcyBiYXNlZCBvbiB0aGUgY3VycmVudCBzZWxlY3Rpb24gaW4gYW4gZWRpdGFibGUg d2ViIGFyZWEgKGJ5IHNldHRpbmcgdGhlIHNlbGVjdGlvbiB0d2ljZSBhbmQgY29tcGFyaW5nIHRo ZSBjbGljayBwb2ludCBsb2NhdGlvbnMpCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNl cmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKwor CitQQVNTIHN1Y2NlZWRlZCBpcyB0cnVlCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVl CisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9lZGl0 YWJsZS13ZWJhcmVhLWNvbnRleHQtbWVudS1wb2ludC5odG1sCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL2FjY2Vzc2liaWxpdHkvZWRpdGFibGUtd2ViYXJlYS1jb250ZXh0LW1lbnUtcG9pbnQu aHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZWRpdGFibGUt d2ViYXJlYS1jb250ZXh0LW1lbnUtcG9pbnQuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw1 OCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0 bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vZmFzdC9qcy9yZXNv dXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdD4KK3ZhciBzdWNjZXNzZnVsbHlQYXJz ZWQgPSBmYWxzZTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMvcmVzb3VyY2Vz L2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IGlkPSJib2R5IiBjb250 ZW50ZWRpdGFibGU+CitUaGlzIHRlc3RzIHRoYXQgdGhlIGNsaWNrIHBvaW50LCB1c2VkIGZvciBv cGVuaW5nIGNvbnRleHQgbWVudXMsIGNoYW5nZXMgYmFzZWQgb24gdGhlIGN1cnJlbnQgc2VsZWN0 aW9uIGluIGFuIGVkaXRhYmxlIHdlYiBhcmVhLgorVGhpcyB0ZXN0cyB0aGF0IHRoZSBjbGljayBw b2ludCwgdXNlZCBmb3Igb3BlbmluZyBjb250ZXh0IG1lbnVzLCBjaGFuZ2VzIGJhc2VkIG9uIHRo ZSBjdXJyZW50IHNlbGVjdGlvbiBpbiBhbiBlZGl0YWJsZSB3ZWIgYXJlYS4KKworCis8cCBpZD0i ZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorCis8c2NyaXB0Pgor CisgICAgZGVzY3JpcHRpb24oIlRoaXMgdGVzdHMgdGhhdCB0aGUgY2xpY2sgcG9pbnQsIHVzZWQg Zm9yIG9wZW5pbmcgY29udGV4dCBtZW51cywgY2hhbmdlcyBiYXNlZCBvbiB0aGUgY3VycmVudCBz ZWxlY3Rpb24gaW4gYW4gZWRpdGFibGUgd2ViIGFyZWEgKGJ5IHNldHRpbmcgdGhlIHNlbGVjdGlv biB0d2ljZSBhbmQgY29tcGFyaW5nIHRoZSBjbGljayBwb2ludCBsb2NhdGlvbnMpIik7CisKKyAg ICBpZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisKKyAgICAgICAgICB2YXIg Ym9keSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJib2R5Iik7CisgICAgICAgICAgYm9keS5m b2N1cygpOworCisgICAgICAgICAgeCA9IGJvZHkub2Zmc2V0TGVmdCArIDEwOworICAgICAgICAg IHkgPSBib2R5Lm9mZnNldFRvcCArIDEwOworCisgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VN b3ZlVG8oeCwgeSk7CisgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VEb3duKCk7CisgICAgICAg ICAgZXZlbnRTZW5kZXIubW91c2VVcCgpOworICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93 bigpOworICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlVXAoKTsKKworICAgICAgICAgIHZhciBj bGlja1BvaW50WDEgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudC5jbGlj a1BvaW50WDsKKworICAgICAgICAgIHggPSBib2R5Lm9mZnNldExlZnQgKyAxMDAgKyAxMDsKKyAg ICAgICAgICB5ID0gYm9keS5vZmZzZXRUb3AgKyAxMDsKKworICAgICAgICAgIGV2ZW50U2VuZGVy Lm1vdXNlTW92ZVRvKHgsIHkpOworICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOwor ICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlVXAoKTsKKyAgICAgICAgICBldmVudFNlbmRlci5t b3VzZURvd24oKTsKKyAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7CisKKyAgICAgICAg ICB2YXIgY2xpY2tQb2ludFgyID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1l bnQuY2xpY2tQb2ludFg7CisgICAgICAgICAgdmFyIHN1Y2NlZWRlZCA9IGNsaWNrUG9pbnRYMiAh PSBjbGlja1BvaW50WDE7CisgICAgICAgICAgc2hvdWxkQmUoInN1Y2NlZWRlZCIsICJ0cnVlIik7 CisKKyAgICB9CisKKyAgICBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOworPC9zY3JpcHQ+CisK KzxzY3JpcHQgc3JjPSIuLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2Ny aXB0PgorPC9ib2R5PgorPC9odG1sPgo=