99285 2012-10-14 20:07:08 -0700 [EFL][WK2] Add support for a zoom level setting to MiniBrowser 2012-12-05 23:13:13 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 ktf.kim ktf.kim cdumez gyuyoung.kim kenneth lucas.de.marchi ryuan.choi webkit.review.bot yael oldest_to_newest 741691 0 ktf.kim 2012-10-14 20:07:08 -0700 EFL MiniBrowser does not currently support zoom-in, zoom-out. 741728 1 168621 ktf.kim 2012-10-14 21:34:55 -0700 Created attachment 168621 Patch 741729 2 168621 gyuyoung.kim 2012-10-14 21:39:45 -0700 Comment on attachment 168621 Patch Attachment 168621 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/14296569 741732 3 168621 cdumez 2012-10-14 21:49:18 -0700 Comment on attachment 168621 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=168621&action=review > Tools/MiniBrowser/efl/main.c:194 > + } else if (!strcmp(ev->key, "F7")) { Can you check which shortcut is used by browsers usually and use the same? It is confusing to use different shortcuts. > Tools/MiniBrowser/efl/main.c:199 > + zoom_level_set(obj, currentZoomLevel + 1); There is usually a shortcut to reset the zoom level to its default value as well. 741736 4 ktf.kim 2012-10-14 22:07:47 -0700 Christophe Dumez: I assigned 'F7' and 'F8' because the EWebLauncher uses them as zoom-in, zoom-out. In many browsers, the 'Ctrl +' and 'Ctrl -' are used for zoom-in and zoom-out, and the 'Ctrl 0' is used for resetting zoom level. I can add them, but I think 'F7' and 'F8' are also needed because the consistency with EWebLauncher is important, too. 741753 5 cdumez 2012-10-14 22:46:30 -0700 (In reply to comment #4) > Christophe Dumez: > I assigned 'F7' and 'F8' because the EWebLauncher uses them as zoom-in, zoom-out. > > In many browsers, the 'Ctrl +' and 'Ctrl -' are used for zoom-in and zoom-out, and the 'Ctrl 0' is used for resetting zoom level. > > I can add them, but I think 'F7' and 'F8' are also needed because the consistency with EWebLauncher is important, too. Then I think EWebLauncher should be fixed as well. We don't have any menu in the UI to do this, only keyboard shortcuts. If we use non-standard keyboard shortcuts then people don't know that they can zoom in/out. I already made a similar patch recently to use CTRL+n to open a new window instead of Fx. People are used to some shortcuts. I don't think we should try to be compatible here with EWebLauncher because I don't think it was done properly in EWebLauncher. As I said before, keeping compatibility with WK1 is a good idea, unless we can do better. And here, I believe we can do better. 741781 6 ryuan.choi 2012-10-14 23:55:32 -0700 (In reply to comment #5) > (In reply to comment #4) > > Christophe Dumez: > > I assigned 'F7' and 'F8' because the EWebLauncher uses them as zoom-in, zoom-out. > > > > In many browsers, the 'Ctrl +' and 'Ctrl -' are used for zoom-in and zoom-out, and the 'Ctrl 0' is used for resetting zoom level. > > > > I can add them, but I think 'F7' and 'F8' are also needed because the consistency with EWebLauncher is important, too. > > Then I think EWebLauncher should be fixed as well. We don't have any menu in the UI to do this, only keyboard shortcuts. If we use non-standard keyboard shortcuts then people don't know that they can zoom in/out. > > I already made a similar patch recently to use CTRL+n to open a new window instead of Fx. People are used to some shortcuts. I don't think we should try to be compatible here with EWebLauncher because I don't think it was done properly in EWebLauncher. As I said before, keeping compatibility with WK1 is a good idea, unless we can do better. And here, I believe we can do better. I think that we can decide it, because I believe that almost users of EWebLauncher would monitor the changes. ctrl +/- looks better to me. 741791 7 168621 ryuan.choi 2012-10-15 00:04:52 -0700 Comment on attachment 168621 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=168621&action=review > Tools/MiniBrowser/efl/main.c:68 > + Evas_Coord ox, oy, mx, my, cx, cy; > + evas_pointer_canvas_xy_get(evas_object_evas_get(webview), &mx, &my); > + evas_object_geometry_get(webview, &ox, &oy, NULL, NULL); > + cx = mx - ox; > + cy = my - oy; > + > + Eina_Bool result = ewk_view_scale_set(webview, factor, cx, cy); By the way, is it correct? I think that we can not use ewk_view_scale_set well. At least, cx,cy should be a contents coordination. But, we did not contribute the APIs related to scroll behavior. I hope that we land this after getting correct behavior. 741811 8 168638 ktf.kim 2012-10-15 00:32:04 -0700 Created attachment 168638 Patch 741829 9 168638 gyuyoung.kim 2012-10-15 00:54:15 -0700 Comment on attachment 168638 Patch Attachment 168638 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/14298639 745527 10 yael 2012-10-18 13:47:57 -0700 I don't think we should go forward with this method of zooming. Most mobile browsers zoom via gestures such as pinch or double-tap, and not via a setting or shortcut. What do you think? 745886 11 gyuyoung.kim 2012-10-18 19:09:39 -0700 (In reply to comment #10) > I don't think we should go forward with this method of zooming. > Most mobile browsers zoom via gestures such as pinch or double-tap, and not via a setting or shortcut. > What do you think? Yes, I think so for mobile browser. However, is this for MiniBrowser which is simple test browser for PC ? I think this is useful only for test PC browser. Tizen mobile browser supports to zoom via gestures, double-tap and so on. 746235 12 yael 2012-10-19 05:29:28 -0700 (In reply to comment #11) > (In reply to comment #10) > > I don't think we should go forward with this method of zooming. > > Most mobile browsers zoom via gestures such as pinch or double-tap, and not via a setting or shortcut. > > What do you think? > > Yes, I think so for mobile browser. However, is this for MiniBrowser which is simple test browser for PC ? I think this is useful only for test PC browser. Tizen mobile browser supports to zoom via gestures, double-tap and so on. Sorry, what I meant to ask is if we want to keep MiniBrowser as test desktop browser, or make it more like mobile browser. That is what Qt did with their MiniBrowser and I thought we wanted to go in the same direction. (Yes they also have a desktop browser which is less maintained ). 774917 13 gyuyoung.kim 2012-11-24 18:20:45 -0800 (In reply to comment #12) > (In reply to comment #11) > > (In reply to comment #10) > > > I don't think we should go forward with this method of zooming. > > > Most mobile browsers zoom via gestures such as pinch or double-tap, and not via a setting or shortcut. > > > What do you think? > > > > Yes, I think so for mobile browser. However, is this for MiniBrowser which is simple test browser for PC ? I think this is useful only for test PC browser. Tizen mobile browser supports to zoom via gestures, double-tap and so on. > > Sorry, what I meant to ask is if we want to keep MiniBrowser as test desktop browser, or make it more like mobile browser. That is what Qt did with their MiniBrowser and I thought we wanted to go in the same direction. (Yes they also have a desktop browser which is less maintained ). I think it would be good if MiniBrowser supports shortcut keys to change zoom level when we test some websites in MiniBrowser. KyungTae, any update ? 775099 14 175914 ktf.kim 2012-11-25 19:25:35 -0800 Created attachment 175914 Patch 775113 15 175914 ryuan.choi 2012-11-25 20:37:21 -0800 Comment on attachment 175914 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175914&action=review > Tools/MiniBrowser/efl/main.c:51 > +static int currentZoomLevel = DEFAULT_ZOOM_LEVEL; When ewk_view is more than one, each view should have own zoom level 775138 16 175914 cdumez 2012-11-25 22:02:32 -0800 Comment on attachment 175914 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175914&action=review > Tools/MiniBrowser/efl/main.c:50 > +#define DEFAULT_ZOOM_LEVEL 5 // set defeault zoom level to 100% (index 5 on zoomLevels) "default", comments in WebKit usually end with a period (.) >> Tools/MiniBrowser/efl/main.c:51 >> +static int currentZoomLevel = DEFAULT_ZOOM_LEVEL; > > When ewk_view is more than one, each view should have own zoom level Yes, Ryuan is right. You should move this to _Browser_Window struct probably. > Tools/MiniBrowser/efl/main.c:52 > +// the zoom values are chosen to be like in Mozilla Firefox 3 Usually ends with a period. > Tools/MiniBrowser/efl/main.c:53 > +static int zoomLevels[] = {30, 50, 67, 80, 90, 100, 110, 120, 133, 150, 170, 200, 240, 300}; could be const. > Tools/MiniBrowser/efl/main.c:65 > + cx = mx - ox; Maybe a comment to explain what you're doing here? 781146 17 177185 ktf.kim 2012-12-02 22:52:39 -0800 Created attachment 177185 Patch 781174 18 177185 gyuyoung.kim 2012-12-02 23:38:49 -0800 Comment on attachment 177185 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177185&action=review Looks good to me now. > Tools/MiniBrowser/efl/main.c:59 > + if (level < 0 || level >= sizeof(zoomLevels) / sizeof(int)) Don't you need to add a fail message ? 781181 19 177185 ktf.kim 2012-12-02 23:54:07 -0800 Comment on attachment 177185 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177185&action=review >> Tools/MiniBrowser/efl/main.c:59 >> + if (level < 0 || level >= sizeof(zoomLevels) / sizeof(int)) > > Don't you need to add a fail message ? I thought it's OK because there's a message for zoom level setting, and user can see the fail because the zoom level was not changed. If there needs a fail message, I think it needs to be added on on_key_down, but I didn't add it because it can make code too complicate. 781185 20 177185 webkit.review.bot 2012-12-02 23:59:33 -0800 Comment on attachment 177185 Patch Clearing flags on attachment: 177185 Committed r136369: <http://trac.webkit.org/changeset/136369> 781186 21 webkit.review.bot 2012-12-02 23:59:39 -0800 All reviewed patches have been landed. Closing bug. 781214 22 177185 kenneth 2012-12-03 01:08:17 -0800 Comment on attachment 177185 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177185&action=review > Tools/MiniBrowser/efl/main.c:71 > + > + float factor = ((float) zoomLevels[level]) / 100.0; > + Evas_Coord ox, oy, mx, my, cx, cy; > + evas_pointer_canvas_xy_get(evas_object_evas_get(webview), &mx, &my); // Get current mouse position on window. > + evas_object_geometry_get(webview, &ox, &oy, NULL, NULL); // Get webview's position on window. > + cx = mx - ox; // current x position = mouse x position - webview x position > + cy = my - oy; // current y position = mouse y position - webview y position > + > + Eina_Bool result = ewk_view_scale_set(webview, factor, cx, cy); > + return result; > +} This is pretty broken with interaction with viewport etc, and with deviceScaleFactor etc the way you get the position is probably also broken. Anyway, I don't even get what you are trying to implement here? Some way to scale the content, or a scale factor (leaving things to fit into the viewport - that is what firefox does). If that is the case, using devicescalefactor instead makes more sense. I dislike that people review these things without good explanation and without knowledge of the area. 781242 23 kenneth 2012-12-03 02:08:26 -0800 Argh! This even allows people to scale beyond valid bounds! 781243 24 gyuyoung.kim 2012-12-03 02:12:39 -0800 (In reply to comment #22) > (From update of attachment 177185 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=177185&action=review > > > Tools/MiniBrowser/efl/main.c:71 > > + > > + float factor = ((float) zoomLevels[level]) / 100.0; > > + Evas_Coord ox, oy, mx, my, cx, cy; > > + evas_pointer_canvas_xy_get(evas_object_evas_get(webview), &mx, &my); // Get current mouse position on window. > > + evas_object_geometry_get(webview, &ox, &oy, NULL, NULL); // Get webview's position on window. > > + cx = mx - ox; // current x position = mouse x position - webview x position > > + cy = my - oy; // current y position = mouse y position - webview y position > > + > > + Eina_Bool result = ewk_view_scale_set(webview, factor, cx, cy); > > + return result; > > +} > > This is pretty broken with interaction with viewport etc, and with deviceScaleFactor etc the way you get the position is probably also broken. > > Anyway, I don't even get what you are trying to implement here? Some way to scale the content, or a scale factor (leaving things to fit into the viewport - that is what firefox does). If that is the case, using devicescalefactor instead makes more sense. > > I dislike that people review these things without good explanation and without knowledge of the area. As Yael and I talked about this issue in comment #10 ~ #13, I thought MiniBrowser is just test PC browser. If MiniBrowser should support viewport meta tag and deviceScaleFactor, I needed to ask you this patch. But, there was no comments or objections about this anymore. So, I thought that this patch could be landed from test PC browser perspective. Do you think MiniBrowser should support viewport meta tag or mobile zooming and so on ? If so, let's decide how many things MiniBrowser support. Anyway, I'm sorry that this review displease you. BTW, it would be good if you watch EFL port directories. It will help to avoid similar problem next time. 781250 25 kenneth 2012-12-03 02:16:34 -0800 > As Yael and I talked about this issue in comment #10 ~ #13, I thought MiniBrowser is just test PC browser. Is it also supposed to work 100% as it is what we use for development testing. It is a very important tool. > If MiniBrowser should support viewport meta tag and deviceScaleFactor, I needed to ask you this patch. It already does. 781256 26 ryuan.choi 2012-12-03 02:26:32 -0800 (In reply to comment #22) > (From update of attachment 177185 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=177185&action=review > > > Tools/MiniBrowser/efl/main.c:71 > > + > > + float factor = ((float) zoomLevels[level]) / 100.0; > > + Evas_Coord ox, oy, mx, my, cx, cy; > > + evas_pointer_canvas_xy_get(evas_object_evas_get(webview), &mx, &my); // Get current mouse position on window. > > + evas_object_geometry_get(webview, &ox, &oy, NULL, NULL); // Get webview's position on window. > > + cx = mx - ox; // current x position = mouse x position - webview x position > > + cy = my - oy; // current y position = mouse y position - webview y position > > + > > + Eina_Bool result = ewk_view_scale_set(webview, factor, cx, cy); > > + return result; > > +} > > This is pretty broken with interaction with viewport etc, and with deviceScaleFactor etc the way you get the position is probably also broken. > > Anyway, I don't even get what you are trying to implement here? Some way to scale the content, or a scale factor (leaving things to fit into the viewport - that is what firefox does). If that is the case, using devicescalefactor instead makes more sense. > > I dislike that people review these things without good explanation and without knowledge of the area. Sorry, I can not understand your point about scale factor and device scale factor. Although I am wrong, we are using scale_set for user interaction such as pinch zoom and device scale factor for viewport (1.5 for 160 dpi normally) Why this is broken with viewport? At least, we need to make this clear for application developers. Almost developers, who I know, are using scale_set for scaling contents. By the way, position logic was really wrong because scale_set requires scrolled position. If we called this after scrolled, it will be broken. :( 781261 27 kenneth 2012-12-03 02:34:17 -0800 > Sorry, I can not understand your point about scale factor and device scale factor. > > Although I am wrong, we are using scale_set for user interaction such as pinch zoom and device scale factor for viewport (1.5 for 160 dpi normally) > Why this is broken with viewport? > > At least, we need to make this clear for application developers. > Almost developers, who I know, are using scale_set for scaling contents. > > By the way, position logic was really wrong because scale_set requires scrolled position. > If we called this after scrolled, it will be broken. :( This patch seems to try to emulate desktop zoom factor which scales all contents by a factor as well as divides the layout viewport with the same factor. It seems to do that with the fixed scale values, firefox references etc. But that is not really what it does! It just scales like a pinch zoom! Making all of that pretty irrelevant and confusing. This patch scales like a pinch zoom, which means 1) it is not the behavior that was advertised - this is more like just a pinch zoom, which makes the zoom levels useless. 2) Pinch zoom etc need to check valid boundaries. Qt does this in PageViewportController[Client]Qt and their implementation allows a bit of overscale (20% maybe) and then bounces back. This implementation doesn't even consider valid boundaries. The patch breaks viewport because it doesn't even consider current scale (meta and viewport @rule can define default scale etc). So if you want to emulate pinch zoom: 1) Need to check boundaries! 2) Just increase/decrease current scale with a fixed value. Say scale by 200% or so. 781301 28 ryuan.choi 2012-12-03 03:33:09 -0800 (In reply to comment #27) > > Sorry, I can not understand your point about scale factor and device scale factor. > > > > Although I am wrong, we are using scale_set for user interaction such as pinch zoom and device scale factor for viewport (1.5 for 160 dpi normally) > > Why this is broken with viewport? > > > > At least, we need to make this clear for application developers. > > Almost developers, who I know, are using scale_set for scaling contents. > > > > By the way, position logic was really wrong because scale_set requires scrolled position. > > If we called this after scrolled, it will be broken. :( > > > This patch seems to try to emulate desktop zoom factor which scales all contents by a factor as well as divides the layout viewport with the same factor. It seems to do that with the fixed scale values, firefox references etc. > > But that is not really what it does! It just scales like a pinch zoom! Making all of that pretty irrelevant and confusing. > > > This patch scales like a pinch zoom, which means > > 1) it is not the behavior that was advertised - this is more like just a pinch zoom, which makes the zoom levels useless. > 2) Pinch zoom etc need to check valid boundaries. Qt does this in PageViewportController[Client]Qt and their implementation allows a bit of overscale (20% maybe) and then bounces back. This implementation doesn't even consider valid boundaries. > > The patch breaks viewport because it doesn't even consider current scale (meta and viewport @rule can define default scale etc). So if you want to emulate pinch zoom: > > 1) Need to check boundaries! > 2) Just increase/decrease current scale with a fixed value. Say scale by 200% or so. OK, I understood your concern. thank you. This logic is really confusing. I agree with you. By the way, I think that anyone can call scale_set without considering viewport restriction. 784659 29 ktf.kim 2012-12-05 23:13:13 -0800 (In reply to comment #27) > The patch breaks viewport because it doesn't even consider current scale (meta and viewport @rule can define default scale etc). So if you want to emulate pinch zoom: > > 1) Need to check boundaries! > 2) Just increase/decrease current scale with a fixed value. Say scale by 200% or so. I uploaded a new patch by your advice: bug 104215. Thank you. 168621 2012-10-14 21:34:55 -0700 2012-10-15 00:31:57 -0700 Patch bug-99285-20121015133348.patch text/plain 3048 ktf.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxMjc4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmY1N2Q5NzYxZGE4Zjg0ODg1ZTQ3NjNkMmQ2M2I1Yzc0 OGY3MmJjMS4uNmE3MDliZDk1MGE2MTE1YzI0YzhkZGEyOGNlMzFjMThlNTFkYzJkOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTEwLTE0ICBLeXVuZ1RhZSBLaW0gIDxrdGYua2ltQHNhbXN1bmcuY29tPgorCisg ICAgICAgIFtFRkxdW1dLMl0gQWRkIHN1cHBvcnQgZm9yIGEgem9vbSBsZXZlbCBzZXR0aW5nIHRv IE1pbmlCcm93c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05OTI4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZCBzdXBwb3J0IGZvciBhIHpvb20gbGV2ZWwgc2V0dGluZyB0byBNaW5pQnJvd3Nlci4K KyAgICAgICAgU2FtZSBhcyBFV2ViTGF1bmNoZXIsIHpvb20tb3V0IHdpdGggRjcga2V5IGFuZCB6 b29tLWluIHdpdGggRjgga2V5LgorCisgICAgICAgICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoK KyAgICAgICAgKG9uX2tleV9kb3duKToKKwogMjAxMi0xMC0xMyAgWmFuIERvYmVyc2VrICA8emFu ZG9iZXJzZWtAZ21haWwuY29tPgogCiAgICAgICAgIFtUZXN0UmVzdWx0U2VydmVyXSBVbml0IHRl c3RzIHJlcXVpcmUgYW4gdXBkYXRlIGFmdGVyIHIxMzEyMzkKZGlmZiAtLWdpdCBhL1Rvb2xzL01p bmlCcm93c2VyL2VmbC9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCmluZGV4 IGVlMDNiODg1NzkwNWUxOGVhODg3MzY5Mjk1ZjU3MGNkYTFlNzdmYjYuLjRjNjc0MmUyMWU3M2Y2 YjE1MjEyMTM3OGJlYjRlNjliZDdmM2Y2MGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2Vy L2VmbC9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwpAQCAtMzgsMTEg KzM4LDM5IEBAIHN0YXRpYyBjb25zdCBpbnQgVE9PTF9CQVJfQlVUVE9OX1NJWkUgPSAzMjsKICAg ICAgICAgICAgIHByaW50Zihmb3JtYXQsICMjYXJncyk7IFwKICAgICB9IHdoaWxlICgwKQogCisj ZGVmaW5lIE1JTl9aT09NX0xFVkVMIDAKKyNkZWZpbmUgREVGQVVMVF9aT09NX0xFVkVMIDUKKyNk ZWZpbmUgTUFYX1pPT01fTEVWRUwgMTMKKwogc3RhdGljIGludCB2ZXJib3NlID0gMTsKIHN0YXRp YyBFaW5hX0xpc3QgKndpbmRvd3MgPSBOVUxMOwogc3RhdGljIGNoYXIgKmV2YXNfZW5naW5lX25h bWUgPSBOVUxMOwogc3RhdGljIEVpbmFfQm9vbCBmcmFtZV9mbGF0dGVuaW5nX2VuYWJsZWQgPSBF SU5BX0ZBTFNFOwogCitzdGF0aWMgaW50IGN1cnJlbnRab29tTGV2ZWwgPSBERUZBVUxUX1pPT01f TEVWRUw7CitzdGF0aWMgZmxvYXQgY3VycmVudFpvb20gPSAxLjA7CisvLyB0aGUgem9vbSB2YWx1 ZXMgYXJlIGNob3NlbiB0byBiZSBsaWtlIGluIE1vemlsbGEgRmlyZWZveCAzCitzdGF0aWMgaW50 IHpvb21MZXZlbHNbXSA9IHszMCwgNTAsIDY3LCA4MCwgOTAsIDEwMCwgMTEwLCAxMjAsIDEzMywg MTUwLCAxNzAsIDIwMCwgMjQwLCAzMDB9OworCitzdGF0aWMgRWluYV9Cb29sCit6b29tX2xldmVs X3NldChFdmFzX09iamVjdCAqd2VidmlldywgaW50IGxldmVsKQoreworICAgIGlmIChsZXZlbCA8 IE1JTl9aT09NX0xFVkVMIHx8IGxldmVsID4gTUFYX1pPT01fTEVWRUwpCisgICAgICAgIHJldHVy biBFSU5BX0ZBTFNFOworCisgICAgZmxvYXQgZmFjdG9yID0gKChmbG9hdCkgem9vbUxldmVsc1ts ZXZlbF0pIC8gMTAwLjA7CisgICAgRXZhc19Db29yZCBveCwgb3ksIG14LCBteSwgY3gsIGN5Owor ICAgIGV2YXNfcG9pbnRlcl9jYW52YXNfeHlfZ2V0KGV2YXNfb2JqZWN0X2V2YXNfZ2V0KHdlYnZp ZXcpLCAmbXgsICZteSk7CisgICAgZXZhc19vYmplY3RfZ2VvbWV0cnlfZ2V0KHdlYnZpZXcsICZv eCwgJm95LCBOVUxMLCBOVUxMKTsKKyAgICBjeCA9IG14IC0gb3g7CisgICAgY3kgPSBteSAtIG95 OworCisgICAgRWluYV9Cb29sIHJlc3VsdCA9IGV3a192aWV3X3NjYWxlX3NldCh3ZWJ2aWV3LCBm YWN0b3IsIGN4LCBjeSk7CisgICAgaWYgKHJlc3VsdCkKKyAgICAgICAgY3VycmVudFpvb21MZXZl bCA9IGxldmVsOworICAgIHJldHVybiByZXN1bHQ7Cit9CisKIHN0YXRpYyBFd2tfVmlld19TbWFy dF9DbGFzcyogbWluaUJyb3dzZXJWaWV3U21hcnRDbGFzcygpCiB7CiAgICAgc3RhdGljIEV3a19W aWV3X1NtYXJ0X0NsYXNzIGV3a1ZpZXdDbGFzcyA9IEVXS19WSUVXX1NNQVJUX0NMQVNTX0lOSVRf TkFNRV9WRVJTSU9OKCJNaW5pQnJvd3Nlcl9WaWV3Iik7CkBAIC0xNjMsNiArMTkxLDEyIEBAIG9u X2tleV9kb3duKHZvaWQgKmRhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2 ZW50X2luZm8pCiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJGNiIpKSB7CiAgICAg ICAgIGluZm8oIlN0b3AgKEY2KSB3YXMgcHJlc3NlZCwgc3RvcCBsb2FkaW5nLlxuIik7CiAgICAg ICAgIGV3a192aWV3X3N0b3Aob2JqKTsKKyAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwg IkY3IikpIHsKKyAgICAgICAgaW5mbygiWm9vbSBvdXQgKEY3KSB3YXMgcHJlc3NlZC5cbiIpOwor ICAgICAgICB6b29tX2xldmVsX3NldChvYmosIGN1cnJlbnRab29tTGV2ZWwgLSAxKTsKKyAgICB9 IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIkY4IikpIHsKKyAgICAgICAgaW5mbygiWm9vbSBp biAoRjgpIHdhcyBwcmVzc2VkLlxuIik7CisgICAgICAgIHpvb21fbGV2ZWxfc2V0KG9iaiwgY3Vy cmVudFpvb21MZXZlbCArIDEpOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAibiIp ICYmIGN0cmxQcmVzc2VkKSB7CiAgICAgICAgIGluZm8oIkNyZWF0ZSBuZXcgd2luZG93IChDdHJs K24pIHdhcyBwcmVzc2VkLlxuIik7CiAgICAgICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3 aW5kb3dfY3JlYXRlKERFRkFVTFRfVVJMKTsK 168638 2012-10-15 00:32:04 -0700 2012-11-25 19:25:28 -0800 Patch bug-99285-20121015163056.patch text/plain 3440 ktf.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxMjg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzU0ZmQ4MWQ0ZmI4YmNlMDBjMzY0YTlkYzgzOTA0ODQx OWFjNWJiNi4uYzMwMGE4M2RjMTJmN2Y1MGQ4MGU5YjRlOGI3NmUxZWI4ZWYzYzAwMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEyLTEwLTE1ICBLeXVuZ1RhZSBLaW0gIDxrdGYua2ltQHNhbXN1bmcuY29tPgorCisg ICAgICAgIFtFRkxdW1dLMl0gQWRkIHN1cHBvcnQgZm9yIGEgem9vbSBsZXZlbCBzZXR0aW5nIHRv IE1pbmlCcm93c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05OTI4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZCBzdXBwb3J0IGZvciBhIHpvb20gbGV2ZWwgc2V0dGluZyB0byBNaW5pQnJvd3Nlci4K KyAgICAgICAgU2hvcnRjdXRzIGZvciBzZXR0aW5nIG9wZXJhdGlvbnMgYXJlIHNhbWUgYXMgY29t bW9uIGJyb3dzZXJzOgorICAgICAgICBDdHJsICsgJysnIHRvIHpvb20gaW4sIEN0cmwgKyAnLScg dG8gem9vbSBvdXQgYW5kIEN0cmwgKyAnMCcgdG8gem9vbSB0byBkZWZhdWx0LgorCisgICAgICAg ICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoKKyAgICAgICAgKG9uX2tleV9kb3duKToKKwogMjAx Mi0xMC0xNCAgSm9uIExlZSAgPGpvbmxlZUBhcHBsZS5jb20+CiAKICAgICAgICAgQWxsb3cgbm90 aWZpY2F0aW9uIG9yaWdpbiBwZXJtaXNzaW9uIHJlcXVlc3Qgd2hlbiBubyBqcyBjYWxsYmFjayBp cyBwcm92aWRlZApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYyBiL1Rv b2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKaW5kZXggZWUwM2I4ODU3OTA1ZTE4ZWE4ODczNjky OTVmNTcwY2RhMWU3N2ZiNi4uNzMzMTZkNTgwZjgyMjhjYWViZTQ3NDQ3MWM2NGYzZWQyZTUyYTg4 NiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYworKysgYi9Ub29scy9N aW5pQnJvd3Nlci9lZmwvbWFpbi5jCkBAIC0zOCwxMSArMzgsMzkgQEAgc3RhdGljIGNvbnN0IGlu dCBUT09MX0JBUl9CVVRUT05fU0laRSA9IDMyOwogICAgICAgICAgICAgcHJpbnRmKGZvcm1hdCwg IyNhcmdzKTsgXAogICAgIH0gd2hpbGUgKDApCiAKKyNkZWZpbmUgTUlOX1pPT01fTEVWRUwgMAor I2RlZmluZSBERUZBVUxUX1pPT01fTEVWRUwgNQorI2RlZmluZSBNQVhfWk9PTV9MRVZFTCAxMwor CiBzdGF0aWMgaW50IHZlcmJvc2UgPSAxOwogc3RhdGljIEVpbmFfTGlzdCAqd2luZG93cyA9IE5V TEw7CiBzdGF0aWMgY2hhciAqZXZhc19lbmdpbmVfbmFtZSA9IE5VTEw7CiBzdGF0aWMgRWluYV9C b29sIGZyYW1lX2ZsYXR0ZW5pbmdfZW5hYmxlZCA9IEVJTkFfRkFMU0U7CiAKK3N0YXRpYyBpbnQg Y3VycmVudFpvb21MZXZlbCA9IERFRkFVTFRfWk9PTV9MRVZFTDsKK3N0YXRpYyBmbG9hdCBjdXJy ZW50Wm9vbSA9IDEuMDsKKy8vIHRoZSB6b29tIHZhbHVlcyBhcmUgY2hvc2VuIHRvIGJlIGxpa2Ug aW4gTW96aWxsYSBGaXJlZm94IDMKK3N0YXRpYyBpbnQgem9vbUxldmVsc1tdID0gezMwLCA1MCwg NjcsIDgwLCA5MCwgMTAwLCAxMTAsIDEyMCwgMTMzLCAxNTAsIDE3MCwgMjAwLCAyNDAsIDMwMH07 CisKK3N0YXRpYyBFaW5hX0Jvb2wKK3pvb21fbGV2ZWxfc2V0KEV2YXNfT2JqZWN0ICp3ZWJ2aWV3 LCBpbnQgbGV2ZWwpCit7CisgICAgaWYgKGxldmVsIDwgTUlOX1pPT01fTEVWRUwgfHwgbGV2ZWwg PiBNQVhfWk9PTV9MRVZFTCkKKyAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CisKKyAgICBmbG9h dCBmYWN0b3IgPSAoKGZsb2F0KSB6b29tTGV2ZWxzW2xldmVsXSkgLyAxMDAuMDsKKyAgICBFdmFz X0Nvb3JkIG94LCBveSwgbXgsIG15LCBjeCwgY3k7CisgICAgZXZhc19wb2ludGVyX2NhbnZhc194 eV9nZXQoZXZhc19vYmplY3RfZXZhc19nZXQod2VidmlldyksICZteCwgJm15KTsKKyAgICBldmFz X29iamVjdF9nZW9tZXRyeV9nZXQod2VidmlldywgJm94LCAmb3ksIE5VTEwsIE5VTEwpOworICAg IGN4ID0gbXggLSBveDsKKyAgICBjeSA9IG15IC0gb3k7CisKKyAgICBFaW5hX0Jvb2wgcmVzdWx0 ID0gZXdrX3ZpZXdfc2NhbGVfc2V0KHdlYnZpZXcsIGZhY3RvciwgY3gsIGN5KTsKKyAgICBpZiAo cmVzdWx0KQorICAgICAgICBjdXJyZW50Wm9vbUxldmVsID0gbGV2ZWw7CisgICAgcmV0dXJuIHJl c3VsdDsKK30KKwogc3RhdGljIEV3a19WaWV3X1NtYXJ0X0NsYXNzKiBtaW5pQnJvd3NlclZpZXdT bWFydENsYXNzKCkKIHsKICAgICBzdGF0aWMgRXdrX1ZpZXdfU21hcnRfQ2xhc3MgZXdrVmlld0Ns YXNzID0gRVdLX1ZJRVdfU01BUlRfQ0xBU1NfSU5JVF9OQU1FX1ZFUlNJT04oIk1pbmlCcm93c2Vy X1ZpZXciKTsKQEAgLTE3MCw2ICsxOTgsMTUgQEAgb25fa2V5X2Rvd24odm9pZCAqZGF0YSwgRXZh cyAqZSwgRXZhc19PYmplY3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5mbykKICAgICB9IGVsc2UgaWYg KCFzdHJjbXAoZXYtPmtleSwgImkiKSAmJiBjdHJsUHJlc3NlZCkgewogICAgICAgICBpbmZvKCJT aG93IEluc3BlY3RvciAoQ3RybCtpKSB3YXMgcHJlc3NlZC5cbiIpOwogICAgICAgICBld2tfdmll d19pbnNwZWN0b3Jfc2hvdyhvYmopOworICAgIH0gZWxzZSBpZiAoY3RybFByZXNzZWQgJiYgKCFz dHJjbXAoZXYtPmtleSwgIm1pbnVzIikgfHwgIXN0cmNtcChldi0+a2V5LCAiS1BfU3VidHJhY3Qi KSkpIHsKKyAgICAgICAgem9vbV9sZXZlbF9zZXQob2JqLCBjdXJyZW50Wm9vbUxldmVsIC0gMSk7 CisgICAgICAgIGluZm8oIlpvb20gb3V0IChDdHJsICsgJy0nKSB3YXMgcHJlc3NlZCwgem9vbSBs ZXZlbCBiZWNhbWUgJWQlXG4iLCB6b29tTGV2ZWxzW2N1cnJlbnRab29tTGV2ZWxdKTsKKyAgICB9 IGVsc2UgaWYgKGN0cmxQcmVzc2VkICYmICghc3RyY21wKGV2LT5rZXksICJlcXVhbCIpIHx8ICFz dHJjbXAoZXYtPmtleSwgIktQX0FkZCIpKSkgeworICAgICAgICB6b29tX2xldmVsX3NldChvYmos IGN1cnJlbnRab29tTGV2ZWwgKyAxKTsKKyAgICAgICAgaW5mbygiWm9vbSBpbiAoQ3RybCArICcr Jykgd2FzIHByZXNzZWQsIHpvb20gbGV2ZWwgYmVjYW1lICVkJVxuIiwgem9vbUxldmVsc1tjdXJy ZW50Wm9vbUxldmVsXSk7CisgICAgfSBlbHNlIGlmIChjdHJsUHJlc3NlZCAmJiAhc3RyY21wKGV2 LT5rZXksICIwIikpIHsKKyAgICAgICAgem9vbV9sZXZlbF9zZXQob2JqLCBERUZBVUxUX1pPT01f TEVWRUwpOworICAgICAgICBpbmZvKCJab29tIHRvIGRlZmF1bHQgKEN0cmwgKyAnMCcpIHdhcyBw cmVzc2VkLCB6b29tIGxldmVsIGJlY2FtZSAlZCVcbiIsIHpvb21MZXZlbHNbY3VycmVudFpvb21M ZXZlbF0pOwogICAgIH0KIH0KIAo= 175914 2012-11-25 19:25:35 -0800 2012-12-02 22:52:31 -0800 Patch bug-99285-20121126122316.patch text/plain 3277 ktf.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NjczCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODgwM2E2ZjQ3YTM3YjFiZTk2YWQ1ZjAzZTQ1MjNkZGEx NGJmMjI4OC4uYWU3NGVmZjA0MjZiMjlmYThjODRhZGY0NWU5YTRjYTZlM2QxYTVmYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEyLTExLTI1ICBLeXVuZ1RhZSBLaW0gIDxrdGYua2ltQHNhbXN1bmcuY29tPgorCisg ICAgICAgIFtFRkxdW1dLMl0gQWRkIHN1cHBvcnQgZm9yIGEgem9vbSBsZXZlbCBzZXR0aW5nIHRv IE1pbmlCcm93c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05OTI4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICBBZGQgc3VwcG9ydCBmb3IgYSB6b29tIGxldmVsIHNldHRpbmcgdG8gTWluaUJyb3dzZXIu CisgICAgICAgICBTaG9ydGN1dHMgZm9yIHNldHRpbmcgb3BlcmF0aW9ucyBhcmUgc2FtZSBhcyBj b21tb24gYnJvd3NlcnM6CisgICAgICAgICBDdHJsICsgJysnIHRvIHpvb20gaW4sIEN0cmwgKyAn LScgdG8gem9vbSBvdXQgYW5kIEN0cmwgKyAnMCcgdG8gem9vbSB0byBkZWZhdWx0LgorCisgICAg ICAgICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoKKyAgICAgICAgKG9uX2tleV9kb3duKToKKwog MjAxMi0xMS0yNCAgWmFuIERvYmVyc2VrICA8emFuZG9iZXJzZWtAZ21haWwuY29tPgogCiAgICAg ICAgIEFkZCB0aGUgLS1vcmRlciBvcHRpb24gdG8gTlJXVApkaWZmIC0tZ2l0IGEvVG9vbHMvTWlu aUJyb3dzZXIvZWZsL21haW4uYyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKaW5kZXgg NzY4ZTljYTMzYzNkZDM3MjhmNDIzMDNkMzAyN2U5NThlYTkyMjg1NS4uZTIwZGZjYWIwZWY4NmZh NmExZmNhZWM2YTZmYjY2YzgyNjRlZWJlNiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIv ZWZsL21haW4uYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCkBAIC00Nyw2ICs0 NywzMCBAQCBzdGF0aWMgaW50IHdpbmRvd19oZWlnaHQgPSA2MDA7CiAgKiBzY2FsZSBmYWN0b3Ig dW5sZXNzIGl0J3MgcmVxdWlyZWQgYnkgdGhlIFVzZXIuICovCiBzdGF0aWMgZG91YmxlIGRldmlj ZV9waXhlbF9yYXRpbyA9IDA7CiAKKyNkZWZpbmUgREVGQVVMVF9aT09NX0xFVkVMIDUgLy8gc2V0 IGRlZmVhdWx0IHpvb20gbGV2ZWwgdG8gMTAwJSAoaW5kZXggNSBvbiB6b29tTGV2ZWxzKQorc3Rh dGljIGludCBjdXJyZW50Wm9vbUxldmVsID0gREVGQVVMVF9aT09NX0xFVkVMOyAKKy8vIHRoZSB6 b29tIHZhbHVlcyBhcmUgY2hvc2VuIHRvIGJlIGxpa2UgaW4gTW96aWxsYSBGaXJlZm94IDMKK3N0 YXRpYyBpbnQgem9vbUxldmVsc1tdID0gezMwLCA1MCwgNjcsIDgwLCA5MCwgMTAwLCAxMTAsIDEy MCwgMTMzLCAxNTAsIDE3MCwgMjAwLCAyNDAsIDMwMH07CisKK3N0YXRpYyBFaW5hX0Jvb2wKK3pv b21fbGV2ZWxfc2V0KEV2YXNfT2JqZWN0ICp3ZWJ2aWV3LCBpbnQgbGV2ZWwpCit7CisgICAgaWYg KGxldmVsIDwgMCAgfHwgbGV2ZWwgPj0gc2l6ZW9mKHpvb21MZXZlbHMpIC8gc2l6ZW9mKGludCkp CisgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOworCisgICAgZmxvYXQgZmFjdG9yID0gKChmbG9h dCkgem9vbUxldmVsc1tsZXZlbF0pIC8gMTAwLjA7CisgICAgRXZhc19Db29yZCBveCwgb3ksIG14 LCBteSwgY3gsIGN5OworICAgIGV2YXNfcG9pbnRlcl9jYW52YXNfeHlfZ2V0KGV2YXNfb2JqZWN0 X2V2YXNfZ2V0KHdlYnZpZXcpLCAmbXgsICZteSk7CisgICAgZXZhc19vYmplY3RfZ2VvbWV0cnlf Z2V0KHdlYnZpZXcsICZveCwgJm95LCBOVUxMLCBOVUxMKTsKKyAgICBjeCA9IG14IC0gb3g7Cisg ICAgY3kgPSBteSAtIG95OworCisgICAgRWluYV9Cb29sIHJlc3VsdCA9IGV3a192aWV3X3NjYWxl X3NldCh3ZWJ2aWV3LCBmYWN0b3IsIGN4LCBjeSk7CisgICAgaWYgKHJlc3VsdCkKKyAgICAgICAg Y3VycmVudFpvb21MZXZlbCA9IGxldmVsOworICAgIHJldHVybiByZXN1bHQ7Cit9CisKIHN0YXRp YyBFd2tfVmlld19TbWFydF9DbGFzcyAqbWluaUJyb3dzZXJWaWV3U21hcnRDbGFzcygpCiB7CiAg ICAgc3RhdGljIEV3a19WaWV3X1NtYXJ0X0NsYXNzIGV3a1ZpZXdDbGFzcyA9IEVXS19WSUVXX1NN QVJUX0NMQVNTX0lOSVRfTkFNRV9WRVJTSU9OKCJNaW5pQnJvd3Nlcl9WaWV3Iik7CkBAIC0yMDYs NiArMjMwLDE1IEBAIG9uX2tleV9kb3duKHZvaWQgKnVzZXJfZGF0YSwgRXZhcyAqZSwgRXZhc19P YmplY3QgKmV3a192aWV3LCB2b2lkICpldmVudF9pbmZvKQogICAgIH0gZWxzZSBpZiAoIXN0cmNt cChldi0+a2V5LCAiRXNjYXBlIikpIHsKICAgICAgICAgaWYgKGVsbV93aW5fZnVsbHNjcmVlbl9n ZXQod2luZG93LT5lbG1fd2luZG93KSkKICAgICAgICAgICAgIGV3a192aWV3X2Z1bGxzY3JlZW5f ZXhpdChld2tfdmlldyk7CisgICAgfSBlbHNlIGlmIChjdHJsUHJlc3NlZCAmJiAoIXN0cmNtcChl di0+a2V5LCAibWludXMiKSB8fCAhc3RyY21wKGV2LT5rZXksICJLUF9TdWJ0cmFjdCIpKSkgewor ICAgICAgICB6b29tX2xldmVsX3NldChld2tfdmlldywgY3VycmVudFpvb21MZXZlbCAtIDEpOwor ICAgICAgICBpbmZvKCJab29tIG91dCAoQ3RybCArICctJykgd2FzIHByZXNzZWQsIHpvb20gbGV2 ZWwgYmVjYW1lICVkJVxuIiwgem9vbUxldmVsc1tjdXJyZW50Wm9vbUxldmVsXSk7CisgICAgfSBl bHNlIGlmIChjdHJsUHJlc3NlZCAmJiAoIXN0cmNtcChldi0+a2V5LCAiZXF1YWwiKSB8fCAhc3Ry Y21wKGV2LT5rZXksICJLUF9BZGQiKSkpIHsKKyAgICAgICAgem9vbV9sZXZlbF9zZXQoZXdrX3Zp ZXcsIGN1cnJlbnRab29tTGV2ZWwgKyAxKTsKKyAgICAgICAgaW5mbygiWm9vbSBpbiAoQ3RybCAr ICcrJykgd2FzIHByZXNzZWQsIHpvb20gbGV2ZWwgYmVjYW1lICVkJVxuIiwgem9vbUxldmVsc1tj dXJyZW50Wm9vbUxldmVsXSk7CisgICAgfSBlbHNlIGlmIChjdHJsUHJlc3NlZCAmJiAhc3RyY21w KGV2LT5rZXksICIwIikpIHsKKyAgICAgICAgem9vbV9sZXZlbF9zZXQoZXdrX3ZpZXcsIERFRkFV TFRfWk9PTV9MRVZFTCk7CisgICAgICAgIGluZm8oIlpvb20gdG8gZGVmYXVsdCAoQ3RybCArICcw Jykgd2FzIHByZXNzZWQsIHpvb20gbGV2ZWwgYmVjYW1lICVkJVxuIiwgem9vbUxldmVsc1tjdXJy ZW50Wm9vbUxldmVsXSk7CiAgICAgfQogfQogCg== 177185 2012-12-02 22:52:39 -0800 2012-12-03 01:08:17 -0800 Patch bug-99285-20121203155007.patch text/plain 4466 ktf.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2MzYxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODdkMTRmOTc5NGI3NDEwMzhlYjcyZTFmOTYzNDI5NDJk MmM1Yzk3OS4uYzhhODY0MzlmNDM3YmQ2N2Q1ZjkxYTllYTAwOWFjZjM5MDg0ZDU0YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5 IEBACiAyMDEyLTEyLTAyICBLeXVuZ1RhZSBLaW0gIDxrdGYua2ltQHNhbXN1bmcuY29tPgogCisg ICAgICAgIFtFRkxdW1dLMl0gQWRkIHN1cHBvcnQgZm9yIGEgem9vbSBsZXZlbCBzZXR0aW5nIHRv IE1pbmlCcm93c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05OTI4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICBBZGQgc3VwcG9ydCBmb3IgYSB6b29tIGxldmVsIHNldHRpbmcgdG8gTWluaUJyb3dzZXIu CisgICAgICAgICBTaG9ydGN1dHMgZm9yIHNldHRpbmcgb3BlcmF0aW9ucyBhcmUgc2FtZSBhcyBj b21tb24gYnJvd3NlcnM6CisgICAgICAgICBDdHJsICsgJysnIHRvIHpvb20gaW4sIEN0cmwgKyAn LScgdG8gem9vbSBvdXQgYW5kIEN0cmwgKyAnMCcgdG8gem9vbSB0byBkZWZhdWx0LgorCisgICAg ICAgICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoKKyAgICAgICAgKG9uX2tleV9kb3duKToKKwor MjAxMi0xMi0wMiAgS3l1bmdUYWUgS2ltICA8a3RmLmtpbUBzYW1zdW5nLmNvbT4KKwogICAgICAg ICBbRUZMXVtXSzJdIEVDT1JFX0dFVE9QVF9WQUxVRV9CT09MIG5lZWQgdG8gYmUgdXNlZCBmb3Ig RWluYV9Cb29sCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDM4MzUKIApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYyBiL1Rv b2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKaW5kZXggZjJhNzUxYzAzYmUxOTMyYzNlZWU4Yjk4 ODZkNmE3Yjk3MGNlZWI5OC4uYjlkYjA3N2Q5OGExZmUxZWYwMzdmNDE3YzNkODhiN2E1MjU4MTdk YiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYworKysgYi9Ub29scy9N aW5pQnJvd3Nlci9lZmwvbWFpbi5jCkBAIC00OSw2ICs0OSwyNyBAQCBzdGF0aWMgaW50IHdpbmRv d19oZWlnaHQgPSA2MDA7CiBzdGF0aWMgZG91YmxlIGRldmljZV9waXhlbF9yYXRpbyA9IDA7CiBz dGF0aWMgRWluYV9Cb29sIGxlZ2FjeV9iZWhhdmlvcl9lbmFibGVkID0gRUlOQV9GQUxTRTsKIAor I2RlZmluZSBERUZBVUxUX1pPT01fTEVWRUwgNSAvLyBTZXQgZGVmYXVsdCB6b29tIGxldmVsIHRv IDEwMCUgKGluZGV4IDUgb24gem9vbUxldmVscykuCisvLyBUaGUgem9vbSB2YWx1ZXMgYXJlIGNo b3NlbiB0byBiZSBsaWtlIGluIE1vemlsbGEgRmlyZWZveCAzLgorY29uc3Qgc3RhdGljIGludCB6 b29tTGV2ZWxzW10gPSB7MzAsIDUwLCA2NywgODAsIDkwLCAxMDAsIDExMCwgMTIwLCAxMzMsIDE1 MCwgMTcwLCAyMDAsIDI0MCwgMzAwfTsKKworc3RhdGljIEVpbmFfQm9vbAorem9vbV9sZXZlbF9z ZXQoRXZhc19PYmplY3QgKndlYnZpZXcsIGludCBsZXZlbCkKK3sKKyAgICBpZiAobGV2ZWwgPCAw ICB8fCBsZXZlbCA+PSBzaXplb2Yoem9vbUxldmVscykgLyBzaXplb2YoaW50KSkKKyAgICAgICAg cmV0dXJuIEVJTkFfRkFMU0U7CisKKyAgICBmbG9hdCBmYWN0b3IgPSAoKGZsb2F0KSB6b29tTGV2 ZWxzW2xldmVsXSkgLyAxMDAuMDsKKyAgICBFdmFzX0Nvb3JkIG94LCBveSwgbXgsIG15LCBjeCwg Y3k7CisgICAgZXZhc19wb2ludGVyX2NhbnZhc194eV9nZXQoZXZhc19vYmplY3RfZXZhc19nZXQo d2VidmlldyksICZteCwgJm15KTsgLy8gR2V0IGN1cnJlbnQgbW91c2UgcG9zaXRpb24gb24gd2lu ZG93LgorICAgIGV2YXNfb2JqZWN0X2dlb21ldHJ5X2dldCh3ZWJ2aWV3LCAmb3gsICZveSwgTlVM TCwgTlVMTCk7IC8vIEdldCB3ZWJ2aWV3J3MgcG9zaXRpb24gb24gd2luZG93LgorICAgIGN4ID0g bXggLSBveDsgLy8gY3VycmVudCB4IHBvc2l0aW9uID0gbW91c2UgeCBwb3NpdGlvbiAtIHdlYnZp ZXcgeCBwb3NpdGlvbgorICAgIGN5ID0gbXkgLSBveTsgLy8gY3VycmVudCB5IHBvc2l0aW9uID0g bW91c2UgeSBwb3NpdGlvbiAtIHdlYnZpZXcgeSBwb3NpdGlvbgorCisgICAgRWluYV9Cb29sIHJl c3VsdCA9IGV3a192aWV3X3NjYWxlX3NldCh3ZWJ2aWV3LCBmYWN0b3IsIGN4LCBjeSk7CisgICAg cmV0dXJuIHJlc3VsdDsKK30KKwogc3RhdGljIEV3a19WaWV3X1NtYXJ0X0NsYXNzICptaW5pQnJv d3NlclZpZXdTbWFydENsYXNzKCkKIHsKICAgICBzdGF0aWMgRXdrX1ZpZXdfU21hcnRfQ2xhc3Mg ZXdrVmlld0NsYXNzID0gRVdLX1ZJRVdfU01BUlRfQ0xBU1NfSU5JVF9OQU1FX1ZFUlNJT04oIk1p bmlCcm93c2VyX1ZpZXciKTsKQEAgLTYxLDYgKzgyLDcgQEAgdHlwZWRlZiBzdHJ1Y3QgX0Jyb3dz ZXJfV2luZG93IHsKICAgICBFdmFzX09iamVjdCAqdXJsX2JhcjsKICAgICBFdmFzX09iamVjdCAq YmFja19idXR0b247CiAgICAgRXZhc19PYmplY3QgKmZvcndhcmRfYnV0dG9uOworICAgIGludCBj dXJyZW50X3pvb21fbGV2ZWw7IAogfSBCcm93c2VyX1dpbmRvdzsKIAogdHlwZWRlZiBzdHJ1Y3Qg X0ZpbGVfU2VsZWN0b3JfRGF0YSB7CkBAIC0yMTIsNiArMjM0LDE4IEBAIG9uX2tleV9kb3duKHZv aWQgKnVzZXJfZGF0YSwgRXZhcyAqZSwgRXZhc19PYmplY3QgKmV3a192aWV3LCB2b2lkICpldmVu dF9pbmZvKQogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRXNjYXBlIikpIHsKICAg ICAgICAgaWYgKGVsbV93aW5fZnVsbHNjcmVlbl9nZXQod2luZG93LT5lbG1fd2luZG93KSkKICAg ICAgICAgICAgIGV3a192aWV3X2Z1bGxzY3JlZW5fZXhpdChld2tfdmlldyk7CisgICAgfSBlbHNl IGlmIChjdHJsUHJlc3NlZCAmJiAoIXN0cmNtcChldi0+a2V5LCAibWludXMiKSB8fCAhc3RyY21w KGV2LT5rZXksICJLUF9TdWJ0cmFjdCIpKSkgeworICAgICAgICBpZiAoem9vbV9sZXZlbF9zZXQo ZXdrX3ZpZXcsIHdpbmRvdy0+Y3VycmVudF96b29tX2xldmVsIC0gMSkpCisgICAgICAgICAgICB3 aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbC0tOworICAgICAgICBpbmZvKCJab29tIG91dCAoQ3Ry bCArICctJykgd2FzIHByZXNzZWQsIHpvb20gbGV2ZWwgYmVjYW1lICVkJVxuIiwgem9vbUxldmVs c1t3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbF0pOworICAgIH0gZWxzZSBpZiAoY3RybFByZXNz ZWQgJiYgKCFzdHJjbXAoZXYtPmtleSwgImVxdWFsIikgfHwgIXN0cmNtcChldi0+a2V5LCAiS1Bf QWRkIikpKSB7CisgICAgICAgIGlmICh6b29tX2xldmVsX3NldChld2tfdmlldywgd2luZG93LT5j dXJyZW50X3pvb21fbGV2ZWwgKyAxKSkKKyAgICAgICAgICAgIHdpbmRvdy0+Y3VycmVudF96b29t X2xldmVsKys7CisgICAgICAgIGluZm8oIlpvb20gaW4gKEN0cmwgKyAnKycpIHdhcyBwcmVzc2Vk LCB6b29tIGxldmVsIGJlY2FtZSAlZCVcbiIsIHpvb21MZXZlbHNbd2luZG93LT5jdXJyZW50X3pv b21fbGV2ZWxdKTsKKyAgICB9IGVsc2UgaWYgKGN0cmxQcmVzc2VkICYmICFzdHJjbXAoZXYtPmtl eSwgIjAiKSkgeworICAgICAgICBpZiAoem9vbV9sZXZlbF9zZXQoZXdrX3ZpZXcsIERFRkFVTFRf Wk9PTV9MRVZFTCkpCisgICAgICAgICAgICB3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbCA9IERF RkFVTFRfWk9PTV9MRVZFTDsKKyAgICAgICAgaW5mbygiWm9vbSB0byBkZWZhdWx0IChDdHJsICsg JzAnKSB3YXMgcHJlc3NlZCwgem9vbSBsZXZlbCBiZWNhbWUgJWQlXG4iLCB6b29tTGV2ZWxzW3dp bmRvdy0+Y3VycmVudF96b29tX2xldmVsXSk7CiAgICAgfQogfQogCkBAIC0xMDcwLDYgKzExMDQs OSBAQCBzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoY29uc3QgY2hhciAqdXJs LCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCiAgICAgaWYgKGRldmljZV9waXhlbF9yYXRpbykKICAg ICAgICAgZXdrX3ZpZXdfZGV2aWNlX3BpeGVsX3JhdGlvX3NldCh3aW5kb3ctPmV3a192aWV3LCAo ZmxvYXQpZGV2aWNlX3BpeGVsX3JhdGlvKTsKIAorICAgIC8qIFNldCB0aGUgem9vbSBsZXZlbCB0 byBkZWZhdWx0ICovCisgICAgd2luZG93LT5jdXJyZW50X3pvb21fbGV2ZWwgPSBERUZBVUxUX1pP T01fTEVWRUw7CisKICAgICBFd2tfU2V0dGluZ3MgKnNldHRpbmdzID0gZXdrX3ZpZXdfc2V0dGlu Z3NfZ2V0KHdpbmRvdy0+ZXdrX3ZpZXcpOwogICAgIGV3a19zZXR0aW5nc19maWxlX2FjY2Vzc19m cm9tX2ZpbGVfdXJsc19hbGxvd2VkX3NldChzZXR0aW5ncywgRUlOQV9UUlVFKTsKICAgICBld2tf c2V0dGluZ3NfZW5jb2RpbmdfZGV0ZWN0b3JfZW5hYmxlZF9zZXQoc2V0dGluZ3MsIGVuY29kaW5n X2RldGVjdG9yX2VuYWJsZWQpOwo=