67114 2011-08-29 01:22:17 -0700 [EFL] API to get plain text of the frame 2011-09-29 15:01:48 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) All Linux RESOLVED FIXED P2 Normal --- 62034 1 g.czajkowski rakuco gyuyoung.kim gyuyoung.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 458118 0 g.czajkowski 2011-08-29 01:22:17 -0700 This is an alternative API to ewk_frame_source_get. It gets plain text of the document without any HTML's tokens. 458121 1 105472 g.czajkowski 2011-08-29 01:23:53 -0700 Created attachment 105472 proposed patch 458179 2 rakuco 2011-08-29 05:30:54 -0700 May I ask what are the use cases for exposing this API to the user? I don't see other ports calling outerText, and those who call innerText usually do that for DumpRenderTree only. One other thing is that bug 66876 adds a similar private function (ewk_frame_inner_text_get); would that solve your needs if it was not private? 458221 3 g.czajkowski 2011-08-29 08:00:30 -0700 (In reply to comment #2) > May I ask what are the use cases for exposing this API to the user? I don't see other ports calling outerText, and those who call innerText usually do that for DumpRenderTree only. It's needed to save HTML Pages by application like email client as plain text. > > One other thing is that bug 66876 adds a similar private function (ewk_frame_inner_text_get); would that solve your needs if it was not private? I agree that these functions are similar but implementation is a little different. 458923 4 rakuco 2011-08-30 08:48:50 -0700 (In reply to comment #3) > (In reply to comment #2) > > One other thing is that bug 66876 adds a similar private function (ewk_frame_inner_text_get); would that solve your needs if it was not private? > > I agree that these functions are similar but implementation is a little different. The only noteworthy difference I see is that bug 66876 calls innerText() for the whole document, whereas you only call it for the body. Do the results differ too much? The function (either mine or yours) could accept a parameter specifying whether document or body should be used, if that's the case. 461183 5 g.czajkowski 2011-09-02 06:09:53 -0700 (In reply to comment #4) > (In reply to comment #3) > > (In reply to comment #2) > > > One other thing is that bug 66876 adds a similar private function (ewk_frame_inner_text_get); would that solve your needs if it was not private? > > > > I agree that these functions are similar but implementation is a little different. > > The only noteworthy difference I see is that bug 66876 calls innerText() for the whole document, whereas you only call it for the body. Do the results differ too much? The function (either mine or yours) could accept a parameter specifying whether document or body should be used, if that's the case. Hi Kubo, Let me perform some tests with ewk_frame_inner_text_get() and I will leave a feedback if we really need body param in your implementation. 465890 6 105472 kenneth 2011-09-12 15:56:31 -0700 Comment on attachment 105472 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=105472&action=review > Source/WebKit/efl/ChangeLog:9 > + This is an alternative API to ewk_frame_source_get. It gets plain text > + of the frame without any HTML's tokens. What is that needed for? I mean is there an actual use case? 466005 7 rakuco 2011-09-12 18:11:11 -0700 (In reply to comment #6) > What is that needed for? I mean is there an actual use case? Please see comments #2 and #3. 467781 8 g.czajkowski 2011-09-15 07:14:57 -0700 (In reply to comment #5) > (In reply to comment #4) > > (In reply to comment #3) > > > (In reply to comment #2) > > > > One other thing is that bug 66876 adds a similar private function (ewk_frame_inner_text_get); would that solve your needs if it was not private? > > > > > > I agree that these functions are similar but implementation is a little different. > > > > The only noteworthy difference I see is that bug 66876 calls innerText() for the whole document, whereas you only call it for the body. Do the results differ too much? The function (either mine or yours) could accept a parameter specifying whether document or body should be used, if that's the case. > > Hi Kubo, > Let me perform some tests with ewk_frame_inner_text_get() and I will leave a feedback if we really need body param in your implementation. Sorry for my late answer. There is no any difference between results of ewk_frame_inner_text_get and ewk_frame_plain_text_get. You can make your function as public and then this bug should be marked as duplicated. 468065 9 rakuco 2011-09-15 14:07:02 -0700 (In reply to comment #8) > There is no any difference between results of ewk_frame_inner_text_get and ewk_frame_plain_text_get. You can make your function as public and then this bug should be marked as duplicated. Due to the course of the recent events (the other patch being rejected with the suggestion that a DumpRenderTreeSupportEfl should be implemented), I think it's now better to use this bug for this specific feature. I'll work on a marge of both of our patches and submit it here for review. For now, I'll clear the flags for the current patch. 469409 10 107859 rakuco 2011-09-19 08:31:49 -0700 Created attachment 107859 Patch 469411 11 rakuco 2011-09-19 08:33:44 -0700 (In reply to comment #10) > Created an attachment (id=107859) [details] FWIW, this newer version puts the '*' in pointers on the left side again, as being discussed in bug 68231. 475191 12 107859 rniwa 2011-09-28 19:39:23 -0700 Comment on attachment 107859 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=107859&action=review > Source/WebKit/efl/ewk/ewk_frame.cpp:1590 > +char* ewk_frame_plain_text_get(const Evas_Object* o) Please don't use one-letter variable. > Source/WebKit/efl/ewk/ewk_frame.cpp:1596 > + if (sd->frame->view() && sd->frame->view()->layoutPending()) > + sd->frame->view()->layout(); innerText automatically calls updateLayoutIgnorePendingStylesheets. > Source/WebKit/efl/ewk/ewk_frame.cpp:1598 > + WebCore::Element* documentElement = sd->frame->document()->documentElement(); I don't think we should assume that the frame has a document. 475205 13 109115 rakuco 2011-09-28 19:57:27 -0700 Created attachment 109115 Follow rniwa's suggestions 475308 14 109115 gyuyoung.kim 2011-09-29 01:10:51 -0700 Comment on attachment 109115 Follow rniwa's suggestions Attachment 109115 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/9898030 475310 15 gyuyoung.kim 2011-09-29 01:30:19 -0700 (In reply to comment #12) > (From update of attachment 107859 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=107859&action=review > > > Source/WebKit/efl/ewk/ewk_frame.cpp:1590 > > +char* ewk_frame_plain_text_get(const Evas_Object* o) > > Please don't use one-letter variable. Hello Ryosuke, one-letter variable is efl coding style. However, we are trying to be compliant with webkit coding style in Bug 68209. This one-letter variable is also one of discussing items. I'm going to file a bug for this one-letter variable, then I would like to fix all one-letter variable at a time using a script(e.g uncrustify) after discussing efl contributors enough. So, could you accept one-letter variable in this patch for now ? 475318 16 gyuyoung.kim 2011-09-29 01:59:38 -0700 I file a Bug 69073 for one-letter variable. 475406 17 109158 rakuco 2011-09-29 07:08:03 -0700 Created attachment 109158 Follow rniwa's suggestions and make it compile 475409 18 rakuco 2011-09-29 07:11:02 -0700 (In reply to comment #15) > Hello Ryosuke, He's not on the CC list ;) > So, could you accept one-letter variable in this patch for now ? I think the way to go here is whatever makes the reviewer happier -- even if this case of a one-letter variable is fixed here, uncrustify wouldn't break because of that. 475558 19 109158 rniwa 2011-09-29 11:48:59 -0700 Comment on attachment 109158 Follow rniwa's suggestions and make it compile View in context: https://bugs.webkit.org/attachment.cgi?id=109158&action=review > Source/WebKit/efl/ewk/ewk_frame.cpp:1592 > + EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0); sd? Is this a commonly-used / well-known term? > Source/WebKit/efl/ewk/ewk_frame.cpp:1595 > + if (!sd->frame->document()) You can probably cache Document* here. 475666 20 109158 rniwa 2011-09-29 13:59:21 -0700 Comment on attachment 109158 Follow rniwa's suggestions and make it compile View in context: https://bugs.webkit.org/attachment.cgi?id=109158&action=review >> Source/WebKit/efl/ewk/ewk_frame.cpp:1592 >> + EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0); > > sd? Is this a commonly-used / well-known term? Apparently it is. 475706 21 109158 webkit.review.bot 2011-09-29 15:01:43 -0700 Comment on attachment 109158 Follow rniwa's suggestions and make it compile Clearing flags on attachment: 109158 Committed r96362: <http://trac.webkit.org/changeset/96362> 475707 22 webkit.review.bot 2011-09-29 15:01:48 -0700 All reviewed patches have been landed. Closing bug. 105472 2011-08-29 01:23:53 -0700 2011-09-19 08:31:38 -0700 proposed patch plain_text_get.patch text/plain 2503 g.czajkowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA1OTc2MzhhLi40MGNmNjg2IDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTEtMDgtMjkgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWpr b3dza2lAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gQVBJIHRvIGdldCBwbGFpbiB0ZXh0 IG9mIHRoZSBmcmFtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjcxMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGlzIGlzIGFuIGFsdGVybmF0aXZlIEFQSSB0byBld2tfZnJhbWVfc291cmNlX2dldC4g SXQgZ2V0cyBwbGFpbiB0ZXh0CisgICAgICAgIG9mIHRoZSBmcmFtZSB3aXRob3V0IGFueSBIVE1M J3MgdG9rZW5zLgorCisgICAgICAgICogZXdrL2V3a19mcmFtZS5jcHA6CisgICAgICAgIChld2tf ZnJhbWVfcGxhaW5fdGV4dF9nZXQpOgorICAgICAgICAqIGV3ay9ld2tfZnJhbWUuaDoKKwogMjAx MS0wOC0yNSAgUmFwaGFlbCBLdWJvIGRhIENvc3RhICA8a3Vib0Bwcm9mdXNpb24ubW9iaT4KIAog ICAgICAgICBbRUZMXSBBZGQgQVBJIHRvIGFsbG93IHNjcmlwdHMgdG8gY2xvc2Ugd2luZG93cyBh dXRvbWF0aWNhbGx5IHZpYSBKYXZhU2NyaXB0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9l ZmwvZXdrL2V3a19mcmFtZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNw cAppbmRleCBiMDNkNzI3Li42OGRmMTE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9l d2svZXdrX2ZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNw cApAQCAtNDY2LDYgKzQ2NiwxNiBAQCBjaGFyICpld2tfZnJhbWVfc2VsZWN0aW9uX2dldChjb25z dCBFdmFzX09iamVjdCAqbykKICAgICByZXR1cm4gc3RyZHVwKHMuZGF0YSgpKTsKIH0KIAorY2hh ciAqZXdrX2ZyYW1lX3BsYWluX3RleHRfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvKQoreworICAg IEVXS19GUkFNRV9TRF9HRVRfT1JfUkVUVVJOKG8sIHNkLCAwKTsKKyAgICBFSU5BX1NBRkVUWV9P Tl9OVUxMX1JFVFVSTl9WQUwoc2QtPmZyYW1lLCAwKTsKKyAgICBXVEY6OlN0cmluZyB0ZXh0Owor ICAgIGlmIChzZC0+ZnJhbWUtPmRvY3VtZW50KCktPmJvZHkoKSkKKyAgICAgICAgdGV4dCA9IHNk LT5mcmFtZS0+ZG9jdW1lbnQoKS0+Ym9keSgpLT5vdXRlclRleHQoKTsKKyAgICByZXR1cm4gdGV4 dC5pc051bGwoKSA/IDAgOiBzdHJkdXAodGV4dC51dGY4KCkuZGF0YSgpKTsKK30KKwogRWluYV9C b29sIGV3a19mcmFtZV90ZXh0X3NlYXJjaChjb25zdCBFdmFzX09iamVjdCAqbywgY29uc3QgY2hh ciAqc3RyaW5nLCBFaW5hX0Jvb2wgY2FzZV9zZW5zaXRpdmUsIEVpbmFfQm9vbCBmb3J3YXJkLCBF aW5hX0Jvb2wgd3JhcCkKIHsKICAgICBFV0tfRlJBTUVfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwg RUlOQV9GQUxTRSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1l LmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmgKaW5kZXggYTM1Njc3Yi4uZWIx NmUyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5oCisrKyBi L1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaApAQCAtMzU3LDYgKzM1NywyMCBAQCBF QVBJIEVpbmFfQm9vbCAgICBld2tfZnJhbWVfZWRpdGFibGVfc2V0KEV2YXNfT2JqZWN0ICpvLCBF aW5hX0Jvb2wgZWRpdGFibGUpOwogRUFQSSBjaGFyICAgICAgICAqZXdrX2ZyYW1lX3NlbGVjdGlv bl9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOwogCiAvKioKKyAqIEdldHMgdGhlIHBsYWluIHRl eHQgb2YgZnJhbWUuCisgKgorICogVGhlIHJldHVybmVkIHN0cmluZyBAYiBzaG91bGQgYmUgZnJl ZWQgYWZ0ZXIgdXNlLgorICogSXQgZG9lc24ndCByZXR1cm4gYW55IGh0bWwncyB0b2tlbnMganVz dCBwbGFpbiB0ZXh0IGZvciB0aGUgZnJhbWUuCisgKgorICogQHBhcmFtIG8gdGhlIGZyYW1lIG9i amVjdCB0byBnZXQgcGxhaW4gdGV4dAorICoKKyAqIEByZXR1cm4gYSBuZXdseSBhbGxvY2F0ZWQg c3RyaW5nIG9yIEBjIDAgaWYgdGhlIGRvY3VtZW50IGRvZXNuJ3QgaGF2ZSBhIGJvZHkgb3Igb24g ZmFpbHVyZQorICoKKyAqIEBzZWUgZXdrX2ZyYW1lX3NvdXJjZV9nZXQoKQorICovCitFQVBJIGNo YXIgICAgICAgICpld2tfZnJhbWVfcGxhaW5fdGV4dF9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8p OworCisvKioKICAqIFNlYXJjaGVzIHRoZSBnaXZlbiBzdHJpbmcgaW4gYSBkb2N1bWVudC4KICAq CiAgKiBAcGFyYW0gbyBmcmFtZSBvYmplY3Qgd2hlcmUgdG8gc2VhcmNoIHRoZSB0ZXh0Cg== 107859 2011-09-19 08:31:49 -0700 2011-09-28 19:57:20 -0700 Patch bug-67114-20110919123149.patch text/plain 2670 rakuco U3VidmVyc2lvbiBSZXZpc2lvbjogOTU0MTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZs L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRleCA2OWM2MGEyMjVk ODgyNmNkMTJjNTM1MzM5Yjk0YjEwODQ4YzA3MzA2Li5hOTYzODE5NmUwMWNkYWFjZWIwZjk4N2I0 ZWZiZTk3YTI0ZGI4MTI3IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEt MDktMTkgIFJhcGhhZWwgS3VibyBkYSBDb3N0YSAgPGt1Ym9AcHJvZnVzaW9uLm1vYmk+CisKKyAg ICAgICAgW0VGTF0gQWRkIEFQSSB0byBnZXQgcGxhaW4gdGV4dCBvZiBhIGZyYW1lLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjcxMTQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBmdW5jdGlvbiB0 byByZXR1cm4gYSBmcmFtZSdzIGNvbnRlbnRzIGNvbnZlcnRlZCB0byBwbGFpbiB0ZXh0LAorICAg ICAgICBhcyBhbHJlYWR5IGV4cG9zZWQgYnkgb3RoZXIgcG9ydHMgYW5kIG5lZWRlZCBieSBEUlQg d2hlbiBkdW1waW5nIGEKKyAgICAgICAgZnJhbWUncyBjb250ZW50cy4KKworICAgICAgICAqIGV3 ay9ld2tfZnJhbWUuY3BwOgorICAgICAgICAoZXdrX2ZyYW1lX3BsYWluX3RleHRfZ2V0KToKKyAg ICAgICAgKiBld2svZXdrX2ZyYW1lLmg6CisKIDIwMTEtMDktMTcgIE1paGFpIFBhcnBhcml0YSAg PG1paGFpcEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRnJhbWVMb2FkZXJDbGllbnQgQmFja0Zv cndhcmRMaXN0LXJlbGF0ZWQgbWV0aG9kcyBhcmUgdW5zdWVkCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tf ZnJhbWUuY3BwCmluZGV4IGRhNDM0NDBlYWJjNDc0NDFmY2RkOTdlNmI3OTllNWZiNGIzMzlmYWEu LjY5ZmNiYjJjNWVmZjM1MjY3ZDc3Yjg4NWI5MzQ4MTY4YTA4ZGI1N2YgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZs L2V3ay9ld2tfZnJhbWUuY3BwCkBAIC0xNTg3LDYgKzE1ODcsMjIgQEAgb3V0X29mX21lbW9yeV9o YW5kbGVyOgogICAgIHJldHVybiAwOwogfQogCitjaGFyKiBld2tfZnJhbWVfcGxhaW5fdGV4dF9n ZXQoY29uc3QgRXZhc19PYmplY3QqIG8pCit7CisgICAgRVdLX0ZSQU1FX1NEX0dFVF9PUl9SRVRV Uk4obywgc2QsIDApOworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChzZC0+ZnJh bWUsIDApOworCisgICAgaWYgKHNkLT5mcmFtZS0+dmlldygpICYmIHNkLT5mcmFtZS0+dmlldygp LT5sYXlvdXRQZW5kaW5nKCkpCisgICAgICAgIHNkLT5mcmFtZS0+dmlldygpLT5sYXlvdXQoKTsK KworICAgIFdlYkNvcmU6OkVsZW1lbnQqIGRvY3VtZW50RWxlbWVudCA9IHNkLT5mcmFtZS0+ZG9j dW1lbnQoKS0+ZG9jdW1lbnRFbGVtZW50KCk7CisKKyAgICBpZiAoIWRvY3VtZW50RWxlbWVudCkK KyAgICAgICAgcmV0dXJuIDA7CisKKyAgICByZXR1cm4gc3RyZHVwKGRvY3VtZW50RWxlbWVudC0+ aW5uZXJUZXh0KCkudXRmOCgpLmRhdGEoKSk7Cit9CisKIC8qKgogICogQGludGVybmFsCiAgKiBS ZXBvcnRzIHVyaSBjaGFuZ2VkIGFuZCBzd2FwIGludGVybmFsIHN0cmluZyByZWZlcmVuY2UuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmggYi9Tb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX2ZyYW1lLmgKaW5kZXggZmNlNTFlNTY5ZWJjNTY5MmYzODAzZTUwNWU2 NDQ4YmQ1OTg0MGQ5ZS4uZGFhZjI1NGJiMGY3MTgyYTA0OTFlMmMyNGFkZDZiMjY3MmI2ZWIxNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaApAQCAtODA0LDYgKzgwNCwxOSBAQCBFQVBJIHNz aXplX3QgZXdrX2ZyYW1lX3NvdXJjZV9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8sIGNoYXIgKipm cmFtZV9zb3VyY2UpOwogICovCiBFQVBJIEVpbmFfTGlzdCAqZXdrX2ZyYW1lX3Jlc291cmNlc19s b2NhdGlvbl9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOwogCisvKioKKyAqIFJldHJpZXZlIHRo ZSBmcmFtZSdzIGNvbnRlbnRzIGluIHBsYWluIHRleHQuCisgKgorICogVGhpcyBmdW5jdGlvbiBy ZXR1cm5zIHRoZSBjb250ZW50cyBvZiB0aGUgZ2l2ZW4gZnJhbWUgY29udmVydGVkIHRvIHBsYWlu IHRleHQsCisgKiByZW1vdmluZyBhbGwgdGhlIEhUTUwgZm9ybWF0dGluZy4KKyAqCisgKiBAcGFy YW0gbyBGcmFtZSBvYmplY3Qgd2hvc2UgY29udGVudHMgdG8gcmV0cmlldmUuCisgKgorICogQHJl dHVybiBBIG5ld2x5IGFsbG9jYXRlZCBzdHJpbmcgKHdoaWNoIG11c3QgYmUgZnJlZWQgYnkgdGhl IGNhbGxlciB3aXRoIEBjIGZyZWUoKSkKKyAqICAgICAgICAgb3IgQGMgMCBpbiBjYXNlIG9mIGZh aWx1cmUuCisgKi8KK0VBUEkgY2hhciogZXdrX2ZyYW1lX3BsYWluX3RleHRfZ2V0KGNvbnN0IEV2 YXNfT2JqZWN0KiBvKTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYK 109115 2011-09-28 19:57:27 -0700 2011-09-29 07:07:56 -0700 Follow rniwa's suggestions bug-67114-20110928235721.patch text/plain 2622 rakuco U3VidmVyc2lvbiBSZXZpc2lvbjogOTYyOTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZs L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRleCAxMzQ4ODBjYjMx YjY3MWE2NjhhNzViMTUxNmYyMTI2Y2ZlNGVhZDllLi45NWExMjQ2MDY4YTE0Mzc2MTc1ZThjYTli ZmFhM2U5MmNmNmU4MTZhIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEt MDktMjggIFJhcGhhZWwgS3VibyBkYSBDb3N0YSAgPGt1Ym9AcHJvZnVzaW9uLm1vYmk+CisKKyAg ICAgICAgW0VGTF0gQVBJIHRvIGdldCBwbGFpbiB0ZXh0IG9mIHRoZSBmcmFtZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjcxMTQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBmdW5jdGlvbiB0byBy ZXR1cm4gYSBmcmFtZSdzIGNvbnRlbnRzIGNvbnZlcnRlZCB0byBwbGFpbiB0ZXh0LAorICAgICAg ICBhcyBhbHJlYWR5IGV4cG9zZWQgYnkgb3RoZXIgcG9ydHMgYW5kIG5lZWRlZCBieSBEUlQgd2hl biBkdW1waW5nIGEKKyAgICAgICAgZnJhbWUncyBjb250ZW50cy4KKworICAgICAgICAqIGV3ay9l d2tfZnJhbWUuY3BwOgorICAgICAgICAoZXdrX2ZyYW1lX3BsYWluX3RleHRfZ2V0KToKKyAgICAg ICAgKiBld2svZXdrX2ZyYW1lLmg6CisKIDIwMTEtMDktMjggIEd5dXlvdW5nIEtpbSAgPGd5dXlv dW5nLmtpbUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXSBSZW1vdmUgKnZvaWQqIHBhcmFt ZXRlciBpbiBpbnRlcm5hbCBmdW5jdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZs L2V3ay9ld2tfZnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAK aW5kZXggM2NmOWM5ODU1YmM2NWQ0MjUzMDJkM2U2ZGFjYzdiYTA0MmZjZDdhYS4uNTY3YjY5MmEw OGUxNWU1OTk1YjZlMDI0MWRhNTg2ZGEyZWZiNzI5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19m cmFtZS5jcHAKQEAgLTE1ODcsNiArMTU4NywyMiBAQCBvdXRfb2ZfbWVtb3J5X2hhbmRsZXI6CiAg ICAgcmV0dXJuIDA7CiB9CiAKK2NoYXIqIGV3a19mcmFtZV9wbGFpbl90ZXh0X2dldChjb25zdCBF dmFzX09iamVjdCogZXdrRnJhbWUpCit7CisgICAgRVdLX0ZSQU1FX1NEX0dFVF9PUl9SRVRVUk4o bywgc2QsIDApOworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChzZC0+ZnJhbWUs IDApOworCisgICAgaWYgKCFzZC0+ZnJhbWUtPmRvY3VtZW50KCkpCisgICAgICAgIHJldHVybiAw OworCisgICAgV2ViQ29yZTo6RWxlbWVudCogZG9jdW1lbnRFbGVtZW50ID0gc2QtPmZyYW1lLT5k b2N1bWVudCgpLT5kb2N1bWVudEVsZW1lbnQoKTsKKworICAgIGlmICghZG9jdW1lbnRFbGVtZW50 KQorICAgICAgICByZXR1cm4gMDsKKworICAgIHJldHVybiBzdHJkdXAoZG9jdW1lbnRFbGVtZW50 LT5pbm5lclRleHQoKS51dGY4KCkuZGF0YSgpKTsKK30KKwogLyoqCiAgKiBAaW50ZXJuYWwKICAq IFJlcG9ydHMgdXJpIGNoYW5nZWQgYW5kIHN3YXAgaW50ZXJuYWwgc3RyaW5nIHJlZmVyZW5jZS4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaCBiL1NvdXJjZS9X ZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaAppbmRleCBhN2MzMmQ2YWYwNmFiMDE3MWYzZmRmM2Q2 MTA0MDNhZTBiM2IwMWI2Li42NjJiMGQ1YTZlMGYwY2QzYzNiMTg2MTRjNDc0OWNmZDJjNjdiYjcw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmgKKysrIGIvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5oCkBAIC04MDQsNiArODA0LDE5IEBAIEVBUEkg c3NpemVfdCBld2tfZnJhbWVfc291cmNlX2dldChjb25zdCBFdmFzX09iamVjdCAqbywgY2hhciAq KmZyYW1lX3NvdXJjZSk7CiAgKi8KIEVBUEkgRWluYV9MaXN0ICpld2tfZnJhbWVfcmVzb3VyY2Vz X2xvY2F0aW9uX2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CiAKKy8qKgorICogUmV0cmlldmUg dGhlIGZyYW1lJ3MgY29udGVudHMgaW4gcGxhaW4gdGV4dC4KKyAqCisgKiBUaGlzIGZ1bmN0aW9u IHJldHVybnMgdGhlIGNvbnRlbnRzIG9mIHRoZSBnaXZlbiBmcmFtZSBjb252ZXJ0ZWQgdG8gcGxh aW4gdGV4dCwKKyAqIHJlbW92aW5nIGFsbCB0aGUgSFRNTCBmb3JtYXR0aW5nLgorICoKKyAqIEBw YXJhbSBld2tGcmFtZSBGcmFtZSBvYmplY3Qgd2hvc2UgY29udGVudHMgdG8gcmV0cmlldmUuCisg KgorICogQHJldHVybiBBIG5ld2x5IGFsbG9jYXRlZCBzdHJpbmcgKHdoaWNoIG11c3QgYmUgZnJl ZWQgYnkgdGhlIGNhbGxlciB3aXRoIEBjIGZyZWUoKSkKKyAqICAgICAgICAgb3IgQGMgMCBpbiBj YXNlIG9mIGZhaWx1cmUuCisgKi8KK0VBUEkgY2hhciogZXdrX2ZyYW1lX3BsYWluX3RleHRfZ2V0 KGNvbnN0IEV2YXNfT2JqZWN0KiBvKTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYK 109158 2011-09-29 07:08:03 -0700 2011-09-29 15:01:43 -0700 Follow rniwa's suggestions and make it compile bug-67114-20110929110757.patch text/plain 2629 rakuco U3VidmVyc2lvbiBSZXZpc2lvbjogOTYyOTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZs L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRleCAxMzQ4ODBjYjMx YjY3MWE2NjhhNzViMTUxNmYyMTI2Y2ZlNGVhZDllLi45NWExMjQ2MDY4YTE0Mzc2MTc1ZThjYTli ZmFhM2U5MmNmNmU4MTZhIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEt MDktMjggIFJhcGhhZWwgS3VibyBkYSBDb3N0YSAgPGt1Ym9AcHJvZnVzaW9uLm1vYmk+CisKKyAg ICAgICAgW0VGTF0gQVBJIHRvIGdldCBwbGFpbiB0ZXh0IG9mIHRoZSBmcmFtZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjcxMTQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBmdW5jdGlvbiB0byBy ZXR1cm4gYSBmcmFtZSdzIGNvbnRlbnRzIGNvbnZlcnRlZCB0byBwbGFpbiB0ZXh0LAorICAgICAg ICBhcyBhbHJlYWR5IGV4cG9zZWQgYnkgb3RoZXIgcG9ydHMgYW5kIG5lZWRlZCBieSBEUlQgd2hl biBkdW1waW5nIGEKKyAgICAgICAgZnJhbWUncyBjb250ZW50cy4KKworICAgICAgICAqIGV3ay9l d2tfZnJhbWUuY3BwOgorICAgICAgICAoZXdrX2ZyYW1lX3BsYWluX3RleHRfZ2V0KToKKyAgICAg ICAgKiBld2svZXdrX2ZyYW1lLmg6CisKIDIwMTEtMDktMjggIEd5dXlvdW5nIEtpbSAgPGd5dXlv dW5nLmtpbUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXSBSZW1vdmUgKnZvaWQqIHBhcmFt ZXRlciBpbiBpbnRlcm5hbCBmdW5jdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZs L2V3ay9ld2tfZnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAK aW5kZXggM2NmOWM5ODU1YmM2NWQ0MjUzMDJkM2U2ZGFjYzdiYTA0MmZjZDdhYS4uNTdlYWUxMmI0 NWJmZjZiMzRhNzc0MjNjNjY1OWRlNDhmMWRkNTk2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19m cmFtZS5jcHAKQEAgLTE1ODcsNiArMTU4NywyMiBAQCBvdXRfb2ZfbWVtb3J5X2hhbmRsZXI6CiAg ICAgcmV0dXJuIDA7CiB9CiAKK2NoYXIqIGV3a19mcmFtZV9wbGFpbl90ZXh0X2dldChjb25zdCBF dmFzX09iamVjdCogZXdrRnJhbWUpCit7CisgICAgRVdLX0ZSQU1FX1NEX0dFVF9PUl9SRVRVUk4o ZXdrRnJhbWUsIHNkLCAwKTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoc2Qt PmZyYW1lLCAwKTsKKworICAgIGlmICghc2QtPmZyYW1lLT5kb2N1bWVudCgpKQorICAgICAgICBy ZXR1cm4gMDsKKworICAgIFdlYkNvcmU6OkVsZW1lbnQqIGRvY3VtZW50RWxlbWVudCA9IHNkLT5m cmFtZS0+ZG9jdW1lbnQoKS0+ZG9jdW1lbnRFbGVtZW50KCk7CisKKyAgICBpZiAoIWRvY3VtZW50 RWxlbWVudCkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICByZXR1cm4gc3RyZHVwKGRvY3VtZW50 RWxlbWVudC0+aW5uZXJUZXh0KCkudXRmOCgpLmRhdGEoKSk7Cit9CisKIC8qKgogICogQGludGVy bmFsCiAgKiBSZXBvcnRzIHVyaSBjaGFuZ2VkIGFuZCBzd2FwIGludGVybmFsIHN0cmluZyByZWZl cmVuY2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmggYi9T b3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmgKaW5kZXggYTdjMzJkNmFmMDZhYjAxNzFm M2ZkZjNkNjEwNDAzYWUwYjNiMDFiNi4uNjYyYjBkNWE2ZTBmMGNkM2MzYjE4NjE0YzQ3NDljZmQy YzY3YmI3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaApAQCAtODA0LDYgKzgwNCwxOSBA QCBFQVBJIHNzaXplX3QgZXdrX2ZyYW1lX3NvdXJjZV9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8s IGNoYXIgKipmcmFtZV9zb3VyY2UpOwogICovCiBFQVBJIEVpbmFfTGlzdCAqZXdrX2ZyYW1lX3Jl c291cmNlc19sb2NhdGlvbl9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOwogCisvKioKKyAqIFJl dHJpZXZlIHRoZSBmcmFtZSdzIGNvbnRlbnRzIGluIHBsYWluIHRleHQuCisgKgorICogVGhpcyBm dW5jdGlvbiByZXR1cm5zIHRoZSBjb250ZW50cyBvZiB0aGUgZ2l2ZW4gZnJhbWUgY29udmVydGVk IHRvIHBsYWluIHRleHQsCisgKiByZW1vdmluZyBhbGwgdGhlIEhUTUwgZm9ybWF0dGluZy4KKyAq CisgKiBAcGFyYW0gZXdrRnJhbWUgRnJhbWUgb2JqZWN0IHdob3NlIGNvbnRlbnRzIHRvIHJldHJp ZXZlLgorICoKKyAqIEByZXR1cm4gQSBuZXdseSBhbGxvY2F0ZWQgc3RyaW5nICh3aGljaCBtdXN0 IGJlIGZyZWVkIGJ5IHRoZSBjYWxsZXIgd2l0aCBAYyBmcmVlKCkpCisgKiAgICAgICAgIG9yIEBj IDAgaW4gY2FzZSBvZiBmYWlsdXJlLgorICovCitFQVBJIGNoYXIqIGV3a19mcmFtZV9wbGFpbl90 ZXh0X2dldChjb25zdCBFdmFzX09iamVjdCogbyk7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQog I2VuZGlmCg==