26253 2009-06-08 05:27:04 -0700 Still update main resource meta-data if resource tracking is disabled 2009-06-10 10:18:13 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 yurys webkit-unassigned dglazkov pfeldman timothy oldest_to_newest 124750 0 yurys 2009-06-08 05:27:04 -0700 Try to enable debugger for an HTML page with some inline js with resource tracking disabled. The page URL is in the file list in Scripts panel but the page's source is not available. The problem is that InspectorController does not track main resource's MIME-type when resource tracking is disabled. In that case inspector front-end will fail to show main resource in Scripts panel as it doesn't know its MIME-type. Although resource tracking should explicitly be enabled to get Resources panel running the main resource is always tracked and it's metadata including MIME-type should always be updated no matter resource tracking enabled or not. 124752 1 31043 yurys 2009-06-08 05:49:45 -0700 Created attachment 31043 Update main resource meta-data when resource tracking is off 124753 2 31044 yurys 2009-06-08 05:49:47 -0700 Created attachment 31044 Update main resource meta-data when resource tracking is off 124760 3 31044 timothy 2009-06-08 06:22:56 -0700 Comment on attachment 31044 Update main resource meta-data when resource tracking is off Using PassRefPtr here isn't correct, since you are not transfering ownership. The InspectorController still owns the resources. A plain pointer return is best. r+ if you change that. 124762 4 31047 yurys 2009-06-08 06:46:50 -0700 Created attachment 31047 Update main resource meta-data when resource tracking is off Previous patch with Timothy's comment addressed. 125156 5 bfulgham 2009-06-10 10:18:13 -0700 Landed in @r44568 31043 2009-06-08 05:49:45 -0700 2009-06-08 05:50:44 -0700 Update main resource meta-data when resource tracking is off update-main-resource.patch text/plain 4649 yurys SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDQ5NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDktMDYtMDggIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVXBkYXRlIG1haW4gcmVzb3VyY2UgbWV0YS1kYXRhIHdoZW4gcmVzb3VyY2UgdHJhY2tpbmcg aXMgZGlzYWJsZWQuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI2MjUzCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpnZXRUcmFja2VkUmVz b3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6d2lsbFNlbmRS ZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFJlY2Vp dmVSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRS ZWNlaXZlQ29udGVudExlbmd0aCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9s bGVyOjpkaWRGaW5pc2hMb2FkaW5nKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRy b2xsZXI6OmRpZEZhaWxMb2FkaW5nKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29u dHJvbGxlci5oOgorCiAyMDA5LTA2LTA4ICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9z QG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBcml5YSBIaWRheWF0LgpJbmRleDog V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJKHJldmlzaW9uIDQ0NDkz KQorKysgV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTgwNCw2ICs4MDQsMjEgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpyZW1v dmVSZXNvdXJjZQogICAgIH0KIH0KIAorUGFzc1JlZlB0cjxJbnNwZWN0b3JSZXNvdXJjZT4gSW5z cGVjdG9yQ29udHJvbGxlcjo6Z2V0VHJhY2tlZFJlc291cmNlKGxvbmcgbG9uZyBpZGVudGlmaWVy KQoreworICAgIGlmICghZW5hYmxlZCgpKQorICAgICAgICByZXR1cm4gUGFzc1JlZlB0cjxJbnNw ZWN0b3JSZXNvdXJjZT4oKTsKKworICAgIGlmIChtX3Jlc291cmNlVHJhY2tpbmdFbmFibGVkKQor ICAgICAgICByZXR1cm4gbV9yZXNvdXJjZXMuZ2V0KGlkZW50aWZpZXIpOworCisgICAgYm9vbCBp c01haW5SZXNvdXJjZSA9IG1fbWFpblJlc291cmNlICYmIG1fbWFpblJlc291cmNlLT5pZGVudGlm aWVyKCkgPT0gaWRlbnRpZmllcjsKKyAgICBpZiAoaXNNYWluUmVzb3VyY2UpCisgICAgICAgIHJl dHVybiBtX21haW5SZXNvdXJjZTsKKworICAgIHJldHVybiBQYXNzUmVmUHRyPEluc3BlY3RvclJl c291cmNlPigpOworfQorCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZExvYWRSZXNvdXJj ZUZyb21NZW1vcnlDYWNoZShEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBDYWNoZWRSZXNv dXJjZSogY2FjaGVkUmVzb3VyY2UpCiB7CiAgICAgaWYgKCFlbmFibGVkKCkpCkBAIC04NjAsMTAg Kzg3NSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6aWRlbnRpZmllckZvckkKIAogdm9p ZCBJbnNwZWN0b3JDb250cm9sbGVyOjp3aWxsU2VuZFJlcXVlc3QoRG9jdW1lbnRMb2FkZXIqLCB1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3Qg UmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSkKIHsKLSAgICBpZiAoIWVuYWJsZWQo KSB8fCAhbV9yZXNvdXJjZVRyYWNraW5nRW5hYmxlZCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAg SW5zcGVjdG9yUmVzb3VyY2UqIHJlc291cmNlID0gbV9yZXNvdXJjZXMuZ2V0KGlkZW50aWZpZXIp LmdldCgpOworICAgIFJlZlB0cjxJbnNwZWN0b3JSZXNvdXJjZT4gcmVzb3VyY2UgPSBnZXRUcmFj a2VkUmVzb3VyY2UoaWRlbnRpZmllcik7CiAgICAgaWYgKCFyZXNvdXJjZSkKICAgICAgICAgcmV0 dXJuOwogCkBAIC04ODAsMTAgKzg5Miw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6d2ls bFNlbmRSZXF1ZXMKIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRSZWNlaXZlUmVzcG9u c2UoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291 cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogewotICAgIGlmICghZW5hYmxlZCgpIHx8ICFtX3Jlc291 cmNlVHJhY2tpbmdFbmFibGVkKQotICAgICAgICByZXR1cm47Ci0KLSAgICBJbnNwZWN0b3JSZXNv dXJjZSogcmVzb3VyY2UgPSBtX3Jlc291cmNlcy5nZXQoaWRlbnRpZmllcikuZ2V0KCk7CisgICAg UmVmUHRyPEluc3BlY3RvclJlc291cmNlPiByZXNvdXJjZSA9IGdldFRyYWNrZWRSZXNvdXJjZShp ZGVudGlmaWVyKTsKICAgICBpZiAoIXJlc291cmNlKQogICAgICAgICByZXR1cm47CiAKQEAgLTg5 NiwxMCArOTA1LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRSZWNlaXZlUmVzcAog CiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFJlY2VpdmVDb250ZW50TGVuZ3RoKERvY3Vt ZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBpbnQgbGVuZ3RoUmVjZWl2ZWQp CiB7Ci0gICAgaWYgKCFlbmFibGVkKCkgfHwgIW1fcmVzb3VyY2VUcmFja2luZ0VuYWJsZWQpCi0g ICAgICAgIHJldHVybjsKLQotICAgIEluc3BlY3RvclJlc291cmNlKiByZXNvdXJjZSA9IG1fcmVz b3VyY2VzLmdldChpZGVudGlmaWVyKS5nZXQoKTsKKyAgICBSZWZQdHI8SW5zcGVjdG9yUmVzb3Vy Y2U+IHJlc291cmNlID0gZ2V0VHJhY2tlZFJlc291cmNlKGlkZW50aWZpZXIpOwogICAgIGlmICgh cmVzb3VyY2UpCiAgICAgICAgIHJldHVybjsKIApAQCAtOTExLDEwICs5MTcsNyBAQCB2b2lkIElu c3BlY3RvckNvbnRyb2xsZXI6OmRpZFJlY2VpdmVDb250CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJv bGxlcjo6ZGlkRmluaXNoTG9hZGluZyhEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRl bnRpZmllcikKIHsKLSAgICBpZiAoIWVuYWJsZWQoKSB8fCAhbV9yZXNvdXJjZVRyYWNraW5nRW5h YmxlZCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgUmVmUHRyPEluc3BlY3RvclJlc291cmNlPiBy ZXNvdXJjZSA9IG1fcmVzb3VyY2VzLmdldChpZGVudGlmaWVyKTsKKyAgICBSZWZQdHI8SW5zcGVj dG9yUmVzb3VyY2U+IHJlc291cmNlID0gZ2V0VHJhY2tlZFJlc291cmNlKGlkZW50aWZpZXIpOwog ICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgIHJldHVybjsKIApAQCAtOTMwLDEwICs5MzMsNyBA QCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZEZpbmlzaExvYWRpCiAKIHZvaWQgSW5zcGVj dG9yQ29udHJvbGxlcjo6ZGlkRmFpbExvYWRpbmcoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBs b25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlRXJyb3ImIC8qZXJyb3IqLykKIHsKLSAgICBp ZiAoIWVuYWJsZWQoKSB8fCAhbV9yZXNvdXJjZVRyYWNraW5nRW5hYmxlZCkKLSAgICAgICAgcmV0 dXJuOwotCi0gICAgUmVmUHRyPEluc3BlY3RvclJlc291cmNlPiByZXNvdXJjZSA9IG1fcmVzb3Vy Y2VzLmdldChpZGVudGlmaWVyKTsKKyAgICBSZWZQdHI8SW5zcGVjdG9yUmVzb3VyY2U+IHJlc291 cmNlID0gZ2V0VHJhY2tlZFJlc291cmNlKGlkZW50aWZpZXIpOwogICAgIGlmICghcmVzb3VyY2Up CiAgICAgICAgIHJldHVybjsKIApJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29u dHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRy b2xsZXIuaAkocmV2aXNpb24gNDQ0OTMpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTI5MSw2ICsyOTEsNyBAQCBwcml2YXRlOgog CiAgICAgdm9pZCBhZGRSZXNvdXJjZShJbnNwZWN0b3JSZXNvdXJjZSopOwogICAgIHZvaWQgcmVt b3ZlUmVzb3VyY2UoSW5zcGVjdG9yUmVzb3VyY2UqKTsKKyAgICBQYXNzUmVmUHRyPEluc3BlY3Rv clJlc291cmNlPiBnZXRUcmFja2VkUmVzb3VyY2UobG9uZyBsb25nIGlkZW50aWZpZXIpOwogCiAg ICAgdm9pZCBwcnVuZVJlc291cmNlcyhSZXNvdXJjZXNNYXAqLCBEb2N1bWVudExvYWRlciogbG9h ZGVyVG9LZWVwID0gMCk7CiAgICAgdm9pZCByZW1vdmVBbGxSZXNvdXJjZXMoUmVzb3VyY2VzTWFw KiBtYXApIHsgcHJ1bmVSZXNvdXJjZXMobWFwKTsgfQo= 31044 2009-06-08 05:49:47 -0700 2009-06-08 06:46:50 -0700 Update main resource meta-data when resource tracking is off update-main-resource.patch text/plain 4649 yurys SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDQ5NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDktMDYtMDggIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVXBkYXRlIG1haW4gcmVzb3VyY2UgbWV0YS1kYXRhIHdoZW4gcmVzb3VyY2UgdHJhY2tpbmcg aXMgZGlzYWJsZWQuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI2MjUzCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpnZXRUcmFja2VkUmVz b3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6d2lsbFNlbmRS ZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFJlY2Vp dmVSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRS ZWNlaXZlQ29udGVudExlbmd0aCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9s bGVyOjpkaWRGaW5pc2hMb2FkaW5nKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRy b2xsZXI6OmRpZEZhaWxMb2FkaW5nKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29u dHJvbGxlci5oOgorCiAyMDA5LTA2LTA4ICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9z QG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBcml5YSBIaWRheWF0LgpJbmRleDog V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJKHJldmlzaW9uIDQ0NDkz KQorKysgV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTgwNCw2ICs4MDQsMjEgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpyZW1v dmVSZXNvdXJjZQogICAgIH0KIH0KIAorUGFzc1JlZlB0cjxJbnNwZWN0b3JSZXNvdXJjZT4gSW5z cGVjdG9yQ29udHJvbGxlcjo6Z2V0VHJhY2tlZFJlc291cmNlKGxvbmcgbG9uZyBpZGVudGlmaWVy KQoreworICAgIGlmICghZW5hYmxlZCgpKQorICAgICAgICByZXR1cm4gUGFzc1JlZlB0cjxJbnNw ZWN0b3JSZXNvdXJjZT4oKTsKKworICAgIGlmIChtX3Jlc291cmNlVHJhY2tpbmdFbmFibGVkKQor ICAgICAgICByZXR1cm4gbV9yZXNvdXJjZXMuZ2V0KGlkZW50aWZpZXIpOworCisgICAgYm9vbCBp c01haW5SZXNvdXJjZSA9IG1fbWFpblJlc291cmNlICYmIG1fbWFpblJlc291cmNlLT5pZGVudGlm aWVyKCkgPT0gaWRlbnRpZmllcjsKKyAgICBpZiAoaXNNYWluUmVzb3VyY2UpCisgICAgICAgIHJl dHVybiBtX21haW5SZXNvdXJjZTsKKworICAgIHJldHVybiBQYXNzUmVmUHRyPEluc3BlY3RvclJl c291cmNlPigpOworfQorCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZExvYWRSZXNvdXJj ZUZyb21NZW1vcnlDYWNoZShEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBDYWNoZWRSZXNv dXJjZSogY2FjaGVkUmVzb3VyY2UpCiB7CiAgICAgaWYgKCFlbmFibGVkKCkpCkBAIC04NjAsMTAg Kzg3NSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6aWRlbnRpZmllckZvckkKIAogdm9p ZCBJbnNwZWN0b3JDb250cm9sbGVyOjp3aWxsU2VuZFJlcXVlc3QoRG9jdW1lbnRMb2FkZXIqLCB1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3Qg UmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSkKIHsKLSAgICBpZiAoIWVuYWJsZWQo KSB8fCAhbV9yZXNvdXJjZVRyYWNraW5nRW5hYmxlZCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAg SW5zcGVjdG9yUmVzb3VyY2UqIHJlc291cmNlID0gbV9yZXNvdXJjZXMuZ2V0KGlkZW50aWZpZXIp LmdldCgpOworICAgIFJlZlB0cjxJbnNwZWN0b3JSZXNvdXJjZT4gcmVzb3VyY2UgPSBnZXRUcmFj a2VkUmVzb3VyY2UoaWRlbnRpZmllcik7CiAgICAgaWYgKCFyZXNvdXJjZSkKICAgICAgICAgcmV0 dXJuOwogCkBAIC04ODAsMTAgKzg5Miw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6d2ls bFNlbmRSZXF1ZXMKIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRSZWNlaXZlUmVzcG9u c2UoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291 cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogewotICAgIGlmICghZW5hYmxlZCgpIHx8ICFtX3Jlc291 cmNlVHJhY2tpbmdFbmFibGVkKQotICAgICAgICByZXR1cm47Ci0KLSAgICBJbnNwZWN0b3JSZXNv dXJjZSogcmVzb3VyY2UgPSBtX3Jlc291cmNlcy5nZXQoaWRlbnRpZmllcikuZ2V0KCk7CisgICAg UmVmUHRyPEluc3BlY3RvclJlc291cmNlPiByZXNvdXJjZSA9IGdldFRyYWNrZWRSZXNvdXJjZShp ZGVudGlmaWVyKTsKICAgICBpZiAoIXJlc291cmNlKQogICAgICAgICByZXR1cm47CiAKQEAgLTg5 NiwxMCArOTA1LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRSZWNlaXZlUmVzcAog CiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFJlY2VpdmVDb250ZW50TGVuZ3RoKERvY3Vt ZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBpbnQgbGVuZ3RoUmVjZWl2ZWQp CiB7Ci0gICAgaWYgKCFlbmFibGVkKCkgfHwgIW1fcmVzb3VyY2VUcmFja2luZ0VuYWJsZWQpCi0g ICAgICAgIHJldHVybjsKLQotICAgIEluc3BlY3RvclJlc291cmNlKiByZXNvdXJjZSA9IG1fcmVz b3VyY2VzLmdldChpZGVudGlmaWVyKS5nZXQoKTsKKyAgICBSZWZQdHI8SW5zcGVjdG9yUmVzb3Vy Y2U+IHJlc291cmNlID0gZ2V0VHJhY2tlZFJlc291cmNlKGlkZW50aWZpZXIpOwogICAgIGlmICgh cmVzb3VyY2UpCiAgICAgICAgIHJldHVybjsKIApAQCAtOTExLDEwICs5MTcsNyBAQCB2b2lkIElu c3BlY3RvckNvbnRyb2xsZXI6OmRpZFJlY2VpdmVDb250CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJv bGxlcjo6ZGlkRmluaXNoTG9hZGluZyhEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRl bnRpZmllcikKIHsKLSAgICBpZiAoIWVuYWJsZWQoKSB8fCAhbV9yZXNvdXJjZVRyYWNraW5nRW5h YmxlZCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgUmVmUHRyPEluc3BlY3RvclJlc291cmNlPiBy ZXNvdXJjZSA9IG1fcmVzb3VyY2VzLmdldChpZGVudGlmaWVyKTsKKyAgICBSZWZQdHI8SW5zcGVj dG9yUmVzb3VyY2U+IHJlc291cmNlID0gZ2V0VHJhY2tlZFJlc291cmNlKGlkZW50aWZpZXIpOwog ICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgIHJldHVybjsKIApAQCAtOTMwLDEwICs5MzMsNyBA QCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpZEZpbmlzaExvYWRpCiAKIHZvaWQgSW5zcGVj dG9yQ29udHJvbGxlcjo6ZGlkRmFpbExvYWRpbmcoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBs b25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlRXJyb3ImIC8qZXJyb3IqLykKIHsKLSAgICBp ZiAoIWVuYWJsZWQoKSB8fCAhbV9yZXNvdXJjZVRyYWNraW5nRW5hYmxlZCkKLSAgICAgICAgcmV0 dXJuOwotCi0gICAgUmVmUHRyPEluc3BlY3RvclJlc291cmNlPiByZXNvdXJjZSA9IG1fcmVzb3Vy Y2VzLmdldChpZGVudGlmaWVyKTsKKyAgICBSZWZQdHI8SW5zcGVjdG9yUmVzb3VyY2U+IHJlc291 cmNlID0gZ2V0VHJhY2tlZFJlc291cmNlKGlkZW50aWZpZXIpOwogICAgIGlmICghcmVzb3VyY2Up CiAgICAgICAgIHJldHVybjsKIApJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29u dHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRy b2xsZXIuaAkocmV2aXNpb24gNDQ0OTMpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTI5MSw2ICsyOTEsNyBAQCBwcml2YXRlOgog CiAgICAgdm9pZCBhZGRSZXNvdXJjZShJbnNwZWN0b3JSZXNvdXJjZSopOwogICAgIHZvaWQgcmVt b3ZlUmVzb3VyY2UoSW5zcGVjdG9yUmVzb3VyY2UqKTsKKyAgICBQYXNzUmVmUHRyPEluc3BlY3Rv clJlc291cmNlPiBnZXRUcmFja2VkUmVzb3VyY2UobG9uZyBsb25nIGlkZW50aWZpZXIpOwogCiAg ICAgdm9pZCBwcnVuZVJlc291cmNlcyhSZXNvdXJjZXNNYXAqLCBEb2N1bWVudExvYWRlciogbG9h ZGVyVG9LZWVwID0gMCk7CiAgICAgdm9pZCByZW1vdmVBbGxSZXNvdXJjZXMoUmVzb3VyY2VzTWFw KiBtYXApIHsgcHJ1bmVSZXNvdXJjZXMobWFwKTsgfQo= 31047 2009-06-08 06:46:50 -0700 2009-06-08 06:54:33 -0700 Update main resource meta-data when resource tracking is off update-main-resource2.patch text/plain 4579 yurys SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDQ5NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDktMDYtMDggIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVXBkYXRlIG1haW4gcmVzb3VyY2UgbWV0YS1kYXRhIHdoZW4gcmVzb3VyY2UgdHJhY2tpbmcg aXMgZGlzYWJsZWQuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI2MjUzCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpnZXRUcmFja2VkUmVz b3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6d2lsbFNlbmRS ZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFJlY2Vp dmVSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRS ZWNlaXZlQ29udGVudExlbmd0aCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9s bGVyOjpkaWRGaW5pc2hMb2FkaW5nKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRy b2xsZXI6OmRpZEZhaWxMb2FkaW5nKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29u dHJvbGxlci5oOgorCiAyMDA5LTA2LTA4ICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9z QG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBcml5YSBIaWRheWF0LgpJbmRleDog V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJKHJldmlzaW9uIDQ0NDkz KQorKysgV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTgwNCw2ICs4MDQsMjEgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpyZW1v dmVSZXNvdXJjZQogICAgIH0KIH0KIAorSW5zcGVjdG9yUmVzb3VyY2UqIEluc3BlY3RvckNvbnRy b2xsZXI6OmdldFRyYWNrZWRSZXNvdXJjZShsb25nIGxvbmcgaWRlbnRpZmllcikKK3sKKyAgICBp ZiAoIWVuYWJsZWQoKSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBpZiAobV9yZXNvdXJjZVRy YWNraW5nRW5hYmxlZCkKKyAgICAgICAgcmV0dXJuIG1fcmVzb3VyY2VzLmdldChpZGVudGlmaWVy KS5nZXQoKTsKKworICAgIGJvb2wgaXNNYWluUmVzb3VyY2UgPSBtX21haW5SZXNvdXJjZSAmJiBt X21haW5SZXNvdXJjZS0+aWRlbnRpZmllcigpID09IGlkZW50aWZpZXI7CisgICAgaWYgKGlzTWFp blJlc291cmNlKQorICAgICAgICByZXR1cm4gbV9tYWluUmVzb3VyY2UuZ2V0KCk7CisKKyAgICBy ZXR1cm4gMDsKK30KKwogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRMb2FkUmVzb3VyY2VG cm9tTWVtb3J5Q2FjaGUoRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgY29uc3QgQ2FjaGVkUmVzb3Vy Y2UqIGNhY2hlZFJlc291cmNlKQogewogICAgIGlmICghZW5hYmxlZCgpKQpAQCAtODYwLDEwICs4 NzUsNyBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmlkZW50aWZpZXJGb3JJCiAKIHZvaWQg SW5zcGVjdG9yQ29udHJvbGxlcjo6d2lsbFNlbmRSZXF1ZXN0KERvY3VtZW50TG9hZGVyKiwgdW5z aWduZWQgbG9uZyBpZGVudGlmaWVyLCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFJl c291cmNlUmVzcG9uc2UmIHJlZGlyZWN0UmVzcG9uc2UpCiB7Ci0gICAgaWYgKCFlbmFibGVkKCkg fHwgIW1fcmVzb3VyY2VUcmFja2luZ0VuYWJsZWQpCi0gICAgICAgIHJldHVybjsKLQotICAgIElu c3BlY3RvclJlc291cmNlKiByZXNvdXJjZSA9IG1fcmVzb3VyY2VzLmdldChpZGVudGlmaWVyKS5n ZXQoKTsKKyAgICBSZWZQdHI8SW5zcGVjdG9yUmVzb3VyY2U+IHJlc291cmNlID0gZ2V0VHJhY2tl ZFJlc291cmNlKGlkZW50aWZpZXIpOwogICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgIHJldHVy bjsKIApAQCAtODgwLDEwICs4OTIsNyBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OndpbGxT ZW5kUmVxdWVzCiAKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNl KERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKLSAgICBpZiAoIWVuYWJsZWQoKSB8fCAhbV9yZXNvdXJj ZVRyYWNraW5nRW5hYmxlZCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgSW5zcGVjdG9yUmVzb3Vy Y2UqIHJlc291cmNlID0gbV9yZXNvdXJjZXMuZ2V0KGlkZW50aWZpZXIpLmdldCgpOworICAgIFJl ZlB0cjxJbnNwZWN0b3JSZXNvdXJjZT4gcmVzb3VyY2UgPSBnZXRUcmFja2VkUmVzb3VyY2UoaWRl bnRpZmllcik7CiAgICAgaWYgKCFyZXNvdXJjZSkKICAgICAgICAgcmV0dXJuOwogCkBAIC04OTYs MTAgKzkwNSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkUmVjZWl2ZVJlc3AKIAog dm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRSZWNlaXZlQ29udGVudExlbmd0aChEb2N1bWVu dExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgaW50IGxlbmd0aFJlY2VpdmVkKQog ewotICAgIGlmICghZW5hYmxlZCgpIHx8ICFtX3Jlc291cmNlVHJhY2tpbmdFbmFibGVkKQotICAg ICAgICByZXR1cm47Ci0KLSAgICBJbnNwZWN0b3JSZXNvdXJjZSogcmVzb3VyY2UgPSBtX3Jlc291 cmNlcy5nZXQoaWRlbnRpZmllcikuZ2V0KCk7CisgICAgUmVmUHRyPEluc3BlY3RvclJlc291cmNl PiByZXNvdXJjZSA9IGdldFRyYWNrZWRSZXNvdXJjZShpZGVudGlmaWVyKTsKICAgICBpZiAoIXJl c291cmNlKQogICAgICAgICByZXR1cm47CiAKQEAgLTkxMSwxMCArOTE3LDcgQEAgdm9pZCBJbnNw ZWN0b3JDb250cm9sbGVyOjpkaWRSZWNlaXZlQ29udAogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xs ZXI6OmRpZEZpbmlzaExvYWRpbmcoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50 aWZpZXIpCiB7Ci0gICAgaWYgKCFlbmFibGVkKCkgfHwgIW1fcmVzb3VyY2VUcmFja2luZ0VuYWJs ZWQpCi0gICAgICAgIHJldHVybjsKLQotICAgIFJlZlB0cjxJbnNwZWN0b3JSZXNvdXJjZT4gcmVz b3VyY2UgPSBtX3Jlc291cmNlcy5nZXQoaWRlbnRpZmllcik7CisgICAgUmVmUHRyPEluc3BlY3Rv clJlc291cmNlPiByZXNvdXJjZSA9IGdldFRyYWNrZWRSZXNvdXJjZShpZGVudGlmaWVyKTsKICAg ICBpZiAoIXJlc291cmNlKQogICAgICAgICByZXR1cm47CiAKQEAgLTkzMCwxMCArOTMzLDcgQEAg dm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRGaW5pc2hMb2FkaQogCiB2b2lkIEluc3BlY3Rv ckNvbnRyb2xsZXI6OmRpZEZhaWxMb2FkaW5nKERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9u ZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZUVycm9yJiAvKmVycm9yKi8pCiB7Ci0gICAgaWYg KCFlbmFibGVkKCkgfHwgIW1fcmVzb3VyY2VUcmFja2luZ0VuYWJsZWQpCi0gICAgICAgIHJldHVy bjsKLQotICAgIFJlZlB0cjxJbnNwZWN0b3JSZXNvdXJjZT4gcmVzb3VyY2UgPSBtX3Jlc291cmNl cy5nZXQoaWRlbnRpZmllcik7CisgICAgUmVmUHRyPEluc3BlY3RvclJlc291cmNlPiByZXNvdXJj ZSA9IGdldFRyYWNrZWRSZXNvdXJjZShpZGVudGlmaWVyKTsKICAgICBpZiAoIXJlc291cmNlKQog ICAgICAgICByZXR1cm47CiAKSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRy b2xsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9s bGVyLmgJKHJldmlzaW9uIDQ0NDkzKQorKysgV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29u dHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOTEsNiArMjkxLDcgQEAgcHJpdmF0ZToKIAog ICAgIHZvaWQgYWRkUmVzb3VyY2UoSW5zcGVjdG9yUmVzb3VyY2UqKTsKICAgICB2b2lkIHJlbW92 ZVJlc291cmNlKEluc3BlY3RvclJlc291cmNlKik7CisgICAgSW5zcGVjdG9yUmVzb3VyY2UqIGdl dFRyYWNrZWRSZXNvdXJjZShsb25nIGxvbmcgaWRlbnRpZmllcik7CiAKICAgICB2b2lkIHBydW5l UmVzb3VyY2VzKFJlc291cmNlc01hcCosIERvY3VtZW50TG9hZGVyKiBsb2FkZXJUb0tlZXAgPSAw KTsKICAgICB2b2lkIHJlbW92ZUFsbFJlc291cmNlcyhSZXNvdXJjZXNNYXAqIG1hcCkgeyBwcnVu ZVJlc291cmNlcyhtYXApOyB9Cg==