185327 2018-05-04 14:58:49 -0700 [Win] Implement WebPage::handleEditingKeyboardEvent 2018-05-16 10:55:29 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 174003 1 don.olmstead fujii achristensen bfulgham commit-queue ews-watchlist fujii pvollan webkit-bug-importer oldest_to_newest 1420897 0 don.olmstead 2018-05-04 14:58:49 -0700 Provide an implementation 1420898 1 339599 don.olmstead 2018-05-04 15:01:03 -0700 Created attachment 339599 Patch 1420900 2 ews-watchlist 2018-05-04 15:03:26 -0700 Attachment 339599 did not pass style-queue: ERROR: Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp:271: One space before end of line comments [whitespace/comments] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1420915 3 339603 don.olmstead 2018-05-04 15:37:20 -0700 Created attachment 339603 Patch 1421081 4 339603 ap 2018-05-05 16:14:23 -0700 Comment on attachment 339603 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=339603&action=review > Source/WebKit/ChangeLog:3 > + [Win] Implement WebPage::handleEditingKeyboardEvent Which tests start to pass with this change? I assume this only attempts to make the very basics work, no Asian text input. > Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp:271 > + if (!keyEvent || keyEvent->isSystemKey()) // do not treat this as text input if it's a system key event WebKit coding style calls for full sentences, with capitalization and period. > Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp:287 > + // Don't insert null or control characters as they can result in unexpected behaviour > + if (event->charCode() < ' ') Not even tabs? 1422617 5 339603 fujii 2018-05-09 19:58:35 -0700 Comment on attachment 339603 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=339603&action=review Thank you for the review, Alexey. >> Source/WebKit/ChangeLog:3 >> + [Win] Implement WebPage::handleEditingKeyboardEvent > > Which tests start to pass with this change? I assume this only attempts to make the very basics work, no Asian text input. This change just fix the linkage error of WinCairo WebKit2. WinCairo WebKit2 doesn't have WebKitTestRunner and WebKitAPITests running yet. >> Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp:271 >> + if (!keyEvent || keyEvent->isSystemKey()) // do not treat this as text input if it's a system key event > > WebKit coding style calls for full sentences, with capitalization and period. Will do. >> Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp:287 >> + if (event->charCode() < ' ') > > Not even tabs? This code is copied from Win port WK1. https://trac.webkit.org/browser/webkit/trunk/Source/WebKitLegacy/win/WebView.cpp?rev=231622#L2347 And, GTK port WebKit2 has the same code. https://trac.webkit.org/browser/webkit/trunk/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp#L99 It's a complicated issue how to tab in browsers. https://superuser.com/questions/67934/typing-the-tab-character-in-browser-text-boxes 1422620 6 340065 fujii 2018-05-09 20:12:48 -0700 Created attachment 340065 Patch 1423479 7 fujii 2018-05-13 18:32:49 -0700 @ap, could you review again? 1423896 8 fujii 2018-05-14 18:44:59 -0700 Could anyone review this? 1424275 9 340481 fujii 2018-05-16 01:51:50 -0700 Created attachment 340481 Patch 1424384 10 340481 commit-queue 2018-05-16 10:54:56 -0700 Comment on attachment 340481 Patch Clearing flags on attachment: 340481 Committed r231853: <https://trac.webkit.org/changeset/231853> 1424385 11 commit-queue 2018-05-16 10:54:58 -0700 All reviewed patches have been landed. Closing bug. 1424386 12 webkit-bug-importer 2018-05-16 10:55:29 -0700 <rdar://problem/40299696> 339599 2018-05-04 15:01:03 -0700 2018-05-04 15:37:20 -0700 Patch bug-185327.diff text/plain 2624 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMzJhY2VjYThkZTQuLmVhNzg5MzUzNmNiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDE4LTA1LTA0ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CisKKyAgICAgICAgW1dpbl0gSW1wbGVtZW50IFdlYlBhZ2U6OmhhbmRsZUVkaXRpbmdLZXlib2Fy ZEV2ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x ODUzMjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS93aW4vV2ViUGFnZVdpbi5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2U6OmhhbmRsZUVkaXRpbmdLZXlib2FyZEV2ZW50KToKKwogMjAxOC0wNS0wNCAgQ2hy aXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIEFwcHMgdGhhdCBh cmUgbm90IHZpc2libGUgbWF5IG5vdCBnZXQgc3VzcGVuZGVkIGlmIHRoZXkgdHJpZ2dlciBwYWdl IGxvYWRzIHdoaWxlIGluIHRoZSBiYWNrZ3JvdW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS93aW4vV2ViUGFnZVdpbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS93aW4vV2ViUGFnZVdpbi5jcHAKaW5kZXggZWU4ZThkZmNmOTcuLjdh NDY0MWNmN2RkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS93 aW4vV2ViUGFnZVdpbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv d2luL1dlYlBhZ2VXaW4uY3BwCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiV2ViUGFnZVBy b3h5TWVzc2FnZXMuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNzLmgiCiAjaW5jbHVkZSA8V2ViQ29y ZS9CYWNrRm9yd2FyZENvbnRyb2xsZXIuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL0VkaXRvci5oPgog I2luY2x1ZGUgPFdlYkNvcmUvRXZlbnRIYW5kbGVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9FdmVu dE5hbWVzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Gb2N1c0NvbnRyb2xsZXIuaD4KQEAgLTI2MCw0 ICsyNjEsMzMgQEAgY29uc3QgY2hhciogV2ViUGFnZTo6aW50ZXJwcmV0S2V5RXZlbnQoY29uc3Qg V2ViQ29yZTo6S2V5Ym9hcmRFdmVudCogZXZ0KQogICAgIGludCBtYXBLZXkgPSBtb2RpZmllcnMg PDwgMTYgfCBldnQtPmNoYXJDb2RlKCk7CiAgICAgcmV0dXJuIG1hcEtleSA/IGtleVByZXNzQ29t bWFuZHNNYXAtPmdldChtYXBLZXkpIDogMDsKIH0KKworYm9vbCBXZWJQYWdlOjpoYW5kbGVFZGl0 aW5nS2V5Ym9hcmRFdmVudChXZWJDb3JlOjpLZXlib2FyZEV2ZW50KiBldmVudCkKK3sKKyAgICBh dXRvKiBmcmFtZSA9IGRvd25jYXN0PE5vZGU+KGV2ZW50LT50YXJnZXQoKSktPmRvY3VtZW50KCku ZnJhbWUoKTsKKyAgICBBU1NFUlQoZnJhbWUpOworCisgICAgYXV0byoga2V5RXZlbnQgPSBldmVu dC0+dW5kZXJseWluZ1BsYXRmb3JtRXZlbnQoKTsKKyAgICBpZiAoIWtleUV2ZW50IHx8IGtleUV2 ZW50LT5pc1N5c3RlbUtleSgpKSAgLy8gZG8gbm90IHRyZWF0IHRoaXMgYXMgdGV4dCBpbnB1dCBp ZiBpdCdzIGEgc3lzdGVtIGtleSBldmVudAorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBh dXRvIGNvbW1hbmQgPSBmcmFtZS0+ZWRpdG9yKCkuY29tbWFuZChpbnRlcnByZXRLZXlFdmVudChl dmVudCkpOworCisgICAgaWYgKGtleUV2ZW50LT50eXBlKCkgPT0gUGxhdGZvcm1FdmVudDo6UmF3 S2V5RG93bikgeworICAgICAgICAvLyBXZWJLaXQgZG9lc24ndCBoYXZlIGVub3VnaCBpbmZvcm1h dGlvbiBhYm91dCBtb2RlIHRvIGRlY2lkZSBob3cgY29tbWFuZHMgdGhhdCBqdXN0IGluc2VydCB0 ZXh0IGlmIGV4ZWN1dGVkIHZpYSBFZGl0b3Igc2hvdWxkIGJlIHRyZWF0ZWQsCisgICAgICAgIC8v IHNvIHdlIGxlYXZlIGl0IHVwb24gV2ViQ29yZSB0byBlaXRoZXIgaGFuZGxlIHRoZW0gaW1tZWRp YXRlbHkgKGUuZy4gVGFiIHRoYXQgY2hhbmdlcyBmb2N1cykgb3IgbGV0IGEga2V5cHJlc3MgZXZl bnQgYmUgZ2VuZXJhdGVkCisgICAgICAgIC8vIChlLmcuIFRhYiB0aGF0IGluc2VydHMgYSBUYWIg Y2hhcmFjdGVyLCBvciBFbnRlcikuCisgICAgICAgIHJldHVybiAhY29tbWFuZC5pc1RleHRJbnNl cnRpb24oKSAmJiBjb21tYW5kLmV4ZWN1dGUoZXZlbnQpOworICAgIH0KKworICAgIGlmIChjb21t YW5kLmV4ZWN1dGUoZXZlbnQpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIC8vIERvbid0 IGluc2VydCBudWxsIG9yIGNvbnRyb2wgY2hhcmFjdGVycyBhcyB0aGV5IGNhbiByZXN1bHQgaW4g dW5leHBlY3RlZCBiZWhhdmlvdXIKKyAgICBpZiAoZXZlbnQtPmNoYXJDb2RlKCkgPCAnICcpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiBmcmFtZS0+ZWRpdG9yKCkuaW5zZXJ0 VGV4dChrZXlFdmVudC0+dGV4dCgpLCBldmVudCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktp dAo= 339603 2018-05-04 15:37:20 -0700 2018-05-09 20:12:45 -0700 Patch bug-185327.diff text/plain 2623 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMzJhY2VjYThkZTQuLmVhNzg5MzUzNmNiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDE4LTA1LTA0ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CisKKyAgICAgICAgW1dpbl0gSW1wbGVtZW50IFdlYlBhZ2U6OmhhbmRsZUVkaXRpbmdLZXlib2Fy ZEV2ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x ODUzMjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS93aW4vV2ViUGFnZVdpbi5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2U6OmhhbmRsZUVkaXRpbmdLZXlib2FyZEV2ZW50KToKKwogMjAxOC0wNS0wNCAgQ2hy aXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIEFwcHMgdGhhdCBh cmUgbm90IHZpc2libGUgbWF5IG5vdCBnZXQgc3VzcGVuZGVkIGlmIHRoZXkgdHJpZ2dlciBwYWdl IGxvYWRzIHdoaWxlIGluIHRoZSBiYWNrZ3JvdW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS93aW4vV2ViUGFnZVdpbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS93aW4vV2ViUGFnZVdpbi5jcHAKaW5kZXggZWU4ZThkZmNmOTcuLjdh NDY0MWNmN2RkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS93 aW4vV2ViUGFnZVdpbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv d2luL1dlYlBhZ2VXaW4uY3BwCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiV2ViUGFnZVBy b3h5TWVzc2FnZXMuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNzLmgiCiAjaW5jbHVkZSA8V2ViQ29y ZS9CYWNrRm9yd2FyZENvbnRyb2xsZXIuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL0VkaXRvci5oPgog I2luY2x1ZGUgPFdlYkNvcmUvRXZlbnRIYW5kbGVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9FdmVu dE5hbWVzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Gb2N1c0NvbnRyb2xsZXIuaD4KQEAgLTI2MCw0 ICsyNjEsMzMgQEAgY29uc3QgY2hhciogV2ViUGFnZTo6aW50ZXJwcmV0S2V5RXZlbnQoY29uc3Qg V2ViQ29yZTo6S2V5Ym9hcmRFdmVudCogZXZ0KQogICAgIGludCBtYXBLZXkgPSBtb2RpZmllcnMg PDwgMTYgfCBldnQtPmNoYXJDb2RlKCk7CiAgICAgcmV0dXJuIG1hcEtleSA/IGtleVByZXNzQ29t bWFuZHNNYXAtPmdldChtYXBLZXkpIDogMDsKIH0KKworYm9vbCBXZWJQYWdlOjpoYW5kbGVFZGl0 aW5nS2V5Ym9hcmRFdmVudChXZWJDb3JlOjpLZXlib2FyZEV2ZW50KiBldmVudCkKK3sKKyAgICBh dXRvKiBmcmFtZSA9IGRvd25jYXN0PE5vZGU+KGV2ZW50LT50YXJnZXQoKSktPmRvY3VtZW50KCku ZnJhbWUoKTsKKyAgICBBU1NFUlQoZnJhbWUpOworCisgICAgYXV0byoga2V5RXZlbnQgPSBldmVu dC0+dW5kZXJseWluZ1BsYXRmb3JtRXZlbnQoKTsKKyAgICBpZiAoIWtleUV2ZW50IHx8IGtleUV2 ZW50LT5pc1N5c3RlbUtleSgpKSAvLyBkbyBub3QgdHJlYXQgdGhpcyBhcyB0ZXh0IGlucHV0IGlm IGl0J3MgYSBzeXN0ZW0ga2V5IGV2ZW50CisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGF1 dG8gY29tbWFuZCA9IGZyYW1lLT5lZGl0b3IoKS5jb21tYW5kKGludGVycHJldEtleUV2ZW50KGV2 ZW50KSk7CisKKyAgICBpZiAoa2V5RXZlbnQtPnR5cGUoKSA9PSBQbGF0Zm9ybUV2ZW50OjpSYXdL ZXlEb3duKSB7CisgICAgICAgIC8vIFdlYktpdCBkb2Vzbid0IGhhdmUgZW5vdWdoIGluZm9ybWF0 aW9uIGFib3V0IG1vZGUgdG8gZGVjaWRlIGhvdyBjb21tYW5kcyB0aGF0IGp1c3QgaW5zZXJ0IHRl eHQgaWYgZXhlY3V0ZWQgdmlhIEVkaXRvciBzaG91bGQgYmUgdHJlYXRlZCwKKyAgICAgICAgLy8g c28gd2UgbGVhdmUgaXQgdXBvbiBXZWJDb3JlIHRvIGVpdGhlciBoYW5kbGUgdGhlbSBpbW1lZGlh dGVseSAoZS5nLiBUYWIgdGhhdCBjaGFuZ2VzIGZvY3VzKSBvciBsZXQgYSBrZXlwcmVzcyBldmVu dCBiZSBnZW5lcmF0ZWQKKyAgICAgICAgLy8gKGUuZy4gVGFiIHRoYXQgaW5zZXJ0cyBhIFRhYiBj aGFyYWN0ZXIsIG9yIEVudGVyKS4KKyAgICAgICAgcmV0dXJuICFjb21tYW5kLmlzVGV4dEluc2Vy dGlvbigpICYmIGNvbW1hbmQuZXhlY3V0ZShldmVudCk7CisgICAgfQorCisgICAgaWYgKGNvbW1h bmQuZXhlY3V0ZShldmVudCkpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgLy8gRG9uJ3Qg aW5zZXJ0IG51bGwgb3IgY29udHJvbCBjaGFyYWN0ZXJzIGFzIHRoZXkgY2FuIHJlc3VsdCBpbiB1 bmV4cGVjdGVkIGJlaGF2aW91cgorICAgIGlmIChldmVudC0+Y2hhckNvZGUoKSA8ICcgJykKKyAg ICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIGZyYW1lLT5lZGl0b3IoKS5pbnNlcnRU ZXh0KGtleUV2ZW50LT50ZXh0KCksIGV2ZW50KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0 Cg== 340065 2018-05-09 20:12:48 -0700 2018-05-16 01:51:47 -0700 Patch bug-185327-20180510121247.patch text/plain 2771 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxNjI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ2MWQ4OTFjMjU2YjViMTFj MDhmMGRlODc0M2M3OTE1ZDkyZTI2ODkuLjliOWQyYjQ5OGQyNjRiMjhiOTgxNmIyMTg2OGY2Yjcw MGY5YzU5ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTgtMDUtMDkgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW1dpbl0gSW1wbGVt ZW50IFdlYlBhZ2U6OmhhbmRsZUVkaXRpbmdLZXlib2FyZEV2ZW50CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODUzMjcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS93aW4v V2ViUGFnZVdpbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmhhbmRsZUVkaXRpbmdL ZXlib2FyZEV2ZW50KTogQ29waWVkIGZyb20gV2ViS2l0TGVnYWN5LgorCiAyMDE4LTA1LTA5ICBU aW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSB0 aGUgdW51c2VkIEhBVkVfT1NfQUNUSVZJVFkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL3dpbi9XZWJQYWdlV2luLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL3dpbi9XZWJQYWdlV2luLmNwcAppbmRleCBlZThlOGRmY2Y5Nzg3NjQxZjAw ZmI1MTNlZWQ3ZDMxYWExOTUxZWQ4Li4xZjQwYzJlMWM3MzRmYjM4Y2RlMjMwYTNlZWI1YTI0ZWY0 NjVlYjQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS93aW4v V2ViUGFnZVdpbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uvd2lu L1dlYlBhZ2VXaW4uY3BwCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5 TWVzc2FnZXMuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNzLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9C YWNrRm9yd2FyZENvbnRyb2xsZXIuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL0VkaXRvci5oPgogI2lu Y2x1ZGUgPFdlYkNvcmUvRXZlbnRIYW5kbGVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9FdmVudE5h bWVzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Gb2N1c0NvbnRyb2xsZXIuaD4KQEAgLTI2MCw0ICsy NjEsMzYgQEAgY29uc3QgY2hhciogV2ViUGFnZTo6aW50ZXJwcmV0S2V5RXZlbnQoY29uc3QgV2Vi Q29yZTo6S2V5Ym9hcmRFdmVudCogZXZ0KQogICAgIGludCBtYXBLZXkgPSBtb2RpZmllcnMgPDwg MTYgfCBldnQtPmNoYXJDb2RlKCk7CiAgICAgcmV0dXJuIG1hcEtleSA/IGtleVByZXNzQ29tbWFu ZHNNYXAtPmdldChtYXBLZXkpIDogMDsKIH0KKworYm9vbCBXZWJQYWdlOjpoYW5kbGVFZGl0aW5n S2V5Ym9hcmRFdmVudChXZWJDb3JlOjpLZXlib2FyZEV2ZW50KiBldmVudCkKK3sKKyAgICBhdXRv KiBmcmFtZSA9IGRvd25jYXN0PE5vZGU+KGV2ZW50LT50YXJnZXQoKSktPmRvY3VtZW50KCkuZnJh bWUoKTsKKyAgICBBU1NFUlQoZnJhbWUpOworCisgICAgYXV0byoga2V5RXZlbnQgPSBldmVudC0+ dW5kZXJseWluZ1BsYXRmb3JtRXZlbnQoKTsKKyAgICBpZiAoIWtleUV2ZW50IHx8IGtleUV2ZW50 LT5pc1N5c3RlbUtleSgpKSAvLyBEbyBub3QgdHJlYXQgdGhpcyBhcyB0ZXh0IGlucHV0IGlmIGl0 J3MgYSBzeXN0ZW0ga2V5IGV2ZW50LgorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBhdXRv IGNvbW1hbmQgPSBmcmFtZS0+ZWRpdG9yKCkuY29tbWFuZChpbnRlcnByZXRLZXlFdmVudChldmVu dCkpOworCisgICAgaWYgKGtleUV2ZW50LT50eXBlKCkgPT0gUGxhdGZvcm1FdmVudDo6UmF3S2V5 RG93bikgeworICAgICAgICAvLyBXZWJLaXQgZG9lc24ndCBoYXZlIGVub3VnaCBpbmZvcm1hdGlv biBhYm91dCBtb2RlIHRvIGRlY2lkZQorICAgICAgICAvLyBob3cgY29tbWFuZHMgdGhhdCBqdXN0 IGluc2VydCB0ZXh0IGlmIGV4ZWN1dGVkIHZpYSBFZGl0b3IKKyAgICAgICAgLy8gc2hvdWxkIGJl IHRyZWF0ZWQsIHNvIHdlIGxlYXZlIGl0IHVwb24gV2ViQ29yZSB0byBlaXRoZXIKKyAgICAgICAg Ly8gaGFuZGxlIHRoZW0gaW1tZWRpYXRlbHkgKGUuZy4gVGFiIHRoYXQgY2hhbmdlcyBmb2N1cykg b3IKKyAgICAgICAgLy8gbGV0IGEga2V5cHJlc3MgZXZlbnQgYmUgZ2VuZXJhdGVkIChlLmcuIFRh YiB0aGF0IGluc2VydHMgYQorICAgICAgICAvLyBUYWIgY2hhcmFjdGVyLCBvciBFbnRlcikuCisg ICAgICAgIHJldHVybiAhY29tbWFuZC5pc1RleHRJbnNlcnRpb24oKSAmJiBjb21tYW5kLmV4ZWN1 dGUoZXZlbnQpOworICAgIH0KKworICAgIGlmIChjb21tYW5kLmV4ZWN1dGUoZXZlbnQpKQorICAg ICAgICByZXR1cm4gdHJ1ZTsKKworICAgIC8vIERvbid0IGluc2VydCBudWxsIG9yIGNvbnRyb2wg Y2hhcmFjdGVycyBhcyB0aGV5IGNhbiByZXN1bHQgaW4gdW5leHBlY3RlZCBiZWhhdmlvdXIKKyAg ICBpZiAoZXZlbnQtPmNoYXJDb2RlKCkgPCAnICcpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwor ICAgIHJldHVybiBmcmFtZS0+ZWRpdG9yKCkuaW5zZXJ0VGV4dChrZXlFdmVudC0+dGV4dCgpLCBl dmVudCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo= 340481 2018-05-16 01:51:50 -0700 2018-05-16 10:54:56 -0700 Patch bug-185327-20180516175149.patch text/plain 2854 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYyZDZlNmVmYzQ3ZWIwYjVi MTFhNWNjMWY5YzgxMjllMTllYWEzOWQuLjY5MDRhYjc1ZWU4OWZkZjdjZDI5ZjVmN2VlNjZiNTM1 N2VlZTdkOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTgtMDUtMTYgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW1dpbl0gSW1wbGVt ZW50IFdlYlBhZ2U6OmhhbmRsZUVkaXRpbmdLZXlib2FyZEV2ZW50CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODUzMjcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS93aW4v V2ViUGFnZVdpbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmhhbmRsZUVkaXRpbmdL ZXlib2FyZEV2ZW50KTogQ29waWVkIGZyb20gV2ViS2l0TGVnYWN5LgorCiAyMDE4LTA1LTE1ICBZ dXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgogCiAgICAgICAgIFtKU0NdIENo ZWNrIFR5cGVJbmZvIGZpcnN0IGJlZm9yZSBjYWxsaW5nIGdldENhbGxEYXRhIHdoZW4gd2Ugd291 bGQgbGlrZSB0byBjaGVjayB3aGV0aGVyIGdpdmVuIG9iamVjdCBpcyBhIGZ1bmN0aW9uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS93aW4vV2ViUGFnZVdpbi5j cHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS93aW4vV2ViUGFnZVdpbi5jcHAK aW5kZXggZWU4ZThkZmNmOTc4NzY0MWYwMGZiNTEzZWVkN2QzMWFhMTk1MWVkOC4uZWY0MGM4YTA5 ODNkN2QzZTE4YjQzOWJjMTdiZDU2ZDRlMWM1NjBmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2Uvd2luL1dlYlBhZ2VXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL3dpbi9XZWJQYWdlV2luLmNwcApAQCAtMzMsNiArMzMsNyBA QAogI2luY2x1ZGUgIldlYlBhZ2VQcm94eU1lc3NhZ2VzLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vz cy5oIgogI2luY2x1ZGUgPFdlYkNvcmUvQmFja0ZvcndhcmRDb250cm9sbGVyLmg+CisjaW5jbHVk ZSA8V2ViQ29yZS9FZGl0b3IuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0V2ZW50SGFuZGxlci5oPgog I2luY2x1ZGUgPFdlYkNvcmUvRXZlbnROYW1lcy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRm9jdXND b250cm9sbGVyLmg+CkBAIC0yNjAsNCArMjYxLDM2IEBAIGNvbnN0IGNoYXIqIFdlYlBhZ2U6Omlu dGVycHJldEtleUV2ZW50KGNvbnN0IFdlYkNvcmU6OktleWJvYXJkRXZlbnQqIGV2dCkKICAgICBp bnQgbWFwS2V5ID0gbW9kaWZpZXJzIDw8IDE2IHwgZXZ0LT5jaGFyQ29kZSgpOwogICAgIHJldHVy biBtYXBLZXkgPyBrZXlQcmVzc0NvbW1hbmRzTWFwLT5nZXQobWFwS2V5KSA6IDA7CiB9CisKK2Jv b2wgV2ViUGFnZTo6aGFuZGxlRWRpdGluZ0tleWJvYXJkRXZlbnQoV2ViQ29yZTo6S2V5Ym9hcmRF dmVudCogZXZlbnQpCit7CisgICAgYXV0byogZnJhbWUgPSBkb3duY2FzdDxOb2RlPihldmVudC0+ dGFyZ2V0KCkpLT5kb2N1bWVudCgpLmZyYW1lKCk7CisgICAgQVNTRVJUKGZyYW1lKTsKKworICAg IGF1dG8qIGtleUV2ZW50ID0gZXZlbnQtPnVuZGVybHlpbmdQbGF0Zm9ybUV2ZW50KCk7CisgICAg aWYgKCFrZXlFdmVudCB8fCBrZXlFdmVudC0+aXNTeXN0ZW1LZXkoKSkgLy8gRG8gbm90IHRyZWF0 IHRoaXMgYXMgdGV4dCBpbnB1dCBpZiBpdCdzIGEgc3lzdGVtIGtleSBldmVudC4KKyAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgYXV0byBjb21tYW5kID0gZnJhbWUtPmVkaXRvcigpLmNvbW1h bmQoaW50ZXJwcmV0S2V5RXZlbnQoZXZlbnQpKTsKKworICAgIGlmIChrZXlFdmVudC0+dHlwZSgp ID09IFBsYXRmb3JtRXZlbnQ6OlJhd0tleURvd24pIHsKKyAgICAgICAgLy8gV2ViS2l0IGRvZXNu J3QgaGF2ZSBlbm91Z2ggaW5mb3JtYXRpb24gYWJvdXQgbW9kZSB0byBkZWNpZGUKKyAgICAgICAg Ly8gaG93IGNvbW1hbmRzIHRoYXQganVzdCBpbnNlcnQgdGV4dCBpZiBleGVjdXRlZCB2aWEgRWRp dG9yCisgICAgICAgIC8vIHNob3VsZCBiZSB0cmVhdGVkLCBzbyB3ZSBsZWF2ZSBpdCB1cG9uIFdl YkNvcmUgdG8gZWl0aGVyCisgICAgICAgIC8vIGhhbmRsZSB0aGVtIGltbWVkaWF0ZWx5IChlLmcu IFRhYiB0aGF0IGNoYW5nZXMgZm9jdXMpIG9yCisgICAgICAgIC8vIGxldCBhIGtleXByZXNzIGV2 ZW50IGJlIGdlbmVyYXRlZCAoZS5nLiBUYWIgdGhhdCBpbnNlcnRzIGEKKyAgICAgICAgLy8gVGFi IGNoYXJhY3Rlciwgb3IgRW50ZXIpLgorICAgICAgICByZXR1cm4gIWNvbW1hbmQuaXNUZXh0SW5z ZXJ0aW9uKCkgJiYgY29tbWFuZC5leGVjdXRlKGV2ZW50KTsKKyAgICB9CisKKyAgICBpZiAoY29t bWFuZC5leGVjdXRlKGV2ZW50KSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICAvLyBEb24n dCBpbnNlcnQgbnVsbCBvciBjb250cm9sIGNoYXJhY3RlcnMgYXMgdGhleSBjYW4gcmVzdWx0IGlu IHVuZXhwZWN0ZWQgYmVoYXZpb3VyLgorICAgIGlmIChldmVudC0+Y2hhckNvZGUoKSA8ICcgJykK KyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIGZyYW1lLT5lZGl0b3IoKS5pbnNl cnRUZXh0KGtleUV2ZW50LT50ZXh0KCksIGV2ZW50KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2Vi S2l0Cg==