101530 2012-11-07 17:43:06 -0800 [EFL][WK2] Add ewk_context_additional_plugin_path_set API 2012-11-08 05:13:28 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ky0.choi ky0.choi cdumez gyuyoung.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 761220 0 ky0.choi 2012-11-07 17:43:06 -0800 Add ewk_context_additional_plugin_path_set() to set additional plugin directory. Currently, get additional plugin directories API is missing. Test can be modified after adding it. 761221 1 172900 ky0.choi 2012-11-07 17:43:52 -0800 Created attachment 172900 Patch 761359 2 172900 jinwoo7.song 2012-11-07 22:47:35 -0800 Comment on attachment 172900 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172900&action=review rebase the patch as the ewk_context has been changed. > Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:225 > + WKContextSetAdditionalPluginsDirectory(m_context.get(), WKStringCreateWithUTF8CString(path)); You may use WebContext::setAdditionalPluginsDirectory() instead of WKContextSetAdditionalPluginsDirectory(), as ewk_context uses WebContext now. 761367 3 172900 cdumez 2012-11-07 23:16:45 -0800 Comment on attachment 172900 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172900&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:222 > +bool EwkContext::setAdditionalPluginPath(const char* path) Should take a const String& in argument. >> Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:225 >> + WKContextSetAdditionalPluginsDirectory(m_context.get(), WKStringCreateWithUTF8CString(path)); > > You may use WebContext::setAdditionalPluginsDirectory() instead of WKContextSetAdditionalPluginsDirectory(), as ewk_context uses WebContext now. Yes, please use C++ API instead of C API. > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp:218 > + /* FIXME: Get additional plugin path and compare with the path. */ I'm not sure this comment should be there. There does not seem to be an API to retrieve additional plugin paths at the moment. 761392 4 172900 ky0.choi 2012-11-07 23:42:04 -0800 Comment on attachment 172900 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172900&action=review >> Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:222 >> +bool EwkContext::setAdditionalPluginPath(const char* path) > > Should take a const String& in argument. OK. >>> Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:225 >>> + WKContextSetAdditionalPluginsDirectory(m_context.get(), WKStringCreateWithUTF8CString(path)); >> >> You may use WebContext::setAdditionalPluginsDirectory() instead of WKContextSetAdditionalPluginsDirectory(), as ewk_context uses WebContext now. > > Yes, please use C++ API instead of C API. OK. >> Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp:218 >> + /* FIXME: Get additional plugin path and compare with the path. */ > > I'm not sure this comment should be there. There does not seem to be an API to retrieve additional plugin paths at the moment. As you wrote, currently, there is no API to retrieve additional plugin directories. And these TRUE/FALSE tests are not enough for this API, I think. So, I added some comment here. 761407 5 172944 ky0.choi 2012-11-08 00:02:29 -0800 Created attachment 172944 Patch 761421 6 172944 mikhail.pozdnyakov 2012-11-08 00:24:05 -0800 Comment on attachment 172944 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172944&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:204 > +bool EwkContext::setAdditionalPluginPath(const String& path) does this method make sense at all if NETSCAPE_PLUGIN_API is not enabled? > Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:208 > + return true; m_webContext->setAdditionalPluginsDirectory does not return bool and we should not do it too. 761423 7 cdumez 2012-11-08 00:28:12 -0800 (In reply to comment #6) > (From update of attachment 172944 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=172944&action=review > > > Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:204 > > +bool EwkContext::setAdditionalPluginPath(const String& path) > > does this method make sense at all if NETSCAPE_PLUGIN_API is not enabled? > > > Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:208 > > + return true; > > m_webContext->setAdditionalPluginsDirectory does not return bool and we should not do it too. I agree with both comments. 761450 8 172944 gyuyoung.kim 2012-11-08 01:10:51 -0800 Comment on attachment 172944 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172944&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:324 > +Eina_Bool ewk_context_additional_plugin_path_set(Ewk_Context* ewkContext, const char* path) It seems to me ewk_settings.cpp is more proper place for this function. Can't this API be moved to there ? 761457 9 172944 cdumez 2012-11-08 01:22:01 -0800 Comment on attachment 172944 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172944&action=review >> Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:324 >> +Eina_Bool ewk_context_additional_plugin_path_set(Ewk_Context* ewkContext, const char* path) > > It seems to me ewk_settings.cpp is more proper place for this function. Can't this API be moved to there ? Why? It is a WebContext API not a WebPreferences one. 761469 10 gyuyoung.kim 2012-11-08 01:37:31 -0800 (In reply to comment #9) > (From update of attachment 172944 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=172944&action=review > > >> Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:324 > >> +Eina_Bool ewk_context_additional_plugin_path_set(Ewk_Context* ewkContext, const char* path) > > > > It seems to me ewk_settings.cpp is more proper place for this function. Can't this API be moved to there ? > > Why? It is a WebContext API not a WebPreferences one. Yes, I know it well. But, I just check this because this functionality just sets plugin path. It looks this is close to global setting, not related to context. Of course, this functionality can only be supported by context for now. 761496 11 172966 ky0.choi 2012-11-08 02:19:04 -0800 Created attachment 172966 Patch Applied Mikhail mentioned. I'm not sure this API can be moved to settings. I think, it can be handled by another bug if it's possible. :) 761517 12 gyuyoung.kim 2012-11-08 02:38:01 -0800 (In reply to comment #11) > Created an attachment (id=172966) [details] > Patch > > Applied Mikhail mentioned. > > I'm not sure this API can be moved to settings. I think, it can be handled by another bug if it's possible. :) Yes, I think so. I just would check if this can be moved. 761521 13 172966 mikhail.pozdnyakov 2012-11-08 02:42:00 -0800 Comment on attachment 172966 Patch LGTM 761559 14 172966 gyuyoung.kim 2012-11-08 03:18:13 -0800 Comment on attachment 172966 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172966&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:326 > + impl->setAdditionalPluginPath(String(path)); I think you need to use filenameToString as gtk port. context->priv->context->setAdditionalPluginsDirectory(WebCore::filenameToString(directory)); 761572 15 172966 cdumez 2012-11-08 03:26:22 -0800 Comment on attachment 172966 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172966&action=review >> Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:326 >> + impl->setAdditionalPluginPath(String(path)); > > I think you need to use filenameToString as gtk port. > > context->priv->context->setAdditionalPluginsDirectory(WebCore::filenameToString(directory)); Only GTK port has filenameToString(). In any case, using String(path) is seriously wrong as the path will be processed as ASCII. It should be String::fromUTF8(path). 761590 16 gyuyoung.kim 2012-11-08 03:34:37 -0800 (In reply to comment #15) > (From update of attachment 172966 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=172966&action=review > > >> Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:326 > >> + impl->setAdditionalPluginPath(String(path)); > > > > I think you need to use filenameToString as gtk port. > > > > context->priv->context->setAdditionalPluginsDirectory(WebCore::filenameToString(directory)); > > Only GTK port has filenameToString(). > > In any case, using String(path) is seriously wrong as the path will be processed as ASCII. It should be String::fromUTF8(path). If gtk port only has it, we should use String::fromUTF8() instead. 761596 17 172994 ky0.choi 2012-11-08 03:37:42 -0800 Created attachment 172994 Patch Changed to String::fromUTF8(path) 761603 18 172994 cdumez 2012-11-08 03:43:28 -0800 Comment on attachment 172994 Patch LGTM. 761627 19 172994 webkit.review.bot 2012-11-08 04:15:07 -0800 Comment on attachment 172994 Patch Clearing flags on attachment: 172994 Committed r133880: <http://trac.webkit.org/changeset/133880> 761628 20 webkit.review.bot 2012-11-08 04:15:12 -0800 All reviewed patches have been landed. Closing bug. 761657 21 rakuco 2012-11-08 04:46:25 -0800 Build fix landed in http://trac.webkit.org/changeset/133882 761678 22 gyuyoung.kim 2012-11-08 05:13:28 -0800 (In reply to comment #21) > Build fix landed in http://trac.webkit.org/changeset/133882 Oops, thanks. 172900 2012-11-07 17:43:52 -0800 2012-11-08 00:02:29 -0800 Patch diff text/plain 4521 ky0.choi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1YzEwYTRlLi4zN2ZlYzQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTItMTEtMDcgIEt3YW5nWW9uZyBDaG9pICA8a3kwLmNob2lAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW0VGTF1bV0syXSBBZGQgZXdrX2NvbnRleHRfYWRkaXRpb25hbF9wbHVnaW5fcGF0 aF9zZXQgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDE1MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgZXdrX2NvbnRleHRfYWRkaXRpb25hbF9wbHVnaW5fcGF0aF9zZXQoKSB0byBzZXQgYWRk aXRpb25hbCBwbHVnaW4gZGlyZWN0b3J5LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHQuY3BwOgorICAgICAgICAoRXdrQ29udGV4dDo6c2V0QWRkaXRpb25hbFBsdWdp blBhdGgpOgorICAgICAgICAoZXdrX2NvbnRleHRfYWRkaXRpb25hbF9wbHVnaW5fcGF0aF9zZXQp OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0Lmg6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfcHJpdmF0ZS5oOgorICAgICAgICAoRXdrQ29u dGV4dCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRl eHQuY3BwOgorICAgICAgICAoVEVTVF9GKToKKwogMjAxMi0xMS0wNiAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBKYXZhIHJlbGF0ZWQgV0tT SSBmdW5jdGlvbiBuYW1lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX2NvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHQuY3BwCmluZGV4IDJkYmYzNzguLjFmOWQ2YjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAKQEAgLTI3LDYgKzI3LDcg QEAKICNpbmNsdWRlICJSZXF1ZXN0TWFuYWdlckNsaWVudEVmbC5oIgogI2luY2x1ZGUgIlZpYnJh dGlvblByb3ZpZGVyLmgiCiAjaW5jbHVkZSAiV0tBUElDYXN0LmgiCisjaW5jbHVkZSAiV0tDb250 ZXh0UHJpdmF0ZS5oIgogI2luY2x1ZGUgIldLQ29udGV4dFNvdXAuaCIKICNpbmNsdWRlICJXS051 bWJlci5oIgogI2luY2x1ZGUgIldLUmV0YWluUHRyLmgiCkBAIC0yMTgsNiArMjE5LDE3IEBAIEV3 a19DYWNoZV9Nb2RlbCBFd2tDb250ZXh0OjpjYWNoZU1vZGVsKCkgY29uc3QKICAgICByZXR1cm4g c3RhdGljX2Nhc3Q8RXdrX0NhY2hlX01vZGVsPihXS0NvbnRleHRHZXRDYWNoZU1vZGVsKG1fY29u dGV4dC5nZXQoKSkpOwogfQogCitib29sIEV3a0NvbnRleHQ6OnNldEFkZGl0aW9uYWxQbHVnaW5Q YXRoKGNvbnN0IGNoYXIqIHBhdGgpCit7CisjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkp CisgICAgV0tDb250ZXh0U2V0QWRkaXRpb25hbFBsdWdpbnNEaXJlY3RvcnkobV9jb250ZXh0Lmdl dCgpLCBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhwYXRoKSk7CisgICAgcmV0dXJuIHRy dWU7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShwYXRoKTsKKyAgICByZXR1cm4gZmFsc2U7Cisj ZW5kaWYKK30KKwogRXdrX0Nvb2tpZV9NYW5hZ2VyKiBld2tfY29udGV4dF9jb29raWVfbWFuYWdl cl9nZXQoY29uc3QgRXdrX0NvbnRleHQqIGV3a0NvbnRleHQpCiB7CiAgICAgRVdLX09CSl9HRVRf SU1QTF9PUl9SRVRVUk4oY29uc3QgRXdrQ29udGV4dCwgZXdrQ29udGV4dCwgaW1wbCwgMCk7CkBA IC0zNDEsMyArMzUzLDEwIEBAIEV3a19DYWNoZV9Nb2RlbCBld2tfY29udGV4dF9jYWNoZV9tb2Rl bF9nZXQoY29uc3QgRXdrX0NvbnRleHQqIGV3a0NvbnRleHQpCiAgICAgcmV0dXJuIGltcGwtPmNh Y2hlTW9kZWwoKTsKIH0KIAorRWluYV9Cb29sIGV3a19jb250ZXh0X2FkZGl0aW9uYWxfcGx1Z2lu X3BhdGhfc2V0KEV3a19Db250ZXh0KiBld2tDb250ZXh0LCBjb25zdCBjaGFyKiBwYXRoKQorewor ICAgIEVXS19PQkpfR0VUX0lNUExfT1JfUkVUVVJOKEV3a0NvbnRleHQsIGV3a0NvbnRleHQsIGlt cGwsIGZhbHNlKTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwocGF0aCwgZmFs c2UpOworCisgICAgcmV0dXJuIGltcGwtPnNldEFkZGl0aW9uYWxQbHVnaW5QYXRoKHBhdGgpOwor fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRl eHQuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmgKaW5k ZXggNGE4ZTk1Ni4uMDY4NTcwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX2NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfY29udGV4dC5oCkBAIC0zMzEsNiArMzMxLDE2IEBAIEVBUEkgRWluYV9Cb29sIGV3 a19jb250ZXh0X2NhY2hlX21vZGVsX3NldChFd2tfQ29udGV4dCAqY29udGV4dCwgRXdrX0NhY2hl X01vZGVsCiAgKi8KIEVBUEkgRXdrX0NhY2hlX01vZGVsIGV3a19jb250ZXh0X2NhY2hlX21vZGVs X2dldChjb25zdCBFd2tfQ29udGV4dCAqY29udGV4dCk7CiAKKy8qKgorICogU2V0cyBhZGRpdGlv bmFsIHBsdWdpbiBwYXRoIGZvciBAYSBjb250ZXh0LgorICoKKyAqIEBwYXJhbSBjb250ZXh0IGNv bnRleHQgb2JqZWN0IHRvIHNldCBhZGRpdGlvbmFsIHBsdWdpbiBwYXRoCisgKiBAcGFyYW0gcGF0 aCB0aGUgcGF0aCB0byBiZSB1c2VkIGZvciBwbHVnaW5zCisgKgorICogQHJldHVybiBAYyBFSU5B X1RSVUUgb24gc3VjY2VzcyBvciBAYyBFSU5BX0ZBTFNFIG9uIGZhaWx1cmUKKyAqLworRUFQSSBF aW5hX0Jvb2wgZXdrX2NvbnRleHRfYWRkaXRpb25hbF9wbHVnaW5fcGF0aF9zZXQoRXdrX0NvbnRl eHQgKmNvbnRleHQsIGNvbnN0IGNoYXIgKnBhdGgpOworCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0K ICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X2NvbnRleHRfcHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X2NvbnRleHRfcHJpdmF0ZS5oCmluZGV4IDRkZGI2NTMuLjk1NjUwY2IgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X3ByaXZhdGUuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmgK QEAgLTgyLDYgKzgyLDggQEAgcHVibGljOgogCiAgICAgV2ViS2l0OjpDb250ZXh0SGlzdG9yeUNs aWVudEVmbCogaGlzdG9yeUNsaWVudCgpOwogCisgICAgYm9vbCBzZXRBZGRpdGlvbmFsUGx1Z2lu UGF0aChjb25zdCBjaGFyKik7CisKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgRXdrQ29udGV4dChX S0NvbnRleHRSZWYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dC5jcHAKaW5kZXggYjAyYThkMi4uNGNk N2Y1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMv dGVzdF9ld2syX2NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0LmNwcApAQCAtMjA0LDMgKzIwNCwxNiBAQCBURVNU X0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX2NvbnRleHRfbmV3X3dpdGhfaW5qZWN0ZWRfYnVuZGxl X3BhdGgpCiAgICAgQVNTRVJUX1RSVUUoY29udGV4dCk7CiAgICAgZXdrX29iamVjdF91bnJlZihj b250ZXh0KTsKIH0KKworVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a19jb250ZXh0X2FkZGl0 aW9uYWxfcGx1Z2luX3BhdGhfc2V0KQoreworICAgIEV3a19Db250ZXh0KiBjb250ZXh0ID0gZXdr X3ZpZXdfY29udGV4dF9nZXQod2ViVmlldygpKTsKKworICAgIGNoYXIqIHBhdGggPSAwOworICAg IEFTU0VSVF9GQUxTRShld2tfY29udGV4dF9hZGRpdGlvbmFsX3BsdWdpbl9wYXRoX3NldChjb250 ZXh0LCBwYXRoKSk7CisKKyAgICBwYXRoID0gIi9wbHVnaW5zIjsKKyAgICBBU1NFUlRfVFJVRShl d2tfY29udGV4dF9hZGRpdGlvbmFsX3BsdWdpbl9wYXRoX3NldChjb250ZXh0LCBwYXRoKSk7CisK KyAgICAvKiBGSVhNRTogR2V0IGFkZGl0aW9uYWwgcGx1Z2luIHBhdGggYW5kIGNvbXBhcmUgd2l0 aCB0aGUgcGF0aC4gKi8KK30K 172944 2012-11-08 00:02:29 -0800 2012-11-08 02:19:04 -0800 Patch diff text/plain 4254 ky0.choi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwOTUxZWZiLi5kZWQzNjc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTItMTEtMDcgIEt3YW5nWW9uZyBDaG9pICA8a3kwLmNob2lAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW0VGTF1bV0syXSBBZGQgZXdrX2NvbnRleHRfYWRkaXRpb25hbF9wbHVnaW5fcGF0 aF9zZXQgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDE1MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgZXdrX2NvbnRleHRfYWRkaXRpb25hbF9wbHVnaW5fcGF0aF9zZXQoKSB0byBzZXQgYWRk aXRpb25hbCBwbHVnaW4gZGlyZWN0b3J5LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHQuY3BwOgorICAgICAgICAoRXdrQ29udGV4dDo6c2V0QWRkaXRpb25hbFBsdWdp blBhdGgpOgorICAgICAgICAoZXdrX2NvbnRleHRfYWRkaXRpb25hbF9wbHVnaW5fcGF0aF9zZXQp OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0Lmg6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfcHJpdmF0ZS5oOgorICAgICAgICAoRXdrQ29u dGV4dCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRl eHQuY3BwOgorICAgICAgICAoVEVTVF9GKToKKwogMjAxMi0xMS0wNyAgU2hlcmlmZiBCb3QgIDx3 ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGlu ZyBvdXQgcjEzMzg0MS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19jb250ZXh0LmNwcAppbmRleCA5MWEwY2VjLi5jYTdkYWVkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCkBAIC0yMDEsNiArMjAxLDE3 IEBAIEV3a19DYWNoZV9Nb2RlbCBFd2tDb250ZXh0OjpjYWNoZU1vZGVsKCkgY29uc3QKICAgICBy ZXR1cm4gc3RhdGljX2Nhc3Q8RXdrX0NhY2hlX01vZGVsPihtX3dlYkNvbnRleHQtPmNhY2hlTW9k ZWwoKSk7CiB9CiAKK2Jvb2wgRXdrQ29udGV4dDo6c2V0QWRkaXRpb25hbFBsdWdpblBhdGgoY29u c3QgU3RyaW5nJiBwYXRoKQoreworI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQorICAg IG1fd2ViQ29udGV4dC0+c2V0QWRkaXRpb25hbFBsdWdpbnNEaXJlY3RvcnkocGF0aCk7CisgICAg cmV0dXJuIHRydWU7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShwYXRoKTsKKyAgICByZXR1cm4g ZmFsc2U7CisjZW5kaWYKK30KKwogRXdrX0Nvb2tpZV9NYW5hZ2VyKiBld2tfY29udGV4dF9jb29r aWVfbWFuYWdlcl9nZXQoY29uc3QgRXdrX0NvbnRleHQqIGV3a0NvbnRleHQpCiB7CiAgICAgRVdL X09CSl9HRVRfSU1QTF9PUl9SRVRVUk4oY29uc3QgRXdrQ29udGV4dCwgZXdrQ29udGV4dCwgaW1w bCwgMCk7CkBAIC0zMTAsMyArMzIxLDEwIEBAIEV3a19DYWNoZV9Nb2RlbCBld2tfY29udGV4dF9j YWNoZV9tb2RlbF9nZXQoY29uc3QgRXdrX0NvbnRleHQqIGV3a0NvbnRleHQpCiAgICAgcmV0dXJu IGltcGwtPmNhY2hlTW9kZWwoKTsKIH0KIAorRWluYV9Cb29sIGV3a19jb250ZXh0X2FkZGl0aW9u YWxfcGx1Z2luX3BhdGhfc2V0KEV3a19Db250ZXh0KiBld2tDb250ZXh0LCBjb25zdCBjaGFyKiBw YXRoKQoreworICAgIEVXS19PQkpfR0VUX0lNUExfT1JfUkVUVVJOKEV3a0NvbnRleHQsIGV3a0Nv bnRleHQsIGltcGwsIGZhbHNlKTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwo cGF0aCwgZmFsc2UpOworCisgICAgcmV0dXJuIGltcGwtPnNldEFkZGl0aW9uYWxQbHVnaW5QYXRo KFN0cmluZyhwYXRoKSk7Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfY29udGV4dC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHQuaAppbmRleCAwMWNhMjVmLi4wNzg4MDM4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmgKQEAgLTMwMSw2ICszMDEsMTYgQEAg RUFQSSBFaW5hX0Jvb2wgZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfc2V0KEV3a19Db250ZXh0ICpj b250ZXh0LCBFd2tfQ2FjaGVfTW9kZWwKICAqLwogRUFQSSBFd2tfQ2FjaGVfTW9kZWwgZXdrX2Nv bnRleHRfY2FjaGVfbW9kZWxfZ2V0KGNvbnN0IEV3a19Db250ZXh0ICpjb250ZXh0KTsKIAorLyoq CisgKiBTZXRzIGFkZGl0aW9uYWwgcGx1Z2luIHBhdGggZm9yIEBhIGNvbnRleHQuCisgKgorICog QHBhcmFtIGNvbnRleHQgY29udGV4dCBvYmplY3QgdG8gc2V0IGFkZGl0aW9uYWwgcGx1Z2luIHBh dGgKKyAqIEBwYXJhbSBwYXRoIHRoZSBwYXRoIHRvIGJlIHVzZWQgZm9yIHBsdWdpbnMKKyAqCisg KiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzIG9yIEBjIEVJTkFfRkFMU0Ugb24gZmFp bHVyZQorICovCitFQVBJIEVpbmFfQm9vbCBld2tfY29udGV4dF9hZGRpdGlvbmFsX3BsdWdpbl9w YXRoX3NldChFd2tfQ29udGV4dCAqY29udGV4dCwgY29uc3QgY2hhciAqcGF0aCk7CisKICNpZmRl ZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmgKaW5kZXggZGQzYWZhMi4uNWJjYmE1 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRl eHRfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19j b250ZXh0X3ByaXZhdGUuaApAQCAtNzgsNiArNzgsOCBAQCBwdWJsaWM6CiAKICAgICBXZWJLaXQ6 OkNvbnRleHRIaXN0b3J5Q2xpZW50RWZsKiBoaXN0b3J5Q2xpZW50KCk7CiAKKyAgICBib29sIHNl dEFkZGl0aW9uYWxQbHVnaW5QYXRoKGNvbnN0IFN0cmluZyYpOworCiBwcml2YXRlOgogICAgIGV4 cGxpY2l0IEV3a0NvbnRleHQoV2ViQ29udGV4dCopOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dC5jcHAK aW5kZXggZWNlMjIxZS4uZjZiYjQwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0LmNwcApAQCAtMTI0 LDMgKzEyNCwxNiBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX2NvbnRleHRfbmV3X3dp dGhfaW5qZWN0ZWRfYnVuZGxlX3BhdGgpCiAgICAgQVNTRVJUX1RSVUUoY29udGV4dCk7CiAgICAg ZXdrX29iamVjdF91bnJlZihjb250ZXh0KTsKIH0KKworVEVTVF9GKEVXSzJVbml0VGVzdEJhc2Us IGV3a19jb250ZXh0X2FkZGl0aW9uYWxfcGx1Z2luX3BhdGhfc2V0KQoreworICAgIEV3a19Db250 ZXh0KiBjb250ZXh0ID0gZXdrX3ZpZXdfY29udGV4dF9nZXQod2ViVmlldygpKTsKKworICAgIGNo YXIqIHBhdGggPSAwOworICAgIEFTU0VSVF9GQUxTRShld2tfY29udGV4dF9hZGRpdGlvbmFsX3Bs dWdpbl9wYXRoX3NldChjb250ZXh0LCBwYXRoKSk7CisKKyAgICBwYXRoID0gIi9wbHVnaW5zIjsK KyAgICBBU1NFUlRfVFJVRShld2tfY29udGV4dF9hZGRpdGlvbmFsX3BsdWdpbl9wYXRoX3NldChj b250ZXh0LCBwYXRoKSk7CisKKyAgICAvKiBGSVhNRTogR2V0IGFkZGl0aW9uYWwgcGx1Z2luIHBh dGggYW5kIGNvbXBhcmUgd2l0aCB0aGUgcGF0aC4gKi8KK30K 172966 2012-11-08 02:19:04 -0800 2012-11-08 03:37:42 -0800 Patch diff text/plain 4305 ky0.choi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwOTUxZWZiLi5kZWQzNjc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTItMTEtMDcgIEt3YW5nWW9uZyBDaG9pICA8a3kwLmNob2lAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW0VGTF1bV0syXSBBZGQgZXdrX2NvbnRleHRfYWRkaXRpb25hbF9wbHVnaW5fcGF0 aF9zZXQgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDE1MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgZXdrX2NvbnRleHRfYWRkaXRpb25hbF9wbHVnaW5fcGF0aF9zZXQoKSB0byBzZXQgYWRk aXRpb25hbCBwbHVnaW4gZGlyZWN0b3J5LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHQuY3BwOgorICAgICAgICAoRXdrQ29udGV4dDo6c2V0QWRkaXRpb25hbFBsdWdp blBhdGgpOgorICAgICAgICAoZXdrX2NvbnRleHRfYWRkaXRpb25hbF9wbHVnaW5fcGF0aF9zZXQp OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0Lmg6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfcHJpdmF0ZS5oOgorICAgICAgICAoRXdrQ29u dGV4dCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRl eHQuY3BwOgorICAgICAgICAoVEVTVF9GKToKKwogMjAxMi0xMS0wNyAgU2hlcmlmZiBCb3QgIDx3 ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGlu ZyBvdXQgcjEzMzg0MS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19jb250ZXh0LmNwcAppbmRleCA5MWEwY2VjLi44YjgxNTcxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCkBAIC0yMDEsNiArMjAxLDEz IEBAIEV3a19DYWNoZV9Nb2RlbCBFd2tDb250ZXh0OjpjYWNoZU1vZGVsKCkgY29uc3QKICAgICBy ZXR1cm4gc3RhdGljX2Nhc3Q8RXdrX0NhY2hlX01vZGVsPihtX3dlYkNvbnRleHQtPmNhY2hlTW9k ZWwoKSk7CiB9CiAKKyNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKK3ZvaWQgRXdrQ29u dGV4dDo6c2V0QWRkaXRpb25hbFBsdWdpblBhdGgoY29uc3QgU3RyaW5nJiBwYXRoKQoreworICAg IG1fd2ViQ29udGV4dC0+c2V0QWRkaXRpb25hbFBsdWdpbnNEaXJlY3RvcnkocGF0aCk7Cit9Cisj ZW5kaWYKKwogRXdrX0Nvb2tpZV9NYW5hZ2VyKiBld2tfY29udGV4dF9jb29raWVfbWFuYWdlcl9n ZXQoY29uc3QgRXdrX0NvbnRleHQqIGV3a0NvbnRleHQpCiB7CiAgICAgRVdLX09CSl9HRVRfSU1Q TF9PUl9SRVRVUk4oY29uc3QgRXdrQ29udGV4dCwgZXdrQ29udGV4dCwgaW1wbCwgMCk7CkBAIC0z MTAsMyArMzE3LDE1IEBAIEV3a19DYWNoZV9Nb2RlbCBld2tfY29udGV4dF9jYWNoZV9tb2RlbF9n ZXQoY29uc3QgRXdrX0NvbnRleHQqIGV3a0NvbnRleHQpCiAgICAgcmV0dXJuIGltcGwtPmNhY2hl TW9kZWwoKTsKIH0KIAorRWluYV9Cb29sIGV3a19jb250ZXh0X2FkZGl0aW9uYWxfcGx1Z2luX3Bh dGhfc2V0KEV3a19Db250ZXh0KiBld2tDb250ZXh0LCBjb25zdCBjaGFyKiBwYXRoKQoreworICAg IEVXS19PQkpfR0VUX0lNUExfT1JfUkVUVVJOKEV3a0NvbnRleHQsIGV3a0NvbnRleHQsIGltcGws IGZhbHNlKTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwocGF0aCwgZmFsc2Up OworCisjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCisgICAgaW1wbC0+c2V0QWRkaXRp b25hbFBsdWdpblBhdGgoU3RyaW5nKHBhdGgpKTsKKyAgICByZXR1cm4gdHJ1ZTsKKyNlbHNlCisg ICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX2NvbnRleHQuaAppbmRleCAwMWNhMjVmLi4wNzg4MDM4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmgKQEAgLTMwMSw2ICsz MDEsMTYgQEAgRUFQSSBFaW5hX0Jvb2wgZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfc2V0KEV3a19D b250ZXh0ICpjb250ZXh0LCBFd2tfQ2FjaGVfTW9kZWwKICAqLwogRUFQSSBFd2tfQ2FjaGVfTW9k ZWwgZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfZ2V0KGNvbnN0IEV3a19Db250ZXh0ICpjb250ZXh0 KTsKIAorLyoqCisgKiBTZXRzIGFkZGl0aW9uYWwgcGx1Z2luIHBhdGggZm9yIEBhIGNvbnRleHQu CisgKgorICogQHBhcmFtIGNvbnRleHQgY29udGV4dCBvYmplY3QgdG8gc2V0IGFkZGl0aW9uYWwg cGx1Z2luIHBhdGgKKyAqIEBwYXJhbSBwYXRoIHRoZSBwYXRoIHRvIGJlIHVzZWQgZm9yIHBsdWdp bnMKKyAqCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzIG9yIEBjIEVJTkFfRkFM U0Ugb24gZmFpbHVyZQorICovCitFQVBJIEVpbmFfQm9vbCBld2tfY29udGV4dF9hZGRpdGlvbmFs X3BsdWdpbl9wYXRoX3NldChFd2tfQ29udGV4dCAqY29udGV4dCwgY29uc3QgY2hhciAqcGF0aCk7 CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmgKaW5kZXggZGQzYWZh Mi4uYTNiNjM5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHRfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb250ZXh0X3ByaXZhdGUuaApAQCAtNzgsNiArNzgsMTAgQEAgcHVibGljOgogCiAg ICAgV2ViS2l0OjpDb250ZXh0SGlzdG9yeUNsaWVudEVmbCogaGlzdG9yeUNsaWVudCgpOwogCisj aWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCisgICAgdm9pZCBzZXRBZGRpdGlvbmFsUGx1 Z2luUGF0aChjb25zdCBTdHJpbmcmKTsKKyNlbmRpZgorCiBwcml2YXRlOgogICAgIGV4cGxpY2l0 IEV3a0NvbnRleHQoV2ViQ29udGV4dCopOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dC5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dC5jcHAKaW5kZXgg ZWNlMjIxZS4uZjZiYjQwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0LmNwcApAQCAtMTI0LDMgKzEy NCwxNiBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX2NvbnRleHRfbmV3X3dpdGhfaW5q ZWN0ZWRfYnVuZGxlX3BhdGgpCiAgICAgQVNTRVJUX1RSVUUoY29udGV4dCk7CiAgICAgZXdrX29i amVjdF91bnJlZihjb250ZXh0KTsKIH0KKworVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a19j b250ZXh0X2FkZGl0aW9uYWxfcGx1Z2luX3BhdGhfc2V0KQoreworICAgIEV3a19Db250ZXh0KiBj b250ZXh0ID0gZXdrX3ZpZXdfY29udGV4dF9nZXQod2ViVmlldygpKTsKKworICAgIGNoYXIqIHBh dGggPSAwOworICAgIEFTU0VSVF9GQUxTRShld2tfY29udGV4dF9hZGRpdGlvbmFsX3BsdWdpbl9w YXRoX3NldChjb250ZXh0LCBwYXRoKSk7CisKKyAgICBwYXRoID0gIi9wbHVnaW5zIjsKKyAgICBB U1NFUlRfVFJVRShld2tfY29udGV4dF9hZGRpdGlvbmFsX3BsdWdpbl9wYXRoX3NldChjb250ZXh0 LCBwYXRoKSk7CisKKyAgICAvKiBGSVhNRTogR2V0IGFkZGl0aW9uYWwgcGx1Z2luIHBhdGggYW5k IGNvbXBhcmUgd2l0aCB0aGUgcGF0aC4gKi8KK30K 172994 2012-11-08 03:37:42 -0800 2012-11-08 04:15:07 -0800 Patch diff text/plain 4315 ky0.choi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwOTUxZWZiLi5kZWQzNjc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTItMTEtMDcgIEt3YW5nWW9uZyBDaG9pICA8a3kwLmNob2lAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW0VGTF1bV0syXSBBZGQgZXdrX2NvbnRleHRfYWRkaXRpb25hbF9wbHVnaW5fcGF0 aF9zZXQgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDE1MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgZXdrX2NvbnRleHRfYWRkaXRpb25hbF9wbHVnaW5fcGF0aF9zZXQoKSB0byBzZXQgYWRk aXRpb25hbCBwbHVnaW4gZGlyZWN0b3J5LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHQuY3BwOgorICAgICAgICAoRXdrQ29udGV4dDo6c2V0QWRkaXRpb25hbFBsdWdp blBhdGgpOgorICAgICAgICAoZXdrX2NvbnRleHRfYWRkaXRpb25hbF9wbHVnaW5fcGF0aF9zZXQp OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0Lmg6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfcHJpdmF0ZS5oOgorICAgICAgICAoRXdrQ29u dGV4dCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRl eHQuY3BwOgorICAgICAgICAoVEVTVF9GKToKKwogMjAxMi0xMS0wNyAgU2hlcmlmZiBCb3QgIDx3 ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGlu ZyBvdXQgcjEzMzg0MS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19jb250ZXh0LmNwcAppbmRleCA5MWEwY2VjLi5iMzY4ODdkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCkBAIC0yMDEsNiArMjAxLDEz IEBAIEV3a19DYWNoZV9Nb2RlbCBFd2tDb250ZXh0OjpjYWNoZU1vZGVsKCkgY29uc3QKICAgICBy ZXR1cm4gc3RhdGljX2Nhc3Q8RXdrX0NhY2hlX01vZGVsPihtX3dlYkNvbnRleHQtPmNhY2hlTW9k ZWwoKSk7CiB9CiAKKyNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKK3ZvaWQgRXdrQ29u dGV4dDo6c2V0QWRkaXRpb25hbFBsdWdpblBhdGgoY29uc3QgU3RyaW5nJiBwYXRoKQoreworICAg IG1fd2ViQ29udGV4dC0+c2V0QWRkaXRpb25hbFBsdWdpbnNEaXJlY3RvcnkocGF0aCk7Cit9Cisj ZW5kaWYKKwogRXdrX0Nvb2tpZV9NYW5hZ2VyKiBld2tfY29udGV4dF9jb29raWVfbWFuYWdlcl9n ZXQoY29uc3QgRXdrX0NvbnRleHQqIGV3a0NvbnRleHQpCiB7CiAgICAgRVdLX09CSl9HRVRfSU1Q TF9PUl9SRVRVUk4oY29uc3QgRXdrQ29udGV4dCwgZXdrQ29udGV4dCwgaW1wbCwgMCk7CkBAIC0z MTAsMyArMzE3LDE1IEBAIEV3a19DYWNoZV9Nb2RlbCBld2tfY29udGV4dF9jYWNoZV9tb2RlbF9n ZXQoY29uc3QgRXdrX0NvbnRleHQqIGV3a0NvbnRleHQpCiAgICAgcmV0dXJuIGltcGwtPmNhY2hl TW9kZWwoKTsKIH0KIAorRWluYV9Cb29sIGV3a19jb250ZXh0X2FkZGl0aW9uYWxfcGx1Z2luX3Bh dGhfc2V0KEV3a19Db250ZXh0KiBld2tDb250ZXh0LCBjb25zdCBjaGFyKiBwYXRoKQoreworICAg IEVXS19PQkpfR0VUX0lNUExfT1JfUkVUVVJOKEV3a0NvbnRleHQsIGV3a0NvbnRleHQsIGltcGws IGZhbHNlKTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwocGF0aCwgZmFsc2Up OworCisjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCisgICAgaW1wbC0+c2V0QWRkaXRp b25hbFBsdWdpblBhdGgoU3RyaW5nOjpmcm9tVVRGOChwYXRoKSk7CisgICAgcmV0dXJuIHRydWU7 CisjZWxzZQorICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgorfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmgKaW5kZXggMDFjYTI1Zi4uMDc4ODAzOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5oCkBA IC0zMDEsNiArMzAxLDE2IEBAIEVBUEkgRWluYV9Cb29sIGV3a19jb250ZXh0X2NhY2hlX21vZGVs X3NldChFd2tfQ29udGV4dCAqY29udGV4dCwgRXdrX0NhY2hlX01vZGVsCiAgKi8KIEVBUEkgRXdr X0NhY2hlX01vZGVsIGV3a19jb250ZXh0X2NhY2hlX21vZGVsX2dldChjb25zdCBFd2tfQ29udGV4 dCAqY29udGV4dCk7CiAKKy8qKgorICogU2V0cyBhZGRpdGlvbmFsIHBsdWdpbiBwYXRoIGZvciBA YSBjb250ZXh0LgorICoKKyAqIEBwYXJhbSBjb250ZXh0IGNvbnRleHQgb2JqZWN0IHRvIHNldCBh ZGRpdGlvbmFsIHBsdWdpbiBwYXRoCisgKiBAcGFyYW0gcGF0aCB0aGUgcGF0aCB0byBiZSB1c2Vk IGZvciBwbHVnaW5zCisgKgorICogQHJldHVybiBAYyBFSU5BX1RSVUUgb24gc3VjY2VzcyBvciBA YyBFSU5BX0ZBTFNFIG9uIGZhaWx1cmUKKyAqLworRUFQSSBFaW5hX0Jvb2wgZXdrX2NvbnRleHRf YWRkaXRpb25hbF9wbHVnaW5fcGF0aF9zZXQoRXdrX0NvbnRleHQgKmNvbnRleHQsIGNvbnN0IGNo YXIgKnBhdGgpOworCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfcHJpdmF0ZS5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfcHJpdmF0ZS5oCmlu ZGV4IGRkM2FmYTIuLmEzYjYzOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL2V3a19jb250ZXh0X3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmgKQEAgLTc4LDYgKzc4LDEwIEBAIHB1 YmxpYzoKIAogICAgIFdlYktpdDo6Q29udGV4dEhpc3RvcnlDbGllbnRFZmwqIGhpc3RvcnlDbGll bnQoKTsKIAorI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQorICAgIHZvaWQgc2V0QWRk aXRpb25hbFBsdWdpblBhdGgoY29uc3QgU3RyaW5nJik7CisjZW5kaWYKKwogcHJpdmF0ZToKICAg ICBleHBsaWNpdCBFd2tDb250ZXh0KFdlYkNvbnRleHQqKTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHQuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHQu Y3BwCmluZGV4IGVjZTIyMWUuLmY2YmI0MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dC5jcHAKQEAg LTEyNCwzICsxMjQsMTYgQEAgVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a19jb250ZXh0X25l d193aXRoX2luamVjdGVkX2J1bmRsZV9wYXRoKQogICAgIEFTU0VSVF9UUlVFKGNvbnRleHQpOwog ICAgIGV3a19vYmplY3RfdW5yZWYoY29udGV4dCk7CiB9CisKK1RFU1RfRihFV0syVW5pdFRlc3RC YXNlLCBld2tfY29udGV4dF9hZGRpdGlvbmFsX3BsdWdpbl9wYXRoX3NldCkKK3sKKyAgICBFd2tf Q29udGV4dCogY29udGV4dCA9IGV3a192aWV3X2NvbnRleHRfZ2V0KHdlYlZpZXcoKSk7CisKKyAg ICBjaGFyKiBwYXRoID0gMDsKKyAgICBBU1NFUlRfRkFMU0UoZXdrX2NvbnRleHRfYWRkaXRpb25h bF9wbHVnaW5fcGF0aF9zZXQoY29udGV4dCwgcGF0aCkpOworCisgICAgcGF0aCA9ICIvcGx1Z2lu cyI7CisgICAgQVNTRVJUX1RSVUUoZXdrX2NvbnRleHRfYWRkaXRpb25hbF9wbHVnaW5fcGF0aF9z ZXQoY29udGV4dCwgcGF0aCkpOworCisgICAgLyogRklYTUU6IEdldCBhZGRpdGlvbmFsIHBsdWdp biBwYXRoIGFuZCBjb21wYXJlIHdpdGggdGhlIHBhdGguICovCit9Cg==