90778 2012-07-09 05:03:25 -0700 [EFL][WK2] Zoom the page when the mouse wheel event occurs with pressed control key. 2022-03-01 03:04:01 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 61838 0 enmi.lee enmi.lee cdumez gyuyoung.kim gyuyoung.kim kenneth lucas.de.marchi sw0524.lee webkit.review.bot oldest_to_newest 664808 0 enmi.lee 2012-07-09 05:03:25 -0700 I will implement the zoom for mouse wheel and control key in the WebKit2 EFL port. 664825 1 151236 enmi.lee 2012-07-09 05:40:48 -0700 Created attachment 151236 Zoom for wheel event with pressed control key. 664830 2 webkit.review.bot 2012-07-09 05:45:04 -0700 Attachment 151236 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:140: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 664833 3 151239 enmi.lee 2012-07-09 05:55:58 -0700 Created attachment 151239 Zoom for wheel event with pressed control key. Fix the coding style error. 670262 4 152516 enmi.lee 2012-07-16 05:21:01 -0700 Created attachment 152516 Patch 670265 5 152516 cdumez 2012-07-16 05:34:36 -0700 Comment on attachment 152516 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152516&action=review LGTM with minor nit. > Source/WebKit2/ChangeLog:8 > + Zoom in the page when the vertial mouse wheel scrolls up and zoom out "vertical" 670405 6 152516 gyuyoung.kim 2012-07-16 09:38:08 -0700 Comment on attachment 152516 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152516&action=review To my quick search, it looks other ports don't support this functionality in port layer. So, I'm not sure if EFL port should support this. I wonder whether application can do this via existing APIs. > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:152 > + if (priv->isWheelZoomEnabled && evas_key_modifier_is_set(wheelEvent->modifiers, "Control") && !wheelEvent->direction) { In my humble opinion, it is good to be compliant with functionality of other mouse event functions. In other words, I don't think we can add additional functionality to only this wheel event function. How do you think about my opinion ? 670894 7 enmi.lee 2012-07-16 18:56:07 -0700 (In reply to comment #5) > (From update of attachment 152516 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=152516&action=review > > LGTM with minor nit. > > > Source/WebKit2/ChangeLog:8 > > + Zoom in the page when the vertial mouse wheel scrolls up and zoom out > > "vertical" my mistake, I will fix it. 670898 8 enmi.lee 2012-07-16 19:06:24 -0700 (In reply to comment #6) > (From update of attachment 152516 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=152516&action=review > > To my quick search, it looks other ports don't support this functionality in port layer. So, I'm not sure if EFL port should support this. I wonder whether application can do this via existing APIs. > > > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:152 > > + if (priv->isWheelZoomEnabled && evas_key_modifier_is_set(wheelEvent->modifiers, "Control") && !wheelEvent->direction) { > > In my humble opinion, it is good to be compliant with functionality of other mouse event functions. In other words, I don't think we can add additional functionality to only this wheel event function. How do you think about my opinion ? Gyuyoung, The WK1's win and wx port support wheel zoom in their port and other ports do not support. I've added wheel zoom in the EFL port because it is easier to implement than application side. If application implements the wheel zoom, they have to override ewk_view's mouse wheel functions. As you know, EFL is the smart class and many codes are needed to override ewk_view's smart APIs. So, I want to support wheel zoom in the EFL port and also offer the API to enable/disable the wheel zoom in order to reduce the application's work. 670901 9 152679 enmi.lee 2012-07-16 19:11:07 -0700 Created attachment 152679 Patch 670928 10 gyuyoung.kim 2012-07-16 20:10:29 -0700 (In reply to comment #8) > (In reply to comment #6) > > (From update of attachment 152516 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=152516&action=review > > > > To my quick search, it looks other ports don't support this functionality in port layer. So, I'm not sure if EFL port should support this. I wonder whether application can do this via existing APIs. > > > > > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:152 > > > + if (priv->isWheelZoomEnabled && evas_key_modifier_is_set(wheelEvent->modifiers, "Control") && !wheelEvent->direction) { > > > > In my humble opinion, it is good to be compliant with functionality of other mouse event functions. In other words, I don't think we can add additional functionality to only this wheel event function. How do you think about my opinion ? > > Gyuyoung, > > The WK1's win and wx port support wheel zoom in their port and other ports do not support. > I've added wheel zoom in the EFL port because it is easier to implement than application side. > If application implements the wheel zoom, they have to override ewk_view's mouse wheel functions. > As you know, EFL is the smart class and many codes are needed to override ewk_view's smart APIs. > So, I want to support wheel zoom in the EFL port and also offer the API to enable/disable the wheel zoom in order to reduce the application's work. I can understand what do you want. However, I'm not sure if reviewer can accept this patch. If reviewer can accept to land this patch, I won't object to land this patch as well. 152 if (priv->isWheelZoomEnabled && evas_key_modifier_is_set(wheelEvent->modifiers, "Control") && !wheelEvent->direction) { 153 double currentPageZoomFactor = priv->pageClient->page()->pageZoomFactor(); 154 if (wheelEvent->z < 0 && currentPageZoomFactor < zoomMaximum) 155 priv->pageClient->page()->setPageZoomFactor(currentPageZoomFactor * zoomInRatio); 156 if (wheelEvent->z > 0 && currentPageZoomFactor > zoomMinimum) 157 priv->pageClient->page()->setPageZoomFactor(currentPageZoomFactor * zoomOutRatio); 158 return true; 159 } BTW, I think is it better to move below logic to new internal function from the perspective of code readability ? 670997 11 cdumez 2012-07-16 22:43:38 -0700 Actually, Gyouyoung is right. We had a long discussion with Kenneth, Ryuan and Gyuyoung about zooming. We eventually agreed that zooming was deprecated and we should avoid it in the API. As a result, we did not add APIs for page or text zoom to Ewk_View in WK2. I think this patch should be dropped as well, unless we have a specific need for it (but I think we don't). 671045 12 enmi.lee 2012-07-17 00:22:07 -0700 (In reply to comment #11) > Actually, Gyouyoung is right. We had a long discussion with Kenneth, Ryuan and Gyuyoung about zooming. We eventually agreed that zooming was deprecated and we should avoid it in the API. As a result, we did not add APIs for page or text zoom to Ewk_View in WK2. I think this patch should be dropped as well, unless we have a specific need for it (but I think we don't). I think wheel zoom is the different case. I can use "page scale" instead of "page zoom". With "page scale", there is no problem for zooming-in, but I have a problem for zooming-out. If we zooming-out the page with "page scale", the white area is shown in the right side of the contents because "page scale" does not re-layout the contents after scaling. So, I've used the "page zoom" for the wheel zoom. If we should not use the "page zoom" any more, how can I implement the zooming-out? Can I ignore the zooming-out and set the zoom factor after loading to the minimum zoom factor?? If it is the right approach, I can change the code to use "page scale". I want to listen Christophe and Gyuyoung's opinion. 671072 13 gyuyoung.kim 2012-07-17 01:16:15 -0700 (In reply to comment #12) > If we should not use the "page zoom" any more, how can I implement the zooming-out? > Can I ignore the zooming-out and set the zoom factor after loading to the minimum zoom factor?? > If it is the right approach, I can change the code to use "page scale". > > I want to listen Christophe and Gyuyoung's opinion. In my humble opinion, to use page scale is better than page zoom. But, did you check how did QT port support this functionality ? I think we need to refer to QT implementation first. CC'ing Kenneth, when you have time, could you take a look this patch ? I think we need your advice. 671920 14 kenneth 2012-07-17 20:15:24 -0700 (In reply to comment #13) > (In reply to comment #12) > > > If we should not use the "page zoom" any more, how can I implement the zooming-out? > > Can I ignore the zooming-out and set the zoom factor after loading to the minimum zoom factor?? > > If it is the right approach, I can change the code to use "page scale". > > > > I want to listen Christophe and Gyuyoung's opinion. > > In my humble opinion, to use page scale is better than page zoom. But, did you check how did QT port support this functionality ? I think we need to refer to QT implementation first. > > CC'ing Kenneth, when you have time, could you take a look this patch ? I think we need your advice. I don't know how many people who actually use wheel zoom today, especially as it can easily conflict with web sites using the wheel already, thus you will need to first send the events to the view and if it didn't use then the browser view can. That is a very slow patch which is the reason for the ScrollingTree work. With that part of this information is on the UI side, so you can quickly decide whether you need to go the slow path or not. If you want to do full page zoom, it is possible to use it using the device pixel ratio which has the potential benefit of using higher resolution images. 671922 15 152679 kenneth 2012-07-17 20:18:17 -0700 Comment on attachment 152679 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152679&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:160 > + if (priv->isWheelZoomEnabled && evas_key_modifier_is_set(wheelEvent->modifiers, "Control") && !wheelEvent->direction) { > + double currentPageZoomFactor = priv->pageClient->page()->pageZoomFactor(); > + if (wheelEvent->z < 0 && currentPageZoomFactor < zoomMaximum) > + priv->pageClient->page()->setPageZoomFactor(currentPageZoomFactor * zoomInRatio); > + if (wheelEvent->z > 0 && currentPageZoomFactor > zoomMinimum) > + priv->pageClient->page()->setPageZoomFactor(currentPageZoomFactor * zoomOutRatio); > + return true; > + } > + You are not even checking whether the web process is using the wheel events, so this can break pages :-( If you once do a webkit efl summit in korea you should invite me :-) Then I can explain must of this stuff at once. 671999 16 enmi.lee 2012-07-17 22:48:33 -0700 (In reply to comment #15) > (From update of attachment 152679 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=152679&action=review > > > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:160 > > + if (priv->isWheelZoomEnabled && evas_key_modifier_is_set(wheelEvent->modifiers, "Control") && !wheelEvent->direction) { > > + double currentPageZoomFactor = priv->pageClient->page()->pageZoomFactor(); > > + if (wheelEvent->z < 0 && currentPageZoomFactor < zoomMaximum) > > + priv->pageClient->page()->setPageZoomFactor(currentPageZoomFactor * zoomInRatio); > > + if (wheelEvent->z > 0 && currentPageZoomFactor > zoomMinimum) > > + priv->pageClient->page()->setPageZoomFactor(currentPageZoomFactor * zoomOutRatio); > > + return true; > > + } > > + > > You are not even checking whether the web process is using the wheel events, so this can break pages :-( > > If you once do a webkit efl summit in korea you should invite me :-) Then I can explain must of this stuff at once. I also want to have a change to invite you :) and, I've thought about this patch again. Actually, only the Tizen desktop browser requests the wheel zoom feature to me. I don't think I have to support wheel zoom by submitting to slow performance. So, I change my mind to pass the role of wheel zoom to application even though it is hard work for application. and, for that, I have to provide the way to inherit the ewk_view's SmartClass. That is in the Bug 90054 and I have to update that firstly. 151236 2012-07-09 05:40:48 -0700 2012-07-09 05:55:58 -0700 Zoom for wheel event with pressed control key. zoom_wheel_control.patch text/plain 2397 enmi.lee ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2YWNhYzcxLi5hODBjYzQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTItMDctMDkgIEV1bm1pIExlZSAgPGV1bm1pMTUubGVlQHNhbXN1bmcuY29tPgorCisg ICAgICAgIFtFRkxdW1dLMl0gWm9vbSB0aGUgcGFnZSB3aGVuIHRoZSBtb3VzZSB3aGVlbCBldmVu dCBvY2N1cnMgd2l0aCBwcmVzc2VkIGNvbnRyb2wga2V5LgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTA3NzgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBab29tIGluIHRoZSBwYWdlIHdoZW4gdmVydGlhbCBt b3VzZSB3aGVlbCBzY3JvbGxzIHVwIHdpdGggcHJlc3NlZAorICAgICAgICBjb250cm9sIGtleSBh bmQgem9vbSBvdXQgd2hlbiB2ZXJ0aWNhbCBtb3VzZSB3aGVlbCBzY3JvbGxzIGRvd24gd2l0aAor ICAgICAgICBwcmVzc2VkIGNvbnRyb2wga2V5LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuY3BwOgorICAgICAgICAoX2V3a192aWV3X3NtYXJ0X21vdXNlX3doZWVsKToK KwogMjAxMi0wNy0wOSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAg IEZpeCB0aGUgTWFjIGJ1aWxkIHdoZW4gY29kZXNpZ25fYWxsb2NhdGUgaXMgbm90IGluc3RhbGxl ZCBhdCAvdXNyL2Jpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcAppbmRleCBlYjZiMTViLi5lOTZhN2JlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCkBAIC0xMDMsNiArMTAzLDExIEBAIHN0cnVjdCBf RXdrX1ZpZXdfUHJpdmF0ZV9EYXRhIHsKICAgICAgICAgcmV0dXJuIF9fVkFfQVJHU19fOyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgfQog CitzdGF0aWMgY29uc3QgZG91YmxlIHpvb21NaW5pbXVtID0gMC4zOworc3RhdGljIGNvbnN0IGRv dWJsZSB6b29tTWF4aW11bSA9IDQuMDsKK3N0YXRpYyBjb25zdCBkb3VibGUgem9vbUluUmF0aW8g PSAxLjI7CitzdGF0aWMgY29uc3QgZG91YmxlIHpvb21PdXRSYXRpbyA9IDAuODsKKwogc3RhdGlj IHZvaWQgX2V3a192aWV3X3NtYXJ0X2NoYW5nZWQoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnRE YXRhKQogewogICAgIGlmIChzbWFydERhdGEtPmNoYW5nZWQuYW55KQpAQCAtMTMyLDYgKzEzNywx NSBAQCBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld19zbWFydF9tb3VzZV93aGVlbChFd2tfVmll d19TbWFydF9EYXRhKiBzbWFydERhdGEsIGNvbgogewogICAgIEVXS19WSUVXX1BSSVZfR0VUX09S X1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKQogCisgICAgaWYgKGV2YXNfa2V5X21vZGlm aWVyX2lzX3NldCh3aGVlbEV2ZW50LT5tb2RpZmllcnMsICJDb250cm9sIikgJiYgd2hlZWxFdmVu dC0+ZGlyZWN0aW9uID09IDApIHsKKyAgICAgICAgZG91YmxlIGN1cnJlbnRQYWdlWm9vbUZhY3Rv ciA9IFdLUGFnZUdldFBhZ2Vab29tRmFjdG9yKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2Uo KSkpOworICAgICAgICBpZiAod2hlZWxFdmVudC0+eiA8IDAgJiYgY3VycmVudFBhZ2Vab29tRmFj dG9yIDwgem9vbU1heGltdW0pCisgICAgICAgICAgICBXS1BhZ2VTZXRQYWdlWm9vbUZhY3Rvcih0 b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkpLCBjdXJyZW50UGFnZVpvb21GYWN0b3IgKiB6 b29tSW5SYXRpbyk7CisgICAgICAgIGlmICh3aGVlbEV2ZW50LT56ID4gMCAmJiBjdXJyZW50UGFn ZVpvb21GYWN0b3IgPiB6b29tTWluaW11bSkKKyAgICAgICAgICAgIFdLUGFnZVNldFBhZ2Vab29t RmFjdG9yKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSksIGN1cnJlbnRQYWdlWm9vbUZh Y3RvciAqIHpvb21PdXRSYXRpbyk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKwogICAg IEV2YXNfUG9pbnQgcG9zaXRpb24gPSB7c21hcnREYXRhLT52aWV3LngsIHNtYXJ0RGF0YS0+dmll dy55fTsKICAgICBwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCktPmhhbmRsZVdoZWVsRXZlbnQoTmF0 aXZlV2ViV2hlZWxFdmVudCh3aGVlbEV2ZW50LCAmcG9zaXRpb24pKTsKICAgICByZXR1cm4gdHJ1 ZTsK 151239 2012-07-09 05:55:58 -0700 2012-07-16 05:20:53 -0700 Zoom for wheel event with pressed control key. zoom_wheel_control.patch text/plain 2393 enmi.lee ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2YWNhYzcxLi5hODBjYzQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTItMDctMDkgIEV1bm1pIExlZSAgPGV1bm1pMTUubGVlQHNhbXN1bmcuY29tPgorCisg ICAgICAgIFtFRkxdW1dLMl0gWm9vbSB0aGUgcGFnZSB3aGVuIHRoZSBtb3VzZSB3aGVlbCBldmVu dCBvY2N1cnMgd2l0aCBwcmVzc2VkIGNvbnRyb2wga2V5LgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTA3NzgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBab29tIGluIHRoZSBwYWdlIHdoZW4gdmVydGlhbCBt b3VzZSB3aGVlbCBzY3JvbGxzIHVwIHdpdGggcHJlc3NlZAorICAgICAgICBjb250cm9sIGtleSBh bmQgem9vbSBvdXQgd2hlbiB2ZXJ0aWNhbCBtb3VzZSB3aGVlbCBzY3JvbGxzIGRvd24gd2l0aAor ICAgICAgICBwcmVzc2VkIGNvbnRyb2wga2V5LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuY3BwOgorICAgICAgICAoX2V3a192aWV3X3NtYXJ0X21vdXNlX3doZWVsKToK KwogMjAxMi0wNy0wOSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAg IEZpeCB0aGUgTWFjIGJ1aWxkIHdoZW4gY29kZXNpZ25fYWxsb2NhdGUgaXMgbm90IGluc3RhbGxl ZCBhdCAvdXNyL2Jpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcAppbmRleCBlYjZiMTViLi40YmM2YzhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCkBAIC0xMDMsNiArMTAzLDExIEBAIHN0cnVjdCBf RXdrX1ZpZXdfUHJpdmF0ZV9EYXRhIHsKICAgICAgICAgcmV0dXJuIF9fVkFfQVJHU19fOyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgfQog CitzdGF0aWMgY29uc3QgZG91YmxlIHpvb21NaW5pbXVtID0gMC4zOworc3RhdGljIGNvbnN0IGRv dWJsZSB6b29tTWF4aW11bSA9IDQuMDsKK3N0YXRpYyBjb25zdCBkb3VibGUgem9vbUluUmF0aW8g PSAxLjI7CitzdGF0aWMgY29uc3QgZG91YmxlIHpvb21PdXRSYXRpbyA9IDAuODsKKwogc3RhdGlj IHZvaWQgX2V3a192aWV3X3NtYXJ0X2NoYW5nZWQoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnRE YXRhKQogewogICAgIGlmIChzbWFydERhdGEtPmNoYW5nZWQuYW55KQpAQCAtMTMyLDYgKzEzNywx NSBAQCBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld19zbWFydF9tb3VzZV93aGVlbChFd2tfVmll d19TbWFydF9EYXRhKiBzbWFydERhdGEsIGNvbgogewogICAgIEVXS19WSUVXX1BSSVZfR0VUX09S X1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKQogCisgICAgaWYgKGV2YXNfa2V5X21vZGlm aWVyX2lzX3NldCh3aGVlbEV2ZW50LT5tb2RpZmllcnMsICJDb250cm9sIikgJiYgIXdoZWVsRXZl bnQtPmRpcmVjdGlvbikgeworICAgICAgICBkb3VibGUgY3VycmVudFBhZ2Vab29tRmFjdG9yID0g V0tQYWdlR2V0UGFnZVpvb21GYWN0b3IodG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSk7 CisgICAgICAgIGlmICh3aGVlbEV2ZW50LT56IDwgMCAmJiBjdXJyZW50UGFnZVpvb21GYWN0b3Ig PCB6b29tTWF4aW11bSkKKyAgICAgICAgICAgIFdLUGFnZVNldFBhZ2Vab29tRmFjdG9yKHRvQVBJ KHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSksIGN1cnJlbnRQYWdlWm9vbUZhY3RvciAqIHpvb21J blJhdGlvKTsKKyAgICAgICAgaWYgKHdoZWVsRXZlbnQtPnogPiAwICYmIGN1cnJlbnRQYWdlWm9v bUZhY3RvciA+IHpvb21NaW5pbXVtKQorICAgICAgICAgICAgV0tQYWdlU2V0UGFnZVpvb21GYWN0 b3IodG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpKSwgY3VycmVudFBhZ2Vab29tRmFjdG9y ICogem9vbU91dFJhdGlvKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCiAgICAgRXZh c19Qb2ludCBwb3NpdGlvbiA9IHtzbWFydERhdGEtPnZpZXcueCwgc21hcnREYXRhLT52aWV3Lnl9 OwogICAgIHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKS0+aGFuZGxlV2hlZWxFdmVudChOYXRpdmVX ZWJXaGVlbEV2ZW50KHdoZWVsRXZlbnQsICZwb3NpdGlvbikpOwogICAgIHJldHVybiB0cnVlOwo= 152516 2012-07-16 05:21:01 -0700 2012-07-16 19:11:01 -0700 Patch bug-90778-20120716212100.patch text/plain 4916 enmi.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjlmNmYxZDkxYzI3MDVj N2Y5MmNkOTEyYmRhODliYWVhYTA1ZDk2ZC4uYzc4ZDkzMWQ1MzA0OGE3ZTIxYTQzMzA1MmI0NGJj OGU4ZmZiOTk3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA3LTE2ICBFdW5t aSBMZWUgIDxldW5taTE1LmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFpv b20gdGhlIHBhZ2Ugd2hlbiB0aGUgbW91c2Ugd2hlZWwgZXZlbnQgb2NjdXJzIHdpdGggcHJlc3Nl ZCBjb250cm9sIGtleS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTkwNzc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgWm9vbSBpbiB0aGUgcGFnZSB3aGVuIHRoZSB2ZXJ0aWFsIG1vdXNlIHdoZWVsIHNjcm9s bHMgdXAgYW5kIHpvb20gb3V0CisgICAgICAgIHdoZW4gdGhlIHZlcnRpY2FsIG1vdXNlIHdoZWVs IHNjcm9sbHMgZG93biB3aXRoIHByZXNzZWQgY29udHJvbCBrZXkuCisgICAgICAgIEFkZGl0aW9u YWxseSBhZGQgdGhlIEFQSSB0byBlbmFibGUvZGlzYWJsZSB0aGUgd2hlZWwgem9vbSBhbmQgQVBJ IHRvCisgICAgICAgIHF1ZXJ5IHRoZSB3aGVlbCB6b29tIGlzIGVuYWJsZWQgb3Igbm90LgorCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwOgorICAgICAgICAoX0V3a19W aWV3X1ByaXZhdGVfRGF0YSk6CisgICAgICAgIChfRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhOjpfRXdr X1ZpZXdfUHJpdmF0ZV9EYXRhKToKKyAgICAgICAgKF9ld2tfdmlld19zbWFydF9tb3VzZV93aGVl bCk6CisgICAgICAgIChld2tfdmlld193aGVlbF96b29tX2VuYWJsZWRfc2V0KToKKyAgICAgICAg KGV3a192aWV3X3doZWVsX3pvb21fZW5hYmxlZF9nZXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a192aWV3Lmg6CisKIDIwMTItMDctMTQgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2Fy bHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIEFWQ0YgaGFyZHdhcmUgdmlkZW8gZGVj b2RpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcApp bmRleCBlYjFlNWU3YjJhZGIwOWRhOTIwYjVmZDE0MzExY2Q1MTVhNzY1NDNmLi43NzliMWE4ZTI1 NjM4MTM5YzE5ZTBkMzllOTg5ZWEyMDQ1N2ZjZGE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCkBAIC01MCwxMCArNTAsMTIgQEAgc3RydWN0IF9F d2tfVmlld19Qcml2YXRlX0RhdGEgewogICAgIGNvbnN0IGNoYXIqIHVyaTsKICAgICBjb25zdCBj aGFyKiB0aXRsZTsKICAgICBMb2FkaW5nUmVzb3VyY2VzTWFwIGxvYWRpbmdSZXNvdXJjZXNNYXA7 CisgICAgYm9vbCBpc1doZWVsWm9vbUVuYWJsZWQ7CiAKICAgICBfRXdrX1ZpZXdfUHJpdmF0ZV9E YXRhKCkKICAgICAgICAgOiB1cmkoMCkKICAgICAgICAgLCB0aXRsZSgwKQorICAgICAgICAsIGlz V2hlZWxab29tRW5hYmxlZCh0cnVlKQogICAgIHsgfQogfTsKIApAQCAtMTEzLDYgKzExNSwxMSBA QCBzdHJ1Y3QgX0V3a19WaWV3X1ByaXZhdGVfRGF0YSB7CiAgICAgICAgIHJldHVybiBfX1ZBX0FS R1NfXzsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg XAogICAgIH0KIAorc3RhdGljIGNvbnN0IGRvdWJsZSB6b29tTWluaW11bSA9IDAuMzsKK3N0YXRp YyBjb25zdCBkb3VibGUgem9vbU1heGltdW0gPSA0LjA7CitzdGF0aWMgY29uc3QgZG91YmxlIHpv b21JblJhdGlvID0gMS4yOworc3RhdGljIGNvbnN0IGRvdWJsZSB6b29tT3V0UmF0aW8gPSAwLjg7 CisKIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zbWFydF9jaGFuZ2VkKEV3a19WaWV3X1NtYXJ0X0Rh dGEqIHNtYXJ0RGF0YSkKIHsKICAgICBpZiAoc21hcnREYXRhLT5jaGFuZ2VkLmFueSkKQEAgLTE0 Miw2ICsxNDksMTUgQEAgc3RhdGljIEVpbmFfQm9vbCBfZXdrX3ZpZXdfc21hcnRfbW91c2Vfd2hl ZWwoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBjb24KIHsKICAgICBFV0tfVklFV19Q UklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSkKIAorICAgIGlmIChwcml2 LT5pc1doZWVsWm9vbUVuYWJsZWQgJiYgZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KHdoZWVsRXZl bnQtPm1vZGlmaWVycywgIkNvbnRyb2wiKSAmJiAhd2hlZWxFdmVudC0+ZGlyZWN0aW9uKSB7Cisg ICAgICAgIGRvdWJsZSBjdXJyZW50UGFnZVpvb21GYWN0b3IgPSBwcml2LT5wYWdlQ2xpZW50LT5w YWdlKCktPnBhZ2Vab29tRmFjdG9yKCk7CisgICAgICAgIGlmICh3aGVlbEV2ZW50LT56IDwgMCAm JiBjdXJyZW50UGFnZVpvb21GYWN0b3IgPCB6b29tTWF4aW11bSkKKyAgICAgICAgICAgIHByaXYt PnBhZ2VDbGllbnQtPnBhZ2UoKS0+c2V0UGFnZVpvb21GYWN0b3IoY3VycmVudFBhZ2Vab29tRmFj dG9yICogem9vbUluUmF0aW8pOworICAgICAgICBpZiAod2hlZWxFdmVudC0+eiA+IDAgJiYgY3Vy cmVudFBhZ2Vab29tRmFjdG9yID4gem9vbU1pbmltdW0pCisgICAgICAgICAgICBwcml2LT5wYWdl Q2xpZW50LT5wYWdlKCktPnNldFBhZ2Vab29tRmFjdG9yKGN1cnJlbnRQYWdlWm9vbUZhY3RvciAq IHpvb21PdXRSYXRpbyk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKwogICAgIEV2YXNf UG9pbnQgcG9zaXRpb24gPSB7c21hcnREYXRhLT52aWV3LngsIHNtYXJ0RGF0YS0+dmlldy55fTsK ICAgICBwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCktPmhhbmRsZVdoZWVsRXZlbnQoTmF0aXZlV2Vi V2hlZWxFdmVudCh3aGVlbEV2ZW50LCAmcG9zaXRpb24pKTsKICAgICByZXR1cm4gdHJ1ZTsKQEAg LTkzNywzICs5NTMsMjEgQEAgV2ViUGFnZVByb3h5KiBld2tfdmlld19wYWdlX2dldChjb25zdCBF dmFzX09iamVjdCogZXdrVmlldykKIAogICAgIHJldHVybiBwcml2LT5wYWdlQ2xpZW50LT5wYWdl KCk7CiB9CisKK0VpbmFfQm9vbCBld2tfdmlld193aGVlbF96b29tX2VuYWJsZWRfc2V0KEV2YXNf T2JqZWN0KiBld2tWaWV3LCBFaW5hX0Jvb2wgZW5hYmxlZCkKK3sKKyAgICBFV0tfVklFV19TRF9H RVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOworICAgIEVXS19WSUVXX1BS SVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKKworICAgIHByaXYtPmlz V2hlZWxab29tRW5hYmxlZCA9IGVuYWJsZWQ7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKworRWlu YV9Cb29sIGV3a192aWV3X3doZWVsX3pvb21fZW5hYmxlZF9nZXQoY29uc3QgRXZhc19PYmplY3Qq IGV3a1ZpZXcpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFy dERhdGEsIGZhbHNlKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRh LCBwcml2LCBmYWxzZSk7CisKKyAgICByZXR1cm4gcHJpdi0+aXNXaGVlbFpvb21FbmFibGVkOwor fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKaW5kZXggNTg1 NTJlYzdkMjBlMjQxMGRiMjY5ZjAwMjhlNzYxMjlkMzdiMmMwNS4uYTA5ZDhmZDI2OGI5NTgzMjc2 ODg0ODM0YzQ0ZjQ0MDVmMmRiNTMxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfdmlldy5oCkBAIC0zOTMsNiArMzkzLDI3IEBAIEVBUEkgZmxvYXQgZXdrX3ZpZXdf ZGV2aWNlX3BpeGVsX3JhdGlvX2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CiAgKi8KIEVBUEkg RWluYV9Cb29sIGV3a192aWV3X2RldmljZV9waXhlbF9yYXRpb19zZXQoRXZhc19PYmplY3QgKm8s IGZsb2F0IHJhdGlvKTsKIAorLyoqCisgKiBTZXRzIHdoZXRoZXIgdGhlIGV3a192aWV3IHN1cHBv cnRzIHRoZSB3aGVlbCB6b29tIG9yIG5vdC4KKyAqCisgKiBUaGUgZGVmYXVsdCB2YWx1ZSBpcyBF SU5BX1RSVUUuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gZW5hYmxlL2Rpc2FibGUg dGhlIHdoZWVsIHpvb20KKyAqIEBwYXJhbSBlbmFibGVkIGEgc3RhdGUgdG8gc2V0CisgKgorICog QHJldHVybiBAYyBFSU5BX1RSVUUgb24gc3VjY2VzcyBvciBAYyBFSU5BX0ZBTFNFIG9uIGZhaWx1 cmUKKyAqLworRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfd2hlZWxfem9vbV9lbmFibGVkX3NldChF dmFzX09iamVjdCAqbywgRWluYV9Cb29sIGVuYWJsZWQpOworCisvKioKKyAqIFF1ZXJpZXMgaWYg dGhlIGV3a192aWV3IHN1cHBvcnRzIHRoZSB3aGVlbCB6b29tLgorICoKKyAqIEBwYXJhbSBvIHZp ZXcgb2JqZWN0IHRvIHF1ZXJ5IGlmIHRoZSB3aGVlbCB6b29tIGlzIGVuYWJsZWQKKyAqCisgKiBA cmV0dXJuIEBjIEVJTkFfVFJVRSBpZiB0aGUgd2hlZWwgem9vbSBpcyBlbmFibGVkIG9yIEBjIEVJ TkFfRkFMU0Ugb3RoZXJ3aXNlCisgKi8KK0VBUEkgRWluYV9Cb29sIGV3a192aWV3X3doZWVsX3pv b21fZW5hYmxlZF9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOworCiAjaWZkZWYgX19jcGx1c3Bs dXMKIH0KICNlbmRpZgo= 152679 2012-07-16 19:11:07 -0700 2022-03-01 03:04:01 -0800 Patch bug-90778-20120717111106.patch text/plain 4917 enmi.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjlmNmYxZDkxYzI3MDVj N2Y5MmNkOTEyYmRhODliYWVhYTA1ZDk2ZC4uOThkNWY3ZmQzMTE5MmFhYmFlMmM5YWYzMWFhMDA1 M2UwOTI0NmU0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA3LTE2ICBFdW5t aSBMZWUgIDxldW5taTE1LmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFpv b20gdGhlIHBhZ2Ugd2hlbiB0aGUgbW91c2Ugd2hlZWwgZXZlbnQgb2NjdXJzIHdpdGggcHJlc3Nl ZCBjb250cm9sIGtleS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTkwNzc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgWm9vbSBpbiB0aGUgcGFnZSB3aGVuIHRoZSB2ZXJ0aWNhbCBtb3VzZSB3aGVlbCBzY3Jv bGxzIHVwIGFuZCB6b29tIG91dAorICAgICAgICB3aGVuIHRoZSB2ZXJ0aWNhbCBtb3VzZSB3aGVl bCBzY3JvbGxzIGRvd24gd2l0aCBwcmVzc2VkIGNvbnRyb2wga2V5LgorICAgICAgICBBZGRpdGlv bmFsbHkgYWRkIHRoZSBBUEkgdG8gZW5hYmxlL2Rpc2FibGUgdGhlIHdoZWVsIHpvb20gYW5kIEFQ SSB0bworICAgICAgICBxdWVyeSB0aGUgd2hlZWwgem9vbSBpcyBlbmFibGVkIG9yIG5vdC4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKF9Fd2tf Vmlld19Qcml2YXRlX0RhdGEpOgorICAgICAgICAoX0V3a19WaWV3X1ByaXZhdGVfRGF0YTo6X0V3 a19WaWV3X1ByaXZhdGVfRGF0YSk6CisgICAgICAgIChfZXdrX3ZpZXdfc21hcnRfbW91c2Vfd2hl ZWwpOgorICAgICAgICAoZXdrX3ZpZXdfd2hlZWxfem9vbV9lbmFibGVkX3NldCk6CisgICAgICAg IChld2tfdmlld193aGVlbF96b29tX2VuYWJsZWRfZ2V0KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5oOgorCiAyMDEyLTA3LTE0ICBFcmljIENhcmxzb24gIDxlcmljLmNh cmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIEVuYWJsZSBBVkNGIGhhcmR3YXJlIHZpZGVvIGRl Y29kaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf dmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAK aW5kZXggZWIxZTVlN2IyYWRiMDlkYTkyMGI1ZmQxNDMxMWNkNTE1YTc2NTQzZi4uNzc5YjFhOGUy NTYzODEzOWMxOWUwZDM5ZTk4OWVhMjA0NTdmY2RhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcApAQCAtNTAsMTAgKzUwLDEyIEBAIHN0cnVjdCBf RXdrX1ZpZXdfUHJpdmF0ZV9EYXRhIHsKICAgICBjb25zdCBjaGFyKiB1cmk7CiAgICAgY29uc3Qg Y2hhciogdGl0bGU7CiAgICAgTG9hZGluZ1Jlc291cmNlc01hcCBsb2FkaW5nUmVzb3VyY2VzTWFw OworICAgIGJvb2wgaXNXaGVlbFpvb21FbmFibGVkOwogCiAgICAgX0V3a19WaWV3X1ByaXZhdGVf RGF0YSgpCiAgICAgICAgIDogdXJpKDApCiAgICAgICAgICwgdGl0bGUoMCkKKyAgICAgICAgLCBp c1doZWVsWm9vbUVuYWJsZWQodHJ1ZSkKICAgICB7IH0KIH07CiAKQEAgLTExMyw2ICsxMTUsMTEg QEAgc3RydWN0IF9Fd2tfVmlld19Qcml2YXRlX0RhdGEgewogICAgICAgICByZXR1cm4gX19WQV9B UkdTX187ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFwKICAgICB9CiAKK3N0YXRpYyBjb25zdCBkb3VibGUgem9vbU1pbmltdW0gPSAwLjM7CitzdGF0 aWMgY29uc3QgZG91YmxlIHpvb21NYXhpbXVtID0gNC4wOworc3RhdGljIGNvbnN0IGRvdWJsZSB6 b29tSW5SYXRpbyA9IDEuMjsKK3N0YXRpYyBjb25zdCBkb3VibGUgem9vbU91dFJhdGlvID0gMC44 OworCiBzdGF0aWMgdm9pZCBfZXdrX3ZpZXdfc21hcnRfY2hhbmdlZChFd2tfVmlld19TbWFydF9E YXRhKiBzbWFydERhdGEpCiB7CiAgICAgaWYgKHNtYXJ0RGF0YS0+Y2hhbmdlZC5hbnkpCkBAIC0x NDIsNiArMTQ5LDE1IEBAIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3NtYXJ0X21vdXNlX3do ZWVsKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgY29uCiB7CiAgICAgRVdLX1ZJRVdf UFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpCiAKKyAgICBpZiAocHJp di0+aXNXaGVlbFpvb21FbmFibGVkICYmIGV2YXNfa2V5X21vZGlmaWVyX2lzX3NldCh3aGVlbEV2 ZW50LT5tb2RpZmllcnMsICJDb250cm9sIikgJiYgIXdoZWVsRXZlbnQtPmRpcmVjdGlvbikgewor ICAgICAgICBkb3VibGUgY3VycmVudFBhZ2Vab29tRmFjdG9yID0gcHJpdi0+cGFnZUNsaWVudC0+ cGFnZSgpLT5wYWdlWm9vbUZhY3RvcigpOworICAgICAgICBpZiAod2hlZWxFdmVudC0+eiA8IDAg JiYgY3VycmVudFBhZ2Vab29tRmFjdG9yIDwgem9vbU1heGltdW0pCisgICAgICAgICAgICBwcml2 LT5wYWdlQ2xpZW50LT5wYWdlKCktPnNldFBhZ2Vab29tRmFjdG9yKGN1cnJlbnRQYWdlWm9vbUZh Y3RvciAqIHpvb21JblJhdGlvKTsKKyAgICAgICAgaWYgKHdoZWVsRXZlbnQtPnogPiAwICYmIGN1 cnJlbnRQYWdlWm9vbUZhY3RvciA+IHpvb21NaW5pbXVtKQorICAgICAgICAgICAgcHJpdi0+cGFn ZUNsaWVudC0+cGFnZSgpLT5zZXRQYWdlWm9vbUZhY3RvcihjdXJyZW50UGFnZVpvb21GYWN0b3Ig KiB6b29tT3V0UmF0aW8pOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKICAgICBFdmFz X1BvaW50IHBvc2l0aW9uID0ge3NtYXJ0RGF0YS0+dmlldy54LCBzbWFydERhdGEtPnZpZXcueX07 CiAgICAgcHJpdi0+cGFnZUNsaWVudC0+cGFnZSgpLT5oYW5kbGVXaGVlbEV2ZW50KE5hdGl2ZVdl YldoZWVsRXZlbnQod2hlZWxFdmVudCwgJnBvc2l0aW9uKSk7CiAgICAgcmV0dXJuIHRydWU7CkBA IC05MzcsMyArOTUzLDIxIEBAIFdlYlBhZ2VQcm94eSogZXdrX3ZpZXdfcGFnZV9nZXQoY29uc3Qg RXZhc19PYmplY3QqIGV3a1ZpZXcpCiAKICAgICByZXR1cm4gcHJpdi0+cGFnZUNsaWVudC0+cGFn ZSgpOwogfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfd2hlZWxfem9vbV9lbmFibGVkX3NldChFdmFz X09iamVjdCogZXdrVmlldywgRWluYV9Cb29sIGVuYWJsZWQpCit7CisgICAgRVdLX1ZJRVdfU0Rf R0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsKKyAgICBFV0tfVklFV19Q UklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CisKKyAgICBwcml2LT5p c1doZWVsWm9vbUVuYWJsZWQgPSBlbmFibGVkOworCisgICAgcmV0dXJuIHRydWU7Cit9CisKK0Vp bmFfQm9vbCBld2tfdmlld193aGVlbF96b29tX2VuYWJsZWRfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0 KiBld2tWaWV3KQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21h cnREYXRhLCBmYWxzZSk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0 YSwgcHJpdiwgZmFsc2UpOworCisgICAgcmV0dXJuIHByaXYtPmlzV2hlZWxab29tRW5hYmxlZDsK K30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCmluZGV4IDU4 NTUyZWM3ZDIwZTI0MTBkYjI2OWYwMDI4ZTc2MTI5ZDM3YjJjMDUuLmEwOWQ4ZmQyNjhiOTU4MzI3 Njg4NDgzNGM0NGY0NDA1ZjJkYjUzMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXcuaApAQCAtMzkzLDYgKzM5MywyNyBAQCBFQVBJIGZsb2F0IGV3a192aWV3 X2RldmljZV9waXhlbF9yYXRpb19nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOwogICovCiBFQVBJ IEVpbmFfQm9vbCBld2tfdmlld19kZXZpY2VfcGl4ZWxfcmF0aW9fc2V0KEV2YXNfT2JqZWN0ICpv LCBmbG9hdCByYXRpbyk7CiAKKy8qKgorICogU2V0cyB3aGV0aGVyIHRoZSBld2tfdmlldyBzdXBw b3J0cyB0aGUgd2hlZWwgem9vbSBvciBub3QuCisgKgorICogVGhlIGRlZmF1bHQgdmFsdWUgaXMg RUlOQV9UUlVFLgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIGVuYWJsZS9kaXNhYmxl IHRoZSB3aGVlbCB6b29tCisgKiBAcGFyYW0gZW5hYmxlZCBhIHN0YXRlIHRvIHNldAorICoKKyAq IEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3Mgb3IgQGMgRUlOQV9GQUxTRSBvbiBmYWls dXJlCisgKi8KK0VBUEkgRWluYV9Cb29sIGV3a192aWV3X3doZWVsX3pvb21fZW5hYmxlZF9zZXQo RXZhc19PYmplY3QgKm8sIEVpbmFfQm9vbCBlbmFibGVkKTsKKworLyoqCisgKiBRdWVyaWVzIGlm IHRoZSBld2tfdmlldyBzdXBwb3J0cyB0aGUgd2hlZWwgem9vbS4KKyAqCisgKiBAcGFyYW0gbyB2 aWV3IG9iamVjdCB0byBxdWVyeSBpZiB0aGUgd2hlZWwgem9vbSBpcyBlbmFibGVkCisgKgorICog QHJldHVybiBAYyBFSU5BX1RSVUUgaWYgdGhlIHdoZWVsIHpvb20gaXMgZW5hYmxlZCBvciBAYyBF SU5BX0ZBTFNFIG90aGVyd2lzZQorICovCitFQVBJIEVpbmFfQm9vbCBld2tfdmlld193aGVlbF96 b29tX2VuYWJsZWRfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvKTsKKwogI2lmZGVmIF9fY3BsdXNw bHVzCiB9CiAjZW5kaWYK