128813 2014-02-14 06:32:35 -0800 [GTK] Minibrowser: Add shortcut to open Web Inspector 2014-02-18 12:42:11 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Minor --- 1 dpino webkit-unassigned andersca cgarcia commit-queue mrobinson svillar oldest_to_newest 980777 0 dpino 2014-02-14 06:32:35 -0800 To open the Web Inspector it is necessary to right-click on the current page and select "Inspect Element" in the context menu. Safari or MiniBrowser EFL have a shortcut to open the Web Inspector directly. That is more comfortable. 980778 1 224210 dpino 2014-02-14 06:44:19 -0800 Created attachment 224210 Patch 980796 2 224210 svillar 2014-02-14 08:22:34 -0800 Comment on attachment 224210 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224210&action=review There are a couple of minor nits, but this is a r- because the logic is not correct. > Tools/ChangeLog:8 > + Added shortcut Ctrl+i for toggling Web Inspector. Is this shortcut used by some other port? Is it used in GtkLauncher? > Tools/MiniBrowser/gtk/BrowserWindow.c:503 > +static gboolean toggleWebInspector(GObject *gObject, gpointer user_data) Don't use camel case for attributes in this file. Also I guess you can use here BrowserWindow directly instead of GObject as you're using G_CALLBACK(). > Tools/MiniBrowser/gtk/BrowserWindow.c:511 > + height = webkit_web_inspector_get_attached_height(inspectorWindow); If you're going to use the variable just once, better do not define it and directly use the return value from the function. In any case I don't think the logic is correct. If the inspector is shown in a dettached mode, the height will be 0 so you won't close it. 980983 3 224254 dpino 2014-02-14 14:19:27 -0800 Created attachment 224254 Patch 980986 4 224254 mrobinson 2014-02-14 14:22:11 -0800 Comment on attachment 224254 Patch Both Firefox and Chromium use F12 as the inspector toggle shortcut. 980991 5 224210 dpino 2014-02-14 14:25:15 -0800 Comment on attachment 224210 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224210&action=review >> Tools/ChangeLog:8 >> + Added shortcut Ctrl+i for toggling Web Inspector. > > Is this shortcut used by some other port? Is it used in GtkLauncher? Yes, Minibrowser EFL uses Ctrl+i to open the Web Inspector (Tools/MiniBrowser/efl/main.c:444): else if (!strcmp(ev->key, "i") && ctrlPressed) { info("Show Inspector (Ctrl+i) was pressed."); ewk_view_inspector_show(ewk_view); } GtkLauncher doesn't implement this shortcut. >> Tools/MiniBrowser/gtk/BrowserWindow.c:503 >> +static gboolean toggleWebInspector(GObject *gObject, gpointer user_data) > > Don't use camel case for attributes in this file. Also I guess you can use here BrowserWindow directly instead of GObject as you're using G_CALLBACK(). Ok >> Tools/MiniBrowser/gtk/BrowserWindow.c:511 >> + height = webkit_web_inspector_get_attached_height(inspectorWindow); > > If you're going to use the variable just once, better do not define it and directly use the return value from the function. > > In any case I don't think the logic is correct. If the inspector is shown in a dettached mode, the height will be 0 so you won't close it. Yes, that's correct. Finally I implemented visibility of the window registering to signals "open-window" and "closed" to know when the window has been detached but it's still opened and when the window was closed. 980998 6 dpino 2014-02-14 14:30:45 -0800 (In reply to comment #4) > (From update of attachment 224254 [details]) > Both Firefox and Chromium use F12 as the inspector toggle shortcut. I didn't know about that. Minibrowser EFL uses Ctrl+i and Safari uses Command+Option+i (Ctrl+Alt+i in PCs). https://developer.apple.com/library/mac/documentation/AppleApplications/Conceptual/Safari_Developer_Guide/KeyboardShortcuts/KeyboardShortcuts.html I initially thought of implemented as Ctrl+i as it's close to what other WebKit browsers (Minibrowser EFL and Safari) but if other browsers use F12 we can use that too. 981162 7 andersca 2014-02-15 09:04:09 -0800 Oops, I missed the discussion in the bug when I set cq+. Resetting cq flag (hopefully this won't be landed!) 981872 8 dpino 2014-02-18 03:37:36 -0800 I checked Firefox and it uses 'Ctrl+Shift+I' for opening up its Toolbox. https://developer.mozilla.org/en-US/docs/Tools/Keyboard_shortcuts Chromium uses 'Ctrl+Shift+I' too. http://www.shortcutworld.com/en/linux/Chrome.html Martin, I think you were thinking of Firebug which uses Ctrl+F12. https://getfirebug.com/enable So, I think the shortcut should involve the 'Ctrl' and 'I' keys. Should 'Shift' also be included? 981926 9 mrobinson 2014-02-18 07:34:03 -0800 (In reply to comment #8) > Martin, I think you were thinking of Firebug which uses Ctrl+F12. > > https://getfirebug.com/enable It seems that F12 and Ctrl+Shift+i both do the same thing. I do not have firebug installed. Using both Ctrl+Shift+i and F12 sounds find to me. That will make our behavior match Firefox and Chrome. 982010 10 224527 dpino 2014-02-18 11:28:42 -0800 Created attachment 224527 Patch 982046 11 224527 commit-queue 2014-02-18 12:42:09 -0800 Comment on attachment 224527 Patch Clearing flags on attachment: 224527 Committed r164307: <http://trac.webkit.org/changeset/164307> 982047 12 commit-queue 2014-02-18 12:42:11 -0800 All reviewed patches have been landed. Closing bug. 224210 2014-02-14 06:44:19 -0800 2014-02-14 14:25:15 -0800 Patch bug-128813-20140214154417.patch text/plain 2321 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzOTY3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjVhZWQ1MmNjZDk5ZDFhYzc5ZDMxY2JjZTNiMjZiZDU4 YTllZTQ1YS4uZGFjZjQwMWYwZDgwYjFhNjUxYTBjZjQ4ZWE1OTkzNjdkOWQ4ZDUwMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE0LTAyLTE0ICBEaWVnbyBQaW5vIEdhcmPDrWEgIDxkcGlub0BpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdIE1pbmlicm93c2VyOiBBZGQgc2hvcnRjdXQgdG8gb3BlbiBXZWIgSW5z cGVjdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x Mjg4MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGRlZCBzaG9ydGN1dCBDdHJsK2kgZm9yIHRvZ2dsaW5nIFdlYiBJbnNwZWN0b3IuCisKKyAgICAg ICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jOgorICAgICAgICAodG9nZ2xlV2Vi SW5zcGVjdG9yKToKKyAgICAgICAgKGJyb3dzZXJfd2luZG93X2luaXQpOgorCiAyMDE0LTAyLTEx ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBpdCBwb3Nz aWJsZSB0byBpbXBsZW1lbnQgSlMgYnVpbHRpbnMgaW4gSlMKZGlmZiAtLWdpdCBhL1Rvb2xzL01p bmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJv d3NlcldpbmRvdy5jCmluZGV4IGI4YTBkMDU2YzIxOWYxOTI3ZjQzMzI0YmRjNTk4MGIzN2Y3MjYw MWQuLmYxNDAxNjAzYjFiZjI4OTY0YzdiOGQ0Y2ZlOGIwMzVhZDcyZWFlMTcgMTAwNjQ0Ci0tLSBh L1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKKysrIGIvVG9vbHMvTWluaUJy b3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwpAQCAtNTAwLDYgKzUwMCwyMyBAQCBzdGF0aWMgdm9p ZCBzZWFyY2hDYWxsYmFjayhCcm93c2VyV2luZG93ICp3aW5kb3cpCiAgICAgYnJvd3Nlcl9zZWFy Y2hfYmFyX29wZW4od2luZG93LT5zZWFyY2hCYXIpOwogfQogCitzdGF0aWMgZ2Jvb2xlYW4gdG9n Z2xlV2ViSW5zcGVjdG9yKEdPYmplY3QgKmdPYmplY3QsIGdwb2ludGVyIHVzZXJfZGF0YSkKK3sK KyAgICBCcm93c2VyV2luZG93ICp3aW5kb3cgPSBCUk9XU0VSX1dJTkRPVyhnT2JqZWN0KTsKKyAg ICBXZWJLaXRXZWJJbnNwZWN0b3IgKmluc3BlY3RvcldpbmRvdzsKKyAgICBndWludCBoZWlnaHQ7 CisKKyAgICBpbnNwZWN0b3JXaW5kb3cgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2luc3BlY3RvcihX RUJLSVRfV0VCX1ZJRVcod2luZG93LT53ZWJWaWV3KSk7CisKKyAgICBoZWlnaHQgPSB3ZWJraXRf d2ViX2luc3BlY3Rvcl9nZXRfYXR0YWNoZWRfaGVpZ2h0KGluc3BlY3RvcldpbmRvdyk7CisgICAg aWYgKCFoZWlnaHQpCisgICAgICAgIHdlYmtpdF93ZWJfaW5zcGVjdG9yX3Nob3coaW5zcGVjdG9y V2luZG93KTsKKyAgICBlbHNlCisgICAgICAgIHdlYmtpdF93ZWJfaW5zcGVjdG9yX2Nsb3NlKGlu c3BlY3RvcldpbmRvdyk7CisKKyAgICByZXR1cm4gVFJVRTsKK30KKwogc3RhdGljIHZvaWQgYnJv d3NlcldpbmRvd0ZpbmFsaXplKEdPYmplY3QgKmdPYmplY3QpCiB7CiAgICAgQnJvd3NlcldpbmRv dyAqd2luZG93ID0gQlJPV1NFUl9XSU5ET1coZ09iamVjdCk7CkBAIC01NjcsNiArNTg0LDEwIEBA IHN0YXRpYyB2b2lkIGJyb3dzZXJfd2luZG93X2luaXQoQnJvd3NlcldpbmRvdyAqd2luZG93KQog ICAgIHdpbmRvdy0+YWNjZWxHcm91cCA9IGd0a19hY2NlbF9ncm91cF9uZXcoKTsKICAgICBndGtf d2luZG93X2FkZF9hY2NlbF9ncm91cChHVEtfV0lORE9XKHdpbmRvdyksIHdpbmRvdy0+YWNjZWxH cm91cCk7CiAKKyAgICAvKiBHbG9iYWwgYWNjZWxlcmF0b3JzICovCisgICAgZ3RrX2FjY2VsX2dy b3VwX2Nvbm5lY3Qod2luZG93LT5hY2NlbEdyb3VwLCBHREtfS0VZX0ksIEdES19DT05UUk9MX01B U0ssIEdUS19BQ0NFTF9WSVNJQkxFLAorICAgICAgICBnX2NjbG9zdXJlX25ld19zd2FwKEdfQ0FM TEJBQ0sodG9nZ2xlV2ViSW5zcGVjdG9yKSwgd2luZG93LCBOVUxMKSk7CisKICAgICBHdGtXaWRn ZXQgKnRvb2xiYXIgPSBndGtfdG9vbGJhcl9uZXcoKTsKICAgICB3aW5kb3ctPnRvb2xiYXIgPSB0 b29sYmFyOwogICAgIGd0a19vcmllbnRhYmxlX3NldF9vcmllbnRhdGlvbihHVEtfT1JJRU5UQUJM RSh0b29sYmFyKSwgR1RLX09SSUVOVEFUSU9OX0hPUklaT05UQUwpOwo= 224254 2014-02-14 14:19:27 -0800 2014-02-18 11:28:31 -0800 Patch bug-128813-20140214231925.patch text/plain 4051 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0MTAyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTVhMGVlMTMxODE4OWUyNGM2MWY0ZThhMTNjMTAxZWZh NjJkZTg2Yi4uM2U1ZmU3NzQ5MzFmY2RjN2ViNTg1OTA4M2E3ODkzNjI2YTM4YjJjNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE0LTAyLTE0ICBEaWVnbyBQaW5vIEdhcmPDrWEgIDxkcGlub0BpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdIE1pbmlicm93c2VyOiBBZGQgc2hvcnRjdXQgdG8gb3BlbiBXZWIgSW5z cGVjdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x Mjg4MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGRlZCBzaG9ydGN1dCBDdHJsK2kgZm9yIHRvZ2dsaW5nIFdlYiBJbnNwZWN0b3IuCisKKyAgICAg ICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jOgorICAgICAgICAodG9nZ2xlV2Vi SW5zcGVjdG9yKToKKyAgICAgICAgKGJyb3dzZXJfd2luZG93X2luaXQpOgorCiAyMDE0LTAyLTEz ICBEYXZpZCBGYXJsZXIgIDxkZmFybGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBEdW1wUmVuZGVy VHJlZSBmYWlscyB0byBidWlsZDogUGVybCBzdXBwb3J0IG1vZHVsZSBidWlsZGluZyBmb3IgT1Mg WCBidXQgbGlua2luZyBmb3IgdGhlIHNpbXVsYXRvcgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJy b3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2Vy V2luZG93LmMKaW5kZXggYjhhMGQwNTZjMjE5ZjE5MjdmNDMzMjRiZGM1OTgwYjM3ZjcyNjAxZC4u OWY3MTExNWQ2ZjU5NTJhMDllNDQ4ZmM3NGYxNTQyZjdiYmM4NjM1ZiAxMDA2NDQKLS0tIGEvVG9v bHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYworKysgYi9Ub29scy9NaW5pQnJvd3Nl ci9ndGsvQnJvd3NlcldpbmRvdy5jCkBAIC01Niw2ICs1Niw3IEBAIHN0cnVjdCBfQnJvd3Nlcldp bmRvdyB7CiAgICAgR3RrV2lkZ2V0ICpkb3dubG9hZHNCYXI7CiAgICAgQnJvd3NlclNlYXJjaEJh ciAqc2VhcmNoQmFyOwogICAgIGdib29sZWFuIHNlYXJjaEJhclZpc2libGU7CisgICAgZ2Jvb2xl YW4gaW5zcGVjdG9yV2luZG93SXNWaXNpYmxlOwogICAgIEdka1BpeGJ1ZiAqZmF2aWNvbjsKICAg ICBHdGtXaWRnZXQgKnJlbG9hZE9yU3RvcEJ1dHRvbjsKICAgICBHdGtXaWRnZXQgKmZ1bGxTY3Jl ZW5NZXNzYWdlTGFiZWw7CkBAIC00ODMsNiArNDg0LDE4IEBAIHN0YXRpYyB2b2lkIHdlYlZpZXdJ c0xvYWRpbmdDaGFuZ2VkKEdPYmplY3QgKm9iamVjdCwgR1BhcmFtU3BlYyAqcGFyYW1TcGVjLCBC cm93CiAgICAgZ3RrX3Rvb2xfYnV0dG9uX3NldF9zdG9ja19pZChHVEtfVE9PTF9CVVRUT04od2lu ZG93LT5yZWxvYWRPclN0b3BCdXR0b24pLCBpc0xvYWRpbmcgPyBHVEtfU1RPQ0tfU1RPUCA6IEdU S19TVE9DS19SRUZSRVNIKTsKIH0KIAorc3RhdGljIGdib29sZWFuIGluc3BlY3Rvcldhc09wZW5l ZEluQW5vdGhlcldpbmRvdyhXZWJLaXRXZWJJbnNwZWN0b3IgKmluc3BlY3RvcldpbmRvdywgQnJv d3NlcldpbmRvdyAqd2luZG93KQoreworICAgIHdpbmRvdy0+aW5zcGVjdG9yV2luZG93SXNWaXNp YmxlID0gVFJVRTsKKyAgICByZXR1cm4gRkFMU0U7Cit9CisKK3N0YXRpYyBnYm9vbGVhbiBpbnNw ZWN0b3JXYXNDbG9zZWQoV2ViS2l0V2ViSW5zcGVjdG9yICppbnNwZWN0b3JXaW5kb3csIEJyb3dz ZXJXaW5kb3cgKndpbmRvdykKK3sKKyAgICB3aW5kb3ctPmluc3BlY3RvcldpbmRvd0lzVmlzaWJs ZSA9IEZBTFNFOworICAgIHJldHVybiBGQUxTRTsKK30KKwogc3RhdGljIHZvaWQgem9vbUluQ2Fs bGJhY2soQnJvd3NlcldpbmRvdyAqd2luZG93KQogewogICAgIGdkb3VibGUgem9vbUxldmVsID0g d2Via2l0X3dlYl92aWV3X2dldF96b29tX2xldmVsKHdpbmRvdy0+d2ViVmlldykgKiB6b29tU3Rl cDsKQEAgLTUwMCw2ICs1MTMsMjAgQEAgc3RhdGljIHZvaWQgc2VhcmNoQ2FsbGJhY2soQnJvd3Nl cldpbmRvdyAqd2luZG93KQogICAgIGJyb3dzZXJfc2VhcmNoX2Jhcl9vcGVuKHdpbmRvdy0+c2Vh cmNoQmFyKTsKIH0KIAorc3RhdGljIGdib29sZWFuIHRvZ2dsZVdlYkluc3BlY3RvcihCcm93c2Vy V2luZG93ICp3aW5kb3csIGdwb2ludGVyIHVzZXJfZGF0YSkKK3sKKyAgICBXZWJLaXRXZWJJbnNw ZWN0b3IgKmluc3BlY3RvcldpbmRvdzsKKworICAgIGluc3BlY3RvcldpbmRvdyA9IHdlYmtpdF93 ZWJfdmlld19nZXRfaW5zcGVjdG9yKFdFQktJVF9XRUJfVklFVyh3aW5kb3ctPndlYlZpZXcpKTsK KyAgICBpZiAoIXdpbmRvdy0+aW5zcGVjdG9yV2luZG93SXNWaXNpYmxlKSB7CisgICAgICAgIHdl YmtpdF93ZWJfaW5zcGVjdG9yX3Nob3coaW5zcGVjdG9yV2luZG93KTsKKyAgICAgICAgd2luZG93 LT5pbnNwZWN0b3JXaW5kb3dJc1Zpc2libGUgPSBUUlVFOworICAgIH0gZWxzZQorICAgICAgICB3 ZWJraXRfd2ViX2luc3BlY3Rvcl9jbG9zZShpbnNwZWN0b3JXaW5kb3cpOworCisgICAgcmV0dXJu IFRSVUU7Cit9CisKIHN0YXRpYyB2b2lkIGJyb3dzZXJXaW5kb3dGaW5hbGl6ZShHT2JqZWN0ICpn T2JqZWN0KQogewogICAgIEJyb3dzZXJXaW5kb3cgKndpbmRvdyA9IEJST1dTRVJfV0lORE9XKGdP YmplY3QpOwpAQCAtNTY3LDYgKzU5NCwxMCBAQCBzdGF0aWMgdm9pZCBicm93c2VyX3dpbmRvd19p bml0KEJyb3dzZXJXaW5kb3cgKndpbmRvdykKICAgICB3aW5kb3ctPmFjY2VsR3JvdXAgPSBndGtf YWNjZWxfZ3JvdXBfbmV3KCk7CiAgICAgZ3RrX3dpbmRvd19hZGRfYWNjZWxfZ3JvdXAoR1RLX1dJ TkRPVyh3aW5kb3cpLCB3aW5kb3ctPmFjY2VsR3JvdXApOwogCisgICAgLyogR2xvYmFsIGFjY2Vs ZXJhdG9ycyAqLworICAgIGd0a19hY2NlbF9ncm91cF9jb25uZWN0KHdpbmRvdy0+YWNjZWxHcm91 cCwgR0RLX0tFWV9JLCBHREtfQ09OVFJPTF9NQVNLLCBHVEtfQUNDRUxfVklTSUJMRSwKKyAgICAg ICAgZ19jY2xvc3VyZV9uZXdfc3dhcChHX0NBTExCQUNLKHRvZ2dsZVdlYkluc3BlY3RvciksIHdp bmRvdywgTlVMTCkpOworCiAgICAgR3RrV2lkZ2V0ICp0b29sYmFyID0gZ3RrX3Rvb2xiYXJfbmV3 KCk7CiAgICAgd2luZG93LT50b29sYmFyID0gdG9vbGJhcjsKICAgICBndGtfb3JpZW50YWJsZV9z ZXRfb3JpZW50YXRpb24oR1RLX09SSUVOVEFCTEUodG9vbGJhciksIEdUS19PUklFTlRBVElPTl9I T1JJWk9OVEFMKTsKQEAgLTY2MSw2ICs2OTIsMTAgQEAgc3RhdGljIHZvaWQgYnJvd3NlcldpbmRv d0NvbnN0cnVjdGVkKEdPYmplY3QgKmdPYmplY3QpCiAgICAgV2ViS2l0QmFja0ZvcndhcmRMaXN0 ICpiYWNrRm9yd2FkbGlzdCA9IHdlYmtpdF93ZWJfdmlld19nZXRfYmFja19mb3J3YXJkX2xpc3Qo d2luZG93LT53ZWJWaWV3KTsKICAgICBnX3NpZ25hbF9jb25uZWN0KGJhY2tGb3J3YWRsaXN0LCAi Y2hhbmdlZCIsIEdfQ0FMTEJBQ0soYmFja0ZvcndhZGxpc3RDaGFuZ2VkKSwgd2luZG93KTsKIAor ICAgIFdlYktpdFdlYkluc3BlY3RvciAqaW5zcGVjdG9yV2luZG93ID0gd2Via2l0X3dlYl92aWV3 X2dldF9pbnNwZWN0b3IoV0VCS0lUX1dFQl9WSUVXKHdpbmRvdy0+d2ViVmlldykpOworICAgIGdf c2lnbmFsX2Nvbm5lY3QoaW5zcGVjdG9yV2luZG93LCAib3Blbi13aW5kb3ciLCBHX0NBTExCQUNL KGluc3BlY3Rvcldhc09wZW5lZEluQW5vdGhlcldpbmRvdyksIHdpbmRvdyk7CisgICAgZ19zaWdu YWxfY29ubmVjdChpbnNwZWN0b3JXaW5kb3csICJjbG9zZWQiLCBHX0NBTExCQUNLKGluc3BlY3Rv cldhc0Nsb3NlZCksIHdpbmRvdyk7CisKICAgICBHdGtXaWRnZXQgKm92ZXJsYXkgPSBndGtfb3Zl cmxheV9uZXcoKTsKICAgICBndGtfYm94X3BhY2tfc3RhcnQoR1RLX0JPWCh3aW5kb3ctPm1haW5C b3gpLCBvdmVybGF5LCBUUlVFLCBUUlVFLCAwKTsKICAgICBndGtfd2lkZ2V0X3Nob3cob3Zlcmxh eSk7Cg== 224527 2014-02-18 11:28:42 -0800 2014-02-18 12:42:09 -0800 Patch bug-128813-20140218202840.patch text/plain 4214 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0Mjk4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGFlM2E5OGFiYWIwNmIyYzI1NDVhZTdkYWMwZDAxN2E4 NmY5MjQ2Mi4uNGI5MmRkN2MyZTJlOWU2OGNkY2VkNjY3OGY3MDUyM2FiYTYyZTdhYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE0LTAyLTE4ICBEaWVnbyBQaW5vIEdhcmPDrWEgIDxkcGlub0BpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdIE1pbmlicm93c2VyOiBBZGQgc2hvcnRjdXQgdG8gb3BlbiBXZWIgSW5z cGVjdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x Mjg4MTMKKworICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCisKKyAgICAgICAg QWRkZWQgc2hvcnRjdXRzIEN0cmwrU2hpZnQrSSBhbmQgRjEyIGZvciB0b2dnbGluZyBXZWIgSW5z cGVjdG9yLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYzoKKyAg ICAgICAgKHRvZ2dsZVdlYkluc3BlY3Rvcik6CisgICAgICAgIChicm93c2VyX3dpbmRvd19pbml0 KToKKwogMjAxNC0wMi0xOCAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAg ICAgIFN0b3AgdXNpbmcgUExBVEZPUk0oTUFDKSBleGNlcHQgd2hlcmUgaXQgbWVhbnMg4oCcT1Mg WCBidXQgbm90IGlPU+KAnQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dz ZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKaW5kZXgg YjhhMGQwNTZjMjE5ZjE5MjdmNDMzMjRiZGM1OTgwYjM3ZjcyNjAxZC4uMzYwMzlkMmU0YTBlMmE1 OTQwMTRlZTZlMmM0ZDA5YjQzN2Y2N2QyMiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIv Z3RrL0Jyb3dzZXJXaW5kb3cuYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3Nlcldp bmRvdy5jCkBAIC01Niw2ICs1Niw3IEBAIHN0cnVjdCBfQnJvd3NlcldpbmRvdyB7CiAgICAgR3Rr V2lkZ2V0ICpkb3dubG9hZHNCYXI7CiAgICAgQnJvd3NlclNlYXJjaEJhciAqc2VhcmNoQmFyOwog ICAgIGdib29sZWFuIHNlYXJjaEJhclZpc2libGU7CisgICAgZ2Jvb2xlYW4gaW5zcGVjdG9yV2lu ZG93SXNWaXNpYmxlOwogICAgIEdka1BpeGJ1ZiAqZmF2aWNvbjsKICAgICBHdGtXaWRnZXQgKnJl bG9hZE9yU3RvcEJ1dHRvbjsKICAgICBHdGtXaWRnZXQgKmZ1bGxTY3JlZW5NZXNzYWdlTGFiZWw7 CkBAIC00ODMsNiArNDg0LDE4IEBAIHN0YXRpYyB2b2lkIHdlYlZpZXdJc0xvYWRpbmdDaGFuZ2Vk KEdPYmplY3QgKm9iamVjdCwgR1BhcmFtU3BlYyAqcGFyYW1TcGVjLCBCcm93CiAgICAgZ3RrX3Rv b2xfYnV0dG9uX3NldF9zdG9ja19pZChHVEtfVE9PTF9CVVRUT04od2luZG93LT5yZWxvYWRPclN0 b3BCdXR0b24pLCBpc0xvYWRpbmcgPyBHVEtfU1RPQ0tfU1RPUCA6IEdUS19TVE9DS19SRUZSRVNI KTsKIH0KIAorc3RhdGljIGdib29sZWFuIGluc3BlY3Rvcldhc09wZW5lZEluQW5vdGhlcldpbmRv dyhXZWJLaXRXZWJJbnNwZWN0b3IgKmluc3BlY3RvcldpbmRvdywgQnJvd3NlcldpbmRvdyAqd2lu ZG93KQoreworICAgIHdpbmRvdy0+aW5zcGVjdG9yV2luZG93SXNWaXNpYmxlID0gVFJVRTsKKyAg ICByZXR1cm4gRkFMU0U7Cit9CisKK3N0YXRpYyBnYm9vbGVhbiBpbnNwZWN0b3JXYXNDbG9zZWQo V2ViS2l0V2ViSW5zcGVjdG9yICppbnNwZWN0b3JXaW5kb3csIEJyb3dzZXJXaW5kb3cgKndpbmRv dykKK3sKKyAgICB3aW5kb3ctPmluc3BlY3RvcldpbmRvd0lzVmlzaWJsZSA9IEZBTFNFOworICAg IHJldHVybiBGQUxTRTsKK30KKwogc3RhdGljIHZvaWQgem9vbUluQ2FsbGJhY2soQnJvd3Nlcldp bmRvdyAqd2luZG93KQogewogICAgIGdkb3VibGUgem9vbUxldmVsID0gd2Via2l0X3dlYl92aWV3 X2dldF96b29tX2xldmVsKHdpbmRvdy0+d2ViVmlldykgKiB6b29tU3RlcDsKQEAgLTUwMCw2ICs1 MTMsMjAgQEAgc3RhdGljIHZvaWQgc2VhcmNoQ2FsbGJhY2soQnJvd3NlcldpbmRvdyAqd2luZG93 KQogICAgIGJyb3dzZXJfc2VhcmNoX2Jhcl9vcGVuKHdpbmRvdy0+c2VhcmNoQmFyKTsKIH0KIAor c3RhdGljIGdib29sZWFuIHRvZ2dsZVdlYkluc3BlY3RvcihCcm93c2VyV2luZG93ICp3aW5kb3cs IGdwb2ludGVyIHVzZXJfZGF0YSkKK3sKKyAgICBXZWJLaXRXZWJJbnNwZWN0b3IgKmluc3BlY3Rv cldpbmRvdzsKKworICAgIGluc3BlY3RvcldpbmRvdyA9IHdlYmtpdF93ZWJfdmlld19nZXRfaW5z cGVjdG9yKFdFQktJVF9XRUJfVklFVyh3aW5kb3ctPndlYlZpZXcpKTsKKyAgICBpZiAoIXdpbmRv dy0+aW5zcGVjdG9yV2luZG93SXNWaXNpYmxlKSB7CisgICAgICAgIHdlYmtpdF93ZWJfaW5zcGVj dG9yX3Nob3coaW5zcGVjdG9yV2luZG93KTsKKyAgICAgICAgd2luZG93LT5pbnNwZWN0b3JXaW5k b3dJc1Zpc2libGUgPSBUUlVFOworICAgIH0gZWxzZQorICAgICAgICB3ZWJraXRfd2ViX2luc3Bl Y3Rvcl9jbG9zZShpbnNwZWN0b3JXaW5kb3cpOworCisgICAgcmV0dXJuIFRSVUU7Cit9CisKIHN0 YXRpYyB2b2lkIGJyb3dzZXJXaW5kb3dGaW5hbGl6ZShHT2JqZWN0ICpnT2JqZWN0KQogewogICAg IEJyb3dzZXJXaW5kb3cgKndpbmRvdyA9IEJST1dTRVJfV0lORE9XKGdPYmplY3QpOwpAQCAtNTY3 LDYgKzU5NCwxMiBAQCBzdGF0aWMgdm9pZCBicm93c2VyX3dpbmRvd19pbml0KEJyb3dzZXJXaW5k b3cgKndpbmRvdykKICAgICB3aW5kb3ctPmFjY2VsR3JvdXAgPSBndGtfYWNjZWxfZ3JvdXBfbmV3 KCk7CiAgICAgZ3RrX3dpbmRvd19hZGRfYWNjZWxfZ3JvdXAoR1RLX1dJTkRPVyh3aW5kb3cpLCB3 aW5kb3ctPmFjY2VsR3JvdXApOwogCisgICAgLyogR2xvYmFsIGFjY2VsZXJhdG9ycyAqLworICAg IGd0a19hY2NlbF9ncm91cF9jb25uZWN0KHdpbmRvdy0+YWNjZWxHcm91cCwgR0RLX0tFWV9JLCBH REtfQ09OVFJPTF9NQVNLIHwgR0RLX1NISUZUX01BU0ssIEdUS19BQ0NFTF9WSVNJQkxFLAorICAg ICAgICBnX2NjbG9zdXJlX25ld19zd2FwKEdfQ0FMTEJBQ0sodG9nZ2xlV2ViSW5zcGVjdG9yKSwg d2luZG93LCBOVUxMKSk7CisgICAgZ3RrX2FjY2VsX2dyb3VwX2Nvbm5lY3Qod2luZG93LT5hY2Nl bEdyb3VwLCBHREtfS0VZX0YxMiwgMCwgR1RLX0FDQ0VMX1ZJU0lCTEUsCisgICAgICAgIGdfY2Ns b3N1cmVfbmV3X3N3YXAoR19DQUxMQkFDSyh0b2dnbGVXZWJJbnNwZWN0b3IpLCB3aW5kb3csIE5V TEwpKTsKKwogICAgIEd0a1dpZGdldCAqdG9vbGJhciA9IGd0a190b29sYmFyX25ldygpOwogICAg IHdpbmRvdy0+dG9vbGJhciA9IHRvb2xiYXI7CiAgICAgZ3RrX29yaWVudGFibGVfc2V0X29yaWVu dGF0aW9uKEdUS19PUklFTlRBQkxFKHRvb2xiYXIpLCBHVEtfT1JJRU5UQVRJT05fSE9SSVpPTlRB TCk7CkBAIC02NjEsNiArNjk0LDEwIEBAIHN0YXRpYyB2b2lkIGJyb3dzZXJXaW5kb3dDb25zdHJ1 Y3RlZChHT2JqZWN0ICpnT2JqZWN0KQogICAgIFdlYktpdEJhY2tGb3J3YXJkTGlzdCAqYmFja0Zv cndhZGxpc3QgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2JhY2tfZm9yd2FyZF9saXN0KHdpbmRvdy0+ d2ViVmlldyk7CiAgICAgZ19zaWduYWxfY29ubmVjdChiYWNrRm9yd2FkbGlzdCwgImNoYW5nZWQi LCBHX0NBTExCQUNLKGJhY2tGb3J3YWRsaXN0Q2hhbmdlZCksIHdpbmRvdyk7CiAKKyAgICBXZWJL aXRXZWJJbnNwZWN0b3IgKmluc3BlY3RvcldpbmRvdyA9IHdlYmtpdF93ZWJfdmlld19nZXRfaW5z cGVjdG9yKFdFQktJVF9XRUJfVklFVyh3aW5kb3ctPndlYlZpZXcpKTsKKyAgICBnX3NpZ25hbF9j b25uZWN0KGluc3BlY3RvcldpbmRvdywgIm9wZW4td2luZG93IiwgR19DQUxMQkFDSyhpbnNwZWN0 b3JXYXNPcGVuZWRJbkFub3RoZXJXaW5kb3cpLCB3aW5kb3cpOworICAgIGdfc2lnbmFsX2Nvbm5l Y3QoaW5zcGVjdG9yV2luZG93LCAiY2xvc2VkIiwgR19DQUxMQkFDSyhpbnNwZWN0b3JXYXNDbG9z ZWQpLCB3aW5kb3cpOworCiAgICAgR3RrV2lkZ2V0ICpvdmVybGF5ID0gZ3RrX292ZXJsYXlfbmV3 KCk7CiAgICAgZ3RrX2JveF9wYWNrX3N0YXJ0KEdUS19CT1god2luZG93LT5tYWluQm94KSwgb3Zl cmxheSwgVFJVRSwgVFJVRSwgMCk7CiAgICAgZ3RrX3dpZGdldF9zaG93KG92ZXJsYXkpOwo=