71142 2011-10-28 14:23:19 -0700 Whether backspace goes Back should be configurable 2011-10-28 17:33:05 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 1 sullivan sullivan aroben jeffm oldest_to_newest 492674 0 sullivan 2011-10-28 14:23:19 -0700 Currently there’s code in the guts of the event-handling mechanism that causes the Backspace/Delete key to do a Go Back navigation (also Go Forward with a modifier-key variation) if it’s not intercepted by a form control. This setting should be configurable so that a client can choose to suppress it. 492686 1 112912 sullivan 2011-10-28 14:38:50 -0700 Created attachment 112912 Patch to add a WebCore setting and corresponding WebKit/WebKit2 preferences, with no change to current behavior 492690 2 aroben 2011-10-28 14:45:15 -0700 We often try to add tests to TestWebKitAPI for changes like this these days. 492693 3 sullivan 2011-10-28 14:49:54 -0700 I’ll look into adding a TestWebKitAPI test separately. No promises though! 492706 4 sullivan 2011-10-28 14:59:12 -0700 Ah, I realize that I need to honor this new preference in WebFrameView in WebKit (as well as in the event-handling code in WebCore; not sure if the WebFrameView one still needs to exist, but since it does exist, it should honor this preference). Tweaked patch forthcoming. 492707 5 112918 sullivan 2011-10-28 14:59:54 -0700 Created attachment 112918 Same as last patch except also honors preference in WebFrameView.mm in WebKit 492709 6 sullivan 2011-10-28 15:08:06 -0700 Fixed in http://trac.webkit.org/changeset/98769 492808 7 112912 darin 2011-10-28 17:11:45 -0700 Comment on attachment 112912 Patch to add a WebCore setting and corresponding WebKit/WebKit2 preferences, with no change to current behavior View in context: https://bugs.webkit.org/attachment.cgi?id=112912&action=review > Source/WebCore/page/EventHandler.cpp:3028 > + if (!m_frame->settings()->backspaceKeyNavigationEnabled()) > + return; Since the settings object actually hangs off the page, not the frame, this needs to be done after checking the page is null. 492818 8 sullivan 2011-10-28 17:27:08 -0700 I see. I’ve checked it in, so I’ll fix that in a separate patch. 492825 9 sullivan 2011-10-28 17:30:23 -0700 Reopening for change Darin mentioned. 492826 10 112949 sullivan 2011-10-28 17:30:55 -0700 Created attachment 112949 Move the frame->settings() test to after the !page test. 492827 11 sullivan 2011-10-28 17:33:05 -0700 Checked in this additional change in 98788. 112912 2011-10-28 14:38:50 -0700 2011-10-28 17:11:45 -0700 Patch to add a WebCore setting and corresponding WebKit/WebKit2 preferences, with no change to current behavior backspaceKeyNavigationPreference_patch.txt text/plain 12486 sullivan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4NzYzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMTAtMjggIEpvaG4gU3Vs bGl2YW4gIDxzdWxsaXZhbkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViQ29yZSBwYXJ0IG9mOgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzExNDIKKyAg ICAgICAgV2hldGhlciBiYWNrc3BhY2UgZ29lcyBCYWNrIHNob3VsZCBiZSBjb25maWd1cmFibGUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBhZ2Uv RXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6ZGVmYXVs dEJhY2tzcGFjZUV2ZW50SGFuZGxlcik6CisgICAgICAgIEJhaWwgb3V0IGlmIGJhY2tzcGFjZSBu YXZpZ2F0aW9uIGlzIG5vdCBlbmFibGVkLgorCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6U2V0dGluZ3MpOgorICAgICAgICBJbml0aWFs aXplIG1fYmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQgdG8gdHJ1ZSB0byBtYXRjaCBjdXJy ZW50IGJlaGF2aW9yLgorCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5oOgorICAgICAgICBEZWNs YXJlZCBtX2JhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkLgorICAgICAgICAoV2ViQ29yZTo6 U2V0dGluZ3M6OnNldEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkKToKKyAgICAgICAgTmV3 IGZ1bmN0aW9uLCBzaW1wbGUgc2V0dGVyLgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OmJh Y2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkKToKKyAgICAgICAgTmV3IGZ1bmN0aW9uLCBzaW1w bGUgZ2V0dGVyLgorCiAyMDExLTEwLTI4ICBLZW4gQnVjaGFuYW4gPGtlbnJiQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBDcmFzaCB3aGVuIHNwbGl0dGluZyBpbmxpbmUgZmxvd3Mgd2l0aCBnZW5l cmF0ZWQgZmxvYXRzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCShyZXZp c2lvbiA5ODYyOCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMzAyMyw2ICszMDIzLDkgQEAgdm9pZCBFdmVudEhhbmRsZXI6OmRlZmF1 bHRCYWNrc3BhY2VFdmVudAogCiAgICAgaWYgKCFtX2ZyYW1lLT5lZGl0b3IoKS0+YmVoYXZpb3Io KS5zaG91bGROYXZpZ2F0ZUJhY2tPbkJhY2tzcGFjZSgpKQogICAgICAgICByZXR1cm47CisgICAg CisgICAgaWYgKCFtX2ZyYW1lLT5zZXR0aW5ncygpLT5iYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5h YmxlZCgpKQorICAgICAgICByZXR1cm47CiAKICAgICBQYWdlKiBwYWdlID0gbV9mcmFtZS0+cGFn ZSgpOwogICAgIGlmICghcGFnZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3Mu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCShyZXZp c2lvbiA5ODYyOCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMjksNiArMjI5LDcgQEAgU2V0dGluZ3M6OlNldHRpbmdzKFBhZ2UqIHBhZ2Up CiAgICAgLCBtX3Bhc3N3b3JkRWNob0VuYWJsZWQoZmFsc2UpCiAjZW5kaWYKICAgICAsIG1fc3Vw cHJlc3NJbmNyZW1lbnRhbFJlbmRlcmluZyhmYWxzZSkKKyAgICAsIG1fYmFja3NwYWNlS2V5TmF2 aWdhdGlvbkVuYWJsZWQodHJ1ZSkKICAgICAsIG1fbG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5VGlt ZXIodGhpcywgJlNldHRpbmdzOjpsb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHlUaW1lckZpcmVkKQog ewogICAgIC8vIEEgRnJhbWUgbWF5IG5vdCBoYXZlIGJlZW4gY3JlYXRlZCB5ZXQsIHNvIHdlIGlu aXRpYWxpemUgdGhlIEF0b21pY1N0cmluZyAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0 dGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgJKHJl dmlzaW9uIDk4NjI4KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCSh3b3JraW5n IGNvcHkpCkBAIC00NjksNyArNDY5LDEwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAg ICB2b2lkIHNldFN1cHByZXNzSW5jcmVtZW50YWxSZW5kZXJpbmcoYm9vbCBmbGFnKSB7IG1fc3Vw cHJlc3NJbmNyZW1lbnRhbFJlbmRlcmluZyA9IGZsYWc7IH0KICAgICAgICAgYm9vbCBzdXBwcmVz c0luY3JlbWVudGFsUmVuZGVyaW5nKCkgY29uc3QgeyByZXR1cm4gbV9zdXBwcmVzc0luY3JlbWVu dGFsUmVuZGVyaW5nOyB9Ci0KKyAgICAgICAgCisgICAgICAgIHZvaWQgc2V0QmFja3NwYWNlS2V5 TmF2aWdhdGlvbkVuYWJsZWQoYm9vbCBmbGFnKSB7IG1fYmFja3NwYWNlS2V5TmF2aWdhdGlvbkVu YWJsZWQgPSBmbGFnOyB9CisgICAgICAgIGJvb2wgYmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJs ZWQoKSBjb25zdCB7IHJldHVybiBtX2JhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkOyB9Cisg ICAgICAgIAogICAgICAgICB2b2lkIHNldFBhc3N3b3JkRWNob0R1cmF0aW9uSW5TZWNvbmRzKGRv dWJsZSBkdXJhdGlvbkluU2Vjb25kcykgeyBtX3Bhc3N3b3JkRWNob0R1cmF0aW9uSW5TZWNvbmRz ID0gZHVyYXRpb25JblNlY29uZHM7IH0KICAgICAgICAgZG91YmxlIHBhc3N3b3JkRWNob0R1cmF0 aW9uSW5TZWNvbmRzKCkgY29uc3QgeyByZXR1cm4gbV9wYXNzd29yZEVjaG9EdXJhdGlvbkluU2Vj b25kczsgfQogCkBAIC02MDcsNiArNjEwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAg ICBib29sIG1fbWVkaWFQbGF5YmFja0FsbG93c0lubGluZSA6IDE7CiAgICAgICAgIGJvb2wgbV9w YXNzd29yZEVjaG9FbmFibGVkIDogMTsKICAgICAgICAgYm9vbCBtX3N1cHByZXNzSW5jcmVtZW50 YWxSZW5kZXJpbmcgOiAxOworICAgICAgICBib29sIG1fYmFja3NwYWNlS2V5TmF2aWdhdGlvbkVu YWJsZWQgOiAxOwogCiAgICAgICAgIFRpbWVyPFNldHRpbmdzPiBtX2xvYWRzSW1hZ2VzQXV0b21h dGljYWxseVRpbWVyOwogICAgICAgICB2b2lkIGxvYWRzSW1hZ2VzQXV0b21hdGljYWxseVRpbWVy RmlyZWQoVGltZXI8U2V0dGluZ3M+Kik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiA5ODc2MykK KysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4 IEBACisyMDExLTEwLTI4ICBKb2huIFN1bGxpdmFuICA8c3VsbGl2YW5AYXBwbGUuY29tPgorCisg ICAgICAgIFdlYktpdDIgcGFydCBvZjoKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTcxMTQyCisgICAgICAgIFdoZXRoZXIgYmFja3NwYWNlIGdvZXMgQmFj ayBzaG91bGQgYmUgY29uZmlndXJhYmxlCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oOgorICAgICAg ICBEZWNsYXJlZCBiYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZCBwcm9wZXJ0eSB1c2luZyBt YWNyby4gVGhpcyBpbml0aWFsaXplcworICAgICAgICBpdCB0byB0cnVlLCB0byBtYXRjaCBjdXJy ZW50IGJlaGF2aW9yLgorICAgICAgICAKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVm ZXJlbmNlcy5jcHA6CisgICAgICAgIChXS1ByZWZlcmVuY2VzU2V0QmFja3NwYWNlS2V5TmF2aWdh dGlvbkVuYWJsZWQpOgorICAgICAgICBOZXcgZnVuY3Rpb24sIHBhc3MgdmFsdWUgdG8gaW1wbC4K KyAgICAgICAgKFdLUHJlZmVyZW5jZXNHZXRCYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZCk6 CisgICAgICAgIE5ldyBmdW5jdGlvbiwgcmV0dXJucyByZXN1bHQgZnJvbSBpbXBsLgorICAgICAg ICAKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5oOgorICAgICAgICBE ZWNsYXJlZCBBUEkgZnVuY3Rpb25zIGZvciBuZXcgcHJlZmVyZW5jZS4KKyAgICAgICAgCisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyk6CisgICAgICAgIFVwZGF0ZXMgV2ViQ29yZSBzZXR0 aW5ncyBmcm9tIFdlYktpdDIgcHJlZnMuCisKIDIwMTEtMTAtMjggIFRpbW90aHkgSGF0Y2hlciAg PHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIFN1cHBvcnQgdXNpbmcgYSBkaWZmZXJlbnQg ZnJvbnQtZW5kIGZvciB0aGUgV2ViIEluc3BlY3RvciBpbiBXZWJLaXQyLgpJbmRleDogU291cmNl L1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oCShyZXZpc2lvbiA5ODYyOCkK KysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTk2LDYgKzk2LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAgICAgbWFjcm8oV2Vi QXVkaW9FbmFibGVkLCB3ZWJBdWRpb0VuYWJsZWQsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCiAgICAg bWFjcm8oQXBwbGljYXRpb25DaHJvbWVNb2RlRW5hYmxlZCwgYXBwbGljYXRpb25DaHJvbWVNb2Rl LCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3JvKFN1cHByZXNzSW5jcmVtZW50YWxSZW5k ZXJpbmcsIHN1cHByZXNzSW5jcmVtZW50YWxSZW5kZXJpbmcsIEJvb2wsIGJvb2wsIGZhbHNlKSBc CisgICAgbWFjcm8oQmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQsIGJhY2tzcGFjZUtleU5h dmlnYXRpb25FbmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBcCiAgICAgXAogCiAjZGVmaW5lIEZP Ul9FQUNIX1dFQktJVF9ET1VCTEVfUFJFRkVSRU5DRShtYWNybykgXApJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAkocmV2aXNpb24g OTg2MjgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTY1MSwzICs2NTEsMTMgQEAgYm9vbCBXS1ByZWZlcmVuY2Vz R2V0U3VwcHJlc3NJbmNyZW1lbnRhbAogewogICAgIHJldHVybiB0b0ltcGwocHJlZmVyZW5jZXNS ZWYpLT5zdXBwcmVzc0luY3JlbWVudGFsUmVuZGVyaW5nKCk7CiB9CisKK3ZvaWQgV0tQcmVmZXJl bmNlc1NldEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJl ZmVyZW5jZXNSZWYsIGJvb2wgZW5hYmxlZCkKK3sKKyAgICB0b0ltcGwocHJlZmVyZW5jZXNSZWYp LT5zZXRCYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZChlbmFibGVkKTsKK30KKworYm9vbCBX S1ByZWZlcmVuY2VzR2V0QmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQoV0tQcmVmZXJlbmNl c1JlZiBwcmVmZXJlbmNlc1JlZikKK3sKKyAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVm KS0+YmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQoKTsKK30KSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuaAkocmV2aXNpb24gOTg2Mjgp CisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNzMsNiArMTczLDEwIEBAIFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5j ZXNHZXRXZWJBdWRpb0UKIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRTdXBwcmVzc0lu Y3JlbWVudGFsUmVuZGVyaW5nKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wg ZW5hYmxlZCk7CiBXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0U3VwcHJlc3NJbmNyZW1l bnRhbFJlbmRlcmluZyhXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKTsKIAorLy8gRGVm YXVsdHMgdG8gdHJ1ZQorV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldEJhY2tzcGFjZUtl eU5hdmlnYXRpb25FbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wg ZW5hYmxlZCk7CitXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0QmFja3NwYWNlS2V5TmF2 aWdhdGlvbkVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZik7CisKICNpZmRl ZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiA5ODYyOCkKKysrIFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc0 OCw2ICsxNzQ4LDcgQEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBXZQog CiAgICAgc2V0dGluZ3MtPnNldEFwcGxpY2F0aW9uQ2hyb21lTW9kZShzdG9yZS5nZXRCb29sVmFs dWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmFwcGxpY2F0aW9uQ2hyb21lTW9kZUtleSgpKSk7 ICAgIAogICAgIHNldHRpbmdzLT5zZXRTdXBwcmVzc0luY3JlbWVudGFsUmVuZGVyaW5nKHN0b3Jl LmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6c3VwcHJlc3NJbmNyZW1lbnRh bFJlbmRlcmluZ0tleSgpKSk7CisgICAgc2V0dGluZ3MtPnNldEJhY2tzcGFjZUtleU5hdmlnYXRp b25FbmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6YmFj a3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWRLZXkoKSkpOwogCiAgICAgcGxhdGZvcm1QcmVmZXJl bmNlc0RpZENoYW5nZShzdG9yZSk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiA5 ODc2MykKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDI5IEBACisyMDExLTEwLTI4ICBKb2huIFN1bGxpdmFuICA8c3VsbGl2YW5AYXBwbGUu Y29tPgorCisgICAgICAgIFdlYktpdCBwYXJ0IG9mOgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzExNDIKKyAgICAgICAgV2hldGhlciBiYWNrc3BhY2Ug Z29lcyBCYWNrIHNob3VsZCBiZSBjb25maWd1cmFibGUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2 YXRlLmg6CisgICAgICAgIEFkZGVkICNkZWZpbmUgZm9yIFdlYktpdEJhY2tzcGFjZUtleU5hdmln YXRpb25FbmFibGVkS2V5CisgICAgICAgIAorICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5j ZXMubW06CisgICAgICAgICgrW1dlYlByZWZlcmVuY2VzIGluaXRpYWxpemVdKToKKyAgICAgICAg SW5pdGlhbGl6ZSBuZXcgcHJlZiB0byBZRVMsIHRvIG1hdGNoIGN1cnJlbnQgYmVoYXZpb3IuCisg ICAgICAgICgtW1dlYlByZWZlcmVuY2VzIHNldEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVk Ol0pOgorICAgICAgICBOZXcgbWV0aG9kLCBzdGFuZGFyZCBwcmVmcyBzZXR0ZXIuCisgICAgICAg ICgtW1dlYlByZWZlcmVuY2VzIGJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkXSk6CisgICAg ICAgIE5ldyBtZXRob2QsIHN0YW5kYXJkIHByZWZzIGdldHRlci4KKworICAgICAgICAqIFdlYlZp ZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmg6CisgICAgICAgIERlY2xhcmVkIG5ldyBtZXRob2Rz LgorICAgICAgICAKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dl YlZpZXcgX3ByZWZlcmVuY2VzQ2hhbmdlZDpdKToKKyAgICAgICAgVXBkYXRlcyBXZWJDb3JlIHNl dHRpbmdzIGZyb20gV2ViS2l0IHByZWZzLgorCiAyMDExLTEwLTI4ICBKb2NoZW4gRWlzaW5nZXIg IDxqb2NoZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlbmFtZSBhIG51bWJlciBvZiBtZXRo b2RzIG1lbnRpb25pbmcgSmF2YVNjcmlwdCB0byBqdXN0IFNjcmlwdCBpbnN0ZWFkCkluZGV4OiBT b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2 YXRlLmgJKHJldmlzaW9uIDk4NjI4KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQ cmVmZXJlbmNlS2V5c1ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtMTI2LDYgKzEyNiw3IEBA CiAjZGVmaW5lIFdlYktpdEVkaXRpbmdCZWhhdmlvclByZWZlcmVuY2VLZXkgQCJXZWJLaXRFZGl0 aW5nQmVoYXZpb3IiCiAjZGVmaW5lIFdlYktpdFVzZVByZUhUTUw1UGFyc2VyUXVpcmtzS2V5IEAi V2ViS2l0VXNlUHJlSFRNTDVQYXJzZXJRdWlya3MiCiAjZGVmaW5lIFdlYktpdFN1cHByZXNzSW5j cmVtZW50YWxSZW5kZXJpbmdLZXkgQCJXZWJLaXRTdXBwcmVzc0luY3JlbWVudGFsUmVuZGVyaW5n IgorI2RlZmluZSBXZWJLaXRCYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZEtleSBAIldlYktp dEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkIgogCiAvLyBDb3JlR3JhcGhpY3MgZGVmZXJy ZWQgdXBkYXRlcyBhcmUgZGlzYWJsZWQgaWYgV2ViS2l0RW5hYmxlQ29hbGVzY2VkVXBkYXRlc1By ZWZlcmVuY2VLZXkgaXMgc2V0CiAvLyB0byBOTywgb3IgaGFzIG5vIHZhbHVlLiAgRm9yIGNvbXBh dGliaWxpdHkgd2l0aCBNYWMgT1MgWCAxMC40LjYsIGRlZmVycmVkIHVwZGF0ZXMgYXJlIE9GRiBi eQpJbmRleDogU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCShy ZXZpc2lvbiA5ODYyOCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5j ZXMubW0JKHdvcmtpbmcgY29weSkKQEAgLTM4Niw2ICszODYsNyBAQCArICh2b2lkKWluaXRpYWxp emUKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sICBXZWJLaXRNZWRpYVBs YXliYWNrQWxsb3dzSW5saW5lUHJlZmVyZW5jZUtleSwKICAgICAgICAgW05TTnVtYmVyIG51bWJl cldpdGhCb29sOk5PXSwgICBXZWJLaXRXZWJBdWRpb0VuYWJsZWRQcmVmZXJlbmNlS2V5LAogICAg ICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLCAgIFdlYktpdFN1cHByZXNzSW5jcmVt ZW50YWxSZW5kZXJpbmdLZXksCisgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpZRVNd LCAgV2ViS2l0QmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWRLZXksCiAKICAgICAgICAgW05T TnVtYmVyIG51bWJlcldpdGhMb25nTG9uZzpBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6bm9RdW90 YSgpXSwgV2ViS2l0QXBwbGljYXRpb25DYWNoZVRvdGFsUXVvdGEsCiAgICAgICAgIFtOU051bWJl ciBudW1iZXJXaXRoTG9uZ0xvbmc6QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6Om5vUXVvdGEoKV0s IFdlYktpdEFwcGxpY2F0aW9uQ2FjaGVEZWZhdWx0T3JpZ2luUXVvdGEsCkBAIC0xNTYzLDYgKzE1 NjQsMTYgQEAgLSAoQk9PTClzdXBwcmVzc0luY3JlbWVudGFsUmVuZGVyaW5nCiAgICAgcmV0dXJu IFtzZWxmIF9ib29sVmFsdWVGb3JLZXk6V2ViS2l0U3VwcHJlc3NJbmNyZW1lbnRhbFJlbmRlcmlu Z0tleV07CiB9CiAKKy0gKHZvaWQpc2V0QmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQ6KEJP T0wpZmxhZworeworICAgIFtzZWxmIF9zZXRCb29sVmFsdWU6ZmxhZyBmb3JLZXk6V2ViS2l0QmFj a3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWRLZXldOworfQorCistIChCT09MKWJhY2tzcGFjZUtl eU5hdmlnYXRpb25FbmFibGVkCit7CisgICAgcmV0dXJuIFtzZWxmIF9ib29sVmFsdWVGb3JLZXk6 V2ViS2l0QmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWRLZXldOworfQorCiBAZW5kCiAKIEBp bXBsZW1lbnRhdGlvbiBXZWJQcmVmZXJlbmNlcyAoV2ViSW50ZXJuYWwpCkluZGV4OiBTb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmgJKHJldmlz aW9uIDk4NjI4KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1By aXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtMjY4LDQgKzI2OCw3IEBAIEBpbnRlcmZhY2UgV2Vi UHJlZmVyZW5jZXMgKFdlYlByaXZhdGUpCiAtICh2b2lkKXNldFN1cHByZXNzSW5jcmVtZW50YWxS ZW5kZXJpbmc6KEJPT0wpZmxhZzsKIC0gKEJPT0wpc3VwcHJlc3NJbmNyZW1lbnRhbFJlbmRlcmlu ZzsKIAorLSAodm9pZClzZXRCYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZDooQk9PTClmbGFn OworLSAoQk9PTCliYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZDsKKwogQGVuZApJbmRleDog U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24gOTg2MjgpCisrKyBTb3Vy Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTE0NzQs NiArMTQ3NCw3IEBAIC0gKHZvaWQpX3ByZWZlcmVuY2VzQ2hhbmdlZDooV2ViUHJlZmVyZW4KICAg ICBzZXR0aW5ncy0+c2V0TWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmUoW3ByZWZlcmVu Y2VzIG1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlXSk7CiAgICAgc2V0dGluZ3MtPnNl dE1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUoW3ByZWZlcmVuY2VzIG1lZGlhUGxheWJhY2tBbGxv d3NJbmxpbmVdKTsKICAgICBzZXR0aW5ncy0+c2V0U3VwcHJlc3NJbmNyZW1lbnRhbFJlbmRlcmlu ZyhbcHJlZmVyZW5jZXMgc3VwcHJlc3NJbmNyZW1lbnRhbFJlbmRlcmluZ10pOworICAgIHNldHRp bmdzLT5zZXRCYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZChbcHJlZmVyZW5jZXMgYmFja3Nw YWNlS2V5TmF2aWdhdGlvbkVuYWJsZWRdKTsKIAogICAgIC8vIEFwcGxpY2F0aW9uIENhY2hlIFBy ZWZlcmVuY2VzIGFyZSBzdG9yZWQgb24gdGhlIGdsb2JhbCBjYWNoZSBzdG9yYWdlIG1hbmFnZXIs IG5vdCBpbiBTZXR0aW5ncy4KICAgICBbV2ViQXBwbGljYXRpb25DYWNoZSBzZXREZWZhdWx0T3Jp Z2luUXVvdGE6W3ByZWZlcmVuY2VzIGFwcGxpY2F0aW9uQ2FjaGVEZWZhdWx0T3JpZ2luUXVvdGFd XTsK 112918 2011-10-28 14:59:54 -0700 2011-10-28 15:05:49 -0700 Same as last patch except also honors preference in WebFrameView.mm in WebKit backspaceKeyNavigationPreference_patch.txt text/plain 13288 sullivan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4NzY3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMTAtMjggIEpvaG4gU3Vs bGl2YW4gIDxzdWxsaXZhbkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViQ29yZSBwYXJ0IG9mOgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzExNDIKKyAg ICAgICAgV2hldGhlciBiYWNrc3BhY2UgZ29lcyBCYWNrIHNob3VsZCBiZSBjb25maWd1cmFibGUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBhZ2Uv RXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6ZGVmYXVs dEJhY2tzcGFjZUV2ZW50SGFuZGxlcik6CisgICAgICAgIEJhaWwgb3V0IGlmIGJhY2tzcGFjZSBu YXZpZ2F0aW9uIGlzIG5vdCBlbmFibGVkLgorCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6U2V0dGluZ3MpOgorICAgICAgICBJbml0aWFs aXplIG1fYmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQgdG8gdHJ1ZSB0byBtYXRjaCBjdXJy ZW50IGJlaGF2aW9yLgorCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5oOgorICAgICAgICBEZWNs YXJlZCBtX2JhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkLgorICAgICAgICAoV2ViQ29yZTo6 U2V0dGluZ3M6OnNldEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkKToKKyAgICAgICAgTmV3 IGZ1bmN0aW9uLCBzaW1wbGUgc2V0dGVyLgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OmJh Y2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkKToKKyAgICAgICAgTmV3IGZ1bmN0aW9uLCBzaW1w bGUgZ2V0dGVyLgorCiAyMDExLTEwLTI4ICBFbWlsIEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBPdmVycmlkZGVuIGNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBhaW50KCkg c3RpbGwgdXNlcyBJbnRSZWN0cwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRs ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNw cAkocmV2aXNpb24gOTg2MjgpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTMwMjMsNiArMzAyMyw5IEBAIHZvaWQgRXZlbnRIYW5kbGVy OjpkZWZhdWx0QmFja3NwYWNlRXZlbnQKIAogICAgIGlmICghbV9mcmFtZS0+ZWRpdG9yKCktPmJl aGF2aW9yKCkuc2hvdWxkTmF2aWdhdGVCYWNrT25CYWNrc3BhY2UoKSkKICAgICAgICAgcmV0dXJu OworICAgIAorICAgIGlmICghbV9mcmFtZS0+c2V0dGluZ3MoKS0+YmFja3NwYWNlS2V5TmF2aWdh dGlvbkVuYWJsZWQoKSkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgUGFnZSogcGFnZSA9IG1fZnJh bWUtPnBhZ2UoKTsKICAgICBpZiAoIXBhZ2UpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1Nl dHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNw cAkocmV2aXNpb24gOTg2MjgpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjI5LDYgKzIyOSw3IEBAIFNldHRpbmdzOjpTZXR0aW5ncyhQYWdl KiBwYWdlKQogICAgICwgbV9wYXNzd29yZEVjaG9FbmFibGVkKGZhbHNlKQogI2VuZGlmCiAgICAg LCBtX3N1cHByZXNzSW5jcmVtZW50YWxSZW5kZXJpbmcoZmFsc2UpCisgICAgLCBtX2JhY2tzcGFj ZUtleU5hdmlnYXRpb25FbmFibGVkKHRydWUpCiAgICAgLCBtX2xvYWRzSW1hZ2VzQXV0b21hdGlj YWxseVRpbWVyKHRoaXMsICZTZXR0aW5nczo6bG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5VGltZXJG aXJlZCkKIHsKICAgICAvLyBBIEZyYW1lIG1heSBub3QgaGF2ZSBiZWVuIGNyZWF0ZWQgeWV0LCBz byB3ZSBpbml0aWFsaXplIHRoZSBBdG9taWNTdHJpbmcgCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w YWdlL1NldHRpbmdzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5n cy5oCShyZXZpc2lvbiA5ODYyOCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAko d29ya2luZyBjb3B5KQpAQCAtNDY5LDcgKzQ2OSwxMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK ICAgICAgICAgdm9pZCBzZXRTdXBwcmVzc0luY3JlbWVudGFsUmVuZGVyaW5nKGJvb2wgZmxhZykg eyBtX3N1cHByZXNzSW5jcmVtZW50YWxSZW5kZXJpbmcgPSBmbGFnOyB9CiAgICAgICAgIGJvb2wg c3VwcHJlc3NJbmNyZW1lbnRhbFJlbmRlcmluZygpIGNvbnN0IHsgcmV0dXJuIG1fc3VwcHJlc3NJ bmNyZW1lbnRhbFJlbmRlcmluZzsgfQotCisgICAgICAgIAorICAgICAgICB2b2lkIHNldEJhY2tz cGFjZUtleU5hdmlnYXRpb25FbmFibGVkKGJvb2wgZmxhZykgeyBtX2JhY2tzcGFjZUtleU5hdmln YXRpb25FbmFibGVkID0gZmxhZzsgfQorICAgICAgICBib29sIGJhY2tzcGFjZUtleU5hdmlnYXRp b25FbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9iYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxl ZDsgfQorICAgICAgICAKICAgICAgICAgdm9pZCBzZXRQYXNzd29yZEVjaG9EdXJhdGlvbkluU2Vj b25kcyhkb3VibGUgZHVyYXRpb25JblNlY29uZHMpIHsgbV9wYXNzd29yZEVjaG9EdXJhdGlvbklu U2Vjb25kcyA9IGR1cmF0aW9uSW5TZWNvbmRzOyB9CiAgICAgICAgIGRvdWJsZSBwYXNzd29yZEVj aG9EdXJhdGlvbkluU2Vjb25kcygpIGNvbnN0IHsgcmV0dXJuIG1fcGFzc3dvcmRFY2hvRHVyYXRp b25JblNlY29uZHM7IH0KIApAQCAtNjA3LDYgKzYxMCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgYm9vbCBtX21lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUgOiAxOwogICAgICAgICBi b29sIG1fcGFzc3dvcmRFY2hvRW5hYmxlZCA6IDE7CiAgICAgICAgIGJvb2wgbV9zdXBwcmVzc0lu Y3JlbWVudGFsUmVuZGVyaW5nIDogMTsKKyAgICAgICAgYm9vbCBtX2JhY2tzcGFjZUtleU5hdmln YXRpb25FbmFibGVkIDogMTsKIAogICAgICAgICBUaW1lcjxTZXR0aW5ncz4gbV9sb2Fkc0ltYWdl c0F1dG9tYXRpY2FsbHlUaW1lcjsKICAgICAgICAgdm9pZCBsb2Fkc0ltYWdlc0F1dG9tYXRpY2Fs bHlUaW1lckZpcmVkKFRpbWVyPFNldHRpbmdzPiopOwpJbmRleDogU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24g OTg3NjcpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwyOCBAQAorMjAxMS0xMC0yOCAgSm9obiBTdWxsaXZhbiAgPHN1bGxpdmFuQGFwcGxlLmNv bT4KKworICAgICAgICBXZWJLaXQyIHBhcnQgb2Y6CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTE0MgorICAgICAgICBXaGV0aGVyIGJhY2tzcGFjZSBn b2VzIEJhY2sgc2hvdWxkIGJlIGNvbmZpZ3VyYWJsZQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaDoK KyAgICAgICAgRGVjbGFyZWQgYmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQgcHJvcGVydHkg dXNpbmcgbWFjcm8uIFRoaXMgaW5pdGlhbGl6ZXMKKyAgICAgICAgaXQgdG8gdHJ1ZSwgdG8gbWF0 Y2ggY3VycmVudCBiZWhhdmlvci4KKyAgICAgICAgCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9D L1dLUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV0tQcmVmZXJlbmNlc1NldEJhY2tzcGFjZUtl eU5hdmlnYXRpb25FbmFibGVkKToKKyAgICAgICAgTmV3IGZ1bmN0aW9uLCBwYXNzIHZhbHVlIHRv IGltcGwuCisgICAgICAgIChXS1ByZWZlcmVuY2VzR2V0QmFja3NwYWNlS2V5TmF2aWdhdGlvbkVu YWJsZWQpOgorICAgICAgICBOZXcgZnVuY3Rpb24sIHJldHVybnMgcmVzdWx0IGZyb20gaW1wbC4K KyAgICAgICAgCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuaDoKKyAg ICAgICAgRGVjbGFyZWQgQVBJIGZ1bmN0aW9ucyBmb3IgbmV3IHByZWZlcmVuY2UuCisgICAgICAg IAorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMpOgorICAgICAgICBVcGRhdGVzIFdlYkNv cmUgc2V0dGluZ3MgZnJvbSBXZWJLaXQyIHByZWZzLgorCiAyMDExLTEwLTI4ICBUaW1vdGh5IEhh dGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBTdXBwb3J0IHVzaW5nIGEgZGlm ZmVyZW50IGZyb250LWVuZCBmb3IgdGhlIFdlYiBJbnNwZWN0b3IgaW4gV2ViS2l0Mi4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaAkocmV2aXNpb24g OTg2MjgpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC05Niw2ICs5Niw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogICAgIG1h Y3JvKFdlYkF1ZGlvRW5hYmxlZCwgd2ViQXVkaW9FbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkg XAogICAgIG1hY3JvKEFwcGxpY2F0aW9uQ2hyb21lTW9kZUVuYWJsZWQsIGFwcGxpY2F0aW9uQ2hy b21lTW9kZSwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhTdXBwcmVzc0luY3JlbWVu dGFsUmVuZGVyaW5nLCBzdXBwcmVzc0luY3JlbWVudGFsUmVuZGVyaW5nLCBCb29sLCBib29sLCBm YWxzZSkgXAorICAgIG1hY3JvKEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkLCBiYWNrc3Bh Y2VLZXlOYXZpZ2F0aW9uRW5hYmxlZCwgQm9vbCwgYm9vbCwgdHJ1ZSkgXAogICAgIFwKIAogI2Rl ZmluZSBGT1JfRUFDSF9XRUJLSVRfRE9VQkxFX1BSRUZFUkVOQ0UobWFjcm8pIFwKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAJKHJl dmlzaW9uIDk4NjI4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVy ZW5jZXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NTEsMyArNjUxLDEzIEBAIGJvb2wgV0tQcmVm ZXJlbmNlc0dldFN1cHByZXNzSW5jcmVtZW50YWwKIHsKICAgICByZXR1cm4gdG9JbXBsKHByZWZl cmVuY2VzUmVmKS0+c3VwcHJlc3NJbmNyZW1lbnRhbFJlbmRlcmluZygpOwogfQorCit2b2lkIFdL UHJlZmVyZW5jZXNTZXRCYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZChXS1ByZWZlcmVuY2Vz UmVmIHByZWZlcmVuY2VzUmVmLCBib29sIGVuYWJsZWQpCit7CisgICAgdG9JbXBsKHByZWZlcmVu Y2VzUmVmKS0+c2V0QmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQoZW5hYmxlZCk7Cit9CisK K2Jvb2wgV0tQcmVmZXJlbmNlc0dldEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkKFdLUHJl ZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJl bmNlc1JlZiktPmJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkKCk7Cit9CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmgJKHJldmlzaW9u IDk4NjI4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMu aAkod29ya2luZyBjb3B5KQpAQCAtMTczLDYgKzE3MywxMCBAQCBXS19FWFBPUlQgYm9vbCBXS1By ZWZlcmVuY2VzR2V0V2ViQXVkaW9FCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0U3Vw cHJlc3NJbmNyZW1lbnRhbFJlbmRlcmluZyhXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVm LCBib29sIGVuYWJsZWQpOwogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFN1cHByZXNz SW5jcmVtZW50YWxSZW5kZXJpbmcoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZik7CiAK Ky8vIERlZmF1bHRzIHRvIHRydWUKK1dLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRCYWNr c3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVm LCBib29sIGVuYWJsZWQpOworV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldEJhY2tzcGFj ZUtleU5hdmlnYXRpb25FbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpOwor CiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gOTg2MjgpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTE3NDgsNiArMTc0OCw3IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29u c3QgV2UKIAogICAgIHNldHRpbmdzLT5zZXRBcHBsaWNhdGlvbkNocm9tZU1vZGUoc3RvcmUuZ2V0 Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjphcHBsaWNhdGlvbkNocm9tZU1vZGVL ZXkoKSkpOyAgICAKICAgICBzZXR0aW5ncy0+c2V0U3VwcHJlc3NJbmNyZW1lbnRhbFJlbmRlcmlu ZyhzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnN1cHByZXNzSW5j cmVtZW50YWxSZW5kZXJpbmdLZXkoKSkpOworICAgIHNldHRpbmdzLT5zZXRCYWNrc3BhY2VLZXlO YXZpZ2F0aW9uRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNL ZXk6OmJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkS2V5KCkpKTsKIAogICAgIHBsYXRmb3Jt UHJlZmVyZW5jZXNEaWRDaGFuZ2Uoc3RvcmUpOwogfQpJbmRleDogU291cmNlL1dlYktpdC9tYWMv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkocmV2 aXNpb24gOTg3NjcpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwzMyBAQAorMjAxMS0xMC0yOCAgSm9obiBTdWxsaXZhbiAgPHN1bGxpdmFu QGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXQgcGFydCBvZjoKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxMTQyCisgICAgICAgIFdoZXRoZXIgYmFj a3NwYWNlIGdvZXMgQmFjayBzaG91bGQgYmUgY29uZmlndXJhYmxlCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYkZyYW1lVmlldy5t bToKKyAgICAgICAgKC1bV2ViRnJhbWVWaWV3IGtleURvd246XSk6CisgICAgICAgIEhvbm9yIHRo ZSBuZXcgcHJlZmVyZW5jZS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQ cml2YXRlLmg6CisgICAgICAgIEFkZGVkICNkZWZpbmUgZm9yIFdlYktpdEJhY2tzcGFjZUtleU5h dmlnYXRpb25FbmFibGVkS2V5CisgICAgICAgIAorICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVy ZW5jZXMubW06CisgICAgICAgICgrW1dlYlByZWZlcmVuY2VzIGluaXRpYWxpemVdKToKKyAgICAg ICAgSW5pdGlhbGl6ZSBuZXcgcHJlZiB0byBZRVMsIHRvIG1hdGNoIGN1cnJlbnQgYmVoYXZpb3Iu CisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIHNldEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFi bGVkOl0pOgorICAgICAgICBOZXcgbWV0aG9kLCBzdGFuZGFyZCBwcmVmcyBzZXR0ZXIuCisgICAg ICAgICgtW1dlYlByZWZlcmVuY2VzIGJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkXSk6Cisg ICAgICAgIE5ldyBtZXRob2QsIHN0YW5kYXJkIHByZWZzIGdldHRlci4KKworICAgICAgICAqIFdl YlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmg6CisgICAgICAgIERlY2xhcmVkIG5ldyBtZXRo b2RzLgorICAgICAgICAKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgICgt W1dlYlZpZXcgX3ByZWZlcmVuY2VzQ2hhbmdlZDpdKToKKyAgICAgICAgVXBkYXRlcyBXZWJDb3Jl IHNldHRpbmdzIGZyb20gV2ViS2l0IHByZWZzLgorCiAyMDExLTEwLTI4ICBKb2NoZW4gRWlzaW5n ZXIgIDxqb2NoZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlbmFtZSBhIG51bWJlciBvZiBt ZXRob2RzIG1lbnRpb25pbmcgSmF2YVNjcmlwdCB0byBqdXN0IFNjcmlwdCBpbnN0ZWFkCkluZGV4 OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lVmlldy5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lVmlldy5tbQkocmV2aXNpb24gOTg2 MjgpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lVmlldy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtNzg0LDcgKzc4NCw3IEBAIC0gKHZvaWQpa2V5RG93bjooTlNFdmVudCAqKWV2 ZW50CiAgICAgZm9yIChpbmRleCA9IDA7IGluZGV4IDwgY291bnQ7ICsraW5kZXgpIHsKICAgICAg ICAgc3dpdGNoIChbY2hhcmFjdGVycyBjaGFyYWN0ZXJBdEluZGV4OmluZGV4XSkgewogICAgICAg ICAgICAgY2FzZSBOU0RlbGV0ZUNoYXJhY3RlcjoKLSAgICAgICAgICAgICAgICBpZiAoIW1haW50 YWluc0JhY2tGb3J3YXJkTGlzdCkgeworICAgICAgICAgICAgICAgIGlmICghbWFpbnRhaW5zQmFj a0ZvcndhcmRMaXN0IHx8ICFbW1tzZWxmIF93ZWJWaWV3XSBwcmVmZXJlbmNlc10gYmFja3NwYWNl S2V5TmF2aWdhdGlvbkVuYWJsZWRdKSB7CiAgICAgICAgICAgICAgICAgICAgIGNhbGxTdXBlciA9 IFlFUzsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgfQpJbmRl eDogU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlz UHJpdmF0ZS5oCShyZXZpc2lvbiA5ODYyOCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyNiw2ICsxMjYs NyBAQAogI2RlZmluZSBXZWJLaXRFZGl0aW5nQmVoYXZpb3JQcmVmZXJlbmNlS2V5IEAiV2ViS2l0 RWRpdGluZ0JlaGF2aW9yIgogI2RlZmluZSBXZWJLaXRVc2VQcmVIVE1MNVBhcnNlclF1aXJrc0tl eSBAIldlYktpdFVzZVByZUhUTUw1UGFyc2VyUXVpcmtzIgogI2RlZmluZSBXZWJLaXRTdXBwcmVz c0luY3JlbWVudGFsUmVuZGVyaW5nS2V5IEAiV2ViS2l0U3VwcHJlc3NJbmNyZW1lbnRhbFJlbmRl cmluZyIKKyNkZWZpbmUgV2ViS2l0QmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWRLZXkgQCJX ZWJLaXRCYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZCIKIAogLy8gQ29yZUdyYXBoaWNzIGRl ZmVycmVkIHVwZGF0ZXMgYXJlIGRpc2FibGVkIGlmIFdlYktpdEVuYWJsZUNvYWxlc2NlZFVwZGF0 ZXNQcmVmZXJlbmNlS2V5IGlzIHNldAogLy8gdG8gTk8sIG9yIGhhcyBubyB2YWx1ZS4gIEZvciBj b21wYXRpYmlsaXR5IHdpdGggTWFjIE9TIFggMTAuNC42LCBkZWZlcnJlZCB1cGRhdGVzIGFyZSBP RkYgYnkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5t bQkocmV2aXNpb24gOTg2MjgpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZl cmVuY2VzLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zODYsNiArMzg2LDcgQEAgKyAodm9pZClpbml0 aWFsaXplCiAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpZRVNdLCAgV2ViS2l0TWVk aWFQbGF5YmFja0FsbG93c0lubGluZVByZWZlcmVuY2VLZXksCiAgICAgICAgIFtOU051bWJlciBu dW1iZXJXaXRoQm9vbDpOT10sICAgV2ViS2l0V2ViQXVkaW9FbmFibGVkUHJlZmVyZW5jZUtleSwK ICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOk5PXSwgICBXZWJLaXRTdXBwcmVzc0lu Y3JlbWVudGFsUmVuZGVyaW5nS2V5LAorICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6 WUVTXSwgIFdlYktpdEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkS2V5LAogCiAgICAgICAg IFtOU051bWJlciBudW1iZXJXaXRoTG9uZ0xvbmc6QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6Om5v UXVvdGEoKV0sIFdlYktpdEFwcGxpY2F0aW9uQ2FjaGVUb3RhbFF1b3RhLAogICAgICAgICBbTlNO dW1iZXIgbnVtYmVyV2l0aExvbmdMb25nOkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpub1F1b3Rh KCldLCBXZWJLaXRBcHBsaWNhdGlvbkNhY2hlRGVmYXVsdE9yaWdpblF1b3RhLApAQCAtMTU2Myw2 ICsxNTY0LDE2IEBAIC0gKEJPT0wpc3VwcHJlc3NJbmNyZW1lbnRhbFJlbmRlcmluZwogICAgIHJl dHVybiBbc2VsZiBfYm9vbFZhbHVlRm9yS2V5OldlYktpdFN1cHByZXNzSW5jcmVtZW50YWxSZW5k ZXJpbmdLZXldOwogfQogCistICh2b2lkKXNldEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVk OihCT09MKWZsYWcKK3sKKyAgICBbc2VsZiBfc2V0Qm9vbFZhbHVlOmZsYWcgZm9yS2V5OldlYktp dEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkS2V5XTsKK30KKworLSAoQk9PTCliYWNrc3Bh Y2VLZXlOYXZpZ2F0aW9uRW5hYmxlZAoreworICAgIHJldHVybiBbc2VsZiBfYm9vbFZhbHVlRm9y S2V5OldlYktpdEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkS2V5XTsKK30KKwogQGVuZAog CiBAaW1wbGVtZW50YXRpb24gV2ViUHJlZmVyZW5jZXMgKFdlYkludGVybmFsKQpJbmRleDogU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oCShy ZXZpc2lvbiA5ODYyOCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5j ZXNQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2OCw0ICsyNjgsNyBAQCBAaW50ZXJmYWNl IFdlYlByZWZlcmVuY2VzIChXZWJQcml2YXRlKQogLSAodm9pZClzZXRTdXBwcmVzc0luY3JlbWVu dGFsUmVuZGVyaW5nOihCT09MKWZsYWc7CiAtIChCT09MKXN1cHByZXNzSW5jcmVtZW50YWxSZW5k ZXJpbmc7CiAKKy0gKHZvaWQpc2V0QmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQ6KEJPT0wp ZmxhZzsKKy0gKEJPT0wpYmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQ7CisKIEBlbmQKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHJldmlzaW9uIDk4NjI4KQorKysg U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0x NDc0LDYgKzE0NzQsNyBAQCAtICh2b2lkKV9wcmVmZXJlbmNlc0NoYW5nZWQ6KFdlYlByZWZlcmVu CiAgICAgc2V0dGluZ3MtPnNldE1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlKFtwcmVm ZXJlbmNlcyBtZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZV0pOwogICAgIHNldHRpbmdz LT5zZXRNZWRpYVBsYXliYWNrQWxsb3dzSW5saW5lKFtwcmVmZXJlbmNlcyBtZWRpYVBsYXliYWNr QWxsb3dzSW5saW5lXSk7CiAgICAgc2V0dGluZ3MtPnNldFN1cHByZXNzSW5jcmVtZW50YWxSZW5k ZXJpbmcoW3ByZWZlcmVuY2VzIHN1cHByZXNzSW5jcmVtZW50YWxSZW5kZXJpbmddKTsKKyAgICBz ZXR0aW5ncy0+c2V0QmFja3NwYWNlS2V5TmF2aWdhdGlvbkVuYWJsZWQoW3ByZWZlcmVuY2VzIGJh Y2tzcGFjZUtleU5hdmlnYXRpb25FbmFibGVkXSk7CiAKICAgICAvLyBBcHBsaWNhdGlvbiBDYWNo ZSBQcmVmZXJlbmNlcyBhcmUgc3RvcmVkIG9uIHRoZSBnbG9iYWwgY2FjaGUgc3RvcmFnZSBtYW5h Z2VyLCBub3QgaW4gU2V0dGluZ3MuCiAgICAgW1dlYkFwcGxpY2F0aW9uQ2FjaGUgc2V0RGVmYXVs dE9yaWdpblF1b3RhOltwcmVmZXJlbmNlcyBhcHBsaWNhdGlvbkNhY2hlRGVmYXVsdE9yaWdpblF1 b3RhXV07Cg== 112949 2011-10-28 17:30:55 -0700 2011-10-28 17:31:29 -0700 Move the frame->settings() test to after the !page test. NullPage_patch.txt text/plain 1464 sullivan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4Nzg2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMTAtMjggIEpvaG4gU3Vs bGl2YW4gIDxzdWxsaXZhbkBhcHBsZS5jb20+CisKKyAgICAgICAgSW1wcm92ZW1lbnQgdG8gdGhl IGZpeCBmb3I6CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03MTE0MgorICAgICAgICBXaGV0aGVyIGJhY2tzcGFjZSBnb2VzIEJhY2sgc2hvdWxkIGJlIGNv bmZpZ3VyYWJsZQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogcGFnZS9FdmVudEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5k bGVyOjpkZWZhdWx0QmFja3NwYWNlRXZlbnRIYW5kbGVyKToKKyAgICAgICAgRG8gdGhlIGZyYW1l LT5zZXR0aW5ncygpIGNoZWNrIGFmdGVyIHRoZSAhcGFnZSBjaGVjaywgc2luY2UKKyAgICAgICAg YSBudWxsIHBhZ2UgbWVhbnMgbnVsbCBzZXR0aW5ncy4KKwogMjAxMS0xMC0yOCAgQWRhbSBCYXJ0 aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIEZhY3RvciBDb250ZXh0RGVzdHJ1Y3Rp b25PYnNlcnZlciBvdXQgb2YgQWN0aXZlRE9NT2JqZWN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w YWdlL0V2ZW50SGFuZGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9F dmVudEhhbmRsZXIuY3BwCShyZXZpc2lvbiA5ODc2OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2Uv RXZlbnRIYW5kbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAyNCwxMyArMzAyNCwxMyBAQCB2 b2lkIEV2ZW50SGFuZGxlcjo6ZGVmYXVsdEJhY2tzcGFjZUV2ZW50CiAgICAgaWYgKCFtX2ZyYW1l LT5lZGl0b3IoKS0+YmVoYXZpb3IoKS5zaG91bGROYXZpZ2F0ZUJhY2tPbkJhY2tzcGFjZSgpKQog ICAgICAgICByZXR1cm47CiAgICAgCi0gICAgaWYgKCFtX2ZyYW1lLT5zZXR0aW5ncygpLT5iYWNr c3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZCgpKQotICAgICAgICByZXR1cm47Ci0KICAgICBQYWdl KiBwYWdlID0gbV9mcmFtZS0+cGFnZSgpOwogICAgIGlmICghcGFnZSkKICAgICAgICAgcmV0dXJu OwogCisgICAgaWYgKCFtX2ZyYW1lLT5zZXR0aW5ncygpLT5iYWNrc3BhY2VLZXlOYXZpZ2F0aW9u RW5hYmxlZCgpKQorICAgICAgICByZXR1cm47CisgICAgCiAgICAgYm9vbCBoYW5kbGVkRXZlbnQg PSBmYWxzZTsKIAogICAgIGlmIChldmVudC0+c2hpZnRLZXkoKSkK