45427 2010-09-08 17:45:13 -0700 [EFL] Add setting api for enabling encoding detector 2010-10-14 11:37:30 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 ryuan.choi webkit-unassigned antognolli+webkit commit-queue lucas.de.marchi tonikitoo oldest_to_newest 276219 0 ryuan.choi 2010-09-08 17:45:13 -0700 contents was broken in some of korean site like http://www.zdnet.co.kr It's because those site doesn't specified encoding. 276221 1 66974 ryuan.choi 2010-09-08 17:49:47 -0700 Created attachment 66974 Patch 276350 2 66974 cfleizach 2010-09-09 00:48:27 -0700 Comment on attachment 66974 Patch > Index: WebKit/efl/ChangeLog > =================================================================== > --- WebKit/efl/ChangeLog (revision 67042) > +++ WebKit/efl/ChangeLog (working copy) > @@ -1,3 +1,15 @@ > +2010-09-08 Ryuan Choi <ryuan.choi@samsung.com> > + > + Reviewed by NOBODY (OOPS!). > + > + [EFL] enable UsesEncodingDetector > + https://bugs.webkit.org/show_bug.cgi?id=45427 > + > + Enable encodingDetector. > + please add a more informative comment as to why you want to enable here. and please add a layout test to confirm the desired behavior is now present. 277078 3 ryuan.choi 2010-09-10 02:03:35 -0700 (In reply to comment #2) > (From update of attachment 66974 [details]) > > Index: WebKit/efl/ChangeLog > > =================================================================== > > --- WebKit/efl/ChangeLog (revision 67042) > > +++ WebKit/efl/ChangeLog (working copy) > > @@ -1,3 +1,15 @@ > > +2010-09-08 Ryuan Choi <ryuan.choi@samsung.com> > > + > > + Reviewed by NOBODY (OOPS!). > > + > > + [EFL] enable UsesEncodingDetector > > + https://bugs.webkit.org/show_bug.cgi?id=45427 > > + > > + Enable encodingDetector. > > + > > please add a more informative comment as to why you want to enable here. > > and please add a layout test to confirm the desired behavior is now present. Hi, Thank you for your reviewing. Unfortunately EFL doesn't have layout test yet. but, while analyzing more, I found that It's not real solution for this bug. Although applying this patch, I got a broken content sometimes. after analyzed more, I'll prepare. 277954 4 67355 ryuan.choi 2010-09-12 20:15:30 -0700 Created attachment 67355 testpage This page contains korean letter. Unless enabling EncodingDetector, this page will not be rendered properly. we need setting APIs to enable encodingDetector like other ports. 277983 5 67359 ryuan.choi 2010-09-12 23:01:40 -0700 Created attachment 67359 Patch 277991 6 ryuan.choi 2010-09-12 23:16:50 -0700 (In reply to comment #5) > Created an attachment (id=67359) [details] > Patch I changed approach to add setting api instead of changing encoding detector directly. 278179 7 antognolli+webkit 2010-09-13 06:38:48 -0700 (In reply to comment #6) > (In reply to comment #5) > > Created an attachment (id=67359) [details] [details] > > Patch > > I changed approach to add setting api instead of changing encoding detector directly. The patch is nice IMHO. Do you still have the problem that you described in comment #3? Although the new approach is better, I don't think it will solve that. 278186 8 67359 lucas.de.marchi 2010-09-13 06:53:34 -0700 Comment on attachment 67359 Patch > Index: WebKit/efl/ewk/ewk_view.cpp > =================================================================== [...] > +/** > + * Sets the encoding detector. > + * > + * @param o view object to set if encoding detector is enabled. > + * @return @c EINA_TRUE on success and @c EINA_FALSE on failure > + */ > +Eina_Bool ewk_view_setting_encoding_detector_set(Evas_Object* o, Eina_Bool enable) > +{ > + EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); > + EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE); > + enable = !!enable; > + if (priv->settings.local_storage != enable) { s/local_storage/encoding_detector/ [...] > +/** > + * Gets if the encoding detector is enabled. > + * > + * @param o view object to set if encoding detector is enabled. s/set/get > + * @return @c EINA_TRUE if encoding detector is enabled, @c EINA_FALSE if not. It returns EINA_FALSE on errors, too. 278212 9 ryuan.choi 2010-09-13 08:01:16 -0700 (In reply to comment #8) > (From update of attachment 67359 [details]) > > Index: WebKit/efl/ewk/ewk_view.cpp > > =================================================================== > [...] > > +/** > > + * Sets the encoding detector. > > + * > > + * @param o view object to set if encoding detector is enabled. > > + * @return @c EINA_TRUE on success and @c EINA_FALSE on failure > > + */ > > +Eina_Bool ewk_view_setting_encoding_detector_set(Evas_Object* o, Eina_Bool enable) > > +{ > > + EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); > > + EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE); > > + enable = !!enable; > > + if (priv->settings.local_storage != enable) { > s/local_storage/encoding_detector/ > > [...] > > +/** > > + * Gets if the encoding detector is enabled. > > + * > > + * @param o view object to set if encoding detector is enabled. > s/set/get > > > + * @return @c EINA_TRUE if encoding detector is enabled, @c EINA_FALSE if not. > It returns EINA_FALSE on errors, too. oops, sorry I mistake. 278217 10 67410 ryuan.choi 2010-09-13 08:10:30 -0700 Created attachment 67410 Patch 278231 11 ryuan.choi 2010-09-13 08:50:52 -0700 (In reply to comment #7) > (In reply to comment #6) > > (In reply to comment #5) > > > Created an attachment (id=67359) [details] [details] [details] > > > Patch > > > > I changed approach to add setting api instead of changing encoding detector directly. > > The patch is nice IMHO. Do you still have the problem that you described in comment #3? Although the new approach is better, I don't think it will solve that. right, this is only for fixing general case like testpage I attached. to solve completely, I think that we need to improve Encoding Detection algorithm. Current TextEncodingDetectorICU algorithm sometimes failed to get proper encoding for this site (zdnet.co.kr) This is not for EFL, I reproduced this in Gtklauncher, epiphany, Chrome in linux. now I don't have idea to improve encoding detector itself and I think that adding encoding detector api and improvement can be separated. 278277 12 antognolli+webkit 2010-09-13 10:04:57 -0700 Ok, then this implementation is nice. Another thing that I forgot before, it would be good to add the default setting in _ewk_view_priv_new() (ok, I know that it's off by default, but having it explicit would be better). 278903 13 tonikitoo 2010-09-14 08:00:55 -0700 (In reply to comment #12) > Ok, then this implementation is nice. > > Another thing that I forgot before, it would be good to add the default setting in _ewk_view_priv_new() (ok, I know that it's off by default, but having it explicit would be better). Please address that. 278942 14 67560 ryuan.choi 2010-09-14 09:02:36 -0700 Created attachment 67560 patch with Rafael suggested 292868 15 ryuan.choi 2010-10-11 23:56:26 -0700 (In reply to comment #13) > (In reply to comment #12) > > Ok, then this implementation is nice. > > > > Another thing that I forgot before, it would be good to add the default setting in _ewk_view_priv_new() (ok, I know that it's off by default, but having it explicit would be better). > > Please address that. could you review this? I applied this as default setting as Rafael suggested. 294202 16 67560 eric 2010-10-14 10:59:42 -0700 Comment on attachment 67560 patch with Rafael suggested rs=me? Would be helpful if other EFL contributors could do informal reviews. This looks sane to me, but I don't know much EFL. I don't think EFL has any official reviewers yet so I'm attempting to help move things along. I'm happy to not rubber-stamp EFL patches if that's preferred. 294238 17 67560 commit-queue 2010-10-14 11:37:25 -0700 Comment on attachment 67560 patch with Rafael suggested Clearing flags on attachment: 67560 Committed r69783: <http://trac.webkit.org/changeset/69783> 294240 18 commit-queue 2010-10-14 11:37:30 -0700 All reviewed patches have been landed. Closing bug. 66974 2010-09-08 17:49:47 -0700 2010-09-12 23:01:35 -0700 Patch bug-45427-20100909094944.patch text/plain 1212 ryuan.choi SW5kZXg6IFdlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvQ2hh bmdlTG9nCShyZXZpc2lvbiA2NzA0MikKKysrIFdlYktpdC9lZmwvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDktMDggIFJ5dWFuIENob2kgIDxyeXVhbi5j aG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtFRkxdIGVuYWJsZSBVc2VzRW5jb2RpbmdEZXRlY3RvcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDU0MjcKKworICAgICAgICBFbmFi bGUgZW5jb2RpbmdEZXRlY3Rvci4KKworICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAg ICAgIChfZXdrX3ZpZXdfcHJpdl9uZXcpOgorCiAyMDEwLTA5LTA4ICBSeXVhbiBDaG9pICA8cnl1 YW4uY2hvaUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeC4KSW5k ZXg6IFdlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZWZs L2V3ay9ld2tfdmlldy5jcHAJKHJldmlzaW9uIDY3MDQyKQorKysgV2ViS2l0L2VmbC9ld2svZXdr X3ZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NjUsNiArNTY1LDcgQEAgc3RhdGljIEV3a19W aWV3X1ByaXZhdGVfRGF0YSogX2V3a192aWV3XwogICAgIHByaXYtPnBhZ2Vfc2V0dGluZ3MtPnNl dFBsdWdpbnNFbmFibGVkKHRydWUpOwogICAgIHByaXYtPnBhZ2Vfc2V0dGluZ3MtPnNldExvY2Fs U3RvcmFnZUVuYWJsZWQodHJ1ZSk7CiAgICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0T2ZmbGlu ZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKHRydWUpOworICAgIHByaXYtPnBhZ2Vfc2V0dGlu Z3MtPnNldFVzZXNFbmNvZGluZ0RldGVjdG9yKHRydWUpOwogCiAgICAgdXJsID0gcHJpdi0+cGFn ZV9zZXR0aW5ncy0+dXNlclN0eWxlU2hlZXRMb2NhdGlvbigpOwogICAgIHByaXYtPnNldHRpbmdz LnVzZXJfc3R5bGVzaGVldCA9IGVpbmFfc3RyaW5nc2hhcmVfYWRkKHVybC5wcmV0dHlVUkwoKS51 dGY4KCkuZGF0YSgpKTsK 67355 2010-09-12 20:15:30 -0700 2010-09-12 20:15:30 -0700 testpage korean.html text/html 47 ryuan.choi PGh0bWw+Cjxib2R5PgrtlZzquIDsnoXri4jri6QuCjwvYm9keT4KPC9odG1sPgo= 67359 2010-09-12 23:01:40 -0700 2010-09-13 08:10:24 -0700 Patch bug-45427-20100913150135.patch text/plain 3192 ryuan.choi SW5kZXg6IFdlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvQ2hh bmdlTG9nCShyZXZpc2lvbiA2NzM2MykKKysrIFdlYktpdC9lZmwvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDktMTIgIFJ5dWFuIENob2kgIDxyeXVhbi5j aG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtFRkxdIEFkZCBzZXR0aW5nIGFwaSBmb3IgZW5hYmxpbmcgZW5jb2RpbmcgZGV0 ZWN0b3IuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 NTQyNworCisgICAgICAgIEFkZCBzZXR0aW5ncyBhcGkgZm9yIGVuYWJsaW5nIGVuY29kaW5nIGRl dGVjdG9yLgorCisgICAgICAgICogZXdrL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a192aWV3 X3NldHRpbmdfZW5jb2RpbmdfZGV0ZWN0b3Jfc2V0KToKKyAgICAgICAgKGV3a192aWV3X3NldHRp bmdfZW5jb2RpbmdfZGV0ZWN0b3JfZ2V0KToKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuaDoKKwog MjAxMC0wOS0xMSAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ftc3VuZy5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQW50b25pbyBHb21lcy4KSW5kZXg6IFdlYktpdC9lZmwvZXdrL2V3a192 aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAJKHJldmlz aW9uIDY3MzU1KQorKysgV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xMDUsNiArMTA1LDcgQEAgc3RydWN0IF9Fd2tfVmlld19Qcml2YXRlX0RhdGEgewogICAg ICAgICBFaW5hX0Jvb2wgZW5hYmxlX3NjcmlwdHM6MTsKICAgICAgICAgRWluYV9Cb29sIGVuYWJs ZV9wbHVnaW5zOjE7CiAgICAgICAgIEVpbmFfQm9vbCBlbmFibGVfZnJhbWVfZmxhdHRlbmluZzox OworICAgICAgICBFaW5hX0Jvb2wgZW5jb2RpbmdfZGV0ZWN0b3I6MTsKICAgICAgICAgRWluYV9C b29sIHNjcmlwdHNfd2luZG93X29wZW46MTsKICAgICAgICAgRWluYV9Cb29sIHJlc2l6YWJsZV90 ZXh0YXJlYXM6MTsKICAgICAgICAgRWluYV9Cb29sIHByaXZhdGVfYnJvd3Npbmc6MTsKQEAgLTI0 OTksNiArMjUwMCwzNyBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGluZ19kZWZh CiAgICAgcmV0dXJuIEVJTkFfVFJVRTsKIH0KIAorLyoqCisgKiBTZXRzIHRoZSBlbmNvZGluZyBk ZXRlY3Rvci4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBzZXQgaWYgZW5jb2Rpbmcg ZGV0ZWN0b3IgaXMgZW5hYmxlZC4KKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3Mg YW5kIEBjIEVJTkFfRkFMU0Ugb24gZmFpbHVyZQorICovCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0 dGluZ19lbmNvZGluZ19kZXRlY3Rvcl9zZXQoRXZhc19PYmplY3QqIG8sIEVpbmFfQm9vbCBlbmFi bGUpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwgRUlOQV9GQUxTRSk7 CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNkLCBwcml2LCBFSU5BX0ZBTFNFKTsK KyAgICBlbmFibGUgPSAhIWVuYWJsZTsKKyAgICBpZiAocHJpdi0+c2V0dGluZ3MubG9jYWxfc3Rv cmFnZSAhPSBlbmFibGUpIHsKKyAgICAgICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0VXNlc0Vu Y29kaW5nRGV0ZWN0b3IoZW5hYmxlKTsKKyAgICAgICAgcHJpdi0+c2V0dGluZ3MuZW5jb2Rpbmdf ZGV0ZWN0b3IgPSBlbmFibGU7CisgICAgfQorICAgIHJldHVybiBFSU5BX1RSVUU7Cit9CisKKy8q KgorICogR2V0cyBpZiB0aGUgZW5jb2RpbmcgZGV0ZWN0b3IgaXMgZW5hYmxlZC4KKyAqCisgKiBA cGFyYW0gbyB2aWV3IG9iamVjdCB0byBzZXQgaWYgZW5jb2RpbmcgZGV0ZWN0b3IgaXMgZW5hYmxl ZC4KKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIGlmIGVuY29kaW5nIGRldGVjdG9yIGlzIGVuYWJs ZWQsIEBjIEVJTkFfRkFMU0UgaWYgbm90LgorICovCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGlu Z19lbmNvZGluZ19kZXRlY3Rvcl9nZXQoRXZhc19PYmplY3QqIG8pCit7CisgICAgRVdLX1ZJRVdf U0RfR0VUX09SX1JFVFVSTihvLCBzZCwgRUlOQV9GQUxTRSk7CisgICAgRVdLX1ZJRVdfUFJJVl9H RVRfT1JfUkVUVVJOKHNkLCBwcml2LCBFSU5BX0ZBTFNFKTsKKyAgICByZXR1cm4gcHJpdi0+c2V0 dGluZ3MuZW5jb2RpbmdfZGV0ZWN0b3I7Cit9CisKIGNvbnN0IGNoYXIqIGV3a192aWV3X3NldHRp bmdfY2FjaGVfZGlyZWN0b3J5X2dldChjb25zdCBFdmFzX09iamVjdCogbykKIHsKICAgICBFV0tf VklFV19TRF9HRVRfT1JfUkVUVVJOKG8sIHNkLCAwKTsKSW5kZXg6IFdlYktpdC9lZmwvZXdrL2V3 a192aWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAkocmV2aXNp b24gNjczNTUpCisrKyBXZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCSh3b3JraW5nIGNvcHkpCkBA IC00NTAsNiArNDUwLDkgQEAgRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19zcGF0 aQogRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19sb2NhbF9zdG9yYWdlX2dldChF dmFzX09iamVjdCogbyk7CiBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX2xvY2Fs X3N0b3JhZ2Vfc2V0KEV2YXNfT2JqZWN0KiBvLCBFaW5hX0Jvb2wgZW5hYmxlKTsKIAorRUFQSSBF aW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGluZ19kZXRlY3Rvcl9nZXQoRXZhc19P YmplY3QqIG8pOworRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGluZ19k ZXRlY3Rvcl9zZXQoRXZhc19PYmplY3QqIG8sIEVpbmFfQm9vbCBlbmFibGUpOworCiAvKiB0byBi ZSB1c2VkIGJ5IHN1YmNsYXNzIGltcGxlbWVudGF0aW9ucyAqLwogRUFQSSBFd2tfVmlld19TbWFy dF9EYXRhICpld2tfdmlld19zbWFydF9kYXRhX2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CiAK 67410 2010-09-13 08:10:30 -0700 2010-09-14 09:02:29 -0700 Patch bug-45427-20100914001030.patch text/plain 3679 ryuan.choi SW5kZXg6IFdlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvQ2hh bmdlTG9nCShyZXZpc2lvbiA2NzM4NykKKysrIFdlYktpdC9lZmwvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDktMTMgIFJ5dWFuIENob2kgIDxyeXVhbi5j aG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtFRkxdIEFkZCBzZXR0aW5nIGFwaSBmb3IgZW5hYmxpbmcgZW5jb2RpbmcgZGV0 ZWN0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1 NDI3CisKKyAgICAgICAgQWRkIHNldHRpbmdzIGFwaSBmb3IgZW5hYmxpbmcgZW5jb2RpbmcgZGV0 ZWN0b3IuCisKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoZXdrX3ZpZXdf c2V0dGluZ19lbmNvZGluZ19kZXRlY3Rvcl9zZXQpOgorICAgICAgICAoZXdrX3ZpZXdfc2V0dGlu Z19lbmNvZGluZ19kZXRlY3Rvcl9nZXQpOgorICAgICAgICAqIGV3ay9ld2tfdmlldy5oOgorCiAy MDEwLTA5LTExICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBBbnRvbmlvIEdvbWVzLgpJbmRleDogV2ViS2l0L2VmbC9ld2svZXdrX3Zp ZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAkocmV2aXNp b24gNjczODUpCisrKyBXZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEwNSw2ICsxMDUsNyBAQCBzdHJ1Y3QgX0V3a19WaWV3X1ByaXZhdGVfRGF0YSB7CiAgICAg ICAgIEVpbmFfQm9vbCBlbmFibGVfc2NyaXB0czoxOwogICAgICAgICBFaW5hX0Jvb2wgZW5hYmxl X3BsdWdpbnM6MTsKICAgICAgICAgRWluYV9Cb29sIGVuYWJsZV9mcmFtZV9mbGF0dGVuaW5nOjE7 CisgICAgICAgIEVpbmFfQm9vbCBlbmNvZGluZ19kZXRlY3RvcjoxOwogICAgICAgICBFaW5hX0Jv b2wgc2NyaXB0c193aW5kb3dfb3BlbjoxOwogICAgICAgICBFaW5hX0Jvb2wgcmVzaXphYmxlX3Rl eHRhcmVhczoxOwogICAgICAgICBFaW5hX0Jvb2wgcHJpdmF0ZV9icm93c2luZzoxOwpAQCAtMjQ5 OSw2ICsyNTAwLDM3IEBAIEVpbmFfQm9vbCBld2tfdmlld19zZXR0aW5nX2VuY29kaW5nX2RlZmEK ICAgICByZXR1cm4gRUlOQV9UUlVFOwogfQogCisvKioKKyAqIFNldHMgdGhlIGVuY29kaW5nIGRl dGVjdG9yLgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIHNldCBpZiBlbmNvZGluZyBk ZXRlY3RvciBpcyBlbmFibGVkLgorICogQHJldHVybiBAYyBFSU5BX1RSVUUgb24gc3VjY2VzcyBh bmQgQGMgRUlOQV9GQUxTRSBvbiBmYWlsdXJlCisgKi8KK0VpbmFfQm9vbCBld2tfdmlld19zZXR0 aW5nX2VuY29kaW5nX2RldGVjdG9yX3NldChFdmFzX09iamVjdCogbywgRWluYV9Cb29sIGVuYWJs ZSkKK3sKKyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKG8sIHNkLCBFSU5BX0ZBTFNFKTsK KyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc2QsIHByaXYsIEVJTkFfRkFMU0UpOwor ICAgIGVuYWJsZSA9ICEhZW5hYmxlOworICAgIGlmIChwcml2LT5zZXR0aW5ncy5lbmNvZGluZ19k ZXRlY3RvciAhPSBlbmFibGUpIHsKKyAgICAgICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0VXNl c0VuY29kaW5nRGV0ZWN0b3IoZW5hYmxlKTsKKyAgICAgICAgcHJpdi0+c2V0dGluZ3MuZW5jb2Rp bmdfZGV0ZWN0b3IgPSBlbmFibGU7CisgICAgfQorICAgIHJldHVybiBFSU5BX1RSVUU7Cit9CisK Ky8qKgorICogR2V0cyBpZiB0aGUgZW5jb2RpbmcgZGV0ZWN0b3IgaXMgZW5hYmxlZC4KKyAqCisg KiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBnZXQgaWYgZW5jb2RpbmcgZGV0ZWN0b3IgaXMgZW5h YmxlZC4KKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIGlmIGVuY29kaW5nIGRldGVjdG9yIGlzIGVu YWJsZWQsIEBjIEVJTkFfRkFMU0UgaWYgbm90IG9yIG9uIGVycm9ycy4KKyAqLworRWluYV9Cb29s IGV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfZGV0ZWN0b3JfZ2V0KEV2YXNfT2JqZWN0KiBvKQor eworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0UpOworICAg IEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7CisgICAg cmV0dXJuIHByaXYtPnNldHRpbmdzLmVuY29kaW5nX2RldGVjdG9yOworfQorCiBjb25zdCBjaGFy KiBld2tfdmlld19zZXR0aW5nX2NhY2hlX2RpcmVjdG9yeV9nZXQoY29uc3QgRXZhc19PYmplY3Qq IG8pCiB7CiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwgMCk7CkBAIC0yNzE3 LDggKzI3NDksOCBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19zcGF0aWFsX25hdmlnCiAv KioKICAqIEdldHMgaWYgdGhlIGxvY2FsIHN0b3JhZ2UgaXMgZW5hYmxlZC4KICAqCi0gKiBAcGFy YW0gbyB2aWV3IG9iamVjdCB0byBzZXQgaWYgbG9jYWwgc3RvcmFnZSBpcyBlbmFibGVkLgotICog QHJldHVybiBAYyBFSU5BX1RSVUUgaWYgbG9jYWwgc3RvcmFnZSBpcyBlbmFibGVkLCBAYyBFSU5B X0ZBTFNFIGlmIG5vdC4KKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIGdldCBpZiBsb2NhbCBz dG9yYWdlIGlzIGVuYWJsZWQuCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBpZiBsb2NhbCBzdG9y YWdlIGlzIGVuYWJsZWQsIEBjIEVJTkFfRkFMU0UgaWYgbm90IG9yIG9uIGVycm9ycy4KICAqLwog RWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfbG9jYWxfc3RvcmFnZV9nZXQoRXZhc19PYmplY3Qq IG8pCiB7CkluZGV4OiBXZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9lZmwvZXdrL2V3a192aWV3LmgJKHJldmlzaW9uIDY3Mzg1KQorKysgV2ViS2l0L2VmbC9l d2svZXdrX3ZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtNDUwLDYgKzQ1MCw5IEBAIEVBUEkgRWlu YV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfc3BhdGkKIEVBUEkgRWluYV9Cb29sICAgIGV3a192 aWV3X3NldHRpbmdfbG9jYWxfc3RvcmFnZV9nZXQoRXZhc19PYmplY3QqIG8pOwogRUFQSSBFaW5h X0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19sb2NhbF9zdG9yYWdlX3NldChFdmFzX09iamVjdCog bywgRWluYV9Cb29sIGVuYWJsZSk7CiAKK0VBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRp bmdfZW5jb2RpbmdfZGV0ZWN0b3JfZ2V0KEV2YXNfT2JqZWN0KiBvKTsKK0VBUEkgRWluYV9Cb29s ICAgIGV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfZGV0ZWN0b3Jfc2V0KEV2YXNfT2JqZWN0KiBv LCBFaW5hX0Jvb2wgZW5hYmxlKTsKKwogLyogdG8gYmUgdXNlZCBieSBzdWJjbGFzcyBpbXBsZW1l bnRhdGlvbnMgKi8KIEVBUEkgRXdrX1ZpZXdfU21hcnRfRGF0YSAqZXdrX3ZpZXdfc21hcnRfZGF0 YV9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOwogCg== 67560 2010-09-14 09:02:36 -0700 2010-10-14 11:37:25 -0700 patch with Rafael suggested bug-45427-20100915010234.patch text/plain 4755 ryuan.choi SW5kZXg6IFdlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvQ2hh bmdlTG9nCShyZXZpc2lvbiA2NzQ3MikKKysrIFdlYktpdC9lZmwvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMTQgIFJ5dWFuIENob2kgIDxyeXVhbi5j aG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtFRkxdIEFkZCBzZXR0aW5nIGFwaSBmb3IgZW5hYmxpbmcgZW5jb2RpbmcgZGV0 ZWN0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1 NDI3CisKKyAgICAgICAgQWRkIHNldHRpbmdzIGFwaSBmb3IgZW5hYmxpbmcgZW5jb2RpbmcgZGV0 ZWN0b3IuCisKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoX2V3a192aWV3 X3ByaXZfbmV3KToKKyAgICAgICAgKGV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfZGV0ZWN0b3Jf c2V0KToKKyAgICAgICAgKGV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfZGV0ZWN0b3JfZ2V0KToK KyAgICAgICAgKiBld2svZXdrX3ZpZXcuaDoKKwogMjAxMC0wOS0xMyAgUmFmYWVsIEFudG9nbm9s bGkgIDxhbnRvZ25vbGxpQHByb2Z1c2lvbi5tb2JpPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVp bGQgZml4LgpJbmRleDogV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAkocmV2aXNpb24gNjc0NzApCisrKyBXZWJLaXQv ZWZsL2V3ay9ld2tfdmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNSw2ICsxMDUsNyBAQCBz dHJ1Y3QgX0V3a19WaWV3X1ByaXZhdGVfRGF0YSB7CiAgICAgICAgIEVpbmFfQm9vbCBlbmFibGVf c2NyaXB0czoxOwogICAgICAgICBFaW5hX0Jvb2wgZW5hYmxlX3BsdWdpbnM6MTsKICAgICAgICAg RWluYV9Cb29sIGVuYWJsZV9mcmFtZV9mbGF0dGVuaW5nOjE7CisgICAgICAgIEVpbmFfQm9vbCBl bmNvZGluZ19kZXRlY3RvcjoxOwogICAgICAgICBFaW5hX0Jvb2wgc2NyaXB0c193aW5kb3dfb3Bl bjoxOwogICAgICAgICBFaW5hX0Jvb2wgcmVzaXphYmxlX3RleHRhcmVhczoxOwogICAgICAgICBF aW5hX0Jvb2wgcHJpdmF0ZV9icm93c2luZzoxOwpAQCAtNTY3LDYgKzU2OCw3IEBAIHN0YXRpYyBF d2tfVmlld19Qcml2YXRlX0RhdGEqIF9ld2tfdmlld18KICAgICBwcml2LT5wYWdlX3NldHRpbmdz LT5zZXRMb2NhbFN0b3JhZ2VFbmFibGVkKHRydWUpOwogICAgIHByaXYtPnBhZ2Vfc2V0dGluZ3Mt PnNldE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCh0cnVlKTsKICAgICBwcml2LT5w YWdlX3NldHRpbmdzLT5zZXRVc2VzUGFnZUNhY2hlKHRydWUpOworICAgIHByaXYtPnBhZ2Vfc2V0 dGluZ3MtPnNldFVzZXNFbmNvZGluZ0RldGVjdG9yKHRydWUpOwogCiAgICAgdXJsID0gcHJpdi0+ cGFnZV9zZXR0aW5ncy0+dXNlclN0eWxlU2hlZXRMb2NhdGlvbigpOwogICAgIHByaXYtPnNldHRp bmdzLnVzZXJfc3R5bGVzaGVldCA9IGVpbmFfc3RyaW5nc2hhcmVfYWRkKHVybC5wcmV0dHlVUkwo KS51dGY4KCkuZGF0YSgpKTsKQEAgLTYwOCw2ICs2MTAsNyBAQCBzdGF0aWMgRXdrX1ZpZXdfUHJp dmF0ZV9EYXRhKiBfZXdrX3ZpZXdfCiAgICAgcHJpdi0+c2V0dGluZ3MubG9jYWxfc3RvcmFnZSA9 IHByaXYtPnBhZ2Vfc2V0dGluZ3MtPmxvY2FsU3RvcmFnZUVuYWJsZWQoKTsKICAgICBwcml2LT5z ZXR0aW5ncy5vZmZsaW5lX2FwcF9jYWNoZSA9IHRydWU7IC8vIFhYWCBubyBmdW5jdGlvbiB0byBy ZWFkIHNldHRpbmc7IHRoaXMga2VlcHMgdGhlIG9yaWdpbmFsIHNldHRpbmcKICAgICBwcml2LT5z ZXR0aW5ncy5wYWdlX2NhY2hlID0gcHJpdi0+cGFnZV9zZXR0aW5ncy0+dXNlc1BhZ2VDYWNoZSgp OworICAgIHByaXYtPnNldHRpbmdzLmVuY29kaW5nX2RldGVjdG9yID0gcHJpdi0+cGFnZV9zZXR0 aW5ncy0+dXNlc0VuY29kaW5nRGV0ZWN0b3IoKTsKIAogICAgIC8vIFNpbmNlIHRoZXJlJ3Mgbm8g c2NhbGUgc2VwYXJhdGVkIGZyb20gem9vbWluZyBpbiB3ZWJraXQtZWZsLCB0aGlzIGZ1bmN0aW9u YWxpdHkgb2YKICAgICAvLyB2aWV3cG9ydCBtZXRhIHRhZyBpcyBpbXBsZW1lbnRlZCB1c2luZyB6 b29tLiBXaGVuIHNjYWxlIHpvb20gaXMgc3VwcG9ydGVkIGJ5IHdlYmtpdC1lZmwsCkBAIC0yNTAy LDYgKzI1MDUsMzcgQEAgRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfZGVmYQog ICAgIHJldHVybiBFSU5BX1RSVUU7CiB9CiAKKy8qKgorICogU2V0cyB0aGUgZW5jb2RpbmcgZGV0 ZWN0b3IuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gc2V0IGlmIGVuY29kaW5nIGRl dGVjdG9yIGlzIGVuYWJsZWQuCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzIGFu ZCBAYyBFSU5BX0ZBTFNFIG9uIGZhaWx1cmUKKyAqLworRWluYV9Cb29sIGV3a192aWV3X3NldHRp bmdfZW5jb2RpbmdfZGV0ZWN0b3Jfc2V0KEV2YXNfT2JqZWN0KiBvLCBFaW5hX0Jvb2wgZW5hYmxl KQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0UpOwor ICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7Cisg ICAgZW5hYmxlID0gISFlbmFibGU7CisgICAgaWYgKHByaXYtPnNldHRpbmdzLmVuY29kaW5nX2Rl dGVjdG9yICE9IGVuYWJsZSkgeworICAgICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRVc2Vz RW5jb2RpbmdEZXRlY3RvcihlbmFibGUpOworICAgICAgICBwcml2LT5zZXR0aW5ncy5lbmNvZGlu Z19kZXRlY3RvciA9IGVuYWJsZTsKKyAgICB9CisgICAgcmV0dXJuIEVJTkFfVFJVRTsKK30KKwor LyoqCisgKiBHZXRzIGlmIHRoZSBlbmNvZGluZyBkZXRlY3RvciBpcyBlbmFibGVkLgorICoKKyAq IEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIGdldCBpZiBlbmNvZGluZyBkZXRlY3RvciBpcyBlbmFi bGVkLgorICogQHJldHVybiBAYyBFSU5BX1RSVUUgaWYgZW5jb2RpbmcgZGV0ZWN0b3IgaXMgZW5h YmxlZCwgQGMgRUlOQV9GQUxTRSBpZiBub3Qgb3Igb24gZXJyb3JzLgorICovCitFaW5hX0Jvb2wg ZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGluZ19kZXRlY3Rvcl9nZXQoRXZhc19PYmplY3QqIG8pCit7 CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwgRUlOQV9GQUxTRSk7CisgICAg RVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNkLCBwcml2LCBFSU5BX0ZBTFNFKTsKKyAgICBy ZXR1cm4gcHJpdi0+c2V0dGluZ3MuZW5jb2RpbmdfZGV0ZWN0b3I7Cit9CisKIGNvbnN0IGNoYXIq IGV3a192aWV3X3NldHRpbmdfY2FjaGVfZGlyZWN0b3J5X2dldChjb25zdCBFdmFzX09iamVjdCog bykKIHsKICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKG8sIHNkLCAwKTsKQEAgLTI3MjAs OCArMjc1NCw4IEBAIEVpbmFfQm9vbCBld2tfdmlld19zZXR0aW5nX3NwYXRpYWxfbmF2aWcKIC8q KgogICogR2V0cyBpZiB0aGUgbG9jYWwgc3RvcmFnZSBpcyBlbmFibGVkLgogICoKLSAqIEBwYXJh bSBvIHZpZXcgb2JqZWN0IHRvIHNldCBpZiBsb2NhbCBzdG9yYWdlIGlzIGVuYWJsZWQuCi0gKiBA cmV0dXJuIEBjIEVJTkFfVFJVRSBpZiBsb2NhbCBzdG9yYWdlIGlzIGVuYWJsZWQsIEBjIEVJTkFf RkFMU0UgaWYgbm90LgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gZ2V0IGlmIGxvY2FsIHN0 b3JhZ2UgaXMgZW5hYmxlZC4KKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIGlmIGxvY2FsIHN0b3Jh Z2UgaXMgZW5hYmxlZCwgQGMgRUlOQV9GQUxTRSBpZiBub3Qgb3Igb24gZXJyb3JzLgogICovCiBF aW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19sb2NhbF9zdG9yYWdlX2dldChFdmFzX09iamVjdCog bykKIHsKSW5kZXg6IFdlYktpdC9lZmwvZXdrL2V3a192aWV3LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L2VmbC9ld2svZXdrX3ZpZXcuaAkocmV2aXNpb24gNjc0NzApCisrKyBXZWJLaXQvZWZsL2V3 ay9ld2tfdmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC00NTMsNiArNDUzLDkgQEAgRUFQSSBFaW5h X0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19sb2NhbAogRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3Zp ZXdfc2V0dGluZ19wYWdlX2NhY2hlX2dldChFdmFzX09iamVjdCogbyk7CiBFQVBJIEVpbmFfQm9v bCAgICBld2tfdmlld19zZXR0aW5nX3BhZ2VfY2FjaGVfc2V0KEV2YXNfT2JqZWN0KiBvLCBFaW5h X0Jvb2wgZW5hYmxlKTsKIAorRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19lbmNv ZGluZ19kZXRlY3Rvcl9nZXQoRXZhc19PYmplY3QqIG8pOworRUFQSSBFaW5hX0Jvb2wgICAgZXdr X3ZpZXdfc2V0dGluZ19lbmNvZGluZ19kZXRlY3Rvcl9zZXQoRXZhc19PYmplY3QqIG8sIEVpbmFf Qm9vbCBlbmFibGUpOworCiAvKiB0byBiZSB1c2VkIGJ5IHN1YmNsYXNzIGltcGxlbWVudGF0aW9u cyAqLwogRUFQSSBFd2tfVmlld19TbWFydF9EYXRhICpld2tfdmlld19zbWFydF9kYXRhX2dldChj b25zdCBFdmFzX09iamVjdCAqbyk7CiAK