50004 2010-11-23 22:16:22 -0800 [GTK] Need 'webview-cache-model' property in WebKitWebSettings 2014-04-08 18:41:45 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED INVALID P2 Enhancement --- 50430 0 joone webkit-unassigned gustavo mathstuf mrobinson webkit.review.bot xan.lopez oldest_to_newest 313127 0 joone 2010-11-23 22:16:22 -0800 Currently, WebKitGtk+ offers the following functions to set the webview cache model, - webkit_get_cache_model() - webkit_set_cache_mode() They are not relevant to any gobjects, so these functions seem to be exceptional. I think we had better add a new property(webview-cache-model) to WebKitWebSettings and use the didPerformFirstNavigation callback to set the cache model instead of using the above functions directly. This is an example of the didPerformFirstNavigation callback. void FrameLoaderClient::didPerformFirstNavigation() const { WebKitWebSettings* settings = webkit_web_view_get_settings(getViewFromFrame(m_frame)); WebKitCacheModel cacheModel; g_object_get(settings, "webview-cache-model", &cacheModel, NULL); webViewSetCacheModel(cacheModel); } Mac and Windows port also set the cache model like this. 313152 1 74727 joone 2010-11-24 00:03:49 -0800 Created attachment 74727 Proposed patch 313199 2 xan.lopez 2010-11-24 03:42:27 -0800 Seems there's two different tasks here. One is doing things on the first navigation method, and the other would be deprecating the methods and adding the setting. I believe they should be addressed separately. FWIW, I'm not so sure that the benefit of the setting is enough to deprecate the existing functions; they might be in the webkitwebview.cpp file but they do not have an object in their API (we could create webkitglobals.cpp and move them there with the default_session getter). 313201 3 xan.lopez 2010-11-24 03:49:07 -0800 It also seems the cache instance and settings are completely global, so I'm not sure of why would you want to constantly set the same value on first navigation? 313202 4 74727 xan.lopez 2010-11-24 03:49:39 -0800 Comment on attachment 74727 Proposed patch r- mostly because I think this can be done in two steps. 313260 5 joone 2010-11-24 06:12:37 -0800 (In reply to comment #2) > Seems there's two different tasks here. One is doing things on the first navigation method, and the other would be deprecating the methods and adding the setting. I believe they should be addressed separately. Okay, I will divide the patch into two. > FWIW, I'm not so sure that the benefit of the setting is enough to deprecate the existing functions; they might be in the webkitwebview.cpp file but they do not have an object in their API (we could create webkitglobals.cpp and move them there with the default_session getter). It seems not neat that the webkit_get/set_cache_model functions are introduced at the same level with other gobjects in the reference manual. Also, if the user want to set WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER, the webkit_set_cache model function should be called twice. 313304 6 xan.lopez 2010-11-24 07:58:35 -0800 (In reply to comment #5) > It seems not neat that the webkit_get/set_cache_model functions are introduced at the same level with other gobjects in the reference manual. This could be solved by just moving the functions to a new webkitglobals.cpp fil. I agree it's ugly. > Also, if the user want to set WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER, the webkit_set_cache model function should be called twice. I don't understand this; why do you have to call it twice? 313545 7 joone 2010-11-24 17:11:42 -0800 > > Also, if the users want to set WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER, the webkit_set_cache_model function should be called twice. > > I don't understand this; why do you have to call it twice? I mean that we don't need to call it twice in that case. Currently, the cache model is set to WEBKIT_CACHE_MODEL_WEB_BROWSER in webkit_init(), so if we want to set WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER, we have to call webkit_set_cache_model function again. However, if we can set the cache-model in the settings, we just call webkit_set_cache_model() once after getting the cache-model property in didPerformFirstNavigation() because the users can change the cache model through the settings before calling webkit_set_cache_model(). 313887 8 joone 2010-11-25 19:58:06 -0800 (In reply to comment #5) > (In reply to comment #2) > > Seems there's two different tasks here. One is doing things on the first navigation method, and the other would be deprecating the methods and adding the setting. I believe they should be addressed separately. > Okay, I will divide the patch into two. I tried to divide this patch into about the first navigation method and deprecating the methods, but it seems impossible to divide it, because we can't access the settings when webkit_init is called. Therefore, I think didPerformFirstNavigation() is the best place to set the cache_model, because we can give a chance for the users to change the settings before calling webkit_set_cache_model(). 315649 9 74727 mrobinson 2010-12-01 08:07:33 -0800 Comment on attachment 74727 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=74727&action=review I think this is a good change. I see an issue with this patch though. The Mac port sets the cache model in didPerformFirstNavigation only if it's autodetected. Otherwise it sets the model as soon as the preferences change. We should replicate that behavior. > WebKit/gtk/webkit/webkitprivate.h:311 > + void webViewSetCacheModel(WebKitCacheModel model); > + This only seems to be used in webkitwebview.cpp, so it should be static and private to that file. > WebKit/gtk/webkit/webkitwebview.cpp:4863 > + * Deprecated: Use WebKitWebSettings:webview-cache-model property instead. Should be "Use the" 316586 10 joone 2010-12-02 18:23:01 -0800 I have filed a new bug #50430 to divide the issue into two such as setting the cache model in didPerformFirstNavigation and introducing the webview-cache-model property, as suggested by Xan. 318138 11 75800 joone 2010-12-07 05:01:53 -0800 Created attachment 75800 Proposed Patch2 The new webview-cache-model property can coexist with the current cache-model APIs,so we should recommend the user agents to use the new property instead of the cache-model APIs if this patch lands. 318140 12 75800 joone 2010-12-07 05:06:01 -0800 Comment on attachment 75800 Proposed Patch2 it has a style problem 318143 13 75803 joone 2010-12-07 05:18:33 -0800 Created attachment 75803 Proposed Patch3 I have submitted the patch again... 318214 14 webkit.review.bot 2010-12-07 08:44:57 -0800 Attachment 75803 did not pass style-queue: Failed to run "[u'git', u'reset', u'--hard', u'refs/remotes/trunk']" exit_code: 128 error: Could not write new index file. fatal: Could not reset index file to revision 'refs/remotes/trunk'. If any of these errors are false positives, please file a bug against check-webkit-style. 318262 15 webkit.review.bot 2010-12-07 09:46:05 -0800 Attachment 75803 did not pass style-queue: Failed to run "[u'git', u'reset', u'--hard', u'refs/remotes/trunk']" exit_code: 128 error: Could not write new index file. fatal: Could not reset index file to revision 'refs/remotes/trunk'. If any of these errors are false positives, please file a bug against check-webkit-style. 318311 16 webkit.review.bot 2010-12-07 10:47:15 -0800 Attachment 75803 did not pass style-queue: Failed to run "[u'git', u'reset', u'--hard', u'refs/remotes/trunk']" exit_code: 128 error: Could not write new index file. fatal: Could not reset index file to revision 'refs/remotes/trunk'. If any of these errors are false positives, please file a bug against check-webkit-style. 318363 17 webkit.review.bot 2010-12-07 11:48:16 -0800 Attachment 75803 did not pass style-queue: Failed to run "[u'git', u'reset', u'--hard', u'refs/remotes/trunk']" exit_code: 128 error: Could not write new index file. fatal: Could not reset index file to revision 'refs/remotes/trunk'. If any of these errors are false positives, please file a bug against check-webkit-style. 318592 18 webkit.review.bot 2010-12-07 21:33:51 -0800 Attachment 75803 did not pass style-queue: Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2 Updating OpenSource Incomplete data: Delta source ended unexpectedly at /usr/lib/git-core/git-svn line 5061 Died at WebKitTools/Scripts/update-webkit line 132. If any of these errors are false positives, please file a bug against check-webkit-style. 999001 19 mrobinson 2014-04-08 18:41:45 -0700 The GTK+ port of WebKit1 has been removed. 74727 2010-11-24 00:03:49 -0800 2010-12-07 05:01:53 -0800 Proposed patch cache_model.patch text/plain 9445 joone ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggYjI4YWQ3Yi4uYzZmOTYzNCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0xMS0yMyAg Sm9vbmUgSHVyICA8am9vbmVAa2xkcC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW0dUS10gTmVlZCAnd2Vidmlldy1jYWNoZS1tb2RlbCcgcHJv cGVydHkgaW4gV2ViS2l0V2ViU2V0dGluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTUwMDA0CisKKyAgICAgICAgQWRkIGEgbmV3IHByb3BlcnR5KHdl YnZpZXctY2FjaGUtbW9kZWwpIHRvIFdlYktpdFdlYlNldHRpbmdzIGFuZCAKKyAgICAgICAgdXNl IHRoZSBkaWRQZXJmb3JtRmlyc3ROYXZpZ2F0aW9uIGNhbGxiYWNrIHRvIHNldCB0aGUgY2FjaGUg bW9kZWwgCisgICAgICAgIGluc3RlYWQgb2YgdXNpbmcgdGhlIHdlYmtpdF9zZXRfY2FjaGUgZnVu Y3Rpb25zIGRpcmVjdGx5LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudDo6ZGlkUGVy Zm9ybUZpcnN0TmF2aWdhdGlvbik6IHNldCB0aGUgY2FjaGUgbW9kZWwuCisgICAgICAgICogd2Vi a2l0L3dlYmtpdHByaXZhdGUuY3BwOgorICAgICAgICAod2Via2l0X2luaXQpOiBUaGUgY2FjaGUg bW9kZWwgZG9lc24ndCBzZXQgaGVyZSBhbnkgbW9yZS4KKyAgICAgICAgKiB3ZWJraXQvd2Via2l0 cHJpdmF0ZS5oOgorICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHA6CisgICAg ICAgICh3ZWJraXRfd2ViX3NldHRpbmdzX2NsYXNzX2luaXQpOiBBZGRlZCAnd2Vidmlldy1jYWNo ZS1tb2RlbCcgcHJvcGVydHkuCisgICAgICAgICh3ZWJraXRfd2ViX3NldHRpbmdzX3NldF9wcm9w ZXJ0eSk6IERpdHRvLiAKKyAgICAgICAgKHdlYmtpdF93ZWJfc2V0dGluZ3NfZ2V0X3Byb3BlcnR5 KTogRGl0dG8uCisgICAgICAgICh3ZWJraXRfd2ViX3NldHRpbmdzX2NvcHkpOiBEaXR0by4KKyAg ICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6CisgICAgICAgICh3ZWJraXRfc2V0X2Nh Y2hlX21vZGVsKTogRGVwcmVjYXRlZC4KKyAgICAgICAgKHdlYmtpdF9nZXRfY2FjaGVfbW9kZWwp OiBEZXByZWNhdGVkLgorICAgICAgICAod2ViVmlld1NldENhY2hlTW9kZWwpOiBBZGRlZCBhcyBh IHByaXZhdGUgZnVuY3Rpb24uCisKIDIwMTAtMTEtMjMgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4KZGlmZiAtLWdp dCBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwIGIv V2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAKaW5kZXgg ZmRlZjlkYy4uOTZlYjYzNiAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9G cmFtZUxvYWRlckNsaWVudEd0ay5jcHAKKysrIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9G cmFtZUxvYWRlckNsaWVudEd0ay5jcHAKQEAgLTY5MCw2ICs2OTAsMTEgQEAgdm9pZCBGcmFtZUxv YWRlckNsaWVudDo6ZG9jdW1lbnRFbGVtZW50QXZhaWxhYmxlKCkKIAogdm9pZCBGcmFtZUxvYWRl ckNsaWVudDo6ZGlkUGVyZm9ybUZpcnN0TmF2aWdhdGlvbigpIGNvbnN0CiB7CisgICAgV2ViS2l0 V2ViU2V0dGluZ3MqIHNldHRpbmdzID0gd2Via2l0X3dlYl92aWV3X2dldF9zZXR0aW5ncyhnZXRW aWV3RnJvbUZyYW1lKG1fZnJhbWUpKTsKKworICAgIFdlYktpdENhY2hlTW9kZWwgY2FjaGVNb2Rl bDsKKyAgICBnX29iamVjdF9nZXQoc2V0dGluZ3MsICJ3ZWJ2aWV3LWNhY2hlLW1vZGVsIiwgJmNh Y2hlTW9kZWwsIE5VTEwpOworICAgIHdlYlZpZXdTZXRDYWNoZU1vZGVsKGNhY2hlTW9kZWwpOwog fQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpyZWdpc3RlckZvckljb25Ob3RpZmljYXRpb24o Ym9vbCBzaG91bGRSZWdpc3RlcikKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtp dHByaXZhdGUuY3BwIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHAKaW5kZXgg YWEzZDNkYS4uYjY0YjM0YyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJp dmF0ZS5jcHAKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHAKQEAgLTI4 MywxMSArMjgzLDYgQEAgdm9pZCB3ZWJraXRfaW5pdCgpCiAgICAgLy8gdGhhdCBtYXkgb25seSBi ZSBkb25lIGJ5IHRoZSBtYWluIHRocmVhZC4KICAgICBhdG9taWNDYW5vbmljYWxUZXh0RW5jb2Rp bmdOYW1lKCJVVEYtOCIpOwogCi0gICAgLy8gUGFnZSBjYWNoZSBjYXBhY2l0eSAoaW4gcGFnZXMp LiBDb21tZW50IGZyb20gTWFjIHBvcnQ6Ci0gICAgLy8gKFJlc2VhcmNoIGluZGljYXRlcyB0aGF0 IHZhbHVlIC8gcGFnZSBkcm9wcyBzdWJzdGFudGlhbGx5IGFmdGVyIDMgcGFnZXMuKQotICAgIC8v IEZJWE1FOiBFeHBvc2UgdGhpcyB3aXRoIGFuIEFQSSBhbmQvb3IgY2FsY3VsYXRlIGJhc2VkIG9u IGF2YWlsYWJsZSByZXNvdXJjZXMKLSAgICB3ZWJraXRfc2V0X2NhY2hlX21vZGVsKFdFQktJVF9D QUNIRV9NT0RFTF9XRUJfQlJPV1NFUik7Ci0KICNpZiBFTkFCTEUoREFUQUJBU0UpCiAgICAgZ2No YXIqIGRhdGFiYXNlRGlyZWN0b3J5ID0gZ19idWlsZF9maWxlbmFtZShnX2dldF91c2VyX2RhdGFf ZGlyKCksICJ3ZWJraXQiLCAiZGF0YWJhc2VzIiwgTlVMTCk7CiAgICAgd2Via2l0X3NldF93ZWJf ZGF0YWJhc2VfZGlyZWN0b3J5X3BhdGgoZGF0YWJhc2VEaXJlY3RvcnkpOwpkaWZmIC0tZ2l0IGEv V2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5oIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Vi a2l0cHJpdmF0ZS5oCmluZGV4IGUwOTBlZDQuLjRlNmQ2MmYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRw cml2YXRlLmgKQEAgLTMwNyw2ICszMDcsOCBAQCBleHRlcm4gIkMiIHsKICAgICBXRUJLSVRfQVBJ IGdib29sZWFuCiAgICAgd2Via2l0X3dlYl92aWV3X2lzX2NvbW1hbmRfZW5hYmxlZChXZWJLaXRX ZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBnY2hhciogbmFtZSk7CiAKKyAgICB2b2lkIHdlYlZpZXdT ZXRDYWNoZU1vZGVsKFdlYktpdENhY2hlTW9kZWwgbW9kZWwpOworCiAgICAgV2ViS2l0RG93bmxv YWQqCiAgICAgd2Via2l0X2Rvd25sb2FkX25ld193aXRoX2hhbmRsZShXZWJLaXROZXR3b3JrUmVx dWVzdCogcmVxdWVzdCwgV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqIGhhbmRsZSwgY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpOwogCmRpZmYgLS1naXQgYS9XZWJLaXQv Z3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXR3ZWJzZXR0aW5ncy5jcHAKaW5kZXggMjY2MWI4Mi4uZTk3MDdjNiAxMDA2NDQKLS0tIGEvV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcApAQCAtNiw2ICs2LDcgQEAKICAqIENvcHlyaWdodCAo QykgMjAwOSBKYW4gTWljaGFlbCBBbG9uem8KICAqIENvcHlyaWdodCAoQykgMjAwOSBNb3ZpYWwg Q3JlYXRpdmUgVGVjaG5vbG9naWVzIEluYy4KICAqIENvcHlyaWdodCAoQykgMjAwOSBJZ2FsaWEg Uy5MLgorICogQ29weXJpZ2h0IChDKSAyMDEwIEpvb25lIEh1ciA8am9vbmVAa2xkcC5vcmc+CiAg KgogICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRl IGl0IGFuZC9vcgogICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJh cnkgR2VuZXJhbCBQdWJsaWMKQEAgLTExMCw2ICsxMTEsNyBAQCBzdHJ1Y3QgX1dlYktpdFdlYlNl dHRpbmdzUHJpdmF0ZSB7CiAgICAgZ2Jvb2xlYW4gYXV0b19yZXNpemVfd2luZG93OwogICAgIGdi b29sZWFuIGVuYWJsZV9qYXZhX2FwcGxldDsKICAgICBnYm9vbGVhbiBlbmFibGVfaHlwZXJsaW5r X2F1ZGl0aW5nOworICAgIFdlYktpdENhY2hlTW9kZWwgd2Vidmlld19jYWNoZV9tb2RlbDsKIH07 CiAKICNkZWZpbmUgV0VCS0lUX1dFQl9TRVRUSU5HU19HRVRfUFJJVkFURShvYmopIChHX1RZUEVf SU5TVEFOQ0VfR0VUX1BSSVZBVEUoKG9iaiksIFdFQktJVF9UWVBFX1dFQl9TRVRUSU5HUywgV2Vi S2l0V2ViU2V0dGluZ3NQcml2YXRlKSkKQEAgLTE2MSw3ICsxNjMsOCBAQCBlbnVtIHsKICAgICBQ Uk9QX0VOQUJMRV9QQUdFX0NBQ0hFLAogICAgIFBST1BfQVVUT19SRVNJWkVfV0lORE9XLAogICAg IFBST1BfRU5BQkxFX0pBVkFfQVBQTEVULAotICAgIFBST1BfRU5BQkxFX0hZUEVSTElOS19BVURJ VElORworICAgIFBST1BfRU5BQkxFX0hZUEVSTElOS19BVURJVElORywKKyAgICBQUk9QX1dFQlZJ RVdfQ0FDSEVfTU9ERUwKIH07CiAKIC8vIENyZWF0ZSBhIGRlZmF1bHQgdXNlciBhZ2VudCBzdHJp bmcKQEAgLTkwMiw2ICs5MDUsMzEgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zZXR0aW5nc19j bGFzc19pbml0KFdlYktpdFdlYlNldHRpbmdzQ2xhc3MqIGtsYXNzKQogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRkFMU0UsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmbGFncykp OwogCisgICAgLyoqCisgICAgKiBXZWJLaXRXZWJTZXR0aW5nczp3ZWJ2aWV3LWNhY2hlLW1vZGVs OgorICAgICoKKyAgICAqIFNldCBhIHVzYWdlIG1vZGVsIGZvciAjV2ViS2l0V2ViVmlldywgd2hp Y2ggV2ViS2l0IHdpbGwgdXNlIHRvCisgICAgKiBkZXRlcm1pbmUgaXRzIGNhY2hpbmcgYmVoYXZp b3IuIEFsbCB3ZWIgdmlld3MgZm9sbG93IHRoZSBjYWNoZQorICAgICogbW9kZWwuIFRoaXMgY2Fj aGUgbW9kZWwgZGV0ZXJtaW5lcyB0aGUgUkFNIGFuZCBkaXNrIHNwYWNlIHRvIHVzZQorICAgICog Zm9yIGNhY2hpbmcgcHJldmlvdXNseSB2aWV3ZWQgY29udGVudC4KKyAgICAqCisgICAgKiBCcm93 c2VycyBjYW4gaW1wcm92ZSBkb2N1bWVudCBsb2FkIHNwZWVkIHN1YnN0YW50aWFsbHkgYnkKKyAg ICAqIHNwZWNpZnlpbmcgV0VCS0lUX0NBQ0hFX01PREVMX1dFQl9CUk9XU0VSLiBBcHBsaWNhdGlv bnMgd2l0aG91dCBhCisgICAgKiBicm93c2luZyBpbnRlcmZhY2UgY2FuIHJlZHVjZSBtZW1vcnkg dXNhZ2Ugc3Vic3RhbnRpYWxseSBieQorICAgICogc3BlY2lmeWluZyBXRUJLSVRfQ0FDSEVfTU9E RUxfRE9DVU1FTlRfVklFV0VSLiBEZWZhdWx0IHZhbHVlIGlzCisgICAgKiBXRUJLSVRfQ0FDSEVf TU9ERUxfV0VCX0JST1dTRVIuCisgICAgKgorICAgICogU2luY2U6IDEuMy41CisgICAgKi8KKyAg ICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KGdvYmplY3RfY2xhc3MsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9QX1dFQlZJRVdfQ0FDSEVfTU9ERUwsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnX3BhcmFtX3NwZWNfZW51bSgid2Vi dmlldy1jYWNoZS1tb2RlbCIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBfKCJXZWJWaWV3IENhY2hlIE1vZGVsIiksCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfKCJTZXQgdGhlIHdlYnZp ZXcgY2FjaGUgbW9kZWwiKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFdFQktJVF9UWVBFX0NBQ0hFX01PREVMLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV0VCS0lUX0NBQ0hFX01PREVM X1dFQl9CUk9XU0VSLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZmxhZ3MpKTsKKwogICAgIGdfdHlwZV9jbGFzc19hZGRfcHJpdmF0ZShrbGFz cywgc2l6ZW9mKFdlYktpdFdlYlNldHRpbmdzUHJpdmF0ZSkpOwogfQogCkBAIC0xMTI4LDYgKzEx NTYsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NldHRpbmdzX3NldF9wcm9wZXJ0eShHT2Jq ZWN0KiBvYmplY3QsIGd1aW50IHByb3BfaWQsIGNvbgogICAgIGNhc2UgUFJPUF9FTkFCTEVfSFlQ RVJMSU5LX0FVRElUSU5HOgogICAgICAgICBwcml2LT5lbmFibGVfaHlwZXJsaW5rX2F1ZGl0aW5n ID0gZ192YWx1ZV9nZXRfYm9vbGVhbih2YWx1ZSk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2Ug UFJPUF9XRUJWSUVXX0NBQ0hFX01PREVMOgorICAgICAgICBwcml2LT53ZWJ2aWV3X2NhY2hlX21v ZGVsPSBzdGF0aWNfY2FzdDxXZWJLaXRDYWNoZU1vZGVsPihnX3ZhbHVlX2dldF9lbnVtKHZhbHVl KSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5f SU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BfaWQsIHBzcGVjKTsKICAgICAgICAgYnJl YWs7CkBAIC0xMjc1LDYgKzEzMDYsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NldHRpbmdz X2dldF9wcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BfaWQsIEdWYQogICAgIGNh c2UgUFJPUF9FTkFCTEVfSFlQRVJMSU5LX0FVRElUSU5HOgogICAgICAgICBnX3ZhbHVlX3NldF9i b29sZWFuKHZhbHVlLCBwcml2LT5lbmFibGVfaHlwZXJsaW5rX2F1ZGl0aW5nKTsKICAgICAgICAg YnJlYWs7CisgICAgY2FzZSBQUk9QX1dFQlZJRVdfQ0FDSEVfTU9ERUw6CisgICAgICAgIGdfdmFs dWVfc2V0X2VudW0odmFsdWUsIHByaXYtPndlYnZpZXdfY2FjaGVfbW9kZWwpOworICAgICAgICBi cmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFMSURfUFJPUEVS VFlfSUQob2JqZWN0LCBwcm9wX2lkLCBwc3BlYyk7CiAgICAgICAgIGJyZWFrOwpAQCAtMTM1MCw2 ICsxMzg0LDcgQEAgV2ViS2l0V2ViU2V0dGluZ3MqIHdlYmtpdF93ZWJfc2V0dGluZ3NfY29weShX ZWJLaXRXZWJTZXR0aW5ncyogd2ViX3NldHRpbmdzKQogICAgICAgICAgICAgICAgICAiYXV0by1y ZXNpemUtd2luZG93IiwgcHJpdi0+YXV0b19yZXNpemVfd2luZG93LAogICAgICAgICAgICAgICAg ICAiZW5hYmxlLWphdmEtYXBwbGV0IiwgcHJpdi0+ZW5hYmxlX2phdmFfYXBwbGV0LAogICAgICAg ICAgICAgICAgICAiZW5hYmxlLWh5cGVybGluay1hdWRpdGluZyIsIHByaXYtPmVuYWJsZV9oeXBl cmxpbmtfYXVkaXRpbmcsCisgICAgICAgICAgICAgICAgICJ3ZWJ2aWV3LWNhY2hlLW1vZGVsIiwg cHJpdi0+d2Vidmlld19jYWNoZV9tb2RlbCwKICAgICAgICAgICAgICAgICAgTlVMTCkpOwogCiAg ICAgcmV0dXJuIGNvcHk7CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2 aWV3LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IGVkNjE1 MTYuLmQ1MzgzMjMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcu Y3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC00ODYwLDEy ICs0ODYwLDM1IEBAIFNvdXBTZXNzaW9uKiB3ZWJraXRfZ2V0X2RlZmF1bHRfc2Vzc2lvbiAoKQog ICogc3BlY2lmeWluZyBXRUJLSVRfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfVklFV0VSLiBEZWZhdWx0 IHZhbHVlIGlzCiAgKiBXRUJLSVRfQ0FDSEVfTU9ERUxfV0VCX0JST1dTRVIuCiAgKgotICogU2lu Y2U6IDEuMS4xOAorICogRGVwcmVjYXRlZDogVXNlIFdlYktpdFdlYlNldHRpbmdzOndlYnZpZXct Y2FjaGUtbW9kZWwgcHJvcGVydHkgaW5zdGVhZC4KICAqLwogdm9pZCB3ZWJraXRfc2V0X2NhY2hl X21vZGVsKFdlYktpdENhY2hlTW9kZWwgbW9kZWwpCiB7CiAgICAgd2Via2l0X2luaXQoKTsKKyAg ICB3ZWJWaWV3U2V0Q2FjaGVNb2RlbChtb2RlbCk7Cit9CisKKy8qKgorICogd2Via2l0X2dldF9j YWNoZV9tb2RlbDoKKyAqCisgKiBSZXR1cm5zIHRoZSBjdXJyZW50IGNhY2hlIG1vZGVsLiBGb3Ig bW9yZSBpbmZvcm1hdGlvbiBhYm91dCB0aGlzCisgKiB2YWx1ZSBjaGVjayB0aGUgZG9jdW1lbnRh dGlvbiBvZiB0aGUgZnVuY3Rpb24KKyAqIHdlYmtpdF9zZXRfY2FjaGVfbW9kZWwoKS4KKyAqCisg KiBSZXR1cm4gdmFsdWU6IHRoZSBjdXJyZW50ICNXZWJLaXRDYWNoZU1vZGVsCisgKgorICogRGVw cmVjYXRlZDogVXNlIFdlYktpdFdlYlNldHRpbmdzOndlYnZpZXctY2FjaGUtbW9kZWwgcHJvcGVy dHkgaW5zdGVhZC4KKyAqLworV2ViS2l0Q2FjaGVNb2RlbCB3ZWJraXRfZ2V0X2NhY2hlX21vZGVs KCkKK3sKKyAgICB3ZWJraXRfaW5pdCgpOworICAgIHJldHVybiBjYWNoZU1vZGVsOworfQogCisv LyBTcGVjaWZpZXMgYSB1c2FnZSBtb2RlbCBmb3IgV2ViVmlld3MsIHdoaWNoIFdlYktpdCB3aWxs IHVzZSB0bworLy8gZGV0ZXJtaW5lIGl0cyBjYWNoaW5nIGJlaGF2aW9yLgordm9pZCB3ZWJWaWV3 U2V0Q2FjaGVNb2RlbChXZWJLaXRDYWNoZU1vZGVsIG1vZGVsKQorewogICAgIGlmIChjYWNoZU1v ZGVsID09IG1vZGVsKQogICAgICAgICByZXR1cm47CiAKQEAgLTQ5MDEsMjMgKzQ5MjQsNiBAQCB2 b2lkIHdlYmtpdF9zZXRfY2FjaGVfbW9kZWwoV2ViS2l0Q2FjaGVNb2RlbCBtb2RlbCkKICAgICBj YWNoZU1vZGVsID0gbW9kZWw7CiB9CiAKLS8qKgotICogd2Via2l0X2dldF9jYWNoZV9tb2RlbDoK LSAqCi0gKiBSZXR1cm5zIHRoZSBjdXJyZW50IGNhY2hlIG1vZGVsLiBGb3IgbW9yZSBpbmZvcm1h dGlvbiBhYm91dCB0aGlzCi0gKiB2YWx1ZSBjaGVjayB0aGUgZG9jdW1lbnRhdGlvbiBvZiB0aGUg ZnVuY3Rpb24KLSAqIHdlYmtpdF9zZXRfY2FjaGVfbW9kZWwoKS4KLSAqCi0gKiBSZXR1cm4gdmFs dWU6IHRoZSBjdXJyZW50ICNXZWJLaXRDYWNoZU1vZGVsCi0gKgotICogU2luY2U6IDEuMS4xOAot ICovCi1XZWJLaXRDYWNoZU1vZGVsIHdlYmtpdF9nZXRfY2FjaGVfbW9kZWwoKQotewotICAgIHdl YmtpdF9pbml0KCk7Ci0gICAgcmV0dXJuIGNhY2hlTW9kZWw7Ci19Ci0KIHZvaWQgd2Via2l0X3dl Yl92aWV3X2V4ZWN1dGVfY29yZV9jb21tYW5kX2J5X25hbWUoV2ViS2l0V2ViVmlldyogd2ViVmll dywgY29uc3QgZ2NoYXIqIG5hbWUsIGNvbnN0IGdjaGFyKiB2YWx1ZSkKIHsKICAgICBnX3JldHVy bl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7Cg== 75800 2010-12-07 05:01:53 -0800 2010-12-07 05:06:00 -0800 Proposed Patch2 cache_model.patch text/plain 9490 joone ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggNzM2NzM4OC4uNmIzNzZiNSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxMC0xMi0wNyAg Sm9vbmUgSHVyICA8am9vbmVAa2xkcC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW0dUS10gTmVlZCAnd2Vidmlldy1jYWNoZS1tb2RlbCcgcHJv cGVydHkgaW4gV2ViS2l0V2ViU2V0dGluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTUwMDA0CisKKyAgICAgICAgQWRkIGEgbmV3IHByb3BlcnR5KHdl YnZpZXctY2FjaGUtbW9kZWwpIHRvIFdlYktpdFdlYlNldHRpbmdzCisgICAgICAgIGluc3RlYWQg b2YgdXNpbmcgdGhlIHdlYmtpdF9zZXRfY2FjaGVfbW9kZWwoKSBmdW5jdGlvbnMgZGlyZWN0bHku CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50OjpkaWRQZXJmb3JtRmlyc3ROYXZpZ2F0 aW9uKTogc2V0IHRoZSBjYWNoZSBtb2RlbC4KKyAgICAgICAgKiB3ZWJraXQvd2Via2l0cHJpdmF0 ZS5jcHA6CisgICAgICAgICh3ZWJraXRfaW5pdCk6IFRoZSBjYWNoZSBtb2RlbCBkb2Vzbid0IHNl dCBoZXJlIGFueSBtb3JlLgorICAgICAgICAqIHdlYmtpdC93ZWJraXRwcml2YXRlLmg6CisgICAg ICAgICogd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJf c2V0dGluZ3NfY2xhc3NfaW5pdCk6IEFkZGVkICd3ZWJ2aWV3LWNhY2hlLW1vZGVsJyBwcm9wZXJ0 eS4KKyAgICAgICAgKHdlYmtpdF93ZWJfc2V0dGluZ3Nfc2V0X3Byb3BlcnR5KTogRGl0dG8uIAor ICAgICAgICAod2Via2l0X3dlYl9zZXR0aW5nc19nZXRfcHJvcGVydHkpOiBEaXR0by4KKyAgICAg ICAgKHdlYmtpdF93ZWJfc2V0dGluZ3NfY29weSk6IERpdHRvLgorICAgICAgICAqIHdlYmtpdC93 ZWJraXR3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdF9zZXRfY2FjaGVfbW9kZWwpOiBEZXBy ZWNhdGVkLgorICAgICAgICAod2Via2l0X2dldF9jYWNoZV9tb2RlbCk6IERlcHJlY2F0ZWQuCisg ICAgICAgICh3ZWJWaWV3U2V0Q2FjaGVNb2RlbCk6IEFkZGVkIGFzIGEgcHJpdmF0ZSBmdW5jdGlv bi4KKwogMjAxMC0xMi0wNiAgTmF0ZSBDaGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IDk2MTNiYjEuLjZjZGQwZGEg MTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRH dGsuY3BwCisrKyBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRH dGsuY3BwCkBAIC02OTAsMTAgKzY5MCwxNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50Ojpkb2N1 bWVudEVsZW1lbnRBdmFpbGFibGUoKQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaWRQZXJm b3JtRmlyc3ROYXZpZ2F0aW9uKCkgY29uc3QKIHsKLSAgICBXZWJLaXRDYWNoZU1vZGVsIGNhY2hl TW9kZWwgPSB3ZWJraXRfZ2V0X2NhY2hlX21vZGVsKCk7Ci0gICAgLy8gSWYgdXNlciBhZ2VudHMg ZG8gbm90IGRldGVybWluZSB0aGUgY2FjaGUgbW9kZWwsIHdlIHVzZSBXRUJLSVRfQ0FDSEVfTU9E RUxfV0VCX0JST1dTRVIgYnkgZGVmYXVsdC4KLSAgICBpZiAoY2FjaGVNb2RlbCA9PSBXRUJLSVRf Q0FDSEVfTU9ERUxfREVGQVVMVCkKLSAgICAgICAgd2Via2l0X3NldF9jYWNoZV9tb2RlbChXRUJL SVRfQ0FDSEVfTU9ERUxfV0VCX0JST1dTRVIpOworICAgIFdlYktpdFdlYlNldHRpbmdzKiBzZXR0 aW5ncyA9IHdlYmtpdF93ZWJfdmlld19nZXRfc2V0dGluZ3MoZ2V0Vmlld0Zyb21GcmFtZShtX2Zy YW1lKSk7CisKKyAgICAvLyBJZiB0aGUgdXNlciBhZ2VudHMgZG8gbm90IHVzZSB0aGUgZGVwcmVj YXRlZCBBUEkod2Via2l0X3NldF9jYWNoZV9tb2RlbCkgdG8gc2V0IHRoZSBjYWNoZSBtb2RlbCwK KyAgICAvLyB3ZSB1c2UgdGhlIHdlYnZpZXctY2FjaGUtbW9kZWwgcHJvcHJlcnR5IHRvIGRldGVy bWluZSB0aGUgY2FjaGUgbW9kZWwuCisgICAgaWYgKHdlYmtpdF9nZXRfY2FjaGVfbW9kZWwoKSA9 PSBXRUJLSVRfQ0FDSEVfTU9ERUxfREVGQVVMVCkKKyAgICB7CisgICAgICAgIFdlYktpdENhY2hl TW9kZWwgY2FjaGVNb2RlbDsKKyAgICAgICAgZ19vYmplY3RfZ2V0KHNldHRpbmdzLCAid2Vidmll dy1jYWNoZS1tb2RlbCIsICZjYWNoZU1vZGVsLCBOVUxMKTsKKyAgICAgICAgLy8gVGhlIHdlYnZp ZXctY2FjaGUtbW9kZWwgcHJvcGVydHkgaGFzIFdFQktJVF9DQUNIRV9NT0RFTF9XRUJfQlJPV1NF UiBieSBkZWZhdWx0LgorICAgICAgICB3ZWJWaWV3U2V0Q2FjaGVNb2RlbChjYWNoZU1vZGVsKTsK KyAgICB9CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OnJlZ2lzdGVyRm9ySWNvbk5vdGlm aWNhdGlvbihib29sIHNob3VsZFJlZ2lzdGVyKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJr aXQvd2Via2l0cHJpdmF0ZS5oIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5oCmlu ZGV4IDBiNTk3NDYuLmI4NTQzOGYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtp dHByaXZhdGUuaAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgKQEAgLTMw MSw2ICszMDEsOCBAQCBleHRlcm4gIkMiIHsKICAgICBHdGtNZW51KgogICAgIHdlYmtpdF93ZWJf dmlld19nZXRfY29udGV4dF9tZW51KFdlYktpdFdlYlZpZXcqKTsKIAorICAgIHZvaWQgd2ViVmll d1NldENhY2hlTW9kZWwoV2ViS2l0Q2FjaGVNb2RlbCBtb2RlbCk7CisKICAgICBXZWJLaXREb3du bG9hZCoKICAgICB3ZWJraXRfZG93bmxvYWRfbmV3X3dpdGhfaGFuZGxlKFdlYktpdE5ldHdvcmtS ZXF1ZXN0KiByZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSogaGFuZGxlLCBjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSk7CiAKZGlmZiAtLWdpdCBhL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dl YmtpdHdlYnNldHRpbmdzLmNwcAppbmRleCAyNjYxYjgyLi5jNjBjZjlkIDEwMDY0NAotLS0gYS9X ZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAKKysrIGIvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwCkBAIC02LDYgKzYsNyBAQAogICogQ29weXJpZ2h0 IChDKSAyMDA5IEphbiBNaWNoYWVsIEFsb256bwogICogQ29weXJpZ2h0IChDKSAyMDA5IE1vdmlh bCBDcmVhdGl2ZSBUZWNobm9sb2dpZXMgSW5jLgogICogQ29weXJpZ2h0IChDKSAyMDA5IElnYWxp YSBTLkwuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAgSm9vbmUgSHVyIDxqb29uZUBrbGRwLm9yZz4K ICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1 dGUgaXQgYW5kL29yCiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGli cmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtMTEwLDYgKzExMSw3IEBAIHN0cnVjdCBfV2ViS2l0V2Vi U2V0dGluZ3NQcml2YXRlIHsKICAgICBnYm9vbGVhbiBhdXRvX3Jlc2l6ZV93aW5kb3c7CiAgICAg Z2Jvb2xlYW4gZW5hYmxlX2phdmFfYXBwbGV0OwogICAgIGdib29sZWFuIGVuYWJsZV9oeXBlcmxp bmtfYXVkaXRpbmc7CisgICAgV2ViS2l0Q2FjaGVNb2RlbCB3ZWJ2aWV3X2NhY2hlX21vZGVsOwog fTsKIAogI2RlZmluZSBXRUJLSVRfV0VCX1NFVFRJTkdTX0dFVF9QUklWQVRFKG9iaikgKEdfVFlQ RV9JTlNUQU5DRV9HRVRfUFJJVkFURSgob2JqKSwgV0VCS0lUX1RZUEVfV0VCX1NFVFRJTkdTLCBX ZWJLaXRXZWJTZXR0aW5nc1ByaXZhdGUpKQpAQCAtMTYxLDcgKzE2Myw4IEBAIGVudW0gewogICAg IFBST1BfRU5BQkxFX1BBR0VfQ0FDSEUsCiAgICAgUFJPUF9BVVRPX1JFU0laRV9XSU5ET1csCiAg ICAgUFJPUF9FTkFCTEVfSkFWQV9BUFBMRVQsCi0gICAgUFJPUF9FTkFCTEVfSFlQRVJMSU5LX0FV RElUSU5HCisgICAgUFJPUF9FTkFCTEVfSFlQRVJMSU5LX0FVRElUSU5HLAorICAgIFBST1BfV0VC VklFV19DQUNIRV9NT0RFTAogfTsKIAogLy8gQ3JlYXRlIGEgZGVmYXVsdCB1c2VyIGFnZW50IHN0 cmluZwpAQCAtOTAyLDYgKzkwNSwzMSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NldHRpbmdz X2NsYXNzX2luaXQoV2ViS2l0V2ViU2V0dGluZ3NDbGFzcyoga2xhc3MpCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGQUxTRSwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsYWdz KSk7CiAKKyAgICAvKioKKyAgICAqIFdlYktpdFdlYlNldHRpbmdzOndlYnZpZXctY2FjaGUtbW9k ZWw6CisgICAgKgorICAgICogU2V0IGEgdXNhZ2UgbW9kZWwgZm9yICNXZWJLaXRXZWJWaWV3LCB3 aGljaCBXZWJLaXQgd2lsbCB1c2UgdG8KKyAgICAqIGRldGVybWluZSBpdHMgY2FjaGluZyBiZWhh dmlvci4gQWxsIHdlYiB2aWV3cyBmb2xsb3cgdGhlIGNhY2hlCisgICAgKiBtb2RlbC4gVGhpcyBj YWNoZSBtb2RlbCBkZXRlcm1pbmVzIHRoZSBSQU0gYW5kIGRpc2sgc3BhY2UgdG8gdXNlCisgICAg KiBmb3IgY2FjaGluZyBwcmV2aW91c2x5IHZpZXdlZCBjb250ZW50LgorICAgICoKKyAgICAqIEJy b3dzZXJzIGNhbiBpbXByb3ZlIGRvY3VtZW50IGxvYWQgc3BlZWQgc3Vic3RhbnRpYWxseSBieQor ICAgICogc3BlY2lmeWluZyBXRUJLSVRfQ0FDSEVfTU9ERUxfV0VCX0JST1dTRVIuIEFwcGxpY2F0 aW9ucyB3aXRob3V0IGEKKyAgICAqIGJyb3dzaW5nIGludGVyZmFjZSBjYW4gcmVkdWNlIG1lbW9y eSB1c2FnZSBzdWJzdGFudGlhbGx5IGJ5CisgICAgKiBzcGVjaWZ5aW5nIFdFQktJVF9DQUNIRV9N T0RFTF9ET0NVTUVOVF9WSUVXRVIuCisgICAgKiBXZSB1c2UgV0VCS0lUX0NBQ0hFX01PREVMX1dF Ql9CUk9XU0VSIGJ5IGRlZmF1bHQuCisgICAgKgorICAgICogU2luY2U6IDEuMy44CisgICAgKi8K KyAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KGdvYmplY3RfY2xhc3MsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9QX1dFQlZJRVdfQ0FDSEVfTU9ERUws CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnX3BhcmFtX3NwZWNfZW51bSgi d2Vidmlldy1jYWNoZS1tb2RlbCIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBfKCJXZWJWaWV3IENhY2hlIE1vZGVsIiksCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfKCJTZXQgdGhlIHdl YnZpZXcgY2FjaGUgbW9kZWwiKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFdFQktJVF9UWVBFX0NBQ0hFX01PREVMLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV0VCS0lUX0NBQ0hFX01P REVMX1dFQl9CUk9XU0VSLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZmxhZ3MpKTsKKwogICAgIGdfdHlwZV9jbGFzc19hZGRfcHJpdmF0ZShr bGFzcywgc2l6ZW9mKFdlYktpdFdlYlNldHRpbmdzUHJpdmF0ZSkpOwogfQogCkBAIC0xMTI4LDYg KzExNTYsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NldHRpbmdzX3NldF9wcm9wZXJ0eShH T2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BfaWQsIGNvbgogICAgIGNhc2UgUFJPUF9FTkFCTEVf SFlQRVJMSU5LX0FVRElUSU5HOgogICAgICAgICBwcml2LT5lbmFibGVfaHlwZXJsaW5rX2F1ZGl0 aW5nID0gZ192YWx1ZV9nZXRfYm9vbGVhbih2YWx1ZSk7CiAgICAgICAgIGJyZWFrOworICAgIGNh c2UgUFJPUF9XRUJWSUVXX0NBQ0hFX01PREVMOgorICAgICAgICBwcml2LT53ZWJ2aWV3X2NhY2hl X21vZGVsPSBzdGF0aWNfY2FzdDxXZWJLaXRDYWNoZU1vZGVsPihnX3ZhbHVlX2dldF9lbnVtKHZh bHVlKSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dB Uk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BfaWQsIHBzcGVjKTsKICAgICAgICAg YnJlYWs7CkBAIC0xMjc1LDYgKzEzMDYsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NldHRp bmdzX2dldF9wcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BfaWQsIEdWYQogICAg IGNhc2UgUFJPUF9FTkFCTEVfSFlQRVJMSU5LX0FVRElUSU5HOgogICAgICAgICBnX3ZhbHVlX3Nl dF9ib29sZWFuKHZhbHVlLCBwcml2LT5lbmFibGVfaHlwZXJsaW5rX2F1ZGl0aW5nKTsKICAgICAg ICAgYnJlYWs7CisgICAgY2FzZSBQUk9QX1dFQlZJRVdfQ0FDSEVfTU9ERUw6CisgICAgICAgIGdf dmFsdWVfc2V0X2VudW0odmFsdWUsIHByaXYtPndlYnZpZXdfY2FjaGVfbW9kZWwpOworICAgICAg ICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFMSURfUFJP UEVSVFlfSUQob2JqZWN0LCBwcm9wX2lkLCBwc3BlYyk7CiAgICAgICAgIGJyZWFrOwpAQCAtMTM1 MCw2ICsxMzg0LDcgQEAgV2ViS2l0V2ViU2V0dGluZ3MqIHdlYmtpdF93ZWJfc2V0dGluZ3NfY29w eShXZWJLaXRXZWJTZXR0aW5ncyogd2ViX3NldHRpbmdzKQogICAgICAgICAgICAgICAgICAiYXV0 by1yZXNpemUtd2luZG93IiwgcHJpdi0+YXV0b19yZXNpemVfd2luZG93LAogICAgICAgICAgICAg ICAgICAiZW5hYmxlLWphdmEtYXBwbGV0IiwgcHJpdi0+ZW5hYmxlX2phdmFfYXBwbGV0LAogICAg ICAgICAgICAgICAgICAiZW5hYmxlLWh5cGVybGluay1hdWRpdGluZyIsIHByaXYtPmVuYWJsZV9o eXBlcmxpbmtfYXVkaXRpbmcsCisgICAgICAgICAgICAgICAgICJ3ZWJ2aWV3LWNhY2hlLW1vZGVs IiwgcHJpdi0+d2Vidmlld19jYWNoZV9tb2RlbCwKICAgICAgICAgICAgICAgICAgTlVMTCkpOwog CiAgICAgcmV0dXJuIGNvcHk7CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3 ZWJ2aWV3LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IGEx ZDU1MGYuLjNiM2M4YmYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZp ZXcuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC00OTY5 LDcgKzQ5NjksNyBAQCBTb3VwU2Vzc2lvbiogd2Via2l0X2dldF9kZWZhdWx0X3Nlc3Npb24gKCkK ICAqIHNwZWNpZnlpbmcgV0VCS0lUX0NBQ0hFX01PREVMX0RPQ1VNRU5UX1ZJRVdFUi4gRGVmYXVs dCB2YWx1ZSBpcwogICogV0VCS0lUX0NBQ0hFX01PREVMX1dFQl9CUk9XU0VSLgogICoKLSAqIFNp bmNlOiAxLjEuMTgKKyAqIERlcHJlY2F0ZWQ6IFVzZSBXZWJLaXRXZWJTZXR0aW5nczp3ZWJ2aWV3 LWNhY2hlLW1vZGVsIHByb3BlcnR5IGluc3RlYWQuCiAgKi8KIHZvaWQgd2Via2l0X3NldF9jYWNo ZV9tb2RlbChXZWJLaXRDYWNoZU1vZGVsIG1vZGVsKQogewpAQCAtNDk3OCw2ICs0OTc4LDMxIEBA IHZvaWQgd2Via2l0X3NldF9jYWNoZV9tb2RlbChXZWJLaXRDYWNoZU1vZGVsIG1vZGVsKQogICAg IGlmIChjYWNoZU1vZGVsID09IG1vZGVsKQogICAgICAgICByZXR1cm47CiAKKyAgICB3ZWJWaWV3 U2V0Q2FjaGVNb2RlbChtb2RlbCk7CisgICAgY2FjaGVNb2RlbCA9IG1vZGVsOworfQorCisvKioK KyAqIHdlYmtpdF9nZXRfY2FjaGVfbW9kZWw6CisgKgorICogUmV0dXJucyB0aGUgY3VycmVudCBj YWNoZSBtb2RlbC4gRm9yIG1vcmUgaW5mb3JtYXRpb24gYWJvdXQgdGhpcworICogdmFsdWUgY2hl Y2sgdGhlIGRvY3VtZW50YXRpb24gb2YgdGhlIGZ1bmN0aW9uCisgKiB3ZWJraXRfc2V0X2NhY2hl X21vZGVsKCkuCisgKgorICogUmV0dXJuIHZhbHVlOiB0aGUgY3VycmVudCAjV2ViS2l0Q2FjaGVN b2RlbAorICoKKyAqIERlcHJlY2F0ZWQ6IFVzZSBXZWJLaXRXZWJTZXR0aW5nczp3ZWJ2aWV3LWNh Y2hlLW1vZGVsIHByb3BlcnR5IGluc3RlYWQuCisgKi8KK1dlYktpdENhY2hlTW9kZWwgd2Via2l0 X2dldF9jYWNoZV9tb2RlbCgpCit7CisgICAgd2Via2l0X2luaXQoKTsKKyAgICByZXR1cm4gY2Fj aGVNb2RlbDsKK30KKworLy8gU3BlY2lmaWVzIGEgdXNhZ2UgbW9kZWwgZm9yIFdlYlZpZXdzLCB3 aGljaCBXZWJLaXQgd2lsbCB1c2UgdG8KKy8vIGRldGVybWluZSBpdHMgY2FjaGluZyBiZWhhdmlv ci4KK3ZvaWQgd2ViVmlld1NldENhY2hlTW9kZWwoV2ViS2l0Q2FjaGVNb2RlbCBtb2RlbCkKK3sK ICAgICAvLyBGSVhNRTogQWRkIGRpc2sgY2FjaGUgaGFuZGxpbmcgd2hlbiBzb3VwIGhhcyB0aGUg QVBJCiAgICAgZ3VpbnQgY2FjaGVUb3RhbENhcGFjaXR5OwogICAgIGd1aW50IGNhY2hlTWluRGVh ZENhcGFjaXR5OwpAQCAtNTAwOSwyNCArNTAzNCw2IEBAIHZvaWQgd2Via2l0X3NldF9jYWNoZV9t b2RlbChXZWJLaXRDYWNoZU1vZGVsIG1vZGVsKQogICAgIGNhY2hlKCktPnNldENhcGFjaXRpZXMo Y2FjaGVNaW5EZWFkQ2FwYWNpdHksIGNhY2hlTWF4RGVhZENhcGFjaXR5LCBjYWNoZVRvdGFsQ2Fw YWNpdHkpOwogICAgIGNhY2hlKCktPnNldERlYWREZWNvZGVkRGF0YURlbGV0aW9uSW50ZXJ2YWwo ZGVhZERlY29kZWREYXRhRGVsZXRpb25JbnRlcnZhbCk7CiAgICAgcGFnZUNhY2hlKCktPnNldENh cGFjaXR5KHBhZ2VDYWNoZUNhcGFjaXR5KTsKLSAgICBjYWNoZU1vZGVsID0gbW9kZWw7Ci19Ci0K LS8qKgotICogd2Via2l0X2dldF9jYWNoZV9tb2RlbDoKLSAqCi0gKiBSZXR1cm5zIHRoZSBjdXJy ZW50IGNhY2hlIG1vZGVsLiBGb3IgbW9yZSBpbmZvcm1hdGlvbiBhYm91dCB0aGlzCi0gKiB2YWx1 ZSBjaGVjayB0aGUgZG9jdW1lbnRhdGlvbiBvZiB0aGUgZnVuY3Rpb24KLSAqIHdlYmtpdF9zZXRf Y2FjaGVfbW9kZWwoKS4KLSAqCi0gKiBSZXR1cm4gdmFsdWU6IHRoZSBjdXJyZW50ICNXZWJLaXRD YWNoZU1vZGVsCi0gKgotICogU2luY2U6IDEuMS4xOAotICovCi1XZWJLaXRDYWNoZU1vZGVsIHdl YmtpdF9nZXRfY2FjaGVfbW9kZWwoKQotewotICAgIHdlYmtpdF9pbml0KCk7Ci0gICAgcmV0dXJu IGNhY2hlTW9kZWw7CiB9CiAKIEd0a01lbnUqIHdlYmtpdF93ZWJfdmlld19nZXRfY29udGV4dF9t ZW51KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCg== 75803 2010-12-07 05:18:33 -0800 2011-03-23 19:59:59 -0700 Proposed Patch3 cache_model.patch text/plain 9487 joone ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggNzM2NzM4OC4uNmIzNzZiNSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxMC0xMi0wNyAg Sm9vbmUgSHVyICA8am9vbmVAa2xkcC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW0dUS10gTmVlZCAnd2Vidmlldy1jYWNoZS1tb2RlbCcgcHJv cGVydHkgaW4gV2ViS2l0V2ViU2V0dGluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTUwMDA0CisKKyAgICAgICAgQWRkIGEgbmV3IHByb3BlcnR5KHdl YnZpZXctY2FjaGUtbW9kZWwpIHRvIFdlYktpdFdlYlNldHRpbmdzCisgICAgICAgIGluc3RlYWQg b2YgdXNpbmcgdGhlIHdlYmtpdF9zZXRfY2FjaGVfbW9kZWwoKSBmdW5jdGlvbnMgZGlyZWN0bHku CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50OjpkaWRQZXJmb3JtRmlyc3ROYXZpZ2F0 aW9uKTogc2V0IHRoZSBjYWNoZSBtb2RlbC4KKyAgICAgICAgKiB3ZWJraXQvd2Via2l0cHJpdmF0 ZS5jcHA6CisgICAgICAgICh3ZWJraXRfaW5pdCk6IFRoZSBjYWNoZSBtb2RlbCBkb2Vzbid0IHNl dCBoZXJlIGFueSBtb3JlLgorICAgICAgICAqIHdlYmtpdC93ZWJraXRwcml2YXRlLmg6CisgICAg ICAgICogd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJf c2V0dGluZ3NfY2xhc3NfaW5pdCk6IEFkZGVkICd3ZWJ2aWV3LWNhY2hlLW1vZGVsJyBwcm9wZXJ0 eS4KKyAgICAgICAgKHdlYmtpdF93ZWJfc2V0dGluZ3Nfc2V0X3Byb3BlcnR5KTogRGl0dG8uIAor ICAgICAgICAod2Via2l0X3dlYl9zZXR0aW5nc19nZXRfcHJvcGVydHkpOiBEaXR0by4KKyAgICAg ICAgKHdlYmtpdF93ZWJfc2V0dGluZ3NfY29weSk6IERpdHRvLgorICAgICAgICAqIHdlYmtpdC93 ZWJraXR3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdF9zZXRfY2FjaGVfbW9kZWwpOiBEZXBy ZWNhdGVkLgorICAgICAgICAod2Via2l0X2dldF9jYWNoZV9tb2RlbCk6IERlcHJlY2F0ZWQuCisg ICAgICAgICh3ZWJWaWV3U2V0Q2FjaGVNb2RlbCk6IEFkZGVkIGFzIGEgcHJpdmF0ZSBmdW5jdGlv bi4KKwogMjAxMC0xMi0wNiAgTmF0ZSBDaGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IDk2MTNiYjEuLjc0OGUzOWEg MTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRH dGsuY3BwCisrKyBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRH dGsuY3BwCkBAIC02OTAsMTAgKzY5MCwxNSBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50Ojpkb2N1 bWVudEVsZW1lbnRBdmFpbGFibGUoKQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaWRQZXJm b3JtRmlyc3ROYXZpZ2F0aW9uKCkgY29uc3QKIHsKLSAgICBXZWJLaXRDYWNoZU1vZGVsIGNhY2hl TW9kZWwgPSB3ZWJraXRfZ2V0X2NhY2hlX21vZGVsKCk7Ci0gICAgLy8gSWYgdXNlciBhZ2VudHMg ZG8gbm90IGRldGVybWluZSB0aGUgY2FjaGUgbW9kZWwsIHdlIHVzZSBXRUJLSVRfQ0FDSEVfTU9E RUxfV0VCX0JST1dTRVIgYnkgZGVmYXVsdC4KLSAgICBpZiAoY2FjaGVNb2RlbCA9PSBXRUJLSVRf Q0FDSEVfTU9ERUxfREVGQVVMVCkKLSAgICAgICAgd2Via2l0X3NldF9jYWNoZV9tb2RlbChXRUJL SVRfQ0FDSEVfTU9ERUxfV0VCX0JST1dTRVIpOworICAgIC8vIElmIHRoZSB1c2VyIGFnZW50cyBk byBub3QgdXNlIHRoZSBkZXByZWNhdGVkIEFQSSh3ZWJraXRfc2V0X2NhY2hlX21vZGVsKSB0byBz ZXQgdGhlIGNhY2hlIG1vZGVsLAorICAgIC8vIHdlIHVzZSB0aGUgd2Vidmlldy1jYWNoZS1tb2Rl bCBwcm9wcmVydHkgdG8gZGV0ZXJtaW5lIHRoZSBjYWNoZSBtb2RlbC4KKyAgICBpZiAod2Via2l0 X2dldF9jYWNoZV9tb2RlbCgpID09IFdFQktJVF9DQUNIRV9NT0RFTF9ERUZBVUxUKSB7CisgICAg ICAgIFdlYktpdENhY2hlTW9kZWwgY2FjaGVNb2RlbDsKKyAgICAgICAgV2ViS2l0V2ViU2V0dGlu Z3MqIHNldHRpbmdzID0gd2Via2l0X3dlYl92aWV3X2dldF9zZXR0aW5ncyhnZXRWaWV3RnJvbUZy YW1lKG1fZnJhbWUpKTsKKyAgICAgICAgZ19vYmplY3RfZ2V0KHNldHRpbmdzLCAid2Vidmlldy1j YWNoZS1tb2RlbCIsICZjYWNoZU1vZGVsLCBOVUxMKTsKKyAgICAgICAgLy8gVGhlIHdlYnZpZXct Y2FjaGUtbW9kZWwgcHJvcGVydHkgaGFzIFdFQktJVF9DQUNIRV9NT0RFTF9XRUJfQlJPV1NFUiBi eSBkZWZhdWx0LgorICAgICAgICB3ZWJWaWV3U2V0Q2FjaGVNb2RlbChjYWNoZU1vZGVsKTsKKyAg ICB9CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OnJlZ2lzdGVyRm9ySWNvbk5vdGlmaWNh dGlvbihib29sIHNob3VsZFJlZ2lzdGVyKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQv d2Via2l0cHJpdmF0ZS5oIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5oCmluZGV4 IDBiNTk3NDYuLmI4NTQzOGYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHBy aXZhdGUuaAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgKQEAgLTMwMSw2 ICszMDEsOCBAQCBleHRlcm4gIkMiIHsKICAgICBHdGtNZW51KgogICAgIHdlYmtpdF93ZWJfdmll d19nZXRfY29udGV4dF9tZW51KFdlYktpdFdlYlZpZXcqKTsKIAorICAgIHZvaWQgd2ViVmlld1Nl dENhY2hlTW9kZWwoV2ViS2l0Q2FjaGVNb2RlbCBtb2RlbCk7CisKICAgICBXZWJLaXREb3dubG9h ZCoKICAgICB3ZWJraXRfZG93bmxvYWRfbmV3X3dpdGhfaGFuZGxlKFdlYktpdE5ldHdvcmtSZXF1 ZXN0KiByZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSogaGFuZGxlLCBjb25zdCBXZWJD b3JlOjpSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSk7CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtp dHdlYnNldHRpbmdzLmNwcAppbmRleCAyNjYxYjgyLi5jNjBjZjlkIDEwMDY0NAotLS0gYS9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAKKysrIGIvV2ViS2l0L2d0ay93ZWJr aXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwCkBAIC02LDYgKzYsNyBAQAogICogQ29weXJpZ2h0IChD KSAyMDA5IEphbiBNaWNoYWVsIEFsb256bwogICogQ29weXJpZ2h0IChDKSAyMDA5IE1vdmlhbCBD cmVhdGl2ZSBUZWNobm9sb2dpZXMgSW5jLgogICogQ29weXJpZ2h0IChDKSAyMDA5IElnYWxpYSBT LkwuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAgSm9vbmUgSHVyIDxqb29uZUBrbGRwLm9yZz4KICAq CiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUg aXQgYW5kL29yCiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFy eSBHZW5lcmFsIFB1YmxpYwpAQCAtMTEwLDYgKzExMSw3IEBAIHN0cnVjdCBfV2ViS2l0V2ViU2V0 dGluZ3NQcml2YXRlIHsKICAgICBnYm9vbGVhbiBhdXRvX3Jlc2l6ZV93aW5kb3c7CiAgICAgZ2Jv b2xlYW4gZW5hYmxlX2phdmFfYXBwbGV0OwogICAgIGdib29sZWFuIGVuYWJsZV9oeXBlcmxpbmtf YXVkaXRpbmc7CisgICAgV2ViS2l0Q2FjaGVNb2RlbCB3ZWJ2aWV3X2NhY2hlX21vZGVsOwogfTsK IAogI2RlZmluZSBXRUJLSVRfV0VCX1NFVFRJTkdTX0dFVF9QUklWQVRFKG9iaikgKEdfVFlQRV9J TlNUQU5DRV9HRVRfUFJJVkFURSgob2JqKSwgV0VCS0lUX1RZUEVfV0VCX1NFVFRJTkdTLCBXZWJL aXRXZWJTZXR0aW5nc1ByaXZhdGUpKQpAQCAtMTYxLDcgKzE2Myw4IEBAIGVudW0gewogICAgIFBS T1BfRU5BQkxFX1BBR0VfQ0FDSEUsCiAgICAgUFJPUF9BVVRPX1JFU0laRV9XSU5ET1csCiAgICAg UFJPUF9FTkFCTEVfSkFWQV9BUFBMRVQsCi0gICAgUFJPUF9FTkFCTEVfSFlQRVJMSU5LX0FVRElU SU5HCisgICAgUFJPUF9FTkFCTEVfSFlQRVJMSU5LX0FVRElUSU5HLAorICAgIFBST1BfV0VCVklF V19DQUNIRV9NT0RFTAogfTsKIAogLy8gQ3JlYXRlIGEgZGVmYXVsdCB1c2VyIGFnZW50IHN0cmlu ZwpAQCAtOTAyLDYgKzkwNSwzMSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NldHRpbmdzX2Ns YXNzX2luaXQoV2ViS2l0V2ViU2V0dGluZ3NDbGFzcyoga2xhc3MpCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGQUxTRSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsYWdzKSk7 CiAKKyAgICAvKioKKyAgICAqIFdlYktpdFdlYlNldHRpbmdzOndlYnZpZXctY2FjaGUtbW9kZWw6 CisgICAgKgorICAgICogU2V0IGEgdXNhZ2UgbW9kZWwgZm9yICNXZWJLaXRXZWJWaWV3LCB3aGlj aCBXZWJLaXQgd2lsbCB1c2UgdG8KKyAgICAqIGRldGVybWluZSBpdHMgY2FjaGluZyBiZWhhdmlv ci4gQWxsIHdlYiB2aWV3cyBmb2xsb3cgdGhlIGNhY2hlCisgICAgKiBtb2RlbC4gVGhpcyBjYWNo ZSBtb2RlbCBkZXRlcm1pbmVzIHRoZSBSQU0gYW5kIGRpc2sgc3BhY2UgdG8gdXNlCisgICAgKiBm b3IgY2FjaGluZyBwcmV2aW91c2x5IHZpZXdlZCBjb250ZW50LgorICAgICoKKyAgICAqIEJyb3dz ZXJzIGNhbiBpbXByb3ZlIGRvY3VtZW50IGxvYWQgc3BlZWQgc3Vic3RhbnRpYWxseSBieQorICAg ICogc3BlY2lmeWluZyBXRUJLSVRfQ0FDSEVfTU9ERUxfV0VCX0JST1dTRVIuIEFwcGxpY2F0aW9u cyB3aXRob3V0IGEKKyAgICAqIGJyb3dzaW5nIGludGVyZmFjZSBjYW4gcmVkdWNlIG1lbW9yeSB1 c2FnZSBzdWJzdGFudGlhbGx5IGJ5CisgICAgKiBzcGVjaWZ5aW5nIFdFQktJVF9DQUNIRV9NT0RF TF9ET0NVTUVOVF9WSUVXRVIuCisgICAgKiBXZSB1c2UgV0VCS0lUX0NBQ0hFX01PREVMX1dFQl9C Uk9XU0VSIGJ5IGRlZmF1bHQuCisgICAgKgorICAgICogU2luY2U6IDEuMy44CisgICAgKi8KKyAg ICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KGdvYmplY3RfY2xhc3MsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9QX1dFQlZJRVdfQ0FDSEVfTU9ERUwsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnX3BhcmFtX3NwZWNfZW51bSgid2Vi dmlldy1jYWNoZS1tb2RlbCIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBfKCJXZWJWaWV3IENhY2hlIE1vZGVsIiksCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfKCJTZXQgdGhlIHdlYnZp ZXcgY2FjaGUgbW9kZWwiKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFdFQktJVF9UWVBFX0NBQ0hFX01PREVMLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV0VCS0lUX0NBQ0hFX01PREVM X1dFQl9CUk9XU0VSLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZmxhZ3MpKTsKKwogICAgIGdfdHlwZV9jbGFzc19hZGRfcHJpdmF0ZShrbGFz cywgc2l6ZW9mKFdlYktpdFdlYlNldHRpbmdzUHJpdmF0ZSkpOwogfQogCkBAIC0xMTI4LDYgKzEx NTYsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NldHRpbmdzX3NldF9wcm9wZXJ0eShHT2Jq ZWN0KiBvYmplY3QsIGd1aW50IHByb3BfaWQsIGNvbgogICAgIGNhc2UgUFJPUF9FTkFCTEVfSFlQ RVJMSU5LX0FVRElUSU5HOgogICAgICAgICBwcml2LT5lbmFibGVfaHlwZXJsaW5rX2F1ZGl0aW5n ID0gZ192YWx1ZV9nZXRfYm9vbGVhbih2YWx1ZSk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2Ug UFJPUF9XRUJWSUVXX0NBQ0hFX01PREVMOgorICAgICAgICBwcml2LT53ZWJ2aWV3X2NhY2hlX21v ZGVsPSBzdGF0aWNfY2FzdDxXZWJLaXRDYWNoZU1vZGVsPihnX3ZhbHVlX2dldF9lbnVtKHZhbHVl KSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5f SU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BfaWQsIHBzcGVjKTsKICAgICAgICAgYnJl YWs7CkBAIC0xMjc1LDYgKzEzMDYsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NldHRpbmdz X2dldF9wcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BfaWQsIEdWYQogICAgIGNh c2UgUFJPUF9FTkFCTEVfSFlQRVJMSU5LX0FVRElUSU5HOgogICAgICAgICBnX3ZhbHVlX3NldF9i b29sZWFuKHZhbHVlLCBwcml2LT5lbmFibGVfaHlwZXJsaW5rX2F1ZGl0aW5nKTsKICAgICAgICAg YnJlYWs7CisgICAgY2FzZSBQUk9QX1dFQlZJRVdfQ0FDSEVfTU9ERUw6CisgICAgICAgIGdfdmFs dWVfc2V0X2VudW0odmFsdWUsIHByaXYtPndlYnZpZXdfY2FjaGVfbW9kZWwpOworICAgICAgICBi cmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFMSURfUFJPUEVS VFlfSUQob2JqZWN0LCBwcm9wX2lkLCBwc3BlYyk7CiAgICAgICAgIGJyZWFrOwpAQCAtMTM1MCw2 ICsxMzg0LDcgQEAgV2ViS2l0V2ViU2V0dGluZ3MqIHdlYmtpdF93ZWJfc2V0dGluZ3NfY29weShX ZWJLaXRXZWJTZXR0aW5ncyogd2ViX3NldHRpbmdzKQogICAgICAgICAgICAgICAgICAiYXV0by1y ZXNpemUtd2luZG93IiwgcHJpdi0+YXV0b19yZXNpemVfd2luZG93LAogICAgICAgICAgICAgICAg ICAiZW5hYmxlLWphdmEtYXBwbGV0IiwgcHJpdi0+ZW5hYmxlX2phdmFfYXBwbGV0LAogICAgICAg ICAgICAgICAgICAiZW5hYmxlLWh5cGVybGluay1hdWRpdGluZyIsIHByaXYtPmVuYWJsZV9oeXBl cmxpbmtfYXVkaXRpbmcsCisgICAgICAgICAgICAgICAgICJ3ZWJ2aWV3LWNhY2hlLW1vZGVsIiwg cHJpdi0+d2Vidmlld19jYWNoZV9tb2RlbCwKICAgICAgICAgICAgICAgICAgTlVMTCkpOwogCiAg ICAgcmV0dXJuIGNvcHk7CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2 aWV3LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IGExZDU1 MGYuLjNiM2M4YmYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcu Y3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC00OTY5LDcg KzQ5NjksNyBAQCBTb3VwU2Vzc2lvbiogd2Via2l0X2dldF9kZWZhdWx0X3Nlc3Npb24gKCkKICAq IHNwZWNpZnlpbmcgV0VCS0lUX0NBQ0hFX01PREVMX0RPQ1VNRU5UX1ZJRVdFUi4gRGVmYXVsdCB2 YWx1ZSBpcwogICogV0VCS0lUX0NBQ0hFX01PREVMX1dFQl9CUk9XU0VSLgogICoKLSAqIFNpbmNl OiAxLjEuMTgKKyAqIERlcHJlY2F0ZWQ6IFVzZSBXZWJLaXRXZWJTZXR0aW5nczp3ZWJ2aWV3LWNh Y2hlLW1vZGVsIHByb3BlcnR5IGluc3RlYWQuCiAgKi8KIHZvaWQgd2Via2l0X3NldF9jYWNoZV9t b2RlbChXZWJLaXRDYWNoZU1vZGVsIG1vZGVsKQogewpAQCAtNDk3OCw2ICs0OTc4LDMxIEBAIHZv aWQgd2Via2l0X3NldF9jYWNoZV9tb2RlbChXZWJLaXRDYWNoZU1vZGVsIG1vZGVsKQogICAgIGlm IChjYWNoZU1vZGVsID09IG1vZGVsKQogICAgICAgICByZXR1cm47CiAKKyAgICB3ZWJWaWV3U2V0 Q2FjaGVNb2RlbChtb2RlbCk7CisgICAgY2FjaGVNb2RlbCA9IG1vZGVsOworfQorCisvKioKKyAq IHdlYmtpdF9nZXRfY2FjaGVfbW9kZWw6CisgKgorICogUmV0dXJucyB0aGUgY3VycmVudCBjYWNo ZSBtb2RlbC4gRm9yIG1vcmUgaW5mb3JtYXRpb24gYWJvdXQgdGhpcworICogdmFsdWUgY2hlY2sg dGhlIGRvY3VtZW50YXRpb24gb2YgdGhlIGZ1bmN0aW9uCisgKiB3ZWJraXRfc2V0X2NhY2hlX21v ZGVsKCkuCisgKgorICogUmV0dXJuIHZhbHVlOiB0aGUgY3VycmVudCAjV2ViS2l0Q2FjaGVNb2Rl bAorICoKKyAqIERlcHJlY2F0ZWQ6IFVzZSBXZWJLaXRXZWJTZXR0aW5nczp3ZWJ2aWV3LWNhY2hl LW1vZGVsIHByb3BlcnR5IGluc3RlYWQuCisgKi8KK1dlYktpdENhY2hlTW9kZWwgd2Via2l0X2dl dF9jYWNoZV9tb2RlbCgpCit7CisgICAgd2Via2l0X2luaXQoKTsKKyAgICByZXR1cm4gY2FjaGVN b2RlbDsKK30KKworLy8gU3BlY2lmaWVzIGEgdXNhZ2UgbW9kZWwgZm9yIFdlYlZpZXdzLCB3aGlj aCBXZWJLaXQgd2lsbCB1c2UgdG8KKy8vIGRldGVybWluZSBpdHMgY2FjaGluZyBiZWhhdmlvci4K K3ZvaWQgd2ViVmlld1NldENhY2hlTW9kZWwoV2ViS2l0Q2FjaGVNb2RlbCBtb2RlbCkKK3sKICAg ICAvLyBGSVhNRTogQWRkIGRpc2sgY2FjaGUgaGFuZGxpbmcgd2hlbiBzb3VwIGhhcyB0aGUgQVBJ CiAgICAgZ3VpbnQgY2FjaGVUb3RhbENhcGFjaXR5OwogICAgIGd1aW50IGNhY2hlTWluRGVhZENh cGFjaXR5OwpAQCAtNTAwOSwyNCArNTAzNCw2IEBAIHZvaWQgd2Via2l0X3NldF9jYWNoZV9tb2Rl bChXZWJLaXRDYWNoZU1vZGVsIG1vZGVsKQogICAgIGNhY2hlKCktPnNldENhcGFjaXRpZXMoY2Fj aGVNaW5EZWFkQ2FwYWNpdHksIGNhY2hlTWF4RGVhZENhcGFjaXR5LCBjYWNoZVRvdGFsQ2FwYWNp dHkpOwogICAgIGNhY2hlKCktPnNldERlYWREZWNvZGVkRGF0YURlbGV0aW9uSW50ZXJ2YWwoZGVh ZERlY29kZWREYXRhRGVsZXRpb25JbnRlcnZhbCk7CiAgICAgcGFnZUNhY2hlKCktPnNldENhcGFj aXR5KHBhZ2VDYWNoZUNhcGFjaXR5KTsKLSAgICBjYWNoZU1vZGVsID0gbW9kZWw7Ci19Ci0KLS8q KgotICogd2Via2l0X2dldF9jYWNoZV9tb2RlbDoKLSAqCi0gKiBSZXR1cm5zIHRoZSBjdXJyZW50 IGNhY2hlIG1vZGVsLiBGb3IgbW9yZSBpbmZvcm1hdGlvbiBhYm91dCB0aGlzCi0gKiB2YWx1ZSBj aGVjayB0aGUgZG9jdW1lbnRhdGlvbiBvZiB0aGUgZnVuY3Rpb24KLSAqIHdlYmtpdF9zZXRfY2Fj aGVfbW9kZWwoKS4KLSAqCi0gKiBSZXR1cm4gdmFsdWU6IHRoZSBjdXJyZW50ICNXZWJLaXRDYWNo ZU1vZGVsCi0gKgotICogU2luY2U6IDEuMS4xOAotICovCi1XZWJLaXRDYWNoZU1vZGVsIHdlYmtp dF9nZXRfY2FjaGVfbW9kZWwoKQotewotICAgIHdlYmtpdF9pbml0KCk7Ci0gICAgcmV0dXJuIGNh Y2hlTW9kZWw7CiB9CiAKIEd0a01lbnUqIHdlYmtpdF93ZWJfdmlld19nZXRfY29udGV4dF9tZW51 KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCg==