55258 2011-02-25 13:57:27 -0800 [EFL] API for application cache database directory path moved from ewk_view to ewk_setting because of wrong logic 2011-03-08 09:46:56 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED DUPLICATE 52139 P2 Normal --- 0 l.slachciak webkit-unassigned gyuyoung.kim kenneth leandro ryuan.choi tonikitoo oldest_to_newest 358166 0 l.slachciak 2011-02-25 13:57:27 -0800 In ewk_view.cpp there is an API for setting and getting application cache directory path. It is wrong approach because in one WebKit instance only one cache directory path can be set with: WebCore::cacheStorage().setCacheDirectory(). Allowing to set this for each view was misleading because it was changing path in other views also Attached patch fixes this problem proposing new API in ewk_settings.h: EAPI void ewk_settings_application_cache_path_set(const char *path); EAPI const char *ewk_settings_application_cache_path_get(); 358172 1 83871 l.slachciak 2011-02-25 14:02:37 -0800 Created attachment 83871 API for application cache database directory 358396 2 83871 gyuyoung.kim 2011-02-25 22:27:13 -0800 Comment on attachment 83871 API for application cache database directory View in context: https://bugs.webkit.org/attachment.cgi?id=83871&action=review > Source/WebKit/efl/ChangeLog:5 > + API for application cache database directory path moved from ewk_view to ewk_settings Please sync with bug title. > Source/WebKit/efl/ChangeLog:6 > + Please add bug url > Source/WebKit/efl/ewk/ewk_settings.cpp:147 > + eina_stringshare_replace(&_ewk_application_cache_database_path, path); We should prepare that the "OFFLINE_WEB_APPLICATIONS" is disabled, For example, #else return; #endif > Source/WebKit/efl/ewk/ewk_settings.cpp:164 > + return _ewk_application_cache_database_path; Same with above. 358423 3 83931 l.slachciak 2011-02-26 00:50:04 -0800 Created attachment 83931 API for application cache database directory 358424 4 l.slachciak 2011-02-26 00:51:58 -0800 Thank you Gyuyoung for comments. I followed them. 358868 5 ryuan.choi 2011-02-27 20:19:08 -0800 I am sorry about late answer. It looks duplicated with https://bugs.webkit.org/show_bug.cgi?id=52139 358971 6 l.slachciak 2011-02-28 03:36:11 -0800 *** This bug has been marked as a duplicate of bug 52139 *** 358973 7 l.slachciak 2011-02-28 03:39:04 -0800 Thank you Ryuan for comment. I resolved this bug as duplicate, but please take care about adding #if ENABLE(OFFLINE_WEB_APPLICATIONS) in your patch 364001 8 83931 eric 2011-03-08 09:46:56 -0800 Comment on attachment 83931 API for application cache database directory Cleared review? from attachment 83931 so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). 83871 2011-02-25 14:02:37 -0800 2011-02-26 00:50:04 -0800 API for application cache database directory cacheset.patch text/plain 8913 l.slachciak ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCAzZTQ1ODVkLi43NjY0MzRiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTEtMDItMjUgIEx1a2FzeiBTbGFjaGNpYWsgIDxsLnNsYWNoY2lh a0BzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBUEkgZm9yIGFwcGxpY2F0aW9uIGNhY2hlIGRhdGFiYXNlIGRpcmVjdG9yeSBwYXRo IG1vdmVkIGZyb20gZXdrX3ZpZXcgdG8gZXdrX3NldHRpbmdzCisKKyAgICAgICAgKiBld2svZXdr X21haW4uY3BwOgorICAgICAgICAoX2V3a19pbml0X2JvZHkpOmV3a19zZXR0aW5nc19hcHBsaWNh dGlvbl9jYWNoZV9wYXRoX3NldCBjYWxsIGFkZGVkCisgICAgICAgICogZXdrL2V3a19zZXR0aW5n cy5jcHA6CisgICAgICAgIChld2tfc2V0dGluZ3NfYXBwbGljYXRpb25fY2FjaGVfcGF0aF9zZXQp OiBBUEkgZm9yIHNldHRpbmcgYXBwbGljYXRpb24KKyAgICAgICAgY2FjaGUgZGF0YWJhc2UgZGly ZWN0b3J5IHBhdGggYWRkZWQocHJldmlvdXNseSBld2tfdmlld19zZXR0aW5nX2NhY2hlX2RpcmVj dG9yeV9nZXQpCisgICAgICAgIChld2tfc2V0dGluZ3NfYXBwbGljYXRpb25fY2FjaGVfcGF0aF9n ZXQpOiBBUEkgZm9yIGdldHRpbmcgYXBwbGljYXRpb24KKyAgICAgICAgY2FjaGUgZGF0YWJhc2Ug ZGlyZWN0b3J5IHBhdGggYWRkZWQocHJldmlvdXNseSBld2tfdmlld19zZXR0aW5nX2NhY2hlX2Rp cmVjdG9yeV9zZXQpCisgICAgICAgICogZXdrL2V3a19zZXR0aW5ncy5oOiBuZXcgQVBJIGZvciBh cHBsaWNhdGlvbiBjYWNoZSBkYXRhYmFzZSBkaXJlY3RvcnkgcGF0aAorICAgICAgICAqIGV3ay9l d2tfdmlldy5jcHA6IHJlbW92ZWQgQVBJIGZvciBhcHBsaWNhdGlvbiBjYWNoZSBkYXRhYmFzZSBk aXJlY3RvcnkgcGF0aAorICAgICAgICBld2tfdmlld19zZXR0aW5nX2NhY2hlX2RpcmVjdG9yeV9n ZXQgYW5kIGV3a192aWV3X3NldHRpbmdfY2FjaGVfZGlyZWN0b3J5X3NldAorICAgICAgICAoX2V3 a192aWV3X3ByaXZfbmV3KTogY2FjaGVfZGlyZWN0b3J5IGluaXRpYWxpemF0aW9uIHJlbW92ZWQK KyAgICAgICAgKF9ld2tfdmlld19wcml2X2RlbCk6IGNhY2hlX2RpcmVjdG9yeSBkZWluaXRpYWxp emF0aW9uIHJlbW92ZWQKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuaDogcmVtb3ZlZCBBUEkgZm9y IGFwcGxpY2F0aW9uIGNhY2hlIGRhdGFiYXNlIGRpcmVjdG9yeSBwYXRoCisgICAgICAgIGV3a192 aWV3X3NldHRpbmdfY2FjaGVfZGlyZWN0b3J5X2dldCBhbmQgZXdrX3ZpZXdfc2V0dGluZ19jYWNo ZV9kaXJlY3Rvcnlfc2V0CisKIDIwMTEtMDItMjQgIFBldGVyIEthc3RpbmcgIDxwa2FzdGluZ0Bn b29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19tYWluLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZs L2V3ay9ld2tfbWFpbi5jcHAKaW5kZXggN2ZjYzlkMC4uMjBlNDVjOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a19tYWluLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9l d2svZXdrX21haW4uY3BwCkBAIC0xNzQsOCArMTc0LDkgQEAgRWluYV9Cb29sIF9ld2tfaW5pdF9i b2R5KHZvaWQpCiAgICAgaWYgKFdlYkNvcmU6Om1ha2VBbGxEaXJlY3Rvcmllcyh3a2RpcikpIHsK ICAgICAgICAgZXdrX3NldHRpbmdzX3dlYl9kYXRhYmFzZV9wYXRoX3NldCh3a2Rpci51dGY4KCku ZGF0YSgpKTsKICAgICAgICAgZXdrX3NldHRpbmdzX2ljb25fZGF0YWJhc2VfcGF0aF9zZXQod2tk aXIudXRmOCgpLmRhdGEoKSk7Ci0KLSAgICAgICAgV2ViQ29yZTo6Y2FjaGVTdG9yYWdlKCkuc2V0 Q2FjaGVEaXJlY3Rvcnkod2tkaXIpOworI2lmIEVOQUJMRShPRkZMSU5FX1dFQl9BUFBMSUNBVElP TlMpCisgICAgICAgIGV3a19zZXR0aW5nc19hcHBsaWNhdGlvbl9jYWNoZV9wYXRoX3NldCh3a2Rp ci51dGY4KCkuZGF0YSgpKTsKKyNlbmRpZgogICAgIH0KIAogICAgIC8vIFRPRE86IHRoaXMgc2hv dWxkIG1vdmUgdG8gV2ViQ29yZSwgYWxyZWFkeSByZXBvcnRlZCB0byB3ZWJraXQtZ3RrIGZvbGtz OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19zZXR0aW5ncy5jcHAgYi9T b3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3NldHRpbmdzLmNwcAppbmRleCBjMzVhNjJlLi5hNTE5 Y2Q0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3NldHRpbmdzLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3NldHRpbmdzLmNwcApAQCAtMSw2ICsxLDYg QEAKIC8qCiAgICAgQ29weXJpZ2h0IChDKSAyMDA5LTIwMTAgUHJvRlVTSU9OIGVtYmVkZGVkIHN5 c3RlbXMKLSAgICBDb3B5cmlnaHQgKEMpIDIwMDktMjAxMCBTYW1zdW5nIEVsZWN0cm9uaWNzCisg ICAgQ29weXJpZ2h0IChDKSAyMDA5LTIwMTEgU2Ftc3VuZyBFbGVjdHJvbmljcwogCiAgICAgVGhp cyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9v cgogICAgIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVy YWwgUHVibGljCkBAIC0zMCw2ICszMCw5IEBACiAjaW5jbHVkZSAiSW50U2l6ZS5oIgogI2luY2x1 ZGUgIktVUkwuaCIKICNpbmNsdWRlICJld2tfcHJpdmF0ZS5oIgorI2lmIEVOQUJMRShPRkZMSU5F X1dFQl9BUFBMSUNBVElPTlMpCisjaW5jbHVkZSAiYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZVN0 b3JhZ2UuaCIKKyNlbmRpZgogCiAjaW5jbHVkZSA8RWluYS5oPgogI2luY2x1ZGUgPGVpbmFfc2Fm ZXR5X2NoZWNrcy5oPgpAQCAtNDgsNiArNTEsNyBAQAogI2VuZGlmCiAKIHN0YXRpYyBjb25zdCBj aGFyKiBfZXdrX2RlZmF1bHRfd2ViX2RhdGFiYXNlX3BhdGggPSAwOworc3RhdGljIGNvbnN0IGNo YXIqIF9ld2tfYXBwbGljYXRpb25fY2FjaGVfZGF0YWJhc2VfcGF0aCA9IDA7CiBzdGF0aWMgY29u c3QgY2hhciogX2V3a19pY29uX2RhdGFiYXNlX3BhdGggPSAwOwogc3RhdGljIHVpbnQ2NF90IF9l d2tfZGVmYXVsdF93ZWJfZGF0YWJhc2VfcXVvdGEgPSAxICogMTAyNCAqIDEwMjQ7CiAKQEAgLTEy NSw2ICsxMjksNDQgQEAgY29uc3QgY2hhciAqZXdrX3NldHRpbmdzX3dlYl9kYXRhYmFzZV9wYXRo X2dldCgpCiB9CiAKIC8qKgorICogU2V0cyB0aGUgY3VycmVudCBwYXRoIHRvIHRoZSBkaXJlY3Rv cnkgV2ViS2l0IHdpbGwgd3JpdGUgd2ViCisgKiBhcHBsaWNhdGlvbiBjYWNoZSBkYXRhYmFzZXMu CisgKgorICogQHBhdGg6IHRoZSBuZXcgY2FjaGUgZGF0YWJhc2UgZGlyZWN0b3J5IHBhdGgKKyAq CisgKi8KK3ZvaWQgZXdrX3NldHRpbmdzX2FwcGxpY2F0aW9uX2NhY2hlX3BhdGhfc2V0KGNvbnN0 IGNoYXIqIHBhdGgpCit7CisjaWYgRU5BQkxFKE9GRkxJTkVfV0VCX0FQUExJQ0FUSU9OUykKKyAg ICAvLyBUT0RPOiB3ZSBzaG91bGQgdXNlIFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcgd2hlbiBp bXBsZW1lbnRlZAorICAgIFdURjo6U3RyaW5nIGNvcmVQYXRoID0gV1RGOjpTdHJpbmc6OmZyb21V VEY4KHBhdGgpOworICAgIFdlYkNvcmU6OmNhY2hlU3RvcmFnZSgpLnNldENhY2hlRGlyZWN0b3J5 KGNvcmVQYXRoKTsKKyAgICBpZiAoIV9ld2tfYXBwbGljYXRpb25fY2FjaGVfZGF0YWJhc2VfcGF0 aCkKKyAgICAgICAgX2V3a19hcHBsaWNhdGlvbl9jYWNoZV9kYXRhYmFzZV9wYXRoID0gZWluYV9z dHJpbmdzaGFyZV9hZGQocGF0aCk7CisgICAgZWxzZQorICAgICAgICBlaW5hX3N0cmluZ3NoYXJl X3JlcGxhY2UoJl9ld2tfYXBwbGljYXRpb25fY2FjaGVfZGF0YWJhc2VfcGF0aCwgcGF0aCk7Cisj ZW5kaWYKK30KKworLyoqCisgKiBSZXR1cm4gZGlyZWN0b3J5IHBhdGggd2hlcmUgd2ViIGFwcGxp Y2F0aW9uIGNhY2hlIGRhdGFiYXNlcyBhcmUgc3RvcmVkLgorICoKKyAqIEByZXR1cm4gZGF0YWJh c2UgcGF0aCBvciBOVUxMIGlmIG5vbmUgb3IgYXBwbGljYXRpb24gY2FjaGUgZGF0YWJhc2UKKyAq ICAgICAgICAgaXMgbm90IHN1cHBvcnRlZC4KKyAqICAgICAgICAgVGhpcyBpcyBndWFyYW50ZWVk IHRvIGJlIGVpbmFfc3RyaW5nc2hhcmUsIHNvIHdoZW5ldmVyIHBvc3NpYmxlCisgKiAgICAgICAg IHNhdmUgeW91cnNlbGYgc29tZSBjcHUgY3ljbGVzIGFuZCB1c2UKKyAqICAgICAgICAgZWluYV9z dHJpbmdzaGFyZV9yZWYoKSBpbnN0ZWFkIG9mIGVpbmFfc3RyaW5nc2hhcmVfYWRkKCkgb3IKKyAq ICAgICAgICAgc3RyZHVwKCkuCisgKi8KK2NvbnN0IGNoYXIqIGV3a19zZXR0aW5nc19hcHBsaWNh dGlvbl9jYWNoZV9wYXRoX2dldCgpCit7CisjaWYgRU5BQkxFKE9GRkxJTkVfV0VCX0FQUExJQ0FU SU9OUykKKyAgICByZXR1cm4gX2V3a19hcHBsaWNhdGlvbl9jYWNoZV9kYXRhYmFzZV9wYXRoOwor I2VuZGlmCit9CisKKworLyoqCiAgKiBTZXRzIGRpcmVjdG9yeSB3aGVyZSB0byBzdG9yZSBpY29u IGRhdGFiYXNlLCBvcGVuaW5nIGRhdGFiYXNlLgogICoKICAqIEBwYXJhbSBkaXJlY3Rvcnkgd2hl cmUgdG8gc3RvcmUgaWNvbiBkYXRhYmFzZSwgbXVzdCBiZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9lZmwvZXdrL2V3a19zZXR0aW5ncy5oIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19z ZXR0aW5ncy5oCmluZGV4IGQxZTEyYzAuLjk4NmM3MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvZWZsL2V3ay9ld2tfc2V0dGluZ3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdr X3NldHRpbmdzLmgKQEAgLTQxLDYgKzQxLDkgQEAgRUFQSSB1aW50NjRfdCAgICAgICAgIGV3a19z ZXR0aW5nc193ZWJfZGF0YWJhc2VfZGVmYXVsdF9xdW90YV9nZXQoKTsKIEVBUEkgdm9pZCAgICAg ICAgICAgICBld2tfc2V0dGluZ3Nfd2ViX2RhdGFiYXNlX3BhdGhfc2V0KGNvbnN0IGNoYXIgKnBh dGgpOwogRUFQSSBjb25zdCBjaGFyICAgICAgKmV3a19zZXR0aW5nc193ZWJfZGF0YWJhc2VfcGF0 aF9nZXQoKTsKIAorRUFQSSB2b2lkICAgICAgICAgICAgIGV3a19zZXR0aW5nc19hcHBsaWNhdGlv bl9jYWNoZV9wYXRoX3NldChjb25zdCBjaGFyICpwYXRoKTsKK0VBUEkgY29uc3QgY2hhciAgICAg ICpld2tfc2V0dGluZ3NfYXBwbGljYXRpb25fY2FjaGVfcGF0aF9nZXQoKTsKKwogRUFQSSBFaW5h X0Jvb2wgICAgICAgIGV3a19zZXR0aW5nc19pY29uX2RhdGFiYXNlX3BhdGhfc2V0KGNvbnN0IGNo YXIgKnBhdGgpOwogRUFQSSBjb25zdCBjaGFyICAgICAgKmV3a19zZXR0aW5nc19pY29uX2RhdGFi YXNlX3BhdGhfZ2V0KHZvaWQpOwogRUFQSSBFaW5hX0Jvb2wgICAgICAgIGV3a19zZXR0aW5nc19p Y29uX2RhdGFiYXNlX2NsZWFyKHZvaWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwv ZXdrL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKaW5k ZXggYWQ3ZTc0ZS4uMWJmZmM3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3 a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCkBAIC00 Myw3ICs0Myw2IEBACiAjaW5jbHVkZSAiUGxhdGZvcm1Nb3VzZUV2ZW50LmgiCiAjaW5jbHVkZSAi UG9wdXBNZW51Q2xpZW50LmgiCiAjaW5jbHVkZSAiUHJvZ3Jlc3NUcmFja2VyLmgiCi0jaW5jbHVk ZSAiYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuaCIKICNpbmNsdWRlICJld2tfcHJp dmF0ZS5oIgogCiAjaW5jbHVkZSA8RWNvcmUuaD4KQEAgLTEwMSw3ICsxMDAsNiBAQCBzdHJ1Y3Qg X0V3a19WaWV3X1ByaXZhdGVfRGF0YSB7CiAgICAgICAgIGNvbnN0IGNoYXIqIHVzZXJfc3R5bGVz aGVldDsKICAgICAgICAgY29uc3QgY2hhciogZW5jb2RpbmdfZGVmYXVsdDsKICAgICAgICAgY29u c3QgY2hhciogZW5jb2RpbmdfY3VzdG9tOwotICAgICAgICBjb25zdCBjaGFyKiBjYWNoZV9kaXJl Y3Rvcnk7CiAgICAgICAgIGNvbnN0IGNoYXIqIHRoZW1lOwogICAgICAgICBjb25zdCBjaGFyKiBs b2NhbF9zdG9yYWdlX2RhdGFiYXNlX3BhdGg7CiAgICAgICAgIGludCBmb250X21pbmltdW1fc2l6 ZTsKQEAgLTU4NCw5ICs1ODIsNiBAQCBzdGF0aWMgRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKiBfZXdr X3ZpZXdfcHJpdl9uZXcoRXdrX1ZpZXdfU21hcnRfRGF0YSogc2QpCiAgICAgICAgIChwcml2LT5w YWdlX3NldHRpbmdzLT5kZWZhdWx0VGV4dEVuY29kaW5nTmFtZSgpLnV0ZjgoKS5kYXRhKCkpOwog ICAgIHByaXYtPnNldHRpbmdzLmVuY29kaW5nX2N1c3RvbSA9IDA7CiAKLSAgICBwcml2LT5zZXR0 aW5ncy5jYWNoZV9kaXJlY3RvcnkgPSBlaW5hX3N0cmluZ3NoYXJlX2FkZAotICAgICAgICAoV2Vi Q29yZTo6Y2FjaGVTdG9yYWdlKCkuY2FjaGVEaXJlY3RvcnkoKS51dGY4KCkuZGF0YSgpKTsKLQog ICAgIHMgPSBwcml2LT5wYWdlX3NldHRpbmdzLT5sb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgoKTsK ICAgICBwcml2LT5zZXR0aW5ncy5sb2NhbF9zdG9yYWdlX2RhdGFiYXNlX3BhdGggPSBlaW5hX3N0 cmluZ3NoYXJlX2FkZChzLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogCkBAIC02NzIsNyArNjY3 LDYgQEAgc3RhdGljIHZvaWQgX2V3a192aWV3X3ByaXZfZGVsKEV3a19WaWV3X1ByaXZhdGVfRGF0 YSogcHJpdikKICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2LT5zZXR0aW5ncy51c2VyX3N0 eWxlc2hlZXQpOwogICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHByaXYtPnNldHRpbmdzLmVuY29k aW5nX2RlZmF1bHQpOwogICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHByaXYtPnNldHRpbmdzLmVu Y29kaW5nX2N1c3RvbSk7Ci0gICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+c2V0dGluZ3Mu Y2FjaGVfZGlyZWN0b3J5KTsKICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2LT5zZXR0aW5n cy5mb250X3N0YW5kYXJkKTsKICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2LT5zZXR0aW5n cy5mb250X2N1cnNpdmUpOwogICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHByaXYtPnNldHRpbmdz LmZvbnRfbW9ub3NwYWNlKTsKQEAgLTI3MjMsMjIgKzI3MTcsNiBAQCBFaW5hX0Jvb2wgZXdrX3Zp ZXdfc2V0dGluZ19lbmNvZGluZ19kZXRlY3Rvcl9nZXQoRXZhc19PYmplY3QqIG8pCiAgICAgcmV0 dXJuIHByaXYtPnNldHRpbmdzLmVuY29kaW5nX2RldGVjdG9yOwogfQogCi1jb25zdCBjaGFyKiBl d2tfdmlld19zZXR0aW5nX2NhY2hlX2RpcmVjdG9yeV9nZXQoY29uc3QgRXZhc19PYmplY3QqIG8p Ci17Ci0gICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwgMCk7Ci0gICAgRVdLX1ZJ RVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNkLCBwcml2LCAwKTsKLSAgICByZXR1cm4gcHJpdi0+c2V0 dGluZ3MuY2FjaGVfZGlyZWN0b3J5OwotfQotCi1FaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19j YWNoZV9kaXJlY3Rvcnlfc2V0KEV2YXNfT2JqZWN0KiBvLCBjb25zdCBjaGFyKiBwYXRoKQotewot ICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0UpOwotICAgIEVX S19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7Ci0gICAgaWYg KGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+c2V0dGluZ3MuY2FjaGVfZGlyZWN0b3J5 LCBwYXRoKSkKLSAgICAgICAgV2ViQ29yZTo6Y2FjaGVTdG9yYWdlKCkuc2V0Q2FjaGVEaXJlY3Rv cnkoU3RyaW5nOjpmcm9tVVRGOChwYXRoKSk7Ci0gICAgcmV0dXJuIEVJTkFfVFJVRTsKLX0KLQog aW50IGV3a192aWV3X3NldHRpbmdfZm9udF9taW5pbXVtX3NpemVfZ2V0KGNvbnN0IEV2YXNfT2Jq ZWN0KiBvKQogewogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIDApOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0 L2VmbC9ld2svZXdrX3ZpZXcuaAppbmRleCA5YWM1M2FmLi45MTg4NjhhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9l d2svZXdrX3ZpZXcuaApAQCAtNDUwLDggKzQ1MCw2IEBAIEVBUEkgY29uc3QgY2hhciAgKmV3a192 aWV3X3NldHRpbmdfZW5jb2RpbmdfY3VzdG9tX2dldChjb25zdCBFdmFzX09iamVjdCopOwogRUFQ SSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGluZ19jdXN0b21fc2V0KEV2YXNf T2JqZWN0KiwgY29uc3QgY2hhciAqZW5jb2RpbmcpOwogRUFQSSBjb25zdCBjaGFyICAqZXdrX3Zp ZXdfc2V0dGluZ19lbmNvZGluZ19kZWZhdWx0X2dldChjb25zdCBFdmFzX09iamVjdCopOwogRUFQ SSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGluZ19kZWZhdWx0X3NldChFdmFz X09iamVjdCosIGNvbnN0IGNoYXIgKmVuY29kaW5nKTsKLUVBUEkgY29uc3QgY2hhciAgKmV3a192 aWV3X3NldHRpbmdfY2FjaGVfZGlyZWN0b3J5X2dldChjb25zdCBFdmFzX09iamVjdCopOwotRUFQ SSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19jYWNoZV9kaXJlY3Rvcnlfc2V0KEV2YXNf T2JqZWN0KiwgY29uc3QgY2hhciAqcGF0aCk7CiAKIEVBUEkgaW50ICAgICAgICAgIGV3a192aWV3 X3NldHRpbmdfZm9udF9taW5pbXVtX3NpemVfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0Kik7CiBFQVBJ IEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX2ZvbnRfbWluaW11bV9zaXplX3NldChFdmFz X09iamVjdCosIGludCBzaXplKTsK 83931 2011-02-26 00:50:04 -0800 2011-03-08 09:46:56 -0800 API for application cache database directory cacheset2.patch text/plain 9082 l.slachciak ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCAzZTQ1ODVkLi4yMjhmOTc3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTEtMDItMjUgIEx1a2FzeiBTbGFjaGNpYWsgIDxsLnNsYWNoY2lh a0BzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbRUZMXSBBUEkgZm9yIGFwcGxpY2F0aW9uIGNhY2hlIGRhdGFiYXNlIGRpcmVjdG9y eSBwYXRoIG1vdmVkIGZyb20gZXdrX3ZpZXcgdG8gZXdrX3NldHRpbmcgYmVjYXVzZSBvZiB3cm9u ZyBsb2dpYy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU1MjU4CisKKyAgICAgICAgKiBld2svZXdrX21haW4uY3BwOgorICAgICAgICAoX2V3a19pbml0 X2JvZHkpOmV3a19zZXR0aW5nc19hcHBsaWNhdGlvbl9jYWNoZV9wYXRoX3NldCBjYWxsIGFkZGVk CisgICAgICAgICogZXdrL2V3a19zZXR0aW5ncy5jcHA6CisgICAgICAgIChld2tfc2V0dGluZ3Nf YXBwbGljYXRpb25fY2FjaGVfcGF0aF9zZXQpOiBBUEkgZm9yIHNldHRpbmcgYXBwbGljYXRpb24K KyAgICAgICAgY2FjaGUgZGF0YWJhc2UgZGlyZWN0b3J5IHBhdGggYWRkZWQocHJldmlvdXNseSBl d2tfdmlld19zZXR0aW5nX2NhY2hlX2RpcmVjdG9yeV9nZXQpCisgICAgICAgIChld2tfc2V0dGlu Z3NfYXBwbGljYXRpb25fY2FjaGVfcGF0aF9nZXQpOiBBUEkgZm9yIGdldHRpbmcgYXBwbGljYXRp b24KKyAgICAgICAgY2FjaGUgZGF0YWJhc2UgZGlyZWN0b3J5IHBhdGggYWRkZWQocHJldmlvdXNs eSBld2tfdmlld19zZXR0aW5nX2NhY2hlX2RpcmVjdG9yeV9zZXQpCisgICAgICAgICogZXdrL2V3 a19zZXR0aW5ncy5oOiBuZXcgQVBJIGZvciBhcHBsaWNhdGlvbiBjYWNoZSBkYXRhYmFzZSBkaXJl Y3RvcnkgcGF0aAorICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6IHJlbW92ZWQgQVBJIGZvciBh cHBsaWNhdGlvbiBjYWNoZSBkYXRhYmFzZSBkaXJlY3RvcnkgcGF0aAorICAgICAgICBld2tfdmll d19zZXR0aW5nX2NhY2hlX2RpcmVjdG9yeV9nZXQgYW5kIGV3a192aWV3X3NldHRpbmdfY2FjaGVf ZGlyZWN0b3J5X3NldAorICAgICAgICAoX2V3a192aWV3X3ByaXZfbmV3KTogY2FjaGVfZGlyZWN0 b3J5IGluaXRpYWxpemF0aW9uIHJlbW92ZWQKKyAgICAgICAgKF9ld2tfdmlld19wcml2X2RlbCk6 IGNhY2hlX2RpcmVjdG9yeSBkZWluaXRpYWxpemF0aW9uIHJlbW92ZWQKKyAgICAgICAgKiBld2sv ZXdrX3ZpZXcuaDogcmVtb3ZlZCBBUEkgZm9yIGFwcGxpY2F0aW9uIGNhY2hlIGRhdGFiYXNlIGRp cmVjdG9yeSBwYXRoCisgICAgICAgIGV3a192aWV3X3NldHRpbmdfY2FjaGVfZGlyZWN0b3J5X2dl dCBhbmQgZXdrX3ZpZXdfc2V0dGluZ19jYWNoZV9kaXJlY3Rvcnlfc2V0CisKIDIwMTEtMDItMjQg IFBldGVyIEthc3RpbmcgIDxwa2FzdGluZ0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19t YWluLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfbWFpbi5jcHAKaW5kZXggN2ZjYzlk MC4uMjBlNDVjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19tYWluLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX21haW4uY3BwCkBAIC0xNzQsOCArMTc0 LDkgQEAgRWluYV9Cb29sIF9ld2tfaW5pdF9ib2R5KHZvaWQpCiAgICAgaWYgKFdlYkNvcmU6Om1h a2VBbGxEaXJlY3Rvcmllcyh3a2RpcikpIHsKICAgICAgICAgZXdrX3NldHRpbmdzX3dlYl9kYXRh YmFzZV9wYXRoX3NldCh3a2Rpci51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgZXdrX3NldHRpbmdz X2ljb25fZGF0YWJhc2VfcGF0aF9zZXQod2tkaXIudXRmOCgpLmRhdGEoKSk7Ci0KLSAgICAgICAg V2ViQ29yZTo6Y2FjaGVTdG9yYWdlKCkuc2V0Q2FjaGVEaXJlY3Rvcnkod2tkaXIpOworI2lmIEVO QUJMRShPRkZMSU5FX1dFQl9BUFBMSUNBVElPTlMpCisgICAgICAgIGV3a19zZXR0aW5nc19hcHBs aWNhdGlvbl9jYWNoZV9wYXRoX3NldCh3a2Rpci51dGY4KCkuZGF0YSgpKTsKKyNlbmRpZgogICAg IH0KIAogICAgIC8vIFRPRE86IHRoaXMgc2hvdWxkIG1vdmUgdG8gV2ViQ29yZSwgYWxyZWFkeSBy ZXBvcnRlZCB0byB3ZWJraXQtZ3RrIGZvbGtzOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9l ZmwvZXdrL2V3a19zZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3NldHRp bmdzLmNwcAppbmRleCBjMzVhNjJlLi5mNDM4NzdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2VmbC9ld2svZXdrX3NldHRpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdr X3NldHRpbmdzLmNwcApAQCAtMSw2ICsxLDYgQEAKIC8qCiAgICAgQ29weXJpZ2h0IChDKSAyMDA5 LTIwMTAgUHJvRlVTSU9OIGVtYmVkZGVkIHN5c3RlbXMKLSAgICBDb3B5cmlnaHQgKEMpIDIwMDkt MjAxMCBTYW1zdW5nIEVsZWN0cm9uaWNzCisgICAgQ29weXJpZ2h0IChDKSAyMDA5LTIwMTEgU2Ft c3VuZyBFbGVjdHJvbmljcwogCiAgICAgVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlv dSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICAgIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVy bXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCkBAIC0zMCw2ICszMCw5IEBACiAj aW5jbHVkZSAiSW50U2l6ZS5oIgogI2luY2x1ZGUgIktVUkwuaCIKICNpbmNsdWRlICJld2tfcHJp dmF0ZS5oIgorI2lmIEVOQUJMRShPRkZMSU5FX1dFQl9BUFBMSUNBVElPTlMpCisjaW5jbHVkZSAi YXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuaCIKKyNlbmRpZgogCiAjaW5jbHVkZSA8 RWluYS5oPgogI2luY2x1ZGUgPGVpbmFfc2FmZXR5X2NoZWNrcy5oPgpAQCAtNDgsNiArNTEsOSBA QAogI2VuZGlmCiAKIHN0YXRpYyBjb25zdCBjaGFyKiBfZXdrX2RlZmF1bHRfd2ViX2RhdGFiYXNl X3BhdGggPSAwOworI2lmIEVOQUJMRShPRkZMSU5FX1dFQl9BUFBMSUNBVElPTlMpCitzdGF0aWMg Y29uc3QgY2hhciogX2V3a19hcHBsaWNhdGlvbl9jYWNoZV9kYXRhYmFzZV9wYXRoID0gMDsKKyNl bmRpZgogc3RhdGljIGNvbnN0IGNoYXIqIF9ld2tfaWNvbl9kYXRhYmFzZV9wYXRoID0gMDsKIHN0 YXRpYyB1aW50NjRfdCBfZXdrX2RlZmF1bHRfd2ViX2RhdGFiYXNlX3F1b3RhID0gMSAqIDEwMjQg KiAxMDI0OwogCkBAIC0xMjUsNiArMTMxLDQ4IEBAIGNvbnN0IGNoYXIgKmV3a19zZXR0aW5nc193 ZWJfZGF0YWJhc2VfcGF0aF9nZXQoKQogfQogCiAvKioKKyAqIFNldHMgdGhlIGN1cnJlbnQgcGF0 aCB0byB0aGUgZGlyZWN0b3J5IFdlYktpdCB3aWxsIHdyaXRlIHdlYgorICogYXBwbGljYXRpb24g Y2FjaGUgZGF0YWJhc2VzLgorICoKKyAqIEBwYXRoOiB0aGUgbmV3IGNhY2hlIGRhdGFiYXNlIGRp cmVjdG9yeSBwYXRoCisgKgorICovCit2b2lkIGV3a19zZXR0aW5nc19hcHBsaWNhdGlvbl9jYWNo ZV9wYXRoX3NldChjb25zdCBjaGFyKiBwYXRoKQoreworI2lmIEVOQUJMRShPRkZMSU5FX1dFQl9B UFBMSUNBVElPTlMpCisgICAgLy8gVE9ETzogd2Ugc2hvdWxkIHVzZSBXZWJDb3JlOjpmaWxlbmFt ZVRvU3RyaW5nIHdoZW4gaW1wbGVtZW50ZWQKKyAgICBXVEY6OlN0cmluZyBjb3JlUGF0aCA9IFdU Rjo6U3RyaW5nOjpmcm9tVVRGOChwYXRoKTsKKyAgICBXZWJDb3JlOjpjYWNoZVN0b3JhZ2UoKS5z ZXRDYWNoZURpcmVjdG9yeShjb3JlUGF0aCk7CisgICAgaWYgKCFfZXdrX2FwcGxpY2F0aW9uX2Nh Y2hlX2RhdGFiYXNlX3BhdGgpCisgICAgICAgIF9ld2tfYXBwbGljYXRpb25fY2FjaGVfZGF0YWJh c2VfcGF0aCA9IGVpbmFfc3RyaW5nc2hhcmVfYWRkKHBhdGgpOworICAgIGVsc2UKKyAgICAgICAg ZWluYV9zdHJpbmdzaGFyZV9yZXBsYWNlKCZfZXdrX2FwcGxpY2F0aW9uX2NhY2hlX2RhdGFiYXNl X3BhdGgsIHBhdGgpOworI2Vsc2UKKyAgICByZXR1cm47CisjZW5kaWYKK30KKworLyoqCisgKiBS ZXR1cm4gZGlyZWN0b3J5IHBhdGggd2hlcmUgd2ViIGFwcGxpY2F0aW9uIGNhY2hlIGRhdGFiYXNl cyBhcmUgc3RvcmVkLgorICoKKyAqIEByZXR1cm4gZGF0YWJhc2UgcGF0aCBvciAwIGlmIG5vbmUg b3IgYXBwbGljYXRpb24gY2FjaGUgZGF0YWJhc2UKKyAqICAgICAgICAgaXMgbm90IHN1cHBvcnRl ZC4KKyAqICAgICAgICAgVGhpcyBpcyBndWFyYW50ZWVkIHRvIGJlIGVpbmFfc3RyaW5nc2hhcmUs IHNvIHdoZW5ldmVyIHBvc3NpYmxlCisgKiAgICAgICAgIHNhdmUgeW91cnNlbGYgc29tZSBjcHUg Y3ljbGVzIGFuZCB1c2UKKyAqICAgICAgICAgZWluYV9zdHJpbmdzaGFyZV9yZWYoKSBpbnN0ZWFk IG9mIGVpbmFfc3RyaW5nc2hhcmVfYWRkKCkgb3IKKyAqICAgICAgICAgc3RyZHVwKCkuCisgKi8K K2NvbnN0IGNoYXIqIGV3a19zZXR0aW5nc19hcHBsaWNhdGlvbl9jYWNoZV9wYXRoX2dldCgpCit7 CisjaWYgRU5BQkxFKE9GRkxJTkVfV0VCX0FQUExJQ0FUSU9OUykKKyAgICByZXR1cm4gX2V3a19h cHBsaWNhdGlvbl9jYWNoZV9kYXRhYmFzZV9wYXRoOworI2Vsc2UKKyAgICByZXR1cm4gMDsKKyNl bmRpZgorfQorCisKKy8qKgogICogU2V0cyBkaXJlY3Rvcnkgd2hlcmUgdG8gc3RvcmUgaWNvbiBk YXRhYmFzZSwgb3BlbmluZyBkYXRhYmFzZS4KICAqCiAgKiBAcGFyYW0gZGlyZWN0b3J5IHdoZXJl IHRvIHN0b3JlIGljb24gZGF0YWJhc2UsIG11c3QgYmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvZWZsL2V3ay9ld2tfc2V0dGluZ3MuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfc2V0 dGluZ3MuaAppbmRleCBkMWUxMmMwLi45ODZjNzBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2VmbC9ld2svZXdrX3NldHRpbmdzLmgKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19z ZXR0aW5ncy5oCkBAIC00MSw2ICs0MSw5IEBAIEVBUEkgdWludDY0X3QgICAgICAgICBld2tfc2V0 dGluZ3Nfd2ViX2RhdGFiYXNlX2RlZmF1bHRfcXVvdGFfZ2V0KCk7CiBFQVBJIHZvaWQgICAgICAg ICAgICAgZXdrX3NldHRpbmdzX3dlYl9kYXRhYmFzZV9wYXRoX3NldChjb25zdCBjaGFyICpwYXRo KTsKIEVBUEkgY29uc3QgY2hhciAgICAgICpld2tfc2V0dGluZ3Nfd2ViX2RhdGFiYXNlX3BhdGhf Z2V0KCk7CiAKK0VBUEkgdm9pZCAgICAgICAgICAgICBld2tfc2V0dGluZ3NfYXBwbGljYXRpb25f Y2FjaGVfcGF0aF9zZXQoY29uc3QgY2hhciAqcGF0aCk7CitFQVBJIGNvbnN0IGNoYXIgICAgICAq ZXdrX3NldHRpbmdzX2FwcGxpY2F0aW9uX2NhY2hlX3BhdGhfZ2V0KCk7CisKIEVBUEkgRWluYV9C b29sICAgICAgICBld2tfc2V0dGluZ3NfaWNvbl9kYXRhYmFzZV9wYXRoX3NldChjb25zdCBjaGFy ICpwYXRoKTsKIEVBUEkgY29uc3QgY2hhciAgICAgICpld2tfc2V0dGluZ3NfaWNvbl9kYXRhYmFz ZV9wYXRoX2dldCh2b2lkKTsKIEVBUEkgRWluYV9Cb29sICAgICAgICBld2tfc2V0dGluZ3NfaWNv bl9kYXRhYmFzZV9jbGVhcih2b2lkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3 ay9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCmluZGV4 IGFkN2U3NGUuLjFiZmZjNzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tf dmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcApAQCAtNDMs NyArNDMsNiBAQAogI2luY2x1ZGUgIlBsYXRmb3JtTW91c2VFdmVudC5oIgogI2luY2x1ZGUgIlBv cHVwTWVudUNsaWVudC5oIgogI2luY2x1ZGUgIlByb2dyZXNzVHJhY2tlci5oIgotI2luY2x1ZGUg ImFwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmgiCiAjaW5jbHVkZSAiZXdrX3ByaXZh dGUuaCIKIAogI2luY2x1ZGUgPEVjb3JlLmg+CkBAIC0xMDEsNyArMTAwLDYgQEAgc3RydWN0IF9F d2tfVmlld19Qcml2YXRlX0RhdGEgewogICAgICAgICBjb25zdCBjaGFyKiB1c2VyX3N0eWxlc2hl ZXQ7CiAgICAgICAgIGNvbnN0IGNoYXIqIGVuY29kaW5nX2RlZmF1bHQ7CiAgICAgICAgIGNvbnN0 IGNoYXIqIGVuY29kaW5nX2N1c3RvbTsKLSAgICAgICAgY29uc3QgY2hhciogY2FjaGVfZGlyZWN0 b3J5OwogICAgICAgICBjb25zdCBjaGFyKiB0aGVtZTsKICAgICAgICAgY29uc3QgY2hhciogbG9j YWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoOwogICAgICAgICBpbnQgZm9udF9taW5pbXVtX3NpemU7 CkBAIC01ODQsOSArNTgyLDYgQEAgc3RhdGljIEV3a19WaWV3X1ByaXZhdGVfRGF0YSogX2V3a192 aWV3X3ByaXZfbmV3KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNkKQogICAgICAgICAocHJpdi0+cGFn ZV9zZXR0aW5ncy0+ZGVmYXVsdFRleHRFbmNvZGluZ05hbWUoKS51dGY4KCkuZGF0YSgpKTsKICAg ICBwcml2LT5zZXR0aW5ncy5lbmNvZGluZ19jdXN0b20gPSAwOwogCi0gICAgcHJpdi0+c2V0dGlu Z3MuY2FjaGVfZGlyZWN0b3J5ID0gZWluYV9zdHJpbmdzaGFyZV9hZGQKLSAgICAgICAgKFdlYkNv cmU6OmNhY2hlU3RvcmFnZSgpLmNhY2hlRGlyZWN0b3J5KCkudXRmOCgpLmRhdGEoKSk7Ci0KICAg ICBzID0gcHJpdi0+cGFnZV9zZXR0aW5ncy0+bG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoKCk7CiAg ICAgcHJpdi0+c2V0dGluZ3MubG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoID0gZWluYV9zdHJp bmdzaGFyZV9hZGQocy5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKIApAQCAtNjcyLDcgKzY2Nyw2 IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19wcml2X2RlbChFd2tfVmlld19Qcml2YXRlX0RhdGEq IHByaXYpCiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+c2V0dGluZ3MudXNlcl9zdHls ZXNoZWV0KTsKICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2LT5zZXR0aW5ncy5lbmNvZGlu Z19kZWZhdWx0KTsKICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2LT5zZXR0aW5ncy5lbmNv ZGluZ19jdXN0b20pOwotICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHByaXYtPnNldHRpbmdzLmNh Y2hlX2RpcmVjdG9yeSk7CiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+c2V0dGluZ3Mu Zm9udF9zdGFuZGFyZCk7CiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+c2V0dGluZ3Mu Zm9udF9jdXJzaXZlKTsKICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2LT5zZXR0aW5ncy5m b250X21vbm9zcGFjZSk7CkBAIC0yNzIzLDIyICsyNzE3LDYgQEAgRWluYV9Cb29sIGV3a192aWV3 X3NldHRpbmdfZW5jb2RpbmdfZGV0ZWN0b3JfZ2V0KEV2YXNfT2JqZWN0KiBvKQogICAgIHJldHVy biBwcml2LT5zZXR0aW5ncy5lbmNvZGluZ19kZXRlY3RvcjsKIH0KIAotY29uc3QgY2hhciogZXdr X3ZpZXdfc2V0dGluZ19jYWNoZV9kaXJlY3RvcnlfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBvKQot ewotICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIDApOwotICAgIEVXS19WSUVX X1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgMCk7Ci0gICAgcmV0dXJuIHByaXYtPnNldHRp bmdzLmNhY2hlX2RpcmVjdG9yeTsKLX0KLQotRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfY2Fj aGVfZGlyZWN0b3J5X3NldChFdmFzX09iamVjdCogbywgY29uc3QgY2hhciogcGF0aCkKLXsKLSAg ICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKG8sIHNkLCBFSU5BX0ZBTFNFKTsKLSAgICBFV0tf VklFV19QUklWX0dFVF9PUl9SRVRVUk4oc2QsIHByaXYsIEVJTkFfRkFMU0UpOwotICAgIGlmIChl aW5hX3N0cmluZ3NoYXJlX3JlcGxhY2UoJnByaXYtPnNldHRpbmdzLmNhY2hlX2RpcmVjdG9yeSwg cGF0aCkpCi0gICAgICAgIFdlYkNvcmU6OmNhY2hlU3RvcmFnZSgpLnNldENhY2hlRGlyZWN0b3J5 KFN0cmluZzo6ZnJvbVVURjgocGF0aCkpOwotICAgIHJldHVybiBFSU5BX1RSVUU7Ci19Ci0KIGlu dCBld2tfdmlld19zZXR0aW5nX2ZvbnRfbWluaW11bV9zaXplX2dldChjb25zdCBFdmFzX09iamVj dCogbykKIHsKICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKG8sIHNkLCAwKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oIGIvU291cmNlL1dlYktpdC9l ZmwvZXdrL2V3a192aWV3LmgKaW5kZXggOWFjNTNhZi4uOTE4ODY4YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdr L2V3a192aWV3LmgKQEAgLTQ1MCw4ICs0NTAsNiBAQCBFQVBJIGNvbnN0IGNoYXIgICpld2tfdmll d19zZXR0aW5nX2VuY29kaW5nX2N1c3RvbV9nZXQoY29uc3QgRXZhc19PYmplY3QqKTsKIEVBUEkg RWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfY3VzdG9tX3NldChFdmFzX09i amVjdCosIGNvbnN0IGNoYXIgKmVuY29kaW5nKTsKIEVBUEkgY29uc3QgY2hhciAgKmV3a192aWV3 X3NldHRpbmdfZW5jb2RpbmdfZGVmYXVsdF9nZXQoY29uc3QgRXZhc19PYmplY3QqKTsKIEVBUEkg RWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfZGVmYXVsdF9zZXQoRXZhc19P YmplY3QqLCBjb25zdCBjaGFyICplbmNvZGluZyk7Ci1FQVBJIGNvbnN0IGNoYXIgICpld2tfdmll d19zZXR0aW5nX2NhY2hlX2RpcmVjdG9yeV9nZXQoY29uc3QgRXZhc19PYmplY3QqKTsKLUVBUEkg RWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfY2FjaGVfZGlyZWN0b3J5X3NldChFdmFzX09i amVjdCosIGNvbnN0IGNoYXIgKnBhdGgpOwogCiBFQVBJIGludCAgICAgICAgICBld2tfdmlld19z ZXR0aW5nX2ZvbnRfbWluaW11bV9zaXplX2dldChjb25zdCBFdmFzX09iamVjdCopOwogRUFQSSBF aW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19mb250X21pbmltdW1fc2l6ZV9zZXQoRXZhc19P YmplY3QqLCBpbnQgc2l6ZSk7Cg==