69492 2011-10-05 17:43:42 -0700 [Mac] Should be able to scroll embedded PDFs from keyboard 2011-10-06 10:04:11 -0700 1 1 1 Unclassified WebKit PDF 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 67774 1 ap ap andersca simon.fraser oldest_to_newest 478829 0 ap 2011-10-05 17:43:42 -0700 Keyboard commands like arrow keys, PgUp/PgDown and Space should scroll a PDF view. 478839 1 109896 ap 2011-10-05 18:00:19 -0700 Created attachment 109896 proposed fix 478840 2 109896 darin 2011-10-05 18:02:13 -0700 Comment on attachment 109896 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=109896&action=review > Source/WebCore/rendering/RenderEmbeddedObject.cpp:259 > + PluginViewBase* view = static_cast<PluginViewBase*>(widget()); > + return view->scroll(direction, granularity); I don’t think the local variable adds clarity. > Source/WebCore/rendering/RenderEmbeddedObject.h:71 > + virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Node** stopNode = 0); > + virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Node** stopNode = 0); Might not need the default values on these overrides. 479238 3 ap 2011-10-06 10:04:11 -0700 Committed <http://trac.webkit.org/changeset/96823>. 109896 2011-10-05 18:00:19 -0700 2011-10-05 18:02:13 -0700 proposed fix PDFKeyEvents.txt text/plain 13779 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2NzcwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMTAtMDUgIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY5NDkyCisgICAgICAgIFtNYWNdIFNob3VsZCBiZSBhYmxl IHRvIHNjcm9sbCBlbWJlZGRlZCBQREZzIGZyb20ga2V5Ym9hcmQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOiBFeHBvcnQg U2Nyb2xsYWJsZUFyZWE6OnNjcm9sbC4KKworICAgICAgICAqIGh0bWwvSFRNTFBsdWdJbkVsZW1l bnQuY3BwOiAoV2ViQ29yZTo6SFRNTFBsdWdJbkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIp OiBDYWxsIGJhc2UKKyAgICAgICAgY2xhc3MgZGVmYXVsdCBldmVudCBoYW5kbGVyLCBzbyB0aGF0 IGV2ZW50cyBvbiBmb2N1c2VkIHBsdWctaW4gZWxlbWVudHMgd291bGQgZmFsbCB0aHJvdWdoCisg ICAgICAgIHRvIEV2ZW50SGFuZGxlcjo6ZGVmYXVsdEtleWJvYXJkRXZlbnRIYW5kbGVyLgorCisg ICAgICAgICogcGx1Z2lucy9QbHVnaW5WaWV3QmFzZS5oOiAoV2ViQ29yZTo6UGx1Z2luVmlld0Jh c2U6OnNjcm9sbCk6IEFkZGVkIGEgbWV0aG9kIHRoYXQncyBjYWxsZWQKKyAgICAgICAgb24gYSBw bHVnLWluIHdoZW4gV2ViQ29yZSBhc2tzIGl0IHRvIHNjcm9sbC4gUGx1Zy1pbiBjYW5ub3QgcmVh bGx5IGtub3cgd2hhdCBrZXkgZXZlbnRzCisgICAgICAgIHJlc3VsdCBpbiBzY3JvbGwgYWN0aW9u cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJFbWJlZGRlZE9iamVjdDo6c2Nyb2xsKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckVtYmVkZGVkT2JqZWN0Ojpsb2dpY2FsU2Nyb2xsKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaDoKKyAgICAgICAgQXNrIHBsdWctaW4gdG8g c2Nyb2xsIHdoZW4gRXZlbnRIYW5kbGVyOjpzY3JvbGxPdmVyZmxvdygpIGlzIGNhbGxlZC4KKwog MjAxMS0xMC0wMyAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtm bGV4Ym94XSB0YWtlIG1hcmdpbkJlZm9yZUZvckNoaWxkIGludG8gYWNjb3VudCB3aGVuIHBvc2l0 aW9uaW5nIGNoaWxkcmVuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkocmV2aXNpb24gOTY2NTkp CisrKyBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkod29ya2luZyBjb3B5KQpAQCAtMzc3 LDYgKzM3Nyw3IEBAIF9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWEyNWRpZEFkZEhvcmkKIF9f Wk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWEyN3dpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJhckVQ TlNfOVNjcm9sbGJhckUKIF9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWEyOHNldFNjcm9sbE9m ZnNldEZyb21JbnRlcm5hbHNFUktOU184SW50UG9pbnRFCiBfX1pON1dlYkNvcmUxNFNjcm9sbGFi bGVBcmVhMjl3aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhckVQTlNfOVNjcm9sbGJhckUKK19f Wk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWE2c2Nyb2xsRU5TXzE1U2Nyb2xsRGlyZWN0aW9uRU5T XzE3U2Nyb2xsR3JhbnVsYXJpdHlFZgogX19aTjdXZWJDb3JlMTRTY3JvbGxhYmxlQXJlYUMyRXYK IF9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWFEMkV2CiBfX1pON1dlYkNvcmUxNFNjcm9sbGJh clRoZW1lMTFuYXRpdmVUaGVtZUV2CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVn SW5FbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVn SW5FbGVtZW50LmNwcAkocmV2aXNpb24gOTY2NTkpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxQbHVnSW5FbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTgxLDYgKzE4MSw5IEBAIHZv aWQgSFRNTFBsdWdJbkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmQKICAgICBpZiAoIXdpZGdldCkK ICAgICAgICAgcmV0dXJuOwogICAgIHdpZGdldC0+aGFuZGxlRXZlbnQoZXZlbnQpOworICAgIGlm IChldmVudC0+ZGVmYXVsdEhhbmRsZWQoKSkKKyAgICAgICAgcmV0dXJuOworICAgIEhUTUxGcmFt ZU93bmVyRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihldmVudCk7CiB9CiAKICNpZiBFTkFC TEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1 Z2luVmlld0Jhc2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdp blZpZXdCYXNlLmgJKHJldmlzaW9uIDk2NjU5KQorKysgU291cmNlL1dlYkNvcmUvcGx1Z2lucy9Q bHVnaW5WaWV3QmFzZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw2ICsyNyw3IEBACiAKICNpbmNs dWRlICJXaWRnZXQuaCIKICNpbmNsdWRlICJHcmFwaGljc0xheWVyLmgiCisjaW5jbHVkZSAiU2Ny b2xsVHlwZXMuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNwYWNl IEpTQyB7CkBAIC00OCw2ICs0OSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIEpTQzo6SlNPYmpl Y3QqIHNjcmlwdE9iamVjdChKU0M6OkpTR2xvYmFsT2JqZWN0KikgeyByZXR1cm4gMDsgfQogICAg IHZpcnR1YWwgdm9pZCBwcml2YXRlQnJvd3NpbmdTdGF0ZUNoYW5nZWQoYm9vbCkgeyB9CiAgICAg dmlydHVhbCBib29sIGdldEZvcm1WYWx1ZShTdHJpbmcmKSB7IHJldHVybiBmYWxzZTsgfQorICAg IHZpcnR1YWwgYm9vbCBzY3JvbGwoU2Nyb2xsRGlyZWN0aW9uLCBTY3JvbGxHcmFudWxhcml0eSkg eyByZXR1cm4gZmFsc2U7IH0KIAogcHJvdGVjdGVkOgogICAgIFBsdWdpblZpZXdCYXNlKFBsYXRm b3JtV2lkZ2V0IHdpZGdldCA9IDApIDogV2lkZ2V0KHdpZGdldCkgeyB9CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHAJKHJldmlz aW9uIDk2NjU5KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2Jq ZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQ5LDcgKzI0OSwyMyBAQCB2b2lkIFJlbmRlckVt YmVkZGVkT2JqZWN0Ojp2aWV3Q2xlYXJlZCgpCiAgICAgICAgICAgICB2aWV3LT5zZXRNYXJnaW5I ZWlnaHQobWFyZ2luSGVpZ2h0KTsKICAgICB9CiB9Ci0gCisKK2Jvb2wgUmVuZGVyRW1iZWRkZWRP YmplY3Q6OnNjcm9sbChTY3JvbGxEaXJlY3Rpb24gZGlyZWN0aW9uLCBTY3JvbGxHcmFudWxhcml0 eSBncmFudWxhcml0eSwgZmxvYXQsIE5vZGUqKikKK3sKKyAgICBpZiAoIXdpZGdldCgpIHx8ICF3 aWRnZXQoKS0+aXNQbHVnaW5WaWV3QmFzZSgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAg ICBQbHVnaW5WaWV3QmFzZSogdmlldyA9IHN0YXRpY19jYXN0PFBsdWdpblZpZXdCYXNlKj4od2lk Z2V0KCkpOworICAgIHJldHVybiB2aWV3LT5zY3JvbGwoZGlyZWN0aW9uLCBncmFudWxhcml0eSk7 Cit9CisKK2Jvb2wgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OmxvZ2ljYWxTY3JvbGwoU2Nyb2xsTG9n aWNhbERpcmVjdGlvbiBkaXJlY3Rpb24sIFNjcm9sbEdyYW51bGFyaXR5IGdyYW51bGFyaXR5LCBm bG9hdCBtdWx0aXBsaWVyLCBOb2RlKiogc3RvcE5vZGUpCit7CisgICAgLy8gUGx1Z2lucyBkb24n dCBleHBvc2UgYSB3cml0aW5nIGRpcmVjdGlvbiwgc28gYXNzdW1pbmcgaG9yaXpvbnRhbCBMVFIu CisgICAgcmV0dXJuIHNjcm9sbChsb2dpY2FsVG9QaHlzaWNhbChkaXJlY3Rpb24sIHRydWUsIGZh bHNlKSwgZ3JhbnVsYXJpdHksIG11bHRpcGxpZXIsIHN0b3BOb2RlKTsKK30KKworCiBib29sIFJl bmRlckVtYmVkZGVkT2JqZWN0Ojppc0luTWlzc2luZ1BsdWdpbkluZGljYXRvcihjb25zdCBMYXlv dXRQb2ludCYgcG9pbnQpIGNvbnN0CiB7CiAgICAgRmxvYXRSZWN0IGNvbnRlbnRSZWN0OwpJbmRl eDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmgJ KHJldmlzaW9uIDk2NjU5KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVk ZGVkT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTY2LDcgKzY2LDEwIEBAIHByaXZhdGU6CiAK ICAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0KCk7CiAgICAgdmlydHVhbCB2b2lkIHZpZXdDbGVhcmVk KCk7Ci0gICAgCisKKyAgICB2aXJ0dWFsIGJvb2wgc2Nyb2xsKFNjcm9sbERpcmVjdGlvbiwgU2Ny b2xsR3JhbnVsYXJpdHksIGZsb2F0IG11bHRpcGxpZXIgPSAxLCBOb2RlKiogc3RvcE5vZGUgPSAw KTsKKyAgICB2aXJ0dWFsIGJvb2wgbG9naWNhbFNjcm9sbChTY3JvbGxMb2dpY2FsRGlyZWN0aW9u LCBTY3JvbGxHcmFudWxhcml0eSwgZmxvYXQgbXVsdGlwbGllciA9IDEsIE5vZGUqKiBzdG9wTm9k ZSA9IDApOworCiAgICAgdm9pZCBzZXRNaXNzaW5nUGx1Z2luSW5kaWNhdG9ySXNQcmVzc2VkKGJv b2wpOwogICAgIGJvb2wgaXNJbk1pc3NpbmdQbHVnaW5JbmRpY2F0b3IoTW91c2VFdmVudCopIGNv bnN0OwogICAgIGJvb2wgaXNJbk1pc3NpbmdQbHVnaW5JbmRpY2F0b3IoY29uc3QgTGF5b3V0UG9p bnQmKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2Nzc2KQorKysgU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMTAt MDUgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5NDkyCisgICAgICAgIFtNYWNdIFNo b3VsZCBiZSBhYmxlIHRvIHNjcm9sbCBlbWJlZGRlZCBQREZzIGZyb20ga2V5Ym9hcmQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3Mv UGx1Z2lucy9QbHVnaW4uaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUv TmV0c2NhcGVQbHVnaW4uY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6aGFu ZGxlU2Nyb2xsKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2Nh cGVQbHVnaW4uaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm94eTo6aGFuZGxlU2Nyb2xsKToKKyAgICAgICAg KiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuaDoKKyAgICAgICAgQWRkZWQgYSBoYW5k bGVTY3JvbGwgbWV0aG9kLiBBIHBsdWctaW4gZ2V0cyBpdCBpZiBpdCBkb2Vzbid0IGhhbmRsZSBh IGtleWJvYXJkIGV2ZW50LCBhbmQKKyAgICAgICAgV2ViQ29yZSBkZWNpZGVzIHRoYXQgdGhpcyBp cyBhbiBldmVudCBmb3Igc2Nyb2xsaW5nLiBBIHBsdWctaW4gY2FuIGRlY2lkZSB3aGV0aGVyIGl0 IHNjcm9sbHMKKyAgICAgICAgbWFpbiBjb250ZW50LCBvciBzb21lIHNjcm9sbGFibGUgc3Vidmll dyBvZiBpdHMgb3duLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9CdWlsdElu UERGVmlldy5jcHA6CisgICAgICAgIChXZWJLaXQ6OkJ1aWx0SW5QREZWaWV3OjpoYW5kbGVNb3Vz ZUV2ZW50KTogQWRkZWQgYSBjb21tZW50IGV4cGxhaW5pbmcgcmV0dXJuZWQgdmFsdWUuCisgICAg ICAgIChXZWJLaXQ6OkJ1aWx0SW5QREZWaWV3OjpoYW5kbGVTY3JvbGwpOiBKdXN0IGNhbGwgU2Ny b2xsYWJsZUFyZWEsIGl0IHdpbGwgZG8gZXZlcnl0aGluZy4KKworICAgICAgICAqIFdlYlByb2Nl c3MvUGx1Z2lucy9QREYvQnVpbHRJblBERlZpZXcuaDogQWRkZWQgYSBoYW5kbGVTY3JvbGwgb3Zl cnJpZGUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OlBsdWdpblZpZXc6OnNjcm9sbCk6IFBhc3MgYSBQbHVnaW5WaWV3QmFz ZSBzY3JvbGwgdG8gcGx1Zy1pbiB0byBoYW5kbGUuCisgICAgICAgIChXZWJLaXQ6OlBsdWdpblZp ZXc6OmhhbmRsZUV2ZW50KTogQWRkZWQgYSBGSVhNRS4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luVmlldy5oOgorCiAyMDExLTEwLTA1ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVA YXBwbGUuY29tPgogCiAgICAgICAgIEVuYWJsZSBXRUJfQVVESU8gYnkgZGVmYXVsdCBpbiB0aGUg V2ViS2l0L21hYyBwb3J0LgpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L1BsdWdpbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9QbHVnaW4uaAkocmV2aXNpb24gOTY2NTkpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvUGx1Z2luLmgJKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2lu Y2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NMYXllci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvS1VSTC5o PgorI2luY2x1ZGUgPFdlYkNvcmUvU2Nyb2xsVHlwZXMuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291 bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIApAQCAtMTk5LDYgKzIwMCw5IEBAIHB1 YmxpYzoKICAgICAvLyBHZXRzIHRoZSBmb3JtIHZhbHVlIHJlcHJlc2VudGF0aW9uIGZvciB0aGUg cGx1Zy1pbiwgbGV0dGluZyBwbHVnLWlucyBwYXJ0aWNpcGF0ZSBpbiBmb3JtIHN1Ym1pc3Npb24u CiAgICAgdmlydHVhbCBib29sIGdldEZvcm1WYWx1ZShTdHJpbmcmIGZvcm1WYWx1ZSkgPSAwOwog CisgICAgLy8gVGVsbHMgdGhlIHBsdWctaW4gdGhhdCBpdCBzaG91bGQgc2Nyb2xsLiBUaGUgcGx1 Zy1pbiBzaG91bGQgcmV0dXJuIHRydWUgaWYgaXQgZGlkIHNjcm9sbC4KKyAgICB2aXJ0dWFsIGJv b2wgaGFuZGxlU2Nyb2xsKFdlYkNvcmU6OlNjcm9sbERpcmVjdGlvbiwgV2ViQ29yZTo6U2Nyb2xs R3JhbnVsYXJpdHkpID0gMDsKKwogcHJvdGVjdGVkOgogICAgIFBsdWdpbigpOwogCkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5jcHAJ KHJldmlzaW9uIDk2NjU5KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpblByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzgyLDYgKzM4MiwxMSBAQCBib29sIFBs dWdpblByb3h5OjpnZXRGb3JtVmFsdWUoU3RyaW5nJiBmCiAgICAgcmV0dXJuIHJldHVyblZhbHVl OwogfQogCitib29sIFBsdWdpblByb3h5OjpoYW5kbGVTY3JvbGwoU2Nyb2xsRGlyZWN0aW9uLCBT Y3JvbGxHcmFudWxhcml0eSkKK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIHZvaWQgUGx1Z2lu UHJveHk6OmxvYWRVUkwodWludDY0X3QgcmVxdWVzdElELCBjb25zdCBTdHJpbmcmIG1ldGhvZCwg Y29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IFN0cmluZyYgdGFyZ2V0LCBjb25zdCBIVFRQ SGVhZGVyTWFwJiBoZWFkZXJGaWVsZHMsIGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgaHR0cEJvZHks IGJvb2wgYWxsb3dQb3B1cHMpCiB7CiAgICAgY29udHJvbGxlcigpLT5sb2FkVVJMKHJlcXVlc3RJ RCwgbWV0aG9kLCB1cmxTdHJpbmcsIHRhcmdldCwgaGVhZGVyRmllbGRzLCBodHRwQm9keSwgYWxs b3dQb3B1cHMpOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdp blByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L1BsdWdpblByb3h5LmgJKHJldmlzaW9uIDk2NjU5KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMiw2ICsxMDIs NyBAQCBwcml2YXRlOgogCiAgICAgdmlydHVhbCB2b2lkIHByaXZhdGVCcm93c2luZ1N0YXRlQ2hh bmdlZChib29sKTsKICAgICB2aXJ0dWFsIGJvb2wgZ2V0Rm9ybVZhbHVlKFN0cmluZyYgZm9ybVZh bHVlKTsKKyAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlU2Nyb2xsKFdlYkNvcmU6OlNjcm9sbERpcmVj dGlvbiwgV2ViQ29yZTo6U2Nyb2xsR3JhbnVsYXJpdHkpOwogCiAgICAgYm9vbCBuZWVkc0JhY2tp bmdTdG9yZSgpIGNvbnN0OwogICAgIHVpbnQ2NF90IHdpbmRvd05QT2JqZWN0SUQoKTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAJ KHJldmlzaW9uIDk2NjU5KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpblZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MTksNiArNTE5LDE1IEBAIGJvb2wgUGx1 Z2luVmlldzo6Z2V0Rm9ybVZhbHVlKFN0cmluZyYgZm8KICAgICByZXR1cm4gbV9wbHVnaW4tPmdl dEZvcm1WYWx1ZShmb3JtVmFsdWUpOwogfQogCitib29sIFBsdWdpblZpZXc6OnNjcm9sbChTY3Jv bGxEaXJlY3Rpb24gZGlyZWN0aW9uLCBTY3JvbGxHcmFudWxhcml0eSBncmFudWxhcml0eSkKK3sK KyAgICAvLyBUaGUgcGx1Zy1pbiBjYW4gYmUgbnVsbCBoZXJlIGlmIGl0IGZhaWxlZCB0byBpbml0 aWFsaXplLgorICAgIGlmICghbV9pc0luaXRpYWxpemVkIHx8ICFtX3BsdWdpbikKKyAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIG1fcGx1Z2luLT5oYW5kbGVTY3JvbGwoZGlyZWN0 aW9uLCBncmFudWxhcml0eSk7Cit9CisKIHZvaWQgUGx1Z2luVmlldzo6c2V0RnJhbWVSZWN0KGNv bnN0IFdlYkNvcmU6OkludFJlY3QmIHJlY3QpCiB7CiAgICAgV2lkZ2V0OjpzZXRGcmFtZVJlY3Qo cmVjdCk7CkBAIC01ODIsNiArNTkxLDggQEAgdm9pZCBQbHVnaW5WaWV3OjpoYW5kbGVFdmVudChF dmVudCogZXZlbgogICAgICAgICB8fCAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkubW91 c2Vkb3duRXZlbnQgJiYgY3VycmVudEV2ZW50LT50eXBlKCkgPT0gV2ViRXZlbnQ6Ok1vdXNlRG93 bikKICAgICAgICAgfHwgKGV2ZW50LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLm1vdXNldXBFdmVu dCAmJiBjdXJyZW50RXZlbnQtPnR5cGUoKSA9PSBXZWJFdmVudDo6TW91c2VVcCkpIHsKICAgICAg ICAgLy8gV2UgaGF2ZSBhIG1vdXNlIGV2ZW50LgorCisgICAgICAgIC8vIEZJWE1FOiBDbGlja2lu ZyBpbiBhIHNjcm9sbCBiYXIgc2hvdWxkIG5vdCBjaGFuZ2UgZm9jdXMuCiAgICAgICAgIGlmIChj dXJyZW50RXZlbnQtPnR5cGUoKSA9PSBXZWJFdmVudDo6TW91c2VEb3duKQogICAgICAgICAgICAg Zm9jdXNQbHVnaW5FbGVtZW50KCk7CiAgICAgICAgIApJbmRleDogU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oCShyZXZpc2lvbiA5NjY1OSkKKysrIFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgJKHdvcmtpbmcgY29w eSkKQEAgLTEwMyw2ICsxMDMsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgSlNDOjpKU09iamVj dCogc2NyaXB0T2JqZWN0KEpTQzo6SlNHbG9iYWxPYmplY3QqKTsKICAgICB2aXJ0dWFsIHZvaWQg cHJpdmF0ZUJyb3dzaW5nU3RhdGVDaGFuZ2VkKGJvb2wpOwogICAgIHZpcnR1YWwgYm9vbCBnZXRG b3JtVmFsdWUoU3RyaW5nJik7CisgICAgdmlydHVhbCBib29sIHNjcm9sbChXZWJDb3JlOjpTY3Jv bGxEaXJlY3Rpb24sIFdlYkNvcmU6OlNjcm9sbEdyYW51bGFyaXR5KTsKIAogICAgIC8vIFdlYkNv cmU6OldpZGdldAogICAgIHZpcnR1YWwgdm9pZCBzZXRGcmFtZVJlY3QoY29uc3QgV2ViQ29yZTo6 SW50UmVjdCYpOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNj YXBlL05ldHNjYXBlUGx1Z2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwCShyZXZpc2lvbiA5NjY1 OSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2Fw ZVBsdWdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg4MCw2ICs4ODAsMTEgQEAgYm9vbCBOZXRz Y2FwZVBsdWdpbjo6Z2V0Rm9ybVZhbHVlKFN0cmluZwogICAgIHJldHVybiB0cnVlOwogfQogCiti b29sIE5ldHNjYXBlUGx1Z2luOjpoYW5kbGVTY3JvbGwoU2Nyb2xsRGlyZWN0aW9uLCBTY3JvbGxH cmFudWxhcml0eSkKK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIGJvb2wgTmV0c2NhcGVQbHVn aW46OnN1cHBvcnRzU25hcHNob3R0aW5nKCkgY29uc3QKIHsKICNpZiBQTEFURk9STShNQUMpCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQ bHVnaW4uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv TmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaAkocmV2aXNpb24gOTY2NTkpCisrKyBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaAkod29ya2lu ZyBjb3B5KQpAQCAtMjA1LDYgKzIwNSw3IEBAIHByaXZhdGU6CiAKICAgICB2aXJ0dWFsIHZvaWQg cHJpdmF0ZUJyb3dzaW5nU3RhdGVDaGFuZ2VkKGJvb2wpOwogICAgIHZpcnR1YWwgYm9vbCBnZXRG b3JtVmFsdWUoU3RyaW5nJiBmb3JtVmFsdWUpOworICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVTY3Jv bGwoV2ViQ29yZTo6U2Nyb2xsRGlyZWN0aW9uLCBXZWJDb3JlOjpTY3JvbGxHcmFudWxhcml0eSk7 CiAKICAgICBib29sIHN1cHBvcnRzU25hcHNob3R0aW5nKCkgY29uc3Q7CiAKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvQnVpbHRJblBERlZpZXcuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvQnVpbHRJblBE RlZpZXcuY3BwCShyZXZpc2lvbiA5NjY1OSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9QREYvQnVpbHRJblBERlZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zODQsNiAr Mzg0LDggQEAgYm9vbCBCdWlsdEluUERGVmlldzo6aGFuZGxlTW91c2VFdmVudChjbwogICAgICAg ICAgICAgbV9ob3Jpem9udGFsU2Nyb2xsYmFyLT5tb3VzZURvd24obW91c2VEb3duRXZlbnQpOwog ICAgICAgICBpZiAobV92ZXJ0aWNhbFNjcm9sbGJhcikKICAgICAgICAgICAgIG1fdmVydGljYWxT Y3JvbGxiYXItPm1vdXNlRG93bihtb3VzZURvd25FdmVudCk7CisgICAgICAgIC8vIFJldHVybmlu ZyBmYWxzZSBhcyB0aGF0IHdpbGwgbWFrZSBFdmVudEhhbmRsZXIgdW5mb2N1cyB0aGUgcGx1Zy1p biwgd2hpY2ggaXMgYXBwcm9wcmlhdGUgd2hlbiBjbGlja2luZyBzY3JvbGxiYXJzLgorICAgICAg ICAvLyBXaGVuIHN1cHBvcnQgZm9yIFBERiBmb3JtcyBpcyBhZGRlZCwgd2UnbGwgbmVlZCB0byBh Y3R1YWxseSBmb2N1cyB0aGUgcGx1Zy1pbi4KICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIGNh c2UgV2ViRXZlbnQ6Ok1vdXNlVXA6CkBAIC00NjUsNiArNDY3LDExIEBAIGJvb2wgQnVpbHRJblBE RlZpZXc6OmdldEZvcm1WYWx1ZShTdHJpbmcKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKK2Jvb2wg QnVpbHRJblBERlZpZXc6OmhhbmRsZVNjcm9sbChTY3JvbGxEaXJlY3Rpb24gZGlyZWN0aW9uLCBT Y3JvbGxHcmFudWxhcml0eSBncmFudWxhcml0eSkKK3sKKyAgICByZXR1cm4gc2Nyb2xsKGRpcmVj dGlvbiwgZ3JhbnVsYXJpdHkpOworfQorCiBJbnRSZWN0IEJ1aWx0SW5QREZWaWV3OjpzY3JvbGxD b3JuZXJSZWN0KCkgY29uc3QKIHsKICAgICBpZiAoIW1faG9yaXpvbnRhbFNjcm9sbGJhciB8fCAh bV92ZXJ0aWNhbFNjcm9sbGJhcikKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9QREYvQnVpbHRJblBERlZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvUERGL0J1aWx0SW5QREZWaWV3LmgJKHJldmlzaW9uIDk2NjU5KQor KysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9CdWlsdEluUERGVmlldy5o CSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsNiArMTAyLDcgQEAgcHJpdmF0ZToKIAogICAgIHZpcnR1 YWwgdm9pZCBwcml2YXRlQnJvd3NpbmdTdGF0ZUNoYW5nZWQoYm9vbCk7CiAgICAgdmlydHVhbCBi b29sIGdldEZvcm1WYWx1ZShTdHJpbmcmIGZvcm1WYWx1ZSk7CisgICAgdmlydHVhbCBib29sIGhh bmRsZVNjcm9sbChXZWJDb3JlOjpTY3JvbGxEaXJlY3Rpb24sIFdlYkNvcmU6OlNjcm9sbEdyYW51 bGFyaXR5KTsKIAogICAgIC8vIFNjcm9sbGFibGVBcmVhIG1ldGhvZHMuCiAgICAgdmlydHVhbCBX ZWJDb3JlOjpJbnRSZWN0IHNjcm9sbENvcm5lclJlY3QoKSBjb25zdDsK