62634 2011-06-14 07:41:25 -0700 [GTK] Add a statusbar to MiniBrowser 2011-06-15 00:51:54 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned andersca oldest_to_newest 420403 0 cgarcia 2011-06-14 07:41:25 -0700 To show the url of the current hovered link, like GtkLauncher does. 420408 1 97118 cgarcia 2011-06-14 07:48:34 -0700 Created attachment 97118 Patch 420427 2 97118 mrobinson 2011-06-14 08:26:38 -0700 Comment on attachment 97118 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=97118&action=review Looks good, but please make the following changes before landing. > Tools/MiniBrowser/gtk/BrowserWindow.c:47 > GtkWidget* mainBox; > GtkWidget* uriEntry; > + GtkWidget *statusBar; > WKViewRef webView; > > + guint statusBarContextId; > + > gchar* title; > gdouble loadProgress; Do you mind cleaning up the rest of this section as well since you're touching it? > Tools/MiniBrowser/gtk/WebBundle/WebBundleMain.c:35 > +static void mouseDidMoveOverElement(WKBundlePageRef page, WKBundleHitTestResultRef hitTestResult, WKEventModifiers modifiers, WKTypeRef* userData, const void *clientInfo) The asterisk on WKTypeRef should be on userData. > Tools/MiniBrowser/gtk/main.c:32 > +WKContextRef processContext; This could be local and passed as an argument to addInjectedBundleToContext. > Tools/MiniBrowser/gtk/main.c:35 > +static void initContext() I'd prefer this to be called something like addInjectedBundleToContext. 421090 3 cgarcia 2011-06-15 00:51:54 -0700 Committed r88912: <http://trac.webkit.org/changeset/88912> 97118 2011-06-14 07:48:34 -0700 2011-06-14 08:26:38 -0700 Patch wk2-minibrowser-statusbar.diff text/plain 8745 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjNjAz ODNlLi5lODRkNmU0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDYtMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtHVEtdIEFkZCBhIHN0YXR1c2JhciB0byBNaW5pQnJvd3NlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI2MzQKKworICAg ICAgICBJdCBzaG93cyB0aGUgdXJsIG9mIHRoZSBjdXJyZW50IGhvdmVyZWQgbGluay4KKworICAg ICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmM6CisgICAgICAgIChicm93c2Vy V2luZG93Q29uc3RydWN0ZWQpOiBDcmVhdGUgdGhlIEd0a1NhdHVzYmFyLgorICAgICAgICAobW91 c2VEaWRNb3ZlT3ZlckVsZW1lbnQpOiBVcGRhdGUgc3RhdHVzYmFyIHRleHQuCisgICAgICAgIChi cm93c2VyV2luZG93VUlDbGllbnRJbml0KTogQWRkIGltcGxlbWVudGF0aW9uIGZvcgorICAgICAg ICBtb3VzZURpZE1vdmVPdmVyRWxlbWVudCgpLgorICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9H TlVtYWtlZmlsZS5hbTogQWRkIG5ldyBmaWxlcyB0byBjb21waWxhdGlvbi4KKyAgICAgICAgKiBN aW5pQnJvd3Nlci9ndGsvV2ViQnVuZGxlL1dlYkJ1bmRsZU1haW4uYzogQWRkZWQuCisgICAgICAg IChtb3VzZURpZE1vdmVPdmVyRWxlbWVudCk6IFBhc3MgdGhlIHVybCBvZiB0aGUgY3VycmVudCBo b3ZlcmVkCisgICAgICAgIGxpbmsgdG8gdGhlIFVJIHByb2Nlc3MuCisgICAgICAgIChkaWRDcmVh dGVQYWdlKTogU2V0IHRoZSBVSSBjbGllbnQgYWRkaW5nIGFuIGltcGxlbWVudGF0aW9uIGZvcgor ICAgICAgICBtb3VzZURpZE1vdmVPdmVyRWxlbWVudCgpLgorICAgICAgICAoV0tCdW5kbGVJbml0 aWFsaXplKToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvbWFpbi5jOgorICAgICAgICAoaW5p dENvbnRleHQpOiBDcmVhdGUgYSBnbG9iYWwgY29udGV4dCB3aXRoIHRoZSBpbmplY3RlZCBidW5k bGUKKyAgICAgICAgY2xpZW50LgorICAgICAgICAobG9hZFVSSSk6IFVzZSB0aGUgZ2xvYmFsIGNv bnRleHQuCisgICAgICAgIChtYWluKToKKwogMjAxMS0wNi0xNCAgQ2FpbyBNYXJjZWxvIGRlIE9s aXZlaXJhIEZpbGhvICA8Y2Fpby5vbGl2ZWlyYUBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEFuZHJlYXMgS2xpbmcuCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9n dGsvQnJvd3NlcldpbmRvdy5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cu YwppbmRleCA5MTA4OWYzLi43ZTFkNmI3IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9n dGsvQnJvd3NlcldpbmRvdy5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2lu ZG93LmMKQEAgLTM4LDggKzM4LDExIEBAIHN0cnVjdCBfQnJvd3NlcldpbmRvdyB7CiAKICAgICBH dGtXaWRnZXQqIG1haW5Cb3g7CiAgICAgR3RrV2lkZ2V0KiB1cmlFbnRyeTsKKyAgICBHdGtXaWRn ZXQgKnN0YXR1c0JhcjsKICAgICBXS1ZpZXdSZWYgd2ViVmlldzsKIAorICAgIGd1aW50IHN0YXR1 c0JhckNvbnRleHRJZDsKKwogICAgIGdjaGFyKiB0aXRsZTsKICAgICBnZG91YmxlIGxvYWRQcm9n cmVzczsKIH07CkBAIC0xNjQsNiArMTY3LDExIEBAIHN0YXRpYyB2b2lkIGJyb3dzZXJXaW5kb3dD b25zdHJ1Y3RlZChHT2JqZWN0KiBnT2JqZWN0KQogICAgIGd0a19ib3hfcGFja19zdGFydChHVEtf Qk9YKHdpbmRvdy0+bWFpbkJveCksIEdUS19XSURHRVQod2luZG93LT53ZWJWaWV3KSwgVFJVRSwg VFJVRSwgMCk7CiAgICAgZ3RrX3dpZGdldF9zaG93KEdUS19XSURHRVQod2luZG93LT53ZWJWaWV3 KSk7CiAKKyAgICB3aW5kb3ctPnN0YXR1c0JhciA9IGd0a19zdGF0dXNiYXJfbmV3KCk7CisgICAg d2luZG93LT5zdGF0dXNCYXJDb250ZXh0SWQgPSBndGtfc3RhdHVzYmFyX2dldF9jb250ZXh0X2lk KEdUS19TVEFUVVNCQVIod2luZG93LT5zdGF0dXNCYXIpLCAiTGluayBIb3ZlciIpOworICAgIGd0 a19ib3hfcGFja19zdGFydChHVEtfQk9YKHdpbmRvdy0+bWFpbkJveCksIHdpbmRvdy0+c3RhdHVz QmFyLCBGQUxTRSwgRkFMU0UsIDApOworICAgIGd0a193aWRnZXRfc2hvdyh3aW5kb3ctPnN0YXR1 c0Jhcik7CisKICAgICBicm93c2VyV2luZG93TG9hZGVyQ2xpZW50SW5pdCh3aW5kb3cpOwogICAg IGJyb3dzZXJXaW5kb3dVSUNsaWVudEluaXQod2luZG93KTsKIH0KQEAgLTQ2Myw2ICs0NzEsMjIg QEAgc3RhdGljIFdLU3RyaW5nUmVmIHJ1bkphdmFTY3JpcHRQcm9tcHQoV0tQYWdlUmVmIHBhZ2Us IFdLU3RyaW5nUmVmIG1lc3NhZ2UsIFdLU3QKICAgICByZXR1cm4gcmV0dXJuVmFsdWU7CiB9CiAK K3N0YXRpYyB2b2lkIG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50KFdLUGFnZVJlZiBwYWdlLCBXS0V2 ZW50TW9kaWZpZXJzIG1vZGlmaWVycywgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkICpj bGllbnRJbmZvKQoreworICAgIEJyb3dzZXJXaW5kb3cgKndpbmRvdyA9IEJST1dTRVJfV0lORE9X KGNsaWVudEluZm8pOworICAgIGd0a19zdGF0dXNiYXJfcG9wKEdUS19TVEFUVVNCQVIod2luZG93 LT5zdGF0dXNCYXIpLCB3aW5kb3ctPnN0YXR1c0JhckNvbnRleHRJZCk7CisKKyAgICBpZiAoIXVz ZXJEYXRhKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAoV0tHZXRUeXBlSUQodXNlckRhdGEp ICE9IFdLVVJMR2V0VHlwZUlEKCkpCisgICAgICAgIHJldHVybjsKKworICAgIGdjaGFyICpsaW5r ID0gV0tVUkxHZXRDU3RyaW5nKChXS1VSTFJlZil1c2VyRGF0YSk7CisgICAgZ3RrX3N0YXR1c2Jh cl9wdXNoKEdUS19TVEFUVVNCQVIod2luZG93LT5zdGF0dXNCYXIpLCB3aW5kb3ctPnN0YXR1c0Jh ckNvbnRleHRJZCwgbGluayk7CisgICAgZ19mcmVlKGxpbmspOworfQorCiBzdGF0aWMgdm9pZCBi cm93c2VyV2luZG93VUlDbGllbnRJbml0KEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHsKICAgICBX S1BhZ2VVSUNsaWVudCB1aUNsaWVudCA9IHsKQEAgLTQ3OCw3ICs1MDIsNyBAQCBzdGF0aWMgdm9p ZCBicm93c2VyV2luZG93VUlDbGllbnRJbml0KEJyb3dzZXJXaW5kb3cgKndpbmRvdykKICAgICAg ICAgcnVuSmF2YVNjcmlwdENvbmZpcm0sCiAgICAgICAgIHJ1bkphdmFTY3JpcHRQcm9tcHQsCiAg ICAgICAgIDAsICAgICAgLyogc2V0U3RhdHVzVGV4dCAqLwotICAgICAgICAwLCAgICAgIC8qIG1v dXNlRGlkTW92ZU92ZXJFbGVtZW50ICovCisgICAgICAgIG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50 LAogICAgICAgICAwLCAgICAgIC8qIG1pc3NpbmdQbHVnaW5CdXR0b25DbGlja2VkICovCiAgICAg ICAgIDAsICAgICAgLyogZGlkTm90SGFuZGxlS2V5RXZlbnQgKi8KICAgICAgICAgMCwgICAgICAv KiBkaWROb3RIYW5kbGVXaGVlbEV2ZW50ICovCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nl ci9ndGsvR05VbWFrZWZpbGUuYW0gYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvR05VbWFrZWZpbGUu YW0KaW5kZXggMzZkNThlZi4uNjBlZTBkYyAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIv Z3RrL0dOVW1ha2VmaWxlLmFtCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9HTlVtYWtlZmls ZS5hbQpAQCAtMzMsMyArMzMsMjEgQEAgUHJvZ3JhbXNfTWluaUJyb3dzZXJfTERGTEFHUyA9IFwK IAogQ0xFQU5GSUxFUyArPSBcCiAJJCh0b3BfYnVpbGRkaXIpL1Byb2dyYW1zL01pbmlCcm93c2Vy CisKKyMgSW5qZWN0ZWQgYnVuZGxlCitub2luc3RfTFRMSUJSQVJJRVMgKz0gTGlicmFyaWVzL2xp Yk1pbmlCcm93c2VyV2ViQnVuZGxlLmxhCitMaWJyYXJpZXNfbGliTWluaUJyb3dzZXJXZWJCdW5k bGVfbGFfU09VUkNFUyA9IFwKKwlUb29scy9NaW5pQnJvd3Nlci9ndGsvV2ViQnVuZGxlL1dlYkJ1 bmRsZU1haW4uYworCitMaWJyYXJpZXNfbGliTWluaUJyb3dzZXJXZWJCdW5kbGVfbGFfTERGTEFH UyA9IFwKKwktcnBhdGggJHtzaGVsbCBwd2R9LyQodG9wX2J1aWxkZGlyKS8uLi91bml4L1Rlc3RO ZXRzY2FwZVBsdWdpbi8ubGlicyBcCisJJChub191bmRlZmluZWQpIFwKKwktYXZvaWQtdmVyc2lv biBcCisJLW1vZHVsZQorCitMaWJyYXJpZXNfbGliTWluaUJyb3dzZXJXZWJCdW5kbGVfbGFfQ1BQ RkxBR1MgPSBcCisJLUkkKHRvcF9idWlsZGRpcikvRGVyaXZlZFNvdXJjZXMvSW5qZWN0ZWRCdW5k bGUgXAorCS1JJCh0b3BfYnVpbGRkaXIpL0Rlcml2ZWRTb3VyY2VzL1dlYktpdDIvaW5jbHVkZSBc CisJJChnbG9iYWxfY3BwZmxhZ3MpIFwKKwkkKGphdmFzY3JpcHRjb3JlX2NwcGZsYWdzKSBcCisJ JChHTElCX0NGTEFHUykKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9XZWJCdW5k bGUvV2ViQnVuZGxlTWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL1dlYkJ1bmRsZS9XZWJC dW5kbGVNYWluLmMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzU3OWI0MAot LS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9XZWJCdW5kbGUvV2ViQnVu ZGxlTWFpbi5jCkBAIC0wLDAgKzEsNjIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11 c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJp YnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0 CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRl cmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdB UkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElT JycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFO VEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElT Q0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JT CisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVD SUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBP UiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisg KiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJ TElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQg KElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdB WSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAq IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSA8V2ViS2l0 Mi9XS0J1bmRsZS5oPgorI2luY2x1ZGUgPFdlYktpdDIvV0tCdW5kbGVIaXRUZXN0UmVzdWx0Lmg+ CisjaW5jbHVkZSA8V2ViS2l0Mi9XS0J1bmRsZUluaXRpYWxpemUuaD4KKyNpbmNsdWRlIDxXZWJL aXQyL1dLQnVuZGxlUGFnZS5oPgorI2luY2x1ZGUgPGdsaWIuaD4KKyNpbmNsdWRlIDxzdHJpbmcu aD4KKworc3RhdGljIFdLQnVuZGxlUmVmIGdsb2JhbEJ1bmRsZTsKKworc3RhdGljIHZvaWQgbW91 c2VEaWRNb3ZlT3ZlckVsZW1lbnQoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxlSGl0VGVz dFJlc3VsdFJlZiBoaXRUZXN0UmVzdWx0LCBXS0V2ZW50TW9kaWZpZXJzIG1vZGlmaWVycywgV0tU eXBlUmVmKiB1c2VyRGF0YSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbykKK3sKKyAgICAqdXNlckRh dGEgPSBXS0J1bmRsZUhpdFRlc3RSZXN1bHRDb3B5QWJzb2x1dGVMaW5rVVJMKGhpdFRlc3RSZXN1 bHQpOworfQorCitzdGF0aWMgdm9pZCBkaWRDcmVhdGVQYWdlKFdLQnVuZGxlUmVmIGJ1bmRsZSwg V0tCdW5kbGVQYWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit7CisgICAgV0tC dW5kbGVQYWdlVUlDbGllbnQgdWlDbGllbnQ7CisgICAgbWVtc2V0KCZ1aUNsaWVudCwgMCwgc2l6 ZW9mKHVpQ2xpZW50KSk7CisgICAgdWlDbGllbnQubW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQgPSBt b3VzZURpZE1vdmVPdmVyRWxlbWVudDsKKworICAgIFdLQnVuZGxlUGFnZVNldFVJQ2xpZW50KHBh Z2UsICZ1aUNsaWVudCk7Cit9CisKK3ZvaWQgV0tCdW5kbGVJbml0aWFsaXplKFdLQnVuZGxlUmVm IGJ1bmRsZSwgV0tUeXBlUmVmIGluaXRpYWxpemF0aW9uVXNlckRhdGEpCit7CisgICAgZ2xvYmFs QnVuZGxlID0gYnVuZGxlOworCisgICAgV0tCdW5kbGVDbGllbnQgY2xpZW50ID0geworICAgICAg ICAwLAorICAgICAgICAwLAorICAgICAgICBkaWRDcmVhdGVQYWdlLAorICAgICAgICAwLCAvKiB3 aWxsRGVzdHJveVBhZ2UgKi8KKyAgICAgICAgMCwgLyogZGlkSW5pdGlhbGl6ZVBhZ2VHcm91cCAq LworICAgICAgICAwLCAvKiBkaWRSZWNpZXZlTWVzc2FnZSAqLworICAgIH07CisgICAgV0tCdW5k bGVTZXRDbGllbnQoYnVuZGxlLCAmY2xpZW50KTsKK30KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlC cm93c2VyL2d0ay9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jCmluZGV4IDMy ZmJkNWQuLmY5Y2MzZTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9tYWluLmMK KysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL21haW4uYwpAQCAtMjksOCArMjksMjMgQEAKICNp bmNsdWRlIDxXZWJLaXQyL1dlYktpdDIuaD4KICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAKK1dLQ29u dGV4dFJlZiBwcm9jZXNzQ29udGV4dDsKIHN0YXRpYyBjb25zdCBnY2hhciAqKnVyaUFyZ3VtZW50 cyA9IE5VTEw7CiAKK3N0YXRpYyB2b2lkIGluaXRDb250ZXh0KCkKK3sKKyAgICBXS1N0cmluZ1Jl ZiBidW5kbGVQYXRoID0gV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoIkxpYnJhcmllcy8u bGlicy9saWJNaW5pQnJvd3NlcldlYkJ1bmRsZS5zbyIpOworICAgIHByb2Nlc3NDb250ZXh0ID0g V0tDb250ZXh0Q3JlYXRlV2l0aEluamVjdGVkQnVuZGxlUGF0aChidW5kbGVQYXRoKTsKKyAgICBX S0NvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudCBidW5kbGVDbGllbnQgPSB7CisgICAgICAgICAg ICAwLCAvKiB2ZXJzaW9uICovCisgICAgICAgICAgICAwLCAvKiBjbGllbnRJbmZvICovCisgICAg ICAgICAgICAwLCAvKiBkaWRSZWNpZXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZSwqLworICAg ICAgICAgICAgMAorICAgIH07CisgICAgV0tDb250ZXh0U2V0SW5qZWN0ZWRCdW5kbGVDbGllbnQo cHJvY2Vzc0NvbnRleHQsICZidW5kbGVDbGllbnQpOworICAgIFdLUmVsZWFzZShidW5kbGVQYXRo KTsKK30KKwogc3RhdGljIGdjaGFyICphcmd1bWVudFRvVVJMKGNvbnN0IGNoYXIgKmZpbGVuYW1l KQogewogICAgIEdGaWxlICpnZmlsZSA9IGdfZmlsZV9uZXdfZm9yX2NvbW1hbmRsaW5lX2FyZyhm aWxlbmFtZSk7CkBAIC00Miw3ICs1Nyw3IEBAIHN0YXRpYyBnY2hhciAqYXJndW1lbnRUb1VSTChj b25zdCBjaGFyICpmaWxlbmFtZSkKIAogc3RhdGljIHZvaWQgbG9hZFVSSShjb25zdCBnY2hhciAq dXJpKQogewotICAgIFdLVmlld1JlZiB3ZWJWaWV3ID0gV0tWaWV3Q3JlYXRlKFdLQ29udGV4dEdl dFNoYXJlZFByb2Nlc3NDb250ZXh0KCksIDApOworICAgIFdLVmlld1JlZiB3ZWJWaWV3ID0gV0tW aWV3Q3JlYXRlKHByb2Nlc3NDb250ZXh0LCAwKTsKICAgICBHdGtXaWRnZXQgKm1haW5XaW5kb3cg PSBicm93c2VyX3dpbmRvd19uZXcod2ViVmlldyk7CiAgICAgZ2NoYXIgKnVybCA9IGFyZ3VtZW50 VG9VUkwodXJpKTsKICAgICBXS1BhZ2VMb2FkVVJMKFdLVmlld0dldFBhZ2Uod2ViVmlldyksIFdL VVJMQ3JlYXRlV2l0aFVURjhDU3RyaW5nKHVybCkpOwpAQCAtNzcsNiArOTIsOCBAQCBpbnQgbWFp bihpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAgIH0KICAgICBnX29wdGlvbl9jb250ZXh0X2Zy ZWUgKGNvbnRleHQpOwogCisgICAgaW5pdENvbnRleHQoKTsKKwogICAgIGlmICh1cmlBcmd1bWVu dHMpIHsKICAgICAgICAgaW50IGk7CiAK