131148 2014-04-02 21:21:47 -0700 [EFL][WK2] Add API to get contents size of current web page. 2014-04-03 22:37:06 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enmi.lee enmi.lee bunhere cdumez commit-queue gyuyoung.kim gyuyoung.kim lucas.de.marchi sergio oldest_to_newest 996982 0 enmi.lee 2014-04-02 21:21:47 -0700 Application can want to get contents size of current web page without monitoring "contents,size,changed" signal, so I add API to get contents size directly. 996983 1 228462 enmi.lee 2014-04-02 21:26:59 -0700 Created attachment 228462 Patch 996984 2 228462 gyuyoung.kim 2014-04-02 21:33:18 -0700 Comment on attachment 228462 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228462&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:732 > + EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false); Isn't it better to check if ewkView is null ? > Source/WebKit2/UIProcess/API/efl/ewk_view.h:915 > +EAPI Eina_Bool ewk_view_contents_size_get(Evas_Object *o, Evas_Coord *width, Evas_Coord *height); Missing *const* for _get() 996985 3 228462 jinwoo7.song 2014-04-02 21:33:36 -0700 Comment on attachment 228462 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228462&action=review > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:1095 > + EXPECT_EQ(contentsHeight, environment->defaultHeight()); Can't we add more test case? For example, you may load a page with a absolute width and height content. 996987 4 228462 enmi.lee 2014-04-02 21:39:19 -0700 Comment on attachment 228462 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228462&action=review Thanks for review :) >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:732 >> + EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false); > > Isn't it better to check if ewkView is null ? EWK_VIEW_IMPL_GET_OR_RETURN checks if ewkView is null :) >> Source/WebKit2/UIProcess/API/efl/ewk_view.h:915 >> +EAPI Eina_Bool ewk_view_contents_size_get(Evas_Object *o, Evas_Coord *width, Evas_Coord *height); > > Missing *const* for _get() I will add. >> Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:1095 >> + EXPECT_EQ(contentsHeight, environment->defaultHeight()); > > Can't we add more test case? For example, you may load a page with a absolute width and height content. Yes, I can add more test cases. 996988 5 gyuyoung.kim 2014-04-02 21:45:18 -0700 (In reply to comment #4) > (From update of attachment 228462 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=228462&action=review > > Thanks for review :) > > >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:732 > >> + EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false); > > > > Isn't it better to check if ewkView is null ? I meant it would be good if EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false) is called first rather than below 727 if (width) 728 *width = 0; 729 if (height) 730 *height = 0; 996991 6 228462 enmi.lee 2014-04-02 21:59:51 -0700 Comment on attachment 228462 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228462&action=review >>>> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:732 >>>> + EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false); >>> >>> Isn't it better to check if ewkView is null ? >> >> EWK_VIEW_IMPL_GET_OR_RETURN checks if ewkView is null :) > > I meant it would be good if EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false) is called first rather than below > 727 if (width) > 728 *width = 0; > 729 if (height) > 730 *height = 0; I understand. You mean you want to clear width and height only we fail to get impl. right? I can change codes. 996992 7 gyuyoung.kim 2014-04-02 22:12:00 -0700 (In reply to comment #6) > (From update of attachment 228462 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=228462&action=review > > >>>> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:732 > >>>> + EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false); > >>> > >>> Isn't it better to check if ewkView is null ? > >> > >> EWK_VIEW_IMPL_GET_OR_RETURN checks if ewkView is null :) > > > > I meant it would be good if EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false) is called first rather than below > > 727 if (width) > > 728 *width = 0; > > 729 if (height) > > 730 *height = 0; > > I understand. > > You mean you want to clear width and height only we fail to get impl. right? > I can change codes. Exactly ! 997003 8 228466 enmi.lee 2014-04-02 22:39:55 -0700 Created attachment 228466 Patch 997007 9 228466 gyuyoung.kim 2014-04-02 22:57:20 -0700 Comment on attachment 228466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228466&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:731 > + *width = 0; If ewkView is null, I think we don't need to initialize width and height with 0. Has ewk_view_contents_size_get() a role to initialize width and height regardless of ewkView ? 997011 10 228466 enmi.lee 2014-04-02 23:03:01 -0700 Comment on attachment 228466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228466&action=review >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:731 >> + *width = 0; > > If ewkView is null, I think we don't need to initialize width and height with 0. Has ewk_view_contents_size_get() a role to initialize width and height regardless of ewkView ? Ah, actually it is efl style. efl's functions to get value from pointer initialize value to 0. :) 997012 11 228466 enmi.lee 2014-04-02 23:04:46 -0700 Comment on attachment 228466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228466&action=review >>> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:731 >>> + *width = 0; >> >> If ewkView is null, I think we don't need to initialize width and height with 0. Has ewk_view_contents_size_get() a role to initialize width and height regardless of ewkView ? > > Ah, actually it is efl style. > > efl's functions to get value from pointer initialize value to 0. :) That is convenient to API user. 997013 12 gyuyoung.kim 2014-04-02 23:05:14 -0700 (In reply to comment #10) > (From update of attachment 228466 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=228466&action=review > > >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:731 > >> + *width = 0; > > > > If ewkView is null, I think we don't need to initialize width and height with 0. Has ewk_view_contents_size_get() a role to initialize width and height regardless of ewkView ? > > Ah, actually it is efl style. > > efl's functions to get value from pointer initialize value to 0. :) Even when ewkView is null ? 997029 13 228466 jinwoo7.song 2014-04-02 23:42:50 -0700 Comment on attachment 228466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228466&action=review > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:1093 > + EXPECT_EQ(contentsWidth, environment->defaultWidth()); First parameter should be a expected result and second should be an actual result. > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:1100 > + EXPECT_EQ(contentsWidth, environment->defaultWidth() / 2); Is this right operation that content size is changed only we changed the device pixel ration? 997047 14 228466 enmi.lee 2014-04-03 00:13:25 -0700 Comment on attachment 228466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228466&action=review >>>>> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:731 >>>>> + *width = 0; >>>> >>>> If ewkView is null, I think we don't need to initialize width and height with 0. Has ewk_view_contents_size_get() a role to initialize width and height regardless of ewkView ? >>> >>> Ah, actually it is efl style. >>> >>> efl's functions to get value from pointer initialize value to 0. :) >> >> That is convenient to API user. > > Even when ewkView is null ? Yes, right. for example, evas_object_geometry_get() API does. >> Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:1093 >> + EXPECT_EQ(contentsWidth, environment->defaultWidth()); > > First parameter should be a expected result and second should be an actual result. ok, I will change. >> Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:1100 >> + EXPECT_EQ(contentsWidth, environment->defaultWidth() / 2); > > Is this right operation that content size is changed only we changed the device pixel ration? yes, if device pixel ratio is changed, view size is changed by dividing by ratio. So, contents layouts for the changed view size. of course, it is not affect to the fixed size web contents. 997048 15 228478 enmi.lee 2014-04-03 00:20:16 -0700 Created attachment 228478 Patch 997051 16 gyuyoung.kim 2014-04-03 00:26:05 -0700 (In reply to comment #14) > (From update of attachment 228466 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=228466&action=review > > >>>>> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:731 > >>>>> + *width = 0; > >>>> > >>>> If ewkView is null, I think we don't need to initialize width and height with 0. Has ewk_view_contents_size_get() a role to initialize width and height regardless of ewkView ? > >>> > >>> Ah, actually it is efl style. > >>> > >>> efl's functions to get value from pointer initialize value to 0. :) > >> > >> That is convenient to API user. > > > > Even when ewkView is null ? > > Yes, right. for example, evas_object_geometry_get() API does. If so, we need to add this initialization to API description as well. 997054 17 228466 enmi.lee 2014-04-03 00:27:45 -0700 Comment on attachment 228466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228466&action=review >>>>>>> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:731 >>>>>>> + *width = 0; >>>>>> >>>>>> If ewkView is null, I think we don't need to initialize width and height with 0. Has ewk_view_contents_size_get() a role to initialize width and height regardless of ewkView ? >>>>> >>>>> Ah, actually it is efl style. >>>>> >>>>> efl's functions to get value from pointer initialize value to 0. :) >>>> >>>> That is convenient to API user. >>> >>> Even when ewkView is null ? >> >> Yes, right. for example, evas_object_geometry_get() API does. > > If so, we need to add this initialization to API description as well. OK, I will add that to the description. 997061 18 228481 enmi.lee 2014-04-03 00:39:59 -0700 Created attachment 228481 Patch 997451 19 228481 gyuyoung.kim 2014-04-03 20:13:00 -0700 Comment on attachment 228481 Patch LGTM, but someone else might wanna have final look before landing. 997453 20 228481 jinwoo7.song 2014-04-03 20:38:07 -0700 Comment on attachment 228481 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228481&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.h:909 > + * If process to get size fails, values of width and height will be set to 0. I would suggest to rewrite the description like this. If it fails to get the content size, the width and height will be set to 0. 997465 21 enmi.lee 2014-04-03 22:05:28 -0700 (In reply to comment #20) > (From update of attachment 228481 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=228481&action=review > > > Source/WebKit2/UIProcess/API/efl/ewk_view.h:909 > > + * If process to get size fails, values of width and height will be set to 0. > > I would suggest to rewrite the description like this. > If it fails to get the content size, the width and height will be set to 0. Thanks, I will modify like that. 997466 22 enmi.lee 2014-04-03 22:06:01 -0700 Committed r166766: <http://trac.webkit.org/changeset/166766> 228462 2014-04-02 21:26:59 -0700 2014-04-02 22:39:44 -0700 Patch bug-131148-20140403132640.patch text/plain 5296 enmi.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzQ4ZmRlNTdiODY2Yjkz MjRiZTEyMmU3NjI5M2U1ZmJiMTMxMzhjNi4uM2YyZjM5MDE5YjUyNzBiMDZhOGZjMjZiN2Q2ZTBm MTRiNGJlZmI5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA0LTAyICBFdW5t aSBMZWUgIDxldW5taTE1LmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFk ZCBBUEkgdG8gZ2V0IGNvbnRlbnRzIHNpemUgb2YgY3VycmVudCB3ZWIgcGFnZS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTE0OAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFwcGxpY2F0aW9uIGNhbiB3 YW50IHRvIGdldCBjb250ZW50cyBzaXplIG9mIGN1cnJlbnQgd2ViIHBhZ2Ugd2l0aG91dAorICAg ICAgICBtb25pdG9yaW5nICJjb250ZW50cyxzaXplLGNoYW5nZWQiIHNpZ25hbCwgc28gSSBhZGQg QVBJIHRvIGdldCBjb250ZW50cworICAgICAgICBzaXplIGRpcmVjdGx5LgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmNwcDoKKyAgICAgICAg KFdLVmlld0dldENvbnRlbnRzU2l6ZSk6IFdLIEFQSSB0byBnZXQgY29udGVudHMgc2l6ZSBmcm9t IFdlYlZpZXcuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv V0tWaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwOgorICAg ICAgICAoZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9nZXQpOiBuZXcgQVBJIHRvIGdldCBjb250ZW50 cyBzaXplLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3Lmg6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwOgorICAgICAgICAo VEVTVF9GKToKKwogMjAxNC0wMy0zMCAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAK ICAgICAgICAgW0NvY29hXSBBZGQgYW4gb3JpZ2luYXRpbmdXZWJWaWV3IHByb3BlcnR5IHRvIF9X S0Rvd25sb2FkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvQ29v cmRpbmF0ZWRHcmFwaGljcy9XS1ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmNwcAppbmRleCBiMzI0ZDI2ODJmN2M0NDg0 MzYzNDAxYzFkM2ZlYTEwY2I5MTU2OTJhLi45YTIxMTA0Zjg5YjhhYjJjM2ViNDI5OGM1OTUyOGZl ZGNmMjNjNjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvQ29v cmRpbmF0ZWRHcmFwaGljcy9XS1ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQy9Db29yZGluYXRlZEdyYXBoaWNzL1dLVmlldy5jcHAKQEAgLTE5NSw0ICsxOTUsMTAg QEAgdm9pZCBXS1ZpZXdGaW5kWm9vbWFibGVBcmVhRm9yUmVjdChXS1ZpZXdSZWYgdmlld1JlZiwg V0tSZWN0IHdrUmVjdCkKICAgICB0b0ltcGwodmlld1JlZiktPmZpbmRab29tYWJsZUFyZWFGb3JQ b2ludChyZWN0LmNlbnRlcigpLCByZWN0LnNpemUoKSk7CiB9CiAKK1dLU2l6ZSBXS1ZpZXdHZXRD b250ZW50c1NpemUoV0tWaWV3UmVmIHZpZXdSZWYpCit7CisgICAgY29uc3QgV2ViQ29yZTo6SW50 U2l6ZSYgc2l6ZSA9IHRvSW1wbCh2aWV3UmVmKS0+Y29udGVudHNTaXplKCk7CisgICAgcmV0dXJu IFdLU2l6ZU1ha2Uoc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKTsKK30KKwogI2VuZGlmIC8v IFVTRShDT09SRElOQVRFRF9HUkFQSElDUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9Db29yZGluYXRlZEdyYXBoaWNzL1dLVmlldy5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmgKaW5kZXggM2M1 MTliMjk3NzdmZWIxNjM3OTUzYmNmZmQxMzg0OGVkNGIzZGVmYy4uYjhlOTZiZTEzYWNkNWM2MzUw OTFjNWRiODJlZjMwNDg4MjM2NjQyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmgKQEAgLTExMyw2 ICsxMTMsOCBAQCBXS19FWFBPUlQgZG91YmxlIFdLVmlld09wYWNpdHkoV0tWaWV3UmVmIHZpZXcp OwogCiBXS19FWFBPUlQgdm9pZCBXS1ZpZXdGaW5kWm9vbWFibGVBcmVhRm9yUmVjdChXS1ZpZXdS ZWYsIFdLUmVjdCk7CiAKK1dLX0VYUE9SVCBXS1NpemUgV0tWaWV3R2V0Q29udGVudHNTaXplKFdL Vmlld1JlZik7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggMWJjNDFmY2RhOTA1ZTY4 NTU1ZjA1MDgxN2IxMmQ5ZjVlYTcyMjNiYS4uOTZjNzk1NDEzOWJlZWRlMTIxODQxNmQ2Mjg4MjM3 MzFhOGI2M2RlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcApAQCAtNzIxLDMgKzcyMSwyMSBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfbGF5b3V0X2Zp eGVkX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldykKIAogICAgIHJldHVybiBXS1BhZ2VV c2VGaXhlZExheW91dChXS1ZpZXdHZXRQYWdlKGltcGwtPndrVmlldygpKSk7CiB9CisKK0VpbmFf Qm9vbCBld2tfdmlld19jb250ZW50c19zaXplX2dldChFdmFzX09iamVjdCogZXdrVmlldywgRXZh c19Db29yZCogd2lkdGgsIEV2YXNfQ29vcmQqIGhlaWdodCkKK3sKKyAgICBpZiAod2lkdGgpCisg ICAgICAgICp3aWR0aCA9IDA7CisgICAgaWYgKGhlaWdodCkKKyAgICAgICAgKmhlaWdodCA9IDA7 CisKKyAgICBFV0tfVklFV19JTVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFsc2Up OworCisgICAgV0tTaXplIGNvbnRlbnRzU2l6ZSA9IFdLVmlld0dldENvbnRlbnRzU2l6ZShpbXBs LT53a1ZpZXcoKSk7CisgICAgaWYgKHdpZHRoKQorICAgICAgICAqd2lkdGggPSBjb250ZW50c1Np emUud2lkdGg7CisgICAgaWYgKGhlaWdodCkKKyAgICAgICAgKmhlaWdodCA9IGNvbnRlbnRzU2l6 ZS5oZWlnaHQ7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfdmlldy5oCmluZGV4IDA1NmM5YjA5NTEzZTE2NGM3NjFiNDgxMDdmZjA5 Y2M4MDdhN2U0YzIuLmQwZmNkMWFiMWI3MTIwZDljZjU5M2I2NjMxOWE1ZmE1YjliY2QxYzggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaApAQCAtOTAzLDYg KzkwMywxNyBAQCBFQVBJIEVpbmFfQm9vbCBld2tfdmlld19sYXlvdXRfZml4ZWRfc2V0KEV2YXNf T2JqZWN0ICpvLCBFaW5hX0Jvb2wgZW5hYmxlZCk7CiAgKi8KIEVBUEkgRWluYV9Cb29sIGV3a192 aWV3X2xheW91dF9maXhlZF9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOwogCisvKioKKyAqIEdl dCBjb250ZW50cyBzaXplIG9mIGN1cnJlbnQgd2ViIHBhZ2UuCisgKgorICogQHBhcmFtIG8gdmll dyBvYmplY3QgdG8gZ2V0IGNvbnRlbnRzIHNpemUKKyAqIEBwYXJhbSB3aWR0aCBwb2ludGVyIHRv IGFuIGludGVnZXIgaW4gd2hpY2ggdG8gc3RvcmUgdGhlIHdpZHRoIG9mIGNvbnRlbnRzLgorICog QHBhcmFtIGhlaWdodCBwb2ludGVyIHRvIGFuIGludGVnZXIgaW4gd2hpY2ggdG8gc3RvcmUgdGhl IGhlaWdodCBvZiBjb250ZW50cy4KKyAqCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNj ZXNzIG9yIEBjIEVJTkFfRkFMU0Ugb3RoZXJ3aXNlCisgKi8KK0VBUEkgRWluYV9Cb29sIGV3a192 aWV3X2NvbnRlbnRzX3NpemVfZ2V0KEV2YXNfT2JqZWN0ICpvLCBFdmFzX0Nvb3JkICp3aWR0aCwg RXZhc19Db29yZCAqaGVpZ2h0KTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdr Ml92aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3Rf ZXdrMl92aWV3LmNwcAppbmRleCAyZGM1NjViZWM4MGYyZjc0MjY3YmZlOGU1Mzc0YzMwNTE1NmU1 MWU2Li5mODY0NjZiODY2M2ViODg5YjJiYzY4YzE2OGNlNWJhNThmMjBiNDJlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2sy X3ZpZXcuY3BwCkBAIC0xMDgzLDMgKzEwODMsMTQgQEAgVEVTVF9GKEVXSzJWaWV3VGVzdCwgZXdr X3ZpZXdfbGF5b3V0X2ZpeGVkKQogICAgIEVYUEVDVF9UUlVFKGV3a192aWV3X2xheW91dF9maXhl ZF9zZXQod2ViVmlldygpLCB0cnVlKSk7CiAgICAgRVhQRUNUX1RSVUUoZXdrX3ZpZXdfbGF5b3V0 X2ZpeGVkX2dldCh3ZWJWaWV3KCkpKTsKIH0KKworVEVTVF9GKEVXSzJWaWV3VGVzdCwgZXdrX3Zp ZXdfY29udGVudHNfc2l6ZV9nZXQpCit7CisgICAgQVNTRVJUX1RSVUUobG9hZFVybFN5bmMoZW52 aXJvbm1lbnQtPmRlZmF1bHRUZXN0UGFnZVVybCgpKSk7CisKKyAgICBpbnQgY29udGVudHNXaWR0 aCwgY29udGVudHNIZWlnaHQ7CisgICAgZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9nZXQod2ViVmll dygpLCAmY29udGVudHNXaWR0aCwgJmNvbnRlbnRzSGVpZ2h0KTsKKworICAgIEVYUEVDVF9FUShj b250ZW50c1dpZHRoLCBlbnZpcm9ubWVudC0+ZGVmYXVsdFdpZHRoKCkpOworICAgIEVYUEVDVF9F UShjb250ZW50c0hlaWdodCwgZW52aXJvbm1lbnQtPmRlZmF1bHRIZWlnaHQoKSk7Cit9Cg== 228466 2014-04-02 22:39:55 -0700 2014-04-03 00:27:45 -0700 Patch bug-131148-20140403143935.patch text/plain 6178 enmi.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzQ4ZmRlNTdiODY2Yjkz MjRiZTEyMmU3NjI5M2U1ZmJiMTMxMzhjNi4uM2YyZjM5MDE5YjUyNzBiMDZhOGZjMjZiN2Q2ZTBm MTRiNGJlZmI5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA0LTAyICBFdW5t aSBMZWUgIDxldW5taTE1LmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFk ZCBBUEkgdG8gZ2V0IGNvbnRlbnRzIHNpemUgb2YgY3VycmVudCB3ZWIgcGFnZS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTE0OAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFwcGxpY2F0aW9uIGNhbiB3 YW50IHRvIGdldCBjb250ZW50cyBzaXplIG9mIGN1cnJlbnQgd2ViIHBhZ2Ugd2l0aG91dAorICAg ICAgICBtb25pdG9yaW5nICJjb250ZW50cyxzaXplLGNoYW5nZWQiIHNpZ25hbCwgc28gSSBhZGQg QVBJIHRvIGdldCBjb250ZW50cworICAgICAgICBzaXplIGRpcmVjdGx5LgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmNwcDoKKyAgICAgICAg KFdLVmlld0dldENvbnRlbnRzU2l6ZSk6IFdLIEFQSSB0byBnZXQgY29udGVudHMgc2l6ZSBmcm9t IFdlYlZpZXcuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv V0tWaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwOgorICAg ICAgICAoZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9nZXQpOiBuZXcgQVBJIHRvIGdldCBjb250ZW50 cyBzaXplLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3Lmg6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwOgorICAgICAgICAo VEVTVF9GKToKKwogMjAxNC0wMy0zMCAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAK ICAgICAgICAgW0NvY29hXSBBZGQgYW4gb3JpZ2luYXRpbmdXZWJWaWV3IHByb3BlcnR5IHRvIF9X S0Rvd25sb2FkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvQ29v cmRpbmF0ZWRHcmFwaGljcy9XS1ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmNwcAppbmRleCBiMzI0ZDI2ODJmN2M0NDg0 MzYzNDAxYzFkM2ZlYTEwY2I5MTU2OTJhLi45YTIxMTA0Zjg5YjhhYjJjM2ViNDI5OGM1OTUyOGZl ZGNmMjNjNjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvQ29v cmRpbmF0ZWRHcmFwaGljcy9XS1ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQy9Db29yZGluYXRlZEdyYXBoaWNzL1dLVmlldy5jcHAKQEAgLTE5NSw0ICsxOTUsMTAg QEAgdm9pZCBXS1ZpZXdGaW5kWm9vbWFibGVBcmVhRm9yUmVjdChXS1ZpZXdSZWYgdmlld1JlZiwg V0tSZWN0IHdrUmVjdCkKICAgICB0b0ltcGwodmlld1JlZiktPmZpbmRab29tYWJsZUFyZWFGb3JQ b2ludChyZWN0LmNlbnRlcigpLCByZWN0LnNpemUoKSk7CiB9CiAKK1dLU2l6ZSBXS1ZpZXdHZXRD b250ZW50c1NpemUoV0tWaWV3UmVmIHZpZXdSZWYpCit7CisgICAgY29uc3QgV2ViQ29yZTo6SW50 U2l6ZSYgc2l6ZSA9IHRvSW1wbCh2aWV3UmVmKS0+Y29udGVudHNTaXplKCk7CisgICAgcmV0dXJu IFdLU2l6ZU1ha2Uoc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKTsKK30KKwogI2VuZGlmIC8v IFVTRShDT09SRElOQVRFRF9HUkFQSElDUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9Db29yZGluYXRlZEdyYXBoaWNzL1dLVmlldy5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmgKaW5kZXggM2M1 MTliMjk3NzdmZWIxNjM3OTUzYmNmZmQxMzg0OGVkNGIzZGVmYy4uYjhlOTZiZTEzYWNkNWM2MzUw OTFjNWRiODJlZjMwNDg4MjM2NjQyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmgKQEAgLTExMyw2 ICsxMTMsOCBAQCBXS19FWFBPUlQgZG91YmxlIFdLVmlld09wYWNpdHkoV0tWaWV3UmVmIHZpZXcp OwogCiBXS19FWFBPUlQgdm9pZCBXS1ZpZXdGaW5kWm9vbWFibGVBcmVhRm9yUmVjdChXS1ZpZXdS ZWYsIFdLUmVjdCk7CiAKK1dLX0VYUE9SVCBXS1NpemUgV0tWaWV3R2V0Q29udGVudHNTaXplKFdL Vmlld1JlZik7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggMWJjNDFmY2RhOTA1ZTY4 NTU1ZjA1MDgxN2IxMmQ5ZjVlYTcyMjNiYS4uZjQ4ZmY1NDg4NDc5OGEzM2IxZGUzZTg3ODk5MGZk YmE0MWI5NWUwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcApAQCAtNzIxLDMgKzcyMSwyNSBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfbGF5b3V0X2Zp eGVkX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldykKIAogICAgIHJldHVybiBXS1BhZ2VV c2VGaXhlZExheW91dChXS1ZpZXdHZXRQYWdlKGltcGwtPndrVmlldygpKSk7CiB9CisKK0VpbmFf Qm9vbCBld2tfdmlld19jb250ZW50c19zaXplX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmll dywgRXZhc19Db29yZCogd2lkdGgsIEV2YXNfQ29vcmQqIGhlaWdodCkKK3sKKyAgICBFd2tWaWV3 KiBpbXBsID0gdG9Fd2tWaWV3Q2hlY2tlZChld2tWaWV3KTsKKyAgICBpZiAoRUlOQV9VTkxJS0VM WSghaW1wbCkpIHsKKyAgICAgICAgRUlOQV9MT0dfQ1JJVCgibm8gcHJpdmF0ZSBkYXRhIGZvciBv YmplY3QgJXAiLCBld2tWaWV3KTsKKyAgICAgICAgaWYgKHdpZHRoKQorICAgICAgICAgICAgKndp ZHRoID0gMDsKKyAgICAgICAgaWYgKGhlaWdodCkKKyAgICAgICAgICAgICpoZWlnaHQgPSAwOwor CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBXS1NpemUgY29udGVudHNTaXpl ID0gV0tWaWV3R2V0Q29udGVudHNTaXplKGltcGwtPndrVmlldygpKTsKKyAgICBpZiAod2lkdGgp CisgICAgICAgICp3aWR0aCA9IGNvbnRlbnRzU2l6ZS53aWR0aDsKKyAgICBpZiAoaGVpZ2h0KQor ICAgICAgICAqaGVpZ2h0ID0gY29udGVudHNTaXplLmhlaWdodDsKKworICAgIHJldHVybiB0cnVl OworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKaW5kZXgg MDU2YzliMDk1MTNlMTY0Yzc2MWI0ODEwN2ZmMDljYzgwN2E3ZTRjMi4uNDZiNTFmZDViY2FhNzBm Y2Q2NzIzOWFkY2U0NGJjZmVlNDM5ZWQ5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5oCkBAIC05MDMsNiArOTAzLDE3IEBAIEVBUEkgRWluYV9Cb29sIGV3 a192aWV3X2xheW91dF9maXhlZF9zZXQoRXZhc19PYmplY3QgKm8sIEVpbmFfQm9vbCBlbmFibGVk KTsKICAqLwogRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfbGF5b3V0X2ZpeGVkX2dldChjb25zdCBF dmFzX09iamVjdCAqbyk7CiAKKy8qKgorICogR2V0IGNvbnRlbnRzIHNpemUgb2YgY3VycmVudCB3 ZWIgcGFnZS4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBnZXQgY29udGVudHMgc2l6 ZQorICogQHBhcmFtIHdpZHRoIHBvaW50ZXIgdG8gYW4gaW50ZWdlciBpbiB3aGljaCB0byBzdG9y ZSB0aGUgd2lkdGggb2YgY29udGVudHMuCisgKiBAcGFyYW0gaGVpZ2h0IHBvaW50ZXIgdG8gYW4g aW50ZWdlciBpbiB3aGljaCB0byBzdG9yZSB0aGUgaGVpZ2h0IG9mIGNvbnRlbnRzLgorICoKKyAq IEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3Mgb3IgQGMgRUlOQV9GQUxTRSBvdGhlcndp c2UKKyAqLworRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9nZXQoY29uc3Qg RXZhc19PYmplY3QgKm8sIEV2YXNfQ29vcmQgKndpZHRoLCBFdmFzX0Nvb3JkICpoZWlnaHQpOwor CiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCmluZGV4IDJk YzU2NWJlYzgwZjJmNzQyNjdiZmU4ZTUzNzRjMzA1MTU2ZTUxZTYuLmFhMWFhMmRhMjYwOWZmMTIy ZGY0Nzg3MTNmZWRjNmQyNjAxMDkzYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKQEAgLTEwODMsMyAr MTA4MywzMCBAQCBURVNUX0YoRVdLMlZpZXdUZXN0LCBld2tfdmlld19sYXlvdXRfZml4ZWQpCiAg ICAgRVhQRUNUX1RSVUUoZXdrX3ZpZXdfbGF5b3V0X2ZpeGVkX3NldCh3ZWJWaWV3KCksIHRydWUp KTsKICAgICBFWFBFQ1RfVFJVRShld2tfdmlld19sYXlvdXRfZml4ZWRfZ2V0KHdlYlZpZXcoKSkp OwogfQorCitURVNUX0YoRVdLMlZpZXdUZXN0LCBld2tfdmlld19jb250ZW50c19zaXplX2dldCkK K3sKKyAgICBBU1NFUlRfVFJVRShsb2FkVXJsU3luYyhlbnZpcm9ubWVudC0+ZGVmYXVsdFRlc3RQ YWdlVXJsKCkpKTsKKyAgICBpbnQgY29udGVudHNXaWR0aCwgY29udGVudHNIZWlnaHQ7CisgICAg ZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9nZXQod2ViVmlldygpLCAmY29udGVudHNXaWR0aCwgJmNv bnRlbnRzSGVpZ2h0KTsKKworICAgIEVYUEVDVF9FUShjb250ZW50c1dpZHRoLCBlbnZpcm9ubWVu dC0+ZGVmYXVsdFdpZHRoKCkpOworICAgIEVYUEVDVF9FUShjb250ZW50c0hlaWdodCwgZW52aXJv bm1lbnQtPmRlZmF1bHRIZWlnaHQoKSk7CisKKyAgICBld2tfdmlld19kZXZpY2VfcGl4ZWxfcmF0 aW9fc2V0KHdlYlZpZXcoKSwgMik7CisgICAgQVNTRVJUX1RSVUUobG9hZFVybFN5bmMoZW52aXJv bm1lbnQtPmRlZmF1bHRUZXN0UGFnZVVybCgpKSk7CisgICAgZXdrX3ZpZXdfY29udGVudHNfc2l6 ZV9nZXQod2ViVmlldygpLCAmY29udGVudHNXaWR0aCwgJmNvbnRlbnRzSGVpZ2h0KTsKKworICAg IEVYUEVDVF9FUShjb250ZW50c1dpZHRoLCBlbnZpcm9ubWVudC0+ZGVmYXVsdFdpZHRoKCkgLyAy KTsKKyAgICBFWFBFQ1RfRVEoY29udGVudHNIZWlnaHQsIGVudmlyb25tZW50LT5kZWZhdWx0SGVp Z2h0KCkgLyAyKTsKKworICAgIGNvbnN0IGNoYXIgZml4ZWRDb250ZW50c1NpemVbXSA9CisgICAg ICAgICI8IURPQ1RZUEUgaHRtbD4iCisgICAgICAgICI8Ym9keSBzdHlsZT1cIm1hcmdpbjowcHg7 d2lkdGg6MjAwMHB4O2hlaWdodDozMDAwcHhcIj48L2JvZHk+IjsKKyAgICBld2tfdmlld19odG1s X3N0cmluZ19sb2FkKHdlYlZpZXcoKSwgZml4ZWRDb250ZW50c1NpemUsIDAsIDApOworICAgIEFT U0VSVF9UUlVFKHdhaXRVbnRpbExvYWRGaW5pc2hlZCgpKTsKKyAgICBld2tfdmlld19jb250ZW50 c19zaXplX2dldCh3ZWJWaWV3KCksICZjb250ZW50c1dpZHRoLCAmY29udGVudHNIZWlnaHQpOwor CisgICAgRVhQRUNUX0VRKGNvbnRlbnRzV2lkdGgsIDIwMDApOworICAgIEVYUEVDVF9FUShjb250 ZW50c0hlaWdodCwgMzAwMCk7Cit9Cg== 228478 2014-04-03 00:20:16 -0700 2014-04-03 00:39:48 -0700 Patch bug-131148-20140403161957.patch text/plain 6178 enmi.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzQ4ZmRlNTdiODY2Yjkz MjRiZTEyMmU3NjI5M2U1ZmJiMTMxMzhjNi4uM2YyZjM5MDE5YjUyNzBiMDZhOGZjMjZiN2Q2ZTBm MTRiNGJlZmI5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA0LTAyICBFdW5t aSBMZWUgIDxldW5taTE1LmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFk ZCBBUEkgdG8gZ2V0IGNvbnRlbnRzIHNpemUgb2YgY3VycmVudCB3ZWIgcGFnZS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTE0OAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFwcGxpY2F0aW9uIGNhbiB3 YW50IHRvIGdldCBjb250ZW50cyBzaXplIG9mIGN1cnJlbnQgd2ViIHBhZ2Ugd2l0aG91dAorICAg ICAgICBtb25pdG9yaW5nICJjb250ZW50cyxzaXplLGNoYW5nZWQiIHNpZ25hbCwgc28gSSBhZGQg QVBJIHRvIGdldCBjb250ZW50cworICAgICAgICBzaXplIGRpcmVjdGx5LgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmNwcDoKKyAgICAgICAg KFdLVmlld0dldENvbnRlbnRzU2l6ZSk6IFdLIEFQSSB0byBnZXQgY29udGVudHMgc2l6ZSBmcm9t IFdlYlZpZXcuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv V0tWaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwOgorICAg ICAgICAoZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9nZXQpOiBuZXcgQVBJIHRvIGdldCBjb250ZW50 cyBzaXplLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3Lmg6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwOgorICAgICAgICAo VEVTVF9GKToKKwogMjAxNC0wMy0zMCAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAK ICAgICAgICAgW0NvY29hXSBBZGQgYW4gb3JpZ2luYXRpbmdXZWJWaWV3IHByb3BlcnR5IHRvIF9X S0Rvd25sb2FkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvQ29v cmRpbmF0ZWRHcmFwaGljcy9XS1ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmNwcAppbmRleCBiMzI0ZDI2ODJmN2M0NDg0 MzYzNDAxYzFkM2ZlYTEwY2I5MTU2OTJhLi45YTIxMTA0Zjg5YjhhYjJjM2ViNDI5OGM1OTUyOGZl ZGNmMjNjNjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvQ29v cmRpbmF0ZWRHcmFwaGljcy9XS1ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQy9Db29yZGluYXRlZEdyYXBoaWNzL1dLVmlldy5jcHAKQEAgLTE5NSw0ICsxOTUsMTAg QEAgdm9pZCBXS1ZpZXdGaW5kWm9vbWFibGVBcmVhRm9yUmVjdChXS1ZpZXdSZWYgdmlld1JlZiwg V0tSZWN0IHdrUmVjdCkKICAgICB0b0ltcGwodmlld1JlZiktPmZpbmRab29tYWJsZUFyZWFGb3JQ b2ludChyZWN0LmNlbnRlcigpLCByZWN0LnNpemUoKSk7CiB9CiAKK1dLU2l6ZSBXS1ZpZXdHZXRD b250ZW50c1NpemUoV0tWaWV3UmVmIHZpZXdSZWYpCit7CisgICAgY29uc3QgV2ViQ29yZTo6SW50 U2l6ZSYgc2l6ZSA9IHRvSW1wbCh2aWV3UmVmKS0+Y29udGVudHNTaXplKCk7CisgICAgcmV0dXJu IFdLU2l6ZU1ha2Uoc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKTsKK30KKwogI2VuZGlmIC8v IFVTRShDT09SRElOQVRFRF9HUkFQSElDUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9Db29yZGluYXRlZEdyYXBoaWNzL1dLVmlldy5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmgKaW5kZXggM2M1 MTliMjk3NzdmZWIxNjM3OTUzYmNmZmQxMzg0OGVkNGIzZGVmYy4uYjhlOTZiZTEzYWNkNWM2MzUw OTFjNWRiODJlZjMwNDg4MjM2NjQyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmgKQEAgLTExMyw2 ICsxMTMsOCBAQCBXS19FWFBPUlQgZG91YmxlIFdLVmlld09wYWNpdHkoV0tWaWV3UmVmIHZpZXcp OwogCiBXS19FWFBPUlQgdm9pZCBXS1ZpZXdGaW5kWm9vbWFibGVBcmVhRm9yUmVjdChXS1ZpZXdS ZWYsIFdLUmVjdCk7CiAKK1dLX0VYUE9SVCBXS1NpemUgV0tWaWV3R2V0Q29udGVudHNTaXplKFdL Vmlld1JlZik7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggMWJjNDFmY2RhOTA1ZTY4 NTU1ZjA1MDgxN2IxMmQ5ZjVlYTcyMjNiYS4uZjQ4ZmY1NDg4NDc5OGEzM2IxZGUzZTg3ODk5MGZk YmE0MWI5NWUwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcApAQCAtNzIxLDMgKzcyMSwyNSBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfbGF5b3V0X2Zp eGVkX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldykKIAogICAgIHJldHVybiBXS1BhZ2VV c2VGaXhlZExheW91dChXS1ZpZXdHZXRQYWdlKGltcGwtPndrVmlldygpKSk7CiB9CisKK0VpbmFf Qm9vbCBld2tfdmlld19jb250ZW50c19zaXplX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmll dywgRXZhc19Db29yZCogd2lkdGgsIEV2YXNfQ29vcmQqIGhlaWdodCkKK3sKKyAgICBFd2tWaWV3 KiBpbXBsID0gdG9Fd2tWaWV3Q2hlY2tlZChld2tWaWV3KTsKKyAgICBpZiAoRUlOQV9VTkxJS0VM WSghaW1wbCkpIHsKKyAgICAgICAgRUlOQV9MT0dfQ1JJVCgibm8gcHJpdmF0ZSBkYXRhIGZvciBv YmplY3QgJXAiLCBld2tWaWV3KTsKKyAgICAgICAgaWYgKHdpZHRoKQorICAgICAgICAgICAgKndp ZHRoID0gMDsKKyAgICAgICAgaWYgKGhlaWdodCkKKyAgICAgICAgICAgICpoZWlnaHQgPSAwOwor CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBXS1NpemUgY29udGVudHNTaXpl ID0gV0tWaWV3R2V0Q29udGVudHNTaXplKGltcGwtPndrVmlldygpKTsKKyAgICBpZiAod2lkdGgp CisgICAgICAgICp3aWR0aCA9IGNvbnRlbnRzU2l6ZS53aWR0aDsKKyAgICBpZiAoaGVpZ2h0KQor ICAgICAgICAqaGVpZ2h0ID0gY29udGVudHNTaXplLmhlaWdodDsKKworICAgIHJldHVybiB0cnVl OworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKaW5kZXgg MDU2YzliMDk1MTNlMTY0Yzc2MWI0ODEwN2ZmMDljYzgwN2E3ZTRjMi4uNDZiNTFmZDViY2FhNzBm Y2Q2NzIzOWFkY2U0NGJjZmVlNDM5ZWQ5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5oCkBAIC05MDMsNiArOTAzLDE3IEBAIEVBUEkgRWluYV9Cb29sIGV3 a192aWV3X2xheW91dF9maXhlZF9zZXQoRXZhc19PYmplY3QgKm8sIEVpbmFfQm9vbCBlbmFibGVk KTsKICAqLwogRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfbGF5b3V0X2ZpeGVkX2dldChjb25zdCBF dmFzX09iamVjdCAqbyk7CiAKKy8qKgorICogR2V0IGNvbnRlbnRzIHNpemUgb2YgY3VycmVudCB3 ZWIgcGFnZS4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBnZXQgY29udGVudHMgc2l6 ZQorICogQHBhcmFtIHdpZHRoIHBvaW50ZXIgdG8gYW4gaW50ZWdlciBpbiB3aGljaCB0byBzdG9y ZSB0aGUgd2lkdGggb2YgY29udGVudHMuCisgKiBAcGFyYW0gaGVpZ2h0IHBvaW50ZXIgdG8gYW4g aW50ZWdlciBpbiB3aGljaCB0byBzdG9yZSB0aGUgaGVpZ2h0IG9mIGNvbnRlbnRzLgorICoKKyAq IEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3Mgb3IgQGMgRUlOQV9GQUxTRSBvdGhlcndp c2UKKyAqLworRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9nZXQoY29uc3Qg RXZhc19PYmplY3QgKm8sIEV2YXNfQ29vcmQgKndpZHRoLCBFdmFzX0Nvb3JkICpoZWlnaHQpOwor CiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCmluZGV4IDJk YzU2NWJlYzgwZjJmNzQyNjdiZmU4ZTUzNzRjMzA1MTU2ZTUxZTYuLmNlMTQ3ZWE3ZTZiOWI1OTUw ZjZiN2IyZGJjMmIwMzI3YmRlMzJmNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKQEAgLTEwODMsMyAr MTA4MywzMCBAQCBURVNUX0YoRVdLMlZpZXdUZXN0LCBld2tfdmlld19sYXlvdXRfZml4ZWQpCiAg ICAgRVhQRUNUX1RSVUUoZXdrX3ZpZXdfbGF5b3V0X2ZpeGVkX3NldCh3ZWJWaWV3KCksIHRydWUp KTsKICAgICBFWFBFQ1RfVFJVRShld2tfdmlld19sYXlvdXRfZml4ZWRfZ2V0KHdlYlZpZXcoKSkp OwogfQorCitURVNUX0YoRVdLMlZpZXdUZXN0LCBld2tfdmlld19jb250ZW50c19zaXplX2dldCkK K3sKKyAgICBBU1NFUlRfVFJVRShsb2FkVXJsU3luYyhlbnZpcm9ubWVudC0+ZGVmYXVsdFRlc3RQ YWdlVXJsKCkpKTsKKyAgICBpbnQgY29udGVudHNXaWR0aCwgY29udGVudHNIZWlnaHQ7CisgICAg ZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9nZXQod2ViVmlldygpLCAmY29udGVudHNXaWR0aCwgJmNv bnRlbnRzSGVpZ2h0KTsKKworICAgIEVYUEVDVF9FUShlbnZpcm9ubWVudC0+ZGVmYXVsdFdpZHRo KCksIGNvbnRlbnRzV2lkdGgpOworICAgIEVYUEVDVF9FUShlbnZpcm9ubWVudC0+ZGVmYXVsdEhl aWdodCgpLCBjb250ZW50c0hlaWdodCk7CisKKyAgICBld2tfdmlld19kZXZpY2VfcGl4ZWxfcmF0 aW9fc2V0KHdlYlZpZXcoKSwgMik7CisgICAgQVNTRVJUX1RSVUUobG9hZFVybFN5bmMoZW52aXJv bm1lbnQtPmRlZmF1bHRUZXN0UGFnZVVybCgpKSk7CisgICAgZXdrX3ZpZXdfY29udGVudHNfc2l6 ZV9nZXQod2ViVmlldygpLCAmY29udGVudHNXaWR0aCwgJmNvbnRlbnRzSGVpZ2h0KTsKKworICAg IEVYUEVDVF9FUShlbnZpcm9ubWVudC0+ZGVmYXVsdFdpZHRoKCkgLyAyLCBjb250ZW50c1dpZHRo KTsKKyAgICBFWFBFQ1RfRVEoZW52aXJvbm1lbnQtPmRlZmF1bHRIZWlnaHQoKSAvIDIsIGNvbnRl bnRzSGVpZ2h0KTsKKworICAgIGNvbnN0IGNoYXIgZml4ZWRDb250ZW50c1NpemVbXSA9CisgICAg ICAgICI8IURPQ1RZUEUgaHRtbD4iCisgICAgICAgICI8Ym9keSBzdHlsZT1cIm1hcmdpbjowcHg7 d2lkdGg6MjAwMHB4O2hlaWdodDozMDAwcHhcIj48L2JvZHk+IjsKKyAgICBld2tfdmlld19odG1s X3N0cmluZ19sb2FkKHdlYlZpZXcoKSwgZml4ZWRDb250ZW50c1NpemUsIDAsIDApOworICAgIEFT U0VSVF9UUlVFKHdhaXRVbnRpbExvYWRGaW5pc2hlZCgpKTsKKyAgICBld2tfdmlld19jb250ZW50 c19zaXplX2dldCh3ZWJWaWV3KCksICZjb250ZW50c1dpZHRoLCAmY29udGVudHNIZWlnaHQpOwor CisgICAgRVhQRUNUX0VRKDIwMDAsIGNvbnRlbnRzV2lkdGgpOworICAgIEVYUEVDVF9FUSgzMDAw LCBjb250ZW50c0hlaWdodCk7Cit9Cg== 228481 2014-04-03 00:39:59 -0700 2014-04-03 22:37:06 -0700 Patch bug-131148-20140403163940.patch text/plain 6403 enmi.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzQ4ZmRlNTdiODY2Yjkz MjRiZTEyMmU3NjI5M2U1ZmJiMTMxMzhjNi4uM2YyZjM5MDE5YjUyNzBiMDZhOGZjMjZiN2Q2ZTBm MTRiNGJlZmI5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA0LTAyICBFdW5t aSBMZWUgIDxldW5taTE1LmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFk ZCBBUEkgdG8gZ2V0IGNvbnRlbnRzIHNpemUgb2YgY3VycmVudCB3ZWIgcGFnZS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTE0OAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFwcGxpY2F0aW9uIGNhbiB3 YW50IHRvIGdldCBjb250ZW50cyBzaXplIG9mIGN1cnJlbnQgd2ViIHBhZ2Ugd2l0aG91dAorICAg ICAgICBtb25pdG9yaW5nICJjb250ZW50cyxzaXplLGNoYW5nZWQiIHNpZ25hbCwgc28gSSBhZGQg QVBJIHRvIGdldCBjb250ZW50cworICAgICAgICBzaXplIGRpcmVjdGx5LgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmNwcDoKKyAgICAgICAg KFdLVmlld0dldENvbnRlbnRzU2l6ZSk6IFdLIEFQSSB0byBnZXQgY29udGVudHMgc2l6ZSBmcm9t IFdlYlZpZXcuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv V0tWaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwOgorICAg ICAgICAoZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9nZXQpOiBuZXcgQVBJIHRvIGdldCBjb250ZW50 cyBzaXplLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3Lmg6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwOgorICAgICAgICAo VEVTVF9GKToKKwogMjAxNC0wMy0zMCAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAK ICAgICAgICAgW0NvY29hXSBBZGQgYW4gb3JpZ2luYXRpbmdXZWJWaWV3IHByb3BlcnR5IHRvIF9X S0Rvd25sb2FkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvQ29v cmRpbmF0ZWRHcmFwaGljcy9XS1ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmNwcAppbmRleCBiMzI0ZDI2ODJmN2M0NDg0 MzYzNDAxYzFkM2ZlYTEwY2I5MTU2OTJhLi45YTIxMTA0Zjg5YjhhYjJjM2ViNDI5OGM1OTUyOGZl ZGNmMjNjNjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvQ29v cmRpbmF0ZWRHcmFwaGljcy9XS1ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQy9Db29yZGluYXRlZEdyYXBoaWNzL1dLVmlldy5jcHAKQEAgLTE5NSw0ICsxOTUsMTAg QEAgdm9pZCBXS1ZpZXdGaW5kWm9vbWFibGVBcmVhRm9yUmVjdChXS1ZpZXdSZWYgdmlld1JlZiwg V0tSZWN0IHdrUmVjdCkKICAgICB0b0ltcGwodmlld1JlZiktPmZpbmRab29tYWJsZUFyZWFGb3JQ b2ludChyZWN0LmNlbnRlcigpLCByZWN0LnNpemUoKSk7CiB9CiAKK1dLU2l6ZSBXS1ZpZXdHZXRD b250ZW50c1NpemUoV0tWaWV3UmVmIHZpZXdSZWYpCit7CisgICAgY29uc3QgV2ViQ29yZTo6SW50 U2l6ZSYgc2l6ZSA9IHRvSW1wbCh2aWV3UmVmKS0+Y29udGVudHNTaXplKCk7CisgICAgcmV0dXJu IFdLU2l6ZU1ha2Uoc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKTsKK30KKwogI2VuZGlmIC8v IFVTRShDT09SRElOQVRFRF9HUkFQSElDUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9Db29yZGluYXRlZEdyYXBoaWNzL1dLVmlldy5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmgKaW5kZXggM2M1 MTliMjk3NzdmZWIxNjM3OTUzYmNmZmQxMzg0OGVkNGIzZGVmYy4uYjhlOTZiZTEzYWNkNWM2MzUw OTFjNWRiODJlZjMwNDg4MjM2NjQyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3LmgKQEAgLTExMyw2 ICsxMTMsOCBAQCBXS19FWFBPUlQgZG91YmxlIFdLVmlld09wYWNpdHkoV0tWaWV3UmVmIHZpZXcp OwogCiBXS19FWFBPUlQgdm9pZCBXS1ZpZXdGaW5kWm9vbWFibGVBcmVhRm9yUmVjdChXS1ZpZXdS ZWYsIFdLUmVjdCk7CiAKK1dLX0VYUE9SVCBXS1NpemUgV0tWaWV3R2V0Q29udGVudHNTaXplKFdL Vmlld1JlZik7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggMWJjNDFmY2RhOTA1ZTY4 NTU1ZjA1MDgxN2IxMmQ5ZjVlYTcyMjNiYS4uZjQ4ZmY1NDg4NDc5OGEzM2IxZGUzZTg3ODk5MGZk YmE0MWI5NWUwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcApAQCAtNzIxLDMgKzcyMSwyNSBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfbGF5b3V0X2Zp eGVkX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldykKIAogICAgIHJldHVybiBXS1BhZ2VV c2VGaXhlZExheW91dChXS1ZpZXdHZXRQYWdlKGltcGwtPndrVmlldygpKSk7CiB9CisKK0VpbmFf Qm9vbCBld2tfdmlld19jb250ZW50c19zaXplX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmll dywgRXZhc19Db29yZCogd2lkdGgsIEV2YXNfQ29vcmQqIGhlaWdodCkKK3sKKyAgICBFd2tWaWV3 KiBpbXBsID0gdG9Fd2tWaWV3Q2hlY2tlZChld2tWaWV3KTsKKyAgICBpZiAoRUlOQV9VTkxJS0VM WSghaW1wbCkpIHsKKyAgICAgICAgRUlOQV9MT0dfQ1JJVCgibm8gcHJpdmF0ZSBkYXRhIGZvciBv YmplY3QgJXAiLCBld2tWaWV3KTsKKyAgICAgICAgaWYgKHdpZHRoKQorICAgICAgICAgICAgKndp ZHRoID0gMDsKKyAgICAgICAgaWYgKGhlaWdodCkKKyAgICAgICAgICAgICpoZWlnaHQgPSAwOwor CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBXS1NpemUgY29udGVudHNTaXpl ID0gV0tWaWV3R2V0Q29udGVudHNTaXplKGltcGwtPndrVmlldygpKTsKKyAgICBpZiAod2lkdGgp CisgICAgICAgICp3aWR0aCA9IGNvbnRlbnRzU2l6ZS53aWR0aDsKKyAgICBpZiAoaGVpZ2h0KQor ICAgICAgICAqaGVpZ2h0ID0gY29udGVudHNTaXplLmhlaWdodDsKKworICAgIHJldHVybiB0cnVl OworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKaW5kZXgg MDU2YzliMDk1MTNlMTY0Yzc2MWI0ODEwN2ZmMDljYzgwN2E3ZTRjMi4uYWY1OTlkMjQ2NDY1MzI5 MDc4Zjg3MWVhY2E5OGQ0NjMxNGJiNWNhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5oCkBAIC05MDMsNiArOTAzLDE5IEBAIEVBUEkgRWluYV9Cb29sIGV3 a192aWV3X2xheW91dF9maXhlZF9zZXQoRXZhc19PYmplY3QgKm8sIEVpbmFfQm9vbCBlbmFibGVk KTsKICAqLwogRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfbGF5b3V0X2ZpeGVkX2dldChjb25zdCBF dmFzX09iamVjdCAqbyk7CiAKKy8qKgorICogR2V0IGNvbnRlbnRzIHNpemUgb2YgY3VycmVudCB3 ZWIgcGFnZS4KKyAqCisgKiBJZiBwcm9jZXNzIHRvIGdldCBzaXplIGZhaWxzLCB2YWx1ZXMgb2Yg d2lkdGggYW5kIGhlaWdodCB3aWxsIGJlIHNldCB0byAwLgorICoKKyAqIEBwYXJhbSBvIHZpZXcg b2JqZWN0IHRvIGdldCBjb250ZW50cyBzaXplCisgKiBAcGFyYW0gd2lkdGggcG9pbnRlciB0byBh biBpbnRlZ2VyIGluIHdoaWNoIHRvIHN0b3JlIHRoZSB3aWR0aCBvZiBjb250ZW50cy4KKyAqIEBw YXJhbSBoZWlnaHQgcG9pbnRlciB0byBhbiBpbnRlZ2VyIGluIHdoaWNoIHRvIHN0b3JlIHRoZSBo ZWlnaHQgb2YgY29udGVudHMuCisgKgorICogQHJldHVybiBAYyBFSU5BX1RSVUUgb24gc3VjY2Vz cyBvciBAYyBFSU5BX0ZBTFNFIG90aGVyd2lzZQorICovCitFQVBJIEVpbmFfQm9vbCBld2tfdmll d19jb250ZW50c19zaXplX2dldChjb25zdCBFdmFzX09iamVjdCAqbywgRXZhc19Db29yZCAqd2lk dGgsIEV2YXNfQ29vcmQgKmhlaWdodCk7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlm CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0 X2V3azJfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90 ZXN0X2V3azJfdmlldy5jcHAKaW5kZXggMmRjNTY1YmVjODBmMmY3NDI2N2JmZThlNTM3NGMzMDUx NTZlNTFlNi4uYjNmZTAwYjQwMWE5MjJiYmJmNDI2ZTAzZWI2ZTAxNmVjOTRkMjAwYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3Zp ZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3Rf ZXdrMl92aWV3LmNwcApAQCAtMTA4MywzICsxMDgzLDM1IEBAIFRFU1RfRihFV0syVmlld1Rlc3Qs IGV3a192aWV3X2xheW91dF9maXhlZCkKICAgICBFWFBFQ1RfVFJVRShld2tfdmlld19sYXlvdXRf Zml4ZWRfc2V0KHdlYlZpZXcoKSwgdHJ1ZSkpOwogICAgIEVYUEVDVF9UUlVFKGV3a192aWV3X2xh eW91dF9maXhlZF9nZXQod2ViVmlldygpKSk7CiB9CisKK1RFU1RfRihFV0syVmlld1Rlc3QsIGV3 a192aWV3X2NvbnRlbnRzX3NpemVfZ2V0KQoreworICAgIGludCBjb250ZW50c1dpZHRoLCBjb250 ZW50c0hlaWdodDsKKyAgICBld2tfdmlld19jb250ZW50c19zaXplX2dldCgwLCAmY29udGVudHNX aWR0aCwgJmNvbnRlbnRzSGVpZ2h0KTsKKworICAgIEVYUEVDVF9FUSgwLCBjb250ZW50c1dpZHRo KTsKKyAgICBFWFBFQ1RfRVEoMCwgY29udGVudHNIZWlnaHQpOworCisgICAgQVNTRVJUX1RSVUUo bG9hZFVybFN5bmMoZW52aXJvbm1lbnQtPmRlZmF1bHRUZXN0UGFnZVVybCgpKSk7CisgICAgZXdr X3ZpZXdfY29udGVudHNfc2l6ZV9nZXQod2ViVmlldygpLCAmY29udGVudHNXaWR0aCwgJmNvbnRl bnRzSGVpZ2h0KTsKKworICAgIEVYUEVDVF9FUShlbnZpcm9ubWVudC0+ZGVmYXVsdFdpZHRoKCks IGNvbnRlbnRzV2lkdGgpOworICAgIEVYUEVDVF9FUShlbnZpcm9ubWVudC0+ZGVmYXVsdEhlaWdo dCgpLCBjb250ZW50c0hlaWdodCk7CisKKyAgICBld2tfdmlld19kZXZpY2VfcGl4ZWxfcmF0aW9f c2V0KHdlYlZpZXcoKSwgMik7CisgICAgQVNTRVJUX1RSVUUobG9hZFVybFN5bmMoZW52aXJvbm1l bnQtPmRlZmF1bHRUZXN0UGFnZVVybCgpKSk7CisgICAgZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9n ZXQod2ViVmlldygpLCAmY29udGVudHNXaWR0aCwgJmNvbnRlbnRzSGVpZ2h0KTsKKworICAgIEVY UEVDVF9FUShlbnZpcm9ubWVudC0+ZGVmYXVsdFdpZHRoKCkgLyAyLCBjb250ZW50c1dpZHRoKTsK KyAgICBFWFBFQ1RfRVEoZW52aXJvbm1lbnQtPmRlZmF1bHRIZWlnaHQoKSAvIDIsIGNvbnRlbnRz SGVpZ2h0KTsKKworICAgIGNvbnN0IGNoYXIgZml4ZWRDb250ZW50c1NpemVbXSA9CisgICAgICAg ICI8IURPQ1RZUEUgaHRtbD4iCisgICAgICAgICI8Ym9keSBzdHlsZT1cIm1hcmdpbjowcHg7d2lk dGg6MjAwMHB4O2hlaWdodDozMDAwcHhcIj48L2JvZHk+IjsKKyAgICBld2tfdmlld19odG1sX3N0 cmluZ19sb2FkKHdlYlZpZXcoKSwgZml4ZWRDb250ZW50c1NpemUsIDAsIDApOworICAgIEFTU0VS VF9UUlVFKHdhaXRVbnRpbExvYWRGaW5pc2hlZCgpKTsKKyAgICBld2tfdmlld19jb250ZW50c19z aXplX2dldCh3ZWJWaWV3KCksICZjb250ZW50c1dpZHRoLCAmY29udGVudHNIZWlnaHQpOworCisg ICAgRVhQRUNUX0VRKDIwMDAsIGNvbnRlbnRzV2lkdGgpOworICAgIEVYUEVDVF9FUSgzMDAwLCBj b250ZW50c0hlaWdodCk7Cit9Cg==