52886 2011-01-21 04:47:18 -0800 Web Inspector: size is wrong for cached resources in Network panel 2011-01-26 09:00:24 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq abarth apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 338009 0 caseq 2011-01-21 04:47:18 -0800 The numbers displayed in Size column of Network panel are wrong for cached resources: - Size should be the actual size of cached resource (currently 0) - Transfer Size should be the size of response headers (currently 0) 339715 1 80075 caseq 2011-01-25 10:11:25 -0800 Created attachment 80075 patch 339750 2 80075 pfeldman 2011-01-25 10:53:01 -0800 Comment on attachment 80075 patch View in context: https://bugs.webkit.org/attachment.cgi?id=80075&action=review > Source/WebCore/inspector/Inspector.idl:110 > + [notify, domain=Network] void didReceiveResponse(out long identifier, out double time, out String resourceType, out long cachedSize, out Object response); didReceiveResponse should not special-case cached resources. It would be better to call didReceiveContentLength for cached resources instead. > Source/WebCore/inspector/front-end/NetworkManager.js:179 > + if (resource.revalidated) This would go away. > Source/WebCore/inspector/front-end/Resource.js:241 > + var size = this.cached || this.revalidated ? 0 : Number(this.resourceSize || this.responseHeaders["Content-Length"] || 0); Could you replace ternary operators with guards for ease of understanding? > Source/WebCore/inspector/front-end/Resource.js:309 > + get revalidated() get statusIsNotModified? 340198 3 80181 caseq 2011-01-26 03:43:33 -0800 Created attachment 80181 patch Removed additional resource size parameter to didReceiveResponse, issue additional call to didReceiveContentLength in case we got 304 and had a cached resource. 340222 4 80181 pfeldman 2011-01-26 05:27:09 -0800 Comment on attachment 80181 patch View in context: https://bugs.webkit.org/attachment.cgi?id=80181&action=review > Source/WebCore/inspector/front-end/Resource.js:245 > + var bodySize = Number(this.resourceSize || this.responseHeaders["Content-Length"] || 0); In what cases do we use Content-Length header Is it more accurate? Was is used for gzip? 340287 5 webkit.review.bot 2011-01-26 08:56:47 -0800 http://trac.webkit.org/changeset/76690 might have broken Leopard Intel Release (Tests) 340291 6 caseq 2011-01-26 09:00:24 -0800 Manually committed r76690: http://trac.webkit.org/changeset/76690 80075 2011-01-25 10:11:25 -0800 2011-01-26 03:43:33 -0800 patch cached-resource-size text/plain 8751 caseq ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxODg3NzVjLi5lYmQ3NmU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMDEtMjUgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBzaXplIGlzIHdyb25nIGZvciBjYWNoZWQgcmVzb3VyY2VzIGluIE5ldHdvcmsgcGFuZWwK KyAgICAgICAgLSBTZXQgdGhlIHNpemUgZm9yIDMwNC9ub3QgbW9kaWZpZWQgcmVzb3VyY2VzIGZy b20gY2FjaGVkIHJlc291cmNlLgorICAgICAgICAtIEFkZCByZXNwb25zZSBoZWFkZXJzIHNpemUg dG8gcmVzb3VyY2UgdHJhbnNmZXIgc2l6ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTUyODg2CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y LmlkbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRSZWNlaXZlUmVzcG9u c2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlLndpbGxTZW5k UmVxdWVzdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90 eXBlLmRpZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLmdldCB0cmFuc2ZlclNpemUpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5nZXQgcmV2YWxpZGF0ZWQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5zZXQgcmVzcG9uc2VIZWFkZXJz KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuX2hlYWRlcnNTaXpl KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuX21pbWVUeXBlSXND b25zaXN0ZW50V2l0aFR5cGUpOgorCiAyMDExLTAxLTI1ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRt YW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3ku CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCmluZGV4IGFkMGQ4ZjQuLjM5NTg5 Y2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCkBAIC0xMDcsNyArMTA3 LDcgQEAgbW9kdWxlIGNvcmUgewogICAgICAgICBbbm90aWZ5LCBkb21haW49TmV0d29ya10gdm9p ZCBpZGVudGlmaWVyRm9ySW5pdGlhbFJlcXVlc3Qob3V0IGxvbmcgaWRlbnRpZmllciwgb3V0IFN0 cmluZyB1cmwsIG91dCBPYmplY3QgbG9hZGVyLCBvdXQgVmFsdWUgY2FsbFN0YWNrKTsKICAgICAg ICAgW25vdGlmeSwgZG9tYWluPU5ldHdvcmtdIHZvaWQgd2lsbFNlbmRSZXF1ZXN0KG91dCBsb25n IGlkZW50aWZpZXIsIG91dCBkb3VibGUgdGltZSwgb3V0IE9iamVjdCByZXF1ZXN0LCBvdXQgT2Jq ZWN0IHJlZGlyZWN0UmVzcG9uc2UpOwogICAgICAgICBbbm90aWZ5LCBkb21haW49TmV0d29ya10g dm9pZCBtYXJrUmVzb3VyY2VBc0NhY2hlZChvdXQgbG9uZyBpZGVudGlmaWVyKTsKLSAgICAgICAg W25vdGlmeSwgZG9tYWluPU5ldHdvcmtdIHZvaWQgZGlkUmVjZWl2ZVJlc3BvbnNlKG91dCBsb25n IGlkZW50aWZpZXIsIG91dCBkb3VibGUgdGltZSwgb3V0IFN0cmluZyByZXNvdXJjZVR5cGUsIG91 dCBPYmplY3QgcmVzcG9uc2UpOworICAgICAgICBbbm90aWZ5LCBkb21haW49TmV0d29ya10gdm9p ZCBkaWRSZWNlaXZlUmVzcG9uc2Uob3V0IGxvbmcgaWRlbnRpZmllciwgb3V0IGRvdWJsZSB0aW1l LCBvdXQgU3RyaW5nIHJlc291cmNlVHlwZSwgb3V0IGxvbmcgY2FjaGVkU2l6ZSwgb3V0IE9iamVj dCByZXNwb25zZSk7CiAgICAgICAgIFtub3RpZnksIGRvbWFpbj1OZXR3b3JrXSB2b2lkIGRpZFJl Y2VpdmVDb250ZW50TGVuZ3RoKG91dCBsb25nIGlkZW50aWZpZXIsIG91dCBkb3VibGUgdGltZSwg b3V0IGxvbmcgbGVuZ3RoUmVjZWl2ZWQpOwogICAgICAgICBbbm90aWZ5LCBkb21haW49TmV0d29y a10gdm9pZCBkaWRGaW5pc2hMb2FkaW5nKG91dCBsb25nIGlkZW50aWZpZXIsIG91dCBkb3VibGUg ZmluaXNoVGltZSk7CiAgICAgICAgIFtub3RpZnksIGRvbWFpbj1OZXR3b3JrXSB2b2lkIGRpZEZh aWxMb2FkaW5nKG91dCBsb25nIGlkZW50aWZpZXIsIG91dCBkb3VibGUgdGltZSwgb3V0IFN0cmlu ZyBsb2NhbGl6ZWREZXNjcmlwdGlvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKaW5kZXggMTZkMmI2Ni4uMjYxYmVkNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50 LmNwcApAQCAtMzE2LDE0ICszMTYsMTcgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50Ojpk aWRSZWNlaXZlUmVzcG9uc2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWUKIHsKICAg ICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZXNvdXJjZVJlc3BvbnNlID0gYnVpbGRPYmplY3RG b3JSZXNvdXJjZVJlc3BvbnNlKHJlc3BvbnNlKTsKICAgICBTdHJpbmcgdHlwZSA9ICJPdGhlciI7 CisgICAgbG9uZyBjYWNoZWRSZXNvdXJjZVNpemUgPSAtMTsKKwogICAgIGlmIChsb2FkZXIpIHsK ICAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdGcmFnbWVudElkZW50aWZpZXIocmVzcG9uc2UudXJs KCksIGxvYWRlci0+ZnJhbWVMb2FkZXIoKS0+aWNvblVSTCgpKSkKICAgICAgICAgICAgIHR5cGUg PSAiSW1hZ2UiOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIENhY2hlZFJlc291cmNlKiBj YWNoZWRSZXNvdXJjZSA9IEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmNhY2hlZFJlc291cmNlKGxv YWRlci0+ZnJhbWUoKSwgcmVzcG9uc2UudXJsKCkpOwotICAgICAgICAgICAgaWYgKGNhY2hlZFJl c291cmNlKQorICAgICAgICAgICAgaWYgKGNhY2hlZFJlc291cmNlKSB7CiAgICAgICAgICAgICAg ICAgdHlwZSA9IGNhY2hlZFJlc291cmNlVHlwZVN0cmluZygqY2FjaGVkUmVzb3VyY2UpOwotCisg ICAgICAgICAgICAgICAgY2FjaGVkUmVzb3VyY2VTaXplID0gY2FjaGVkUmVzb3VyY2UtPmVuY29k ZWRTaXplKCk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoZXF1YWxJZ25vcmluZ0Zy YWdtZW50SWRlbnRpZmllcihyZXNwb25zZS51cmwoKSwgbG9hZGVyLT51cmwoKSkgJiYgdHlwZSA9 PSAiT3RoZXIiKQogICAgICAgICAgICAgICAgIHR5cGUgPSAiRG9jdW1lbnQiOwogCkBAIC0zMzIs NyArMzM1LDcgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRSZWNlaXZlUmVzcG9u c2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWUKICAgICAgICAgICAgICAgICByZXNv dXJjZVJlc3BvbnNlLT5zZXRTdHJpbmcoIm1pbWVUeXBlIiwgY2FjaGVkUmVzb3VyY2UtPnJlc3Bv bnNlKCkubWltZVR5cGUoKSk7CiAgICAgICAgIH0KICAgICB9Ci0gICAgbV9mcm9udGVuZC0+ZGlk UmVjZWl2ZVJlc3BvbnNlKGlkZW50aWZpZXIsIGN1cnJlbnRUaW1lKCksIHR5cGUsIHJlc291cmNl UmVzcG9uc2UpOworICAgIG1fZnJvbnRlbmQtPmRpZFJlY2VpdmVSZXNwb25zZShpZGVudGlmaWVy LCBjdXJyZW50VGltZSgpLCB0eXBlLCBjYWNoZWRSZXNvdXJjZVNpemUsIHJlc291cmNlUmVzcG9u c2UpOwogfQogCiB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZFJlY2VpdmVDb250ZW50 TGVuZ3RoKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgaW50IGxlbmd0aFJlY2VpdmVkKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdl ci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIu anMKaW5kZXggZDI0NTJkZi4uMjg3NmU4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCkBAIC0xNDIsNyArMTQyLDcgQEAg V2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgLy8g U2VlIGh0dHAvdGVzdHMvbWlzYy93aWxsLXNlbmQtcmVxdWVzdC1yZXR1cm5zLW51bGwtb24tcmVk aXJlY3QuaHRtbAogICAgICAgICB2YXIgaXNSZWRpcmVjdCA9ICFyZWRpcmVjdFJlc3BvbnNlLmlz TnVsbCAmJiByZXF1ZXN0LnVybC5sZW5ndGg7CiAgICAgICAgIGlmIChpc1JlZGlyZWN0KSB7Ci0g ICAgICAgICAgICB0aGlzLmRpZFJlY2VpdmVSZXNwb25zZShpZGVudGlmaWVyLCB0aW1lLCAiT3Ro ZXIiLCByZWRpcmVjdFJlc3BvbnNlKTsKKyAgICAgICAgICAgIHRoaXMuZGlkUmVjZWl2ZVJlc3Bv bnNlKGlkZW50aWZpZXIsIHRpbWUsICJPdGhlciIsIC0xLCByZWRpcmVjdFJlc3BvbnNlKTsKICAg ICAgICAgICAgIHJlc291cmNlID0gdGhpcy5fYXBwZW5kUmVkaXJlY3QocmVzb3VyY2UuaWRlbnRp ZmllciwgdGltZSwgcmVxdWVzdC51cmwpOwogICAgICAgICB9CiAKQEAgLTE2NSw3ICsxNjUsNyBA QCBXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlID0gewogICAgICAgICB0 aGlzLl91cGRhdGVSZXNvdXJjZShyZXNvdXJjZSk7CiAgICAgfSwKIAotICAgIGRpZFJlY2VpdmVS ZXNwb25zZTogZnVuY3Rpb24oaWRlbnRpZmllciwgdGltZSwgcmVzb3VyY2VUeXBlLCByZXNwb25z ZSkKKyAgICBkaWRSZWNlaXZlUmVzcG9uc2U6IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHRpbWUsIHJl c291cmNlVHlwZSwgY2FjaGVkUmVzb3VyY2VTaXplLCByZXNwb25zZSkKICAgICB7CiAgICAgICAg IHZhciByZXNvdXJjZSA9IHRoaXMuX2luZmxpZ2h0UmVzb3VyY2VzQnlJZFtpZGVudGlmaWVyXTsK ICAgICAgICAgaWYgKCFyZXNvdXJjZSkKQEAgLTE3Myw4ICsxNzMsMTEgQEAgV2ViSW5zcGVjdG9y Lk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlwZSA9IHsKIAogICAgICAgICByZXNvdXJjZS5yZXNw b25zZVJlY2VpdmVkVGltZSA9IHRpbWU7CiAgICAgICAgIHJlc291cmNlLnR5cGUgPSBXZWJJbnNw ZWN0b3IuUmVzb3VyY2UuVHlwZVtyZXNvdXJjZVR5cGVdOwotCiAgICAgICAgIHRoaXMuX3VwZGF0 ZVJlc291cmNlV2l0aFJlc3BvbnNlKHJlc291cmNlLCByZXNwb25zZSk7CisgICAgICAgIC8vIElm IHdlIGp1c3QgcmV2YWxpZGF0ZWQgdGhlIHJlc291cmNlIChpLmUuIGdvdCAzMDQvTm90IG1vZGlm aWVkKSwgd2Ugd2lsbCByZXVzZSBjYWNoZWQgcmVzb3VyY2UsCisgICAgICAgIC8vIHNvIHNldCB0 aGUgYWN0dWFsIHNpemUgZnJvbSBpdC4KKyAgICAgICAgaWYgKHJlc291cmNlLnJldmFsaWRhdGVk KQorICAgICAgICAgICAgcmVzb3VyY2UucmVzb3VyY2VTaXplID0gY2FjaGVkUmVzb3VyY2VTaXpl OwogCiAgICAgICAgIHRoaXMuX3VwZGF0ZVJlc291cmNlKHJlc291cmNlKTsKICAgICAgICAgdGhp cy5fcmVzb3VyY2VUcmVlTW9kZWwuYWRkUmVzb3VyY2VUb0ZyYW1lKHJlc291cmNlLmxvYWRlci5m cmFtZUlkLCByZXNvdXJjZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZS5qcwppbmRleCA5MTQ3NmU5Li4zYzQ4OWRmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKQEAgLTM0LDYgKzM0LDcgQEAgV2Vi SW5zcGVjdG9yLlJlc291cmNlID0gZnVuY3Rpb24oaWRlbnRpZmllciwgdXJsKQogICAgIHRoaXMu X3JlcXVlc3RNZXRob2QgPSAiIjsKICAgICB0aGlzLl9jYXRlZ29yeSA9IFdlYkluc3BlY3Rvci5y ZXNvdXJjZUNhdGVnb3JpZXMub3RoZXI7CiAgICAgdGhpcy5fcGVuZGluZ0NvbnRlbnRDYWxsYmFj a3MgPSBbXTsKKyAgICB0aGlzLl9yZXNwb25zZUhlYWRlcnNTaXplID0gMDsKIH0KIAogLy8gS2Vl cCB0aGVzZSBpbiBzeW5jIHdpdGggV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2U6OlR5cGUKQEAg LTIzNyw4ICsyMzgsMTAgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKIAog ICAgIGdldCB0cmFuc2ZlclNpemUoKQogICAgIHsKLSAgICAgICAgLy8gRklYTUU6IHRoaXMgaXMg d3JvbmcgZm9yIGNodW5rZWQtZW5jb2RpbmcgcmVzb3VyY2VzLgotICAgICAgICByZXR1cm4gdGhp cy5jYWNoZWQgPyAwIDogTnVtYmVyKHRoaXMucmVzcG9uc2VIZWFkZXJzWyJDb250ZW50LUxlbmd0 aCJdIHx8IHRoaXMucmVzb3VyY2VTaXplIHx8IDApOworICAgICAgICB2YXIgc2l6ZSA9IHRoaXMu Y2FjaGVkIHx8IHRoaXMucmV2YWxpZGF0ZWQgPyAwIDogTnVtYmVyKHRoaXMucmVzb3VyY2VTaXpl IHx8IHRoaXMucmVzcG9uc2VIZWFkZXJzWyJDb250ZW50LUxlbmd0aCJdIHx8IDApOworICAgICAg ICBpZiAoIXRoaXMuY2FjaGVkKQorICAgICAgICAgICAgc2l6ZSArPSB0aGlzLl9yZXNwb25zZUhl YWRlcnNTaXplOworICAgICAgICByZXR1cm4gc2l6ZTsKICAgICB9LAogCiAgICAgZ2V0IGV4cGVj dGVkQ29udGVudExlbmd0aCgpCkBAIC0zMDMsNiArMzA2LDEwIEBAIFdlYkluc3BlY3Rvci5SZXNv dXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBkZWxldGUgdGhpcy5fdGltaW5nOwogICAg IH0sCiAKKyAgICBnZXQgcmV2YWxpZGF0ZWQoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMu c3RhdHVzQ29kZSA9PT0gMzA0OyAvLyBOb3QgbW9kaWZpZWQuCisgICAgfSwKIAogICAgIGdldCB0 aW1pbmcoKQogICAgIHsKQEAgLTQzMSw2ICs0MzgsOCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2Uu cHJvdG90eXBlID0gewogICAgIHNldCByZXNwb25zZUhlYWRlcnMoeCkKICAgICB7CiAgICAgICAg IHRoaXMuX3Jlc3BvbnNlSGVhZGVycyA9IHg7CisgICAgICAgIC8vIEZJWE1FOiB3ZSBzaG91bGQg dGFrZSBhY3R1YWwgaGVhZGVycyBzaXplIGZyb20gbmV0d29yayBzdGFjaywgd2hlbiBwb3NzaWJs ZS4KKyAgICAgICAgdGhpcy5fcmVzcG9uc2VIZWFkZXJzU2l6ZSA9IHRoaXMuX2hlYWRlcnNTaXpl KHgpOwogICAgICAgICBkZWxldGUgdGhpcy5fc29ydGVkUmVzcG9uc2VIZWFkZXJzOwogICAgICAg ICBkZWxldGUgdGhpcy5fcmVzcG9uc2VDb29raWVzOwogCkBAIC01MTIsNiArNTIxLDE0IEBAIFdl Ykluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogCisg ICAgX2hlYWRlcnNTaXplOiBmdW5jdGlvbihoZWFkZXJzKQorICAgIHsKKyAgICAgICAgdmFyIHNp emUgPSAwOworICAgICAgICBmb3IgKHZhciBoZWFkZXIgaW4gaGVhZGVycykKKyAgICAgICAgICAg IHNpemUgKz0gaGVhZGVyLmxlbmd0aCArIGhlYWRlcnNbaGVhZGVyXS5sZW5ndGggKyAzOyAvLyBf dHlwaWNhbF8gb3ZlcmhlYWQgcGVyIGhlcmFkZXIgaXMgIjogIi5sZW5ndGggKyAiXG4iLmxlbmd0 aC4KKyAgICAgICAgcmV0dXJuIHNpemU7CisgICAgfSwKKwogICAgIGdldCBlcnJvcnMoKQogICAg IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2Vycm9ycyB8fCAwOwpAQCAtNTUwLDkgKzU2Nyw5IEBA IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKIAogICAgICAgICBpZiAodHlwZW9mIHRoaXMudHlwZSA9PT0gInVuZGVmaW5lZCIKLSAg ICAgICAgIHx8IHRoaXMudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUuT3RoZXIK LSAgICAgICAgIHx8IHRoaXMudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUuWEhS Ci0gICAgICAgICB8fCB0aGlzLnR5cGUgPT09IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLldl YlNvY2tldCkKKyAgICAgICAgICAgIHx8IHRoaXMudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlJlc291 cmNlLlR5cGUuT3RoZXIKKyAgICAgICAgICAgIHx8IHRoaXMudHlwZSA9PT0gV2ViSW5zcGVjdG9y LlJlc291cmNlLlR5cGUuWEhSCisgICAgICAgICAgICB8fCB0aGlzLnR5cGUgPT09IFdlYkluc3Bl Y3Rvci5SZXNvdXJjZS5UeXBlLldlYlNvY2tldCkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwog CiAgICAgICAgIGlmICghdGhpcy5taW1lVHlwZSkK 80181 2011-01-26 03:43:33 -0800 2011-01-26 05:27:08 -0800 patch cached-resource-size text/plain 6166 caseq ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxODg3NzVjLi40YWU3Y2FlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDEtMjYgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBzdW1tYXJ5IGJhciBpcyBub3QgcmVzaXplZCBwcm9wZXJseSB3aXRoIHRoZSByZXN0IG9m IG5ldHdvcmsgcGFuZWwKKyAgICAgICAgLSBTZXQgdGhlIHNpemUgZm9yIDMwNC9ub3QgbW9kaWZp ZWQgcmVzb3VyY2VzIGZyb20gY2FjaGVkIHJlc291cmNlLgorICAgICAgICAtIEFkZCByZXNwb25z ZSBoZWFkZXJzIHNpemUgdG8gcmVzb3VyY2UgdHJhbnNmZXIgc2l6ZS4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyODgxCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JSZXNvdXJjZUFnZW50OjpkaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3Vy Y2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5nZXQgdHJhbnNm ZXJTaXplKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuc2V0IHJl c3BvbnNlSGVhZGVycyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBl Ll9oZWFkZXJzU2l6ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBl Ll9taW1lVHlwZUlzQ29uc2lzdGVudFdpdGhUeXBlKToKKwogMjAxMS0wMS0yNSAgUGF2ZWwgRmVs ZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5 IFNlbWlraGF0c2t5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvclJlc291cmNlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clJlc291cmNlQWdlbnQuY3BwCmluZGV4IDE2ZDJiNjYuLmY3MTBmMjkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKQEAgLTMx NiwyMyArMzE2LDI3IEBAIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkUmVjZWl2ZVJl c3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lCiB7CiAgICAgUmVmUHRyPElu c3BlY3Rvck9iamVjdD4gcmVzb3VyY2VSZXNwb25zZSA9IGJ1aWxkT2JqZWN0Rm9yUmVzb3VyY2VS ZXNwb25zZShyZXNwb25zZSk7CiAgICAgU3RyaW5nIHR5cGUgPSAiT3RoZXIiOwotICAgIGlmIChs b2FkZXIpIHsKLSAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdGcmFnbWVudElkZW50aWZpZXIocmVz cG9uc2UudXJsKCksIGxvYWRlci0+ZnJhbWVMb2FkZXIoKS0+aWNvblVSTCgpKSkKLSAgICAgICAg ICAgIHR5cGUgPSAiSW1hZ2UiOwotICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIENhY2hlZFJl c291cmNlKiBjYWNoZWRSZXNvdXJjZSA9IEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmNhY2hlZFJl c291cmNlKGxvYWRlci0+ZnJhbWUoKSwgcmVzcG9uc2UudXJsKCkpOwotICAgICAgICAgICAgaWYg KGNhY2hlZFJlc291cmNlKQotICAgICAgICAgICAgICAgIHR5cGUgPSBjYWNoZWRSZXNvdXJjZVR5 cGVTdHJpbmcoKmNhY2hlZFJlc291cmNlKTsKLQotICAgICAgICAgICAgaWYgKGVxdWFsSWdub3Jp bmdGcmFnbWVudElkZW50aWZpZXIocmVzcG9uc2UudXJsKCksIGxvYWRlci0+dXJsKCkpICYmIHR5 cGUgPT0gIk90aGVyIikKLSAgICAgICAgICAgICAgICB0eXBlID0gIkRvY3VtZW50IjsKKyAgICBs b25nIGNhY2hlZFJlc291cmNlU2l6ZSA9IDA7CiAKKyAgICBpZiAobG9hZGVyKSB7CisgICAgICAg IENhY2hlZFJlc291cmNlKiBjYWNoZWRSZXNvdXJjZSA9IEluc3BlY3RvclJlc291cmNlQWdlbnQ6 OmNhY2hlZFJlc291cmNlKGxvYWRlci0+ZnJhbWUoKSwgcmVzcG9uc2UudXJsKCkpOworICAgICAg ICBpZiAoY2FjaGVkUmVzb3VyY2UpIHsKKyAgICAgICAgICAgIHR5cGUgPSBjYWNoZWRSZXNvdXJj ZVR5cGVTdHJpbmcoKmNhY2hlZFJlc291cmNlKTsKKyAgICAgICAgICAgIGNhY2hlZFJlc291cmNl U2l6ZSA9IGNhY2hlZFJlc291cmNlLT5lbmNvZGVkU2l6ZSgpOwogICAgICAgICAgICAgLy8gVXNl IG1pbWUgdHlwZSBmcm9tIGNhY2hlZCByZXNvdXJjZSBpbiBjYXNlIHRoZSBvbmUgaW4gcmVzcG9u c2UgaXMgZW1wdHkuCi0gICAgICAgICAgICBpZiAocmVzcG9uc2UubWltZVR5cGUoKS5pc0VtcHR5 KCkgJiYgY2FjaGVkUmVzb3VyY2UpCisgICAgICAgICAgICBpZiAocmVzcG9uc2UubWltZVR5cGUo KS5pc0VtcHR5KCkpCiAgICAgICAgICAgICAgICAgcmVzb3VyY2VSZXNwb25zZS0+c2V0U3RyaW5n KCJtaW1lVHlwZSIsIGNhY2hlZFJlc291cmNlLT5yZXNwb25zZSgpLm1pbWVUeXBlKCkpOwogICAg ICAgICB9CisgICAgICAgIGlmIChlcXVhbElnbm9yaW5nRnJhZ21lbnRJZGVudGlmaWVyKHJlc3Bv bnNlLnVybCgpLCBsb2FkZXItPmZyYW1lTG9hZGVyKCktPmljb25VUkwoKSkpCisgICAgICAgICAg ICB0eXBlID0gIkltYWdlIjsKKyAgICAgICAgZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0ZyYWdtZW50 SWRlbnRpZmllcihyZXNwb25zZS51cmwoKSwgbG9hZGVyLT51cmwoKSkgJiYgdHlwZSA9PSAiT3Ro ZXIiKQorICAgICAgICAgICAgdHlwZSA9ICJEb2N1bWVudCI7CiAgICAgfQogICAgIG1fZnJvbnRl bmQtPmRpZFJlY2VpdmVSZXNwb25zZShpZGVudGlmaWVyLCBjdXJyZW50VGltZSgpLCB0eXBlLCBy ZXNvdXJjZVJlc3BvbnNlKTsKKyAgICAvLyBJZiB3ZSByZXZhbGlkYXRlZCB0aGUgcmVzb3VyY2Ug YW5kIGdvdCBOb3QgbW9kaWZpZWQsIHNlbmQgY29udGVudCBsZW5ndGggZm9sbG93aW5nIGRpZFJl Y2VpdmVSZXNwb25zZQorICAgIC8vIGFzIHRoZXJlIHdpbGwgYmUgbm8gY2FsbHMgdG8gZGlkUmVj ZWl2ZUNvbnRlbnRMZW5ndGggZnJvbSB0aGUgbmV0d29yayBzdGFjay4KKyAgICBpZiAoY2FjaGVk UmVzb3VyY2VTaXplICYmIHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkgPT0gMzA0KQorICAgICAg ICBkaWRSZWNlaXZlQ29udGVudExlbmd0aChpZGVudGlmaWVyLCBjYWNoZWRSZXNvdXJjZVNpemUp OwogfQogCiB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OmRpZFJlY2VpdmVDb250ZW50TGVu Z3RoKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgaW50IGxlbmd0aFJlY2VpdmVkKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKaW5kZXggOTE0NzZl OS4uNDA3NjU5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlLmpzCkBAIC0zNCw2ICszNCw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZSA9IGZ1bmN0 aW9uKGlkZW50aWZpZXIsIHVybCkKICAgICB0aGlzLl9yZXF1ZXN0TWV0aG9kID0gIiI7CiAgICAg dGhpcy5fY2F0ZWdvcnkgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VDYXRlZ29yaWVzLm90aGVyOwog ICAgIHRoaXMuX3BlbmRpbmdDb250ZW50Q2FsbGJhY2tzID0gW107CisgICAgdGhpcy5fcmVzcG9u c2VIZWFkZXJzU2l6ZSA9IDA7CiB9CiAKIC8vIEtlZXAgdGhlc2UgaW4gc3luYyB3aXRoIFdlYkNv cmU6Okluc3BlY3RvclJlc291cmNlOjpUeXBlCkBAIC0yMzcsOCArMjM4LDEyIEBAIFdlYkluc3Bl Y3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAKICAgICBnZXQgdHJhbnNmZXJTaXplKCkKICAg ICB7Ci0gICAgICAgIC8vIEZJWE1FOiB0aGlzIGlzIHdyb25nIGZvciBjaHVua2VkLWVuY29kaW5n IHJlc291cmNlcy4KLSAgICAgICAgcmV0dXJuIHRoaXMuY2FjaGVkID8gMCA6IE51bWJlcih0aGlz LnJlc3BvbnNlSGVhZGVyc1siQ29udGVudC1MZW5ndGgiXSB8fCB0aGlzLnJlc291cmNlU2l6ZSB8 fCAwKTsKKyAgICAgICAgaWYgKHRoaXMuY2FjaGVkKQorICAgICAgICAgICAgcmV0dXJuIDA7Cisg ICAgICAgIGlmICh0aGlzLnN0YXR1c0NvZGUgPT09IDMwNCkgLy8gTm90IG1vZGlmaWVkCisgICAg ICAgICAgICByZXR1cm4gdGhpcy5fcmVzcG9uc2VIZWFkZXJzU2l6ZTsKKyAgICAgICAgdmFyIGJv ZHlTaXplID0gTnVtYmVyKHRoaXMucmVzb3VyY2VTaXplIHx8IHRoaXMucmVzcG9uc2VIZWFkZXJz WyJDb250ZW50LUxlbmd0aCJdIHx8IDApOworICAgICAgICByZXR1cm4gdGhpcy5fcmVzcG9uc2VI ZWFkZXJzU2l6ZSArIGJvZHlTaXplOwogICAgIH0sCiAKICAgICBnZXQgZXhwZWN0ZWRDb250ZW50 TGVuZ3RoKCkKQEAgLTMwMyw3ICszMDgsNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90 eXBlID0gewogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3RpbWluZzsKICAgICB9LAogCi0KICAg ICBnZXQgdGltaW5nKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl90aW1pbmc7CkBAIC00 MzEsNiArNDM1LDggQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICBz ZXQgcmVzcG9uc2VIZWFkZXJzKHgpCiAgICAgewogICAgICAgICB0aGlzLl9yZXNwb25zZUhlYWRl cnMgPSB4OworICAgICAgICAvLyBGSVhNRTogd2Ugc2hvdWxkIHRha2UgYWN0dWFsIGhlYWRlcnMg c2l6ZSBmcm9tIG5ldHdvcmsgc3RhY2ssIHdoZW4gcG9zc2libGUuCisgICAgICAgIHRoaXMuX3Jl c3BvbnNlSGVhZGVyc1NpemUgPSB0aGlzLl9oZWFkZXJzU2l6ZSh4KTsKICAgICAgICAgZGVsZXRl IHRoaXMuX3NvcnRlZFJlc3BvbnNlSGVhZGVyczsKICAgICAgICAgZGVsZXRlIHRoaXMuX3Jlc3Bv bnNlQ29va2llczsKIApAQCAtNTEyLDYgKzUxOCwxNCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2Uu cHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgfSwKIAorICAgIF9oZWFkZXJzU2l6ZTogZnVu Y3Rpb24oaGVhZGVycykKKyAgICB7CisgICAgICAgIHZhciBzaXplID0gMDsKKyAgICAgICAgZm9y ICh2YXIgaGVhZGVyIGluIGhlYWRlcnMpCisgICAgICAgICAgICBzaXplICs9IGhlYWRlci5sZW5n dGggKyBoZWFkZXJzW2hlYWRlcl0ubGVuZ3RoICsgMzsgLy8gX3R5cGljYWxfIG92ZXJoZWFkIHBl ciBoZXJhZGVyIGlzICI6ICIubGVuZ3RoICsgIlxuIi5sZW5ndGguCisgICAgICAgIHJldHVybiBz aXplOworICAgIH0sCisKICAgICBnZXQgZXJyb3JzKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0 aGlzLl9lcnJvcnMgfHwgMDsKQEAgLTU1MCw5ICs1NjQsOSBAQCBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2UucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICAgICAgaWYg KHR5cGVvZiB0aGlzLnR5cGUgPT09ICJ1bmRlZmluZWQiCi0gICAgICAgICB8fCB0aGlzLnR5cGUg PT09IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLk90aGVyCi0gICAgICAgICB8fCB0aGlzLnR5 cGUgPT09IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLlhIUgotICAgICAgICAgfHwgdGhpcy50 eXBlID09PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5XZWJTb2NrZXQpCisgICAgICAgICAg ICB8fCB0aGlzLnR5cGUgPT09IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLk90aGVyCisgICAg ICAgICAgICB8fCB0aGlzLnR5cGUgPT09IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLlhIUgor ICAgICAgICAgICAgfHwgdGhpcy50eXBlID09PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5X ZWJTb2NrZXQpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgICAgICBpZiAoIXRoaXMu bWltZVR5cGUpCg==