55939 2011-03-08 07:11:03 -0800 Web Inspector: resource errors are not reported before front-end is opened 2011-03-09 06:51:38 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED Regression P1 Normal --- 1 caseq caseq apavlov ap bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 363951 0 caseq 2011-03-08 07:11:03 -0800 1. run Tools/Scripts/run-webkit-tests 2. Navigate to http://localhost:8000/inspector/console-resource-errors.html 3. Open WebInspector 4. Observe console is empty 5. reload 6. Observe resource errors are logged to console 363973 1 85051 caseq 2011-03-08 08:28:30 -0800 Created attachment 85051 patch 364025 2 ap 2011-03-08 10:33:52 -0800 Could this have been done for performance reasons? 364063 3 caseq 2011-03-08 11:39:49 -0800 (In reply to comment #2) > Could this have been done for performance reasons? I don't think we have much to spare there, considering the overhead of resource load. As long as we're sotring other error messages with no inspector front-end, I don't see why we shouldn't save resource errors. I think this used to work up until recently, so it must be just a bug. 364108 4 85051 pfeldman 2011-03-08 12:34:20 -0800 Comment on attachment 85051 patch View in context: https://bugs.webkit.org/attachment.cgi?id=85051&action=review > Source/WebCore/inspector/InspectorInstrumentation.cpp:441 > + if (hasFrontends()) { Timeline agent does not exist outside front-end lifetime. > Source/WebCore/inspector/InspectorInstrumentation.cpp:454 > + if (!hasFrontends()) Same for resource agent. What you should do is look up appropriate InspectorAgent instance and make consoleAgent call on it. > Source/WebCore/inspector/InspectorInstrumentation.h:674 > + if (cookie.first) We want to make sure that instrumentation is a no-op while there is no front-end. There are exceptional cases such as resource error reporting that should be handled manually. 364386 5 85148 caseq 2011-03-09 02:10:22 -0800 Created attachment 85148 patch - call didReceiveResourceResponseImpl() unconditionally, retrieve agent from loader's frame if missing in cookie - also fixed didFailLoding 364430 6 85160 caseq 2011-03-09 04:42:54 -0800 Created attachment 85160 patch 364476 7 caseq 2011-03-09 06:51:38 -0800 Manually committed r80639: http://trac.webkit.org/changeset/80639 85051 2011-03-08 08:28:30 -0800 2011-03-09 02:10:22 -0800 patch resource-errors.diff text/plain 4262 caseq ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1MTJkNTI0Li4zYjFiOGY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDMtMDggIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiByZXNvdXJjZSBlcnJvcnMgYXJlIG5vdCByZXBvcnRlZCBiZWZvcmUgZnJvbnQtZW5kIGlz IG9wZW5lZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTU5MzkKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUmVjZWl2 ZVJlc291cmNlUmVzcG9uc2VJbXBsKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVJlc291cmNlUmVzcG9uc2VJbXBsKToKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxSZWNlaXZlUmVzb3VyY2VSZXNwb25zZSk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2VpdmVSZXNv dXJjZVJlc3BvbnNlKToKKwogMjAxMS0wMy0wOCAgQW5kcmVhcyBLbGluZyAgPGtsaW5nQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQmVuamFtaW4gUG91bGFpbi4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3Bw IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAK aW5kZXggZGZlMWMyOC4uMGM4NmRhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKQEAgLTQzOCwxMCArNDM4LDExIEBA IHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZlUmVzb3VyY2VEYXRhSW1w bChjb25zdCBJbnNwZWN0b3JJbnN0cnVtCiBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUmVjZWl2ZVJlc291cmNlUmVzcG9uc2VJbXBs KEluc3BlY3RvckFnZW50KiBpbnNwZWN0b3JBZ2VudCwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVy LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKICAgICBpbnQgdGltZWxpbmVB Z2VudElkID0gMDsKLSAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0g cmV0cmlldmVUaW1lbGluZUFnZW50KGluc3BlY3RvckFnZW50KTsKLSAgICBpZiAodGltZWxpbmVB Z2VudCkgewotICAgICAgICB0aW1lbGluZUFnZW50LT53aWxsUmVjZWl2ZVJlc291cmNlUmVzcG9u c2UoaWRlbnRpZmllciwgcmVzcG9uc2UpOwotICAgICAgICB0aW1lbGluZUFnZW50SWQgPSB0aW1l bGluZUFnZW50LT5pZCgpOworICAgIGlmIChoYXNGcm9udGVuZHMoKSkgeworICAgICAgICBpZiAo SW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IHJldHJpZXZlVGltZWxpbmVB Z2VudChpbnNwZWN0b3JBZ2VudCkpIHsKKyAgICAgICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxS ZWNlaXZlUmVzb3VyY2VSZXNwb25zZShpZGVudGlmaWVyLCByZXNwb25zZSk7CisgICAgICAgICAg ICB0aW1lbGluZUFnZW50SWQgPSB0aW1lbGluZUFnZW50LT5pZCgpOworICAgICAgICB9CiAgICAg fQogICAgIHJldHVybiBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUoaW5zcGVjdG9yQWdl bnQsIHRpbWVsaW5lQWdlbnRJZCk7CiB9CkBAIC00NDksOSArNDUwLDExIEBAIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxSZWNlaXZl UmVzb3VyY2VSZXNwCiB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVJl c291cmNlUmVzcG9uc2VJbXBsKGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSYg Y29va2llLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiBsb2FkZXIs IGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogewogICAgIEluc3BlY3RvckFnZW50 KiBpbnNwZWN0b3JBZ2VudCA9IGNvb2tpZS5maXJzdDsKKyAgICBpbnNwZWN0b3JBZ2VudC0+Y29u c29sZUFnZW50KCktPmRpZFJlY2VpdmVSZXNwb25zZShpZGVudGlmaWVyLCByZXNwb25zZSk7Cisg ICAgaWYgKCFoYXNGcm9udGVuZHMoKSkKKyAgICAgICAgcmV0dXJuOwogICAgIGlmIChJbnNwZWN0 b3JSZXNvdXJjZUFnZW50KiByZXNvdXJjZUFnZW50ID0gcmV0cmlldmVSZXNvdXJjZUFnZW50KGlu c3BlY3RvckFnZW50KSkKICAgICAgICAgcmVzb3VyY2VBZ2VudC0+ZGlkUmVjZWl2ZVJlc3BvbnNl KGlkZW50aWZpZXIsIGxvYWRlciwgcmVzcG9uc2UpOwotICAgIGluc3BlY3RvckFnZW50LT5jb25z b2xlQWdlbnQoKS0+ZGlkUmVjZWl2ZVJlc3BvbnNlKGlkZW50aWZpZXIsIHJlc3BvbnNlKTsKICAg ICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IHJldHJpZXZlVGlt ZWxpbmVBZ2VudChjb29raWUpKQogICAgICAgICB0aW1lbGluZUFnZW50LT5kaWRSZWNlaXZlUmVz b3VyY2VSZXNwb25zZSgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCmluZGV4IDJlYTRlNGYuLmM1ZjhmNzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgK QEAgLTY2Miw3ICs2NjIsNyBAQCBpbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246 OmRpZFJlY2VpdmVSZXNvdXJjZURhdGEoY29uc3QgSW5zcGVjdG9ySW5zdAogaW5saW5lIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxS ZWNlaXZlUmVzb3VyY2VSZXNwb25zZShGcmFtZSogZnJhbWUsIHVuc2lnbmVkIGxvbmcgaWRlbnRp ZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiB7CiAjaWYgRU5BQkxFKElO U1BFQ1RPUikKLSAgICBpZiAoSW5zcGVjdG9yQWdlbnQqIGluc3BlY3RvckFnZW50ID0gaW5zcGVj dG9yQWdlbnRXaXRoRnJvbnRlbmRGb3JGcmFtZShmcmFtZSkpCisgICAgaWYgKEluc3BlY3RvckFn ZW50KiBpbnNwZWN0b3JBZ2VudCA9IGluc3BlY3RvckFnZW50Rm9yRnJhbWUoZnJhbWUpKQogICAg ICAgICByZXR1cm4gd2lsbFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlSW1wbChpbnNwZWN0b3JBZ2Vu dCwgaWRlbnRpZmllciwgcmVzcG9uc2UpOwogI2VuZGlmCiAgICAgcmV0dXJuIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbkNvb2tpZSgpOwpAQCAtNjcxLDcgKzY3MSw3IEBAIGlubGluZSBJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb25Db29raWUgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUmVj ZWl2ZVJlc291CiBpbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2Vp dmVSZXNvdXJjZVJlc3BvbnNlKGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSYg Y29va2llLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiBsb2FkZXIs IGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogewogI2lmIEVOQUJMRShJTlNQRUNU T1IpCi0gICAgaWYgKGhhc0Zyb250ZW5kcygpICYmIGNvb2tpZS5maXJzdCkKKyAgICBpZiAoY29v a2llLmZpcnN0KQogICAgICAgICBkaWRSZWNlaXZlUmVzb3VyY2VSZXNwb25zZUltcGwoY29va2ll LCBpZGVudGlmaWVyLCBsb2FkZXIsIHJlc3BvbnNlKTsKICNlbmRpZgogfQo= 85148 2011-03-09 02:10:22 -0800 2011-03-09 04:42:54 -0800 patch resource-errors.diff text/plain 3967 caseq ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1MTJkNTI0Li5kNDNmN2Y1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDMtMDkgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiByZXNvdXJjZSBlcnJvcnMgYXJlIG5vdCByZXBvcnRlZCBiZWZvcmUgZnJvbnQtZW5kIGlz IG9wZW5lZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTU5MzkKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZl UmVzb3VyY2VSZXNwb25zZUltcGwpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0 cnVtZW50YXRpb24uaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6ZGlkUmVjZWl2ZVJlc291cmNlUmVzcG9uc2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRGYWlsTG9hZGluZyk6CisKIDIwMTEtMDMtMDggIEFuZHJl YXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEJlbmph bWluIFBvdWxhaW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JJbnN0cnVtZW50YXRpb24uY3BwCmluZGV4IGRmZTFjMjguLmUxYzQ2NjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3Bw CkBAIC00NDksMTEgKzQ0OSwxNSBAQCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUmVjZWl2ZVJlc291cmNlUmVzcAogdm9pZCBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlSW1wbChjb25z dCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUmIGNvb2tpZSwgdW5zaWduZWQgbG9uZyBp ZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNl JiByZXNwb25zZSkKIHsKICAgICBJbnNwZWN0b3JBZ2VudCogaW5zcGVjdG9yQWdlbnQgPSBjb29r aWUuZmlyc3Q7Ci0gICAgaWYgKEluc3BlY3RvclJlc291cmNlQWdlbnQqIHJlc291cmNlQWdlbnQg PSByZXRyaWV2ZVJlc291cmNlQWdlbnQoaW5zcGVjdG9yQWdlbnQpKQotICAgICAgICByZXNvdXJj ZUFnZW50LT5kaWRSZWNlaXZlUmVzcG9uc2UoaWRlbnRpZmllciwgbG9hZGVyLCByZXNwb25zZSk7 Ci0gICAgaW5zcGVjdG9yQWdlbnQtPmNvbnNvbGVBZ2VudCgpLT5kaWRSZWNlaXZlUmVzcG9uc2Uo aWRlbnRpZmllciwgcmVzcG9uc2UpOwotICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0 aW1lbGluZUFnZW50ID0gcmV0cmlldmVUaW1lbGluZUFnZW50KGNvb2tpZSkpCi0gICAgICAgIHRp bWVsaW5lQWdlbnQtPmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlKCk7CisgICAgaWYgKGluc3Bl Y3RvckFnZW50KSB7CisgICAgICAgIGlmIChJbnNwZWN0b3JSZXNvdXJjZUFnZW50KiByZXNvdXJj ZUFnZW50ID0gcmV0cmlldmVSZXNvdXJjZUFnZW50KGluc3BlY3RvckFnZW50KSkKKyAgICAgICAg ICAgIHJlc291cmNlQWdlbnQtPmRpZFJlY2VpdmVSZXNwb25zZShpZGVudGlmaWVyLCBsb2FkZXIs IHJlc3BvbnNlKTsKKyAgICAgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5l QWdlbnQgPSByZXRyaWV2ZVRpbWVsaW5lQWdlbnQoY29va2llKSkKKyAgICAgICAgICAgIHRpbWVs aW5lQWdlbnQtPmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlKCk7CisgICAgfSBlbHNlIC8vIFdl IHdvbid0IGhhdmUgaW5zcGVjdG9yIGFnZW50IGluIHRoZSBjb29raWUgaW4gY2FzZSB3ZSBkb24n dCBoYXZlIGZyb250LWVuZCwgc28gZ2V0IGl0IGZyb20gbG9hZGVyJ3MgZnJhbWUuCisgICAgICAg IGluc3BlY3RvckFnZW50ID0gaW5zcGVjdG9yQWdlbnRGb3JGcmFtZShsb2FkZXItPmZyYW1lKCkp OworICAgIGlmIChpbnNwZWN0b3JBZ2VudCkKKyAgICAgICAgaW5zcGVjdG9yQWdlbnQtPmNvbnNv bGVBZ2VudCgpLT5kaWRSZWNlaXZlUmVzcG9uc2UoaWRlbnRpZmllciwgcmVzcG9uc2UpOwogfQog CiB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGhJ bXBsKEluc3BlY3RvckFnZW50KiBpbnNwZWN0b3JBZ2VudCwgdW5zaWduZWQgbG9uZyBpZGVudGlm aWVyLCBpbnQgbGVuZ3RoUmVjZWl2ZWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggMmVhNGU0Zi4uMjc1OWMxMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlv bi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRp b24uaApAQCAtNjcxLDggKzY3MSw4IEBAIGlubGluZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25D b29raWUgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUmVjZWl2ZVJlc291CiBpbmxpbmUg dm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNl KGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSYgY29va2llLCB1bnNpZ25lZCBs b25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIGNvbnN0IFJlc291cmNlUmVz cG9uc2UmIHJlc3BvbnNlKQogewogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgaWYgKGhhc0Zy b250ZW5kcygpICYmIGNvb2tpZS5maXJzdCkKLSAgICAgICAgZGlkUmVjZWl2ZVJlc291cmNlUmVz cG9uc2VJbXBsKGNvb2tpZSwgaWRlbnRpZmllciwgbG9hZGVyLCByZXNwb25zZSk7CisgICAgLy8g Q2FsbCB0aGlzIHVuY29uZGl0aW9uYWxseSBzbyB0aGF0IHdlJ3JlIGFibGUgdG8gbG9nIHRvIGNv bnNvbGUgd2l0aCBubyBmcm9udC1lbmQgYXR0YWNoZWQuCisgICAgZGlkUmVjZWl2ZVJlc291cmNl UmVzcG9uc2VJbXBsKGNvb2tpZSwgaWRlbnRpZmllciwgbG9hZGVyLCByZXNwb25zZSk7CiAjZW5k aWYKIH0KIApAQCAtNjk1LDcgKzY5NSw3IEBAIGlubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6ZGlkRmluaXNoTG9hZGluZyhGcmFtZSogZnJhbWUsIHVuc2lnbmVkIGxvCiBpbmxp bmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZEZhaWxMb2FkaW5nKEZyYW1lKiBm cmFtZSwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJv cikKIHsKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIGlmIChJbnNwZWN0b3JBZ2VudCogaW5z cGVjdG9yQWdlbnQgPSBpbnNwZWN0b3JBZ2VudFdpdGhGcm9udGVuZEZvckZyYW1lKGZyYW1lKSkK KyAgICBpZiAoSW5zcGVjdG9yQWdlbnQqIGluc3BlY3RvckFnZW50ID0gaW5zcGVjdG9yQWdlbnRG b3JGcmFtZShmcmFtZSkpCiAgICAgICAgIGRpZEZhaWxMb2FkaW5nSW1wbChpbnNwZWN0b3JBZ2Vu dCwgaWRlbnRpZmllciwgZXJyb3IpOwogI2VuZGlmCiB9Cg== 85160 2011-03-09 04:42:54 -0800 2011-03-09 04:50:03 -0800 patch resource-errors.diff text/plain 3982 caseq ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1MTJkNTI0Li5kNDNmN2Y1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDMtMDkgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiByZXNvdXJjZSBlcnJvcnMgYXJlIG5vdCByZXBvcnRlZCBiZWZvcmUgZnJvbnQtZW5kIGlz IG9wZW5lZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTU5MzkKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZl UmVzb3VyY2VSZXNwb25zZUltcGwpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0 cnVtZW50YXRpb24uaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6ZGlkUmVjZWl2ZVJlc291cmNlUmVzcG9uc2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRGYWlsTG9hZGluZyk6CisKIDIwMTEtMDMtMDggIEFuZHJl YXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEJlbmph bWluIFBvdWxhaW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JJbnN0cnVtZW50YXRpb24uY3BwCmluZGV4IGRmZTFjMjguLjM2MjMyNjggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3Bw CkBAIC00NDgsMTAgKzQ0OCwxMSBAQCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUmVjZWl2ZVJlc291cmNlUmVzcAogCiB2b2lkIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVJlc291cmNlUmVzcG9uc2VJbXBsKGNv bnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSYgY29va2llLCB1bnNpZ25lZCBsb25n IGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIGNvbnN0IFJlc291cmNlUmVzcG9u c2UmIHJlc3BvbnNlKQogewotICAgIEluc3BlY3RvckFnZW50KiBpbnNwZWN0b3JBZ2VudCA9IGNv b2tpZS5maXJzdDsKLSAgICBpZiAoSW5zcGVjdG9yUmVzb3VyY2VBZ2VudCogcmVzb3VyY2VBZ2Vu dCA9IHJldHJpZXZlUmVzb3VyY2VBZ2VudChpbnNwZWN0b3JBZ2VudCkpCi0gICAgICAgIHJlc291 cmNlQWdlbnQtPmRpZFJlY2VpdmVSZXNwb25zZShpZGVudGlmaWVyLCBsb2FkZXIsIHJlc3BvbnNl KTsKLSAgICBpbnNwZWN0b3JBZ2VudC0+Y29uc29sZUFnZW50KCktPmRpZFJlY2VpdmVSZXNwb25z ZShpZGVudGlmaWVyLCByZXNwb25zZSk7CisgICAgaWYgKEluc3BlY3RvckFnZW50KiBpbnNwZWN0 b3JBZ2VudCA9IGluc3BlY3RvckFnZW50Rm9yRnJhbWUobG9hZGVyLT5mcmFtZSgpKSkgeworICAg ICAgICBpZiAoSW5zcGVjdG9yUmVzb3VyY2VBZ2VudCogcmVzb3VyY2VBZ2VudCA9IHJldHJpZXZl UmVzb3VyY2VBZ2VudChpbnNwZWN0b3JBZ2VudCkpCisgICAgICAgICAgICByZXNvdXJjZUFnZW50 LT5kaWRSZWNlaXZlUmVzcG9uc2UoaWRlbnRpZmllciwgbG9hZGVyLCByZXNwb25zZSk7CisgICAg ICAgIGluc3BlY3RvckFnZW50LT5jb25zb2xlQWdlbnQoKS0+ZGlkUmVjZWl2ZVJlc3BvbnNlKGlk ZW50aWZpZXIsIHJlc3BvbnNlKTsKKyAgICB9CiAgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdl bnQqIHRpbWVsaW5lQWdlbnQgPSByZXRyaWV2ZVRpbWVsaW5lQWdlbnQoY29va2llKSkKICAgICAg ICAgdGltZWxpbmVBZ2VudC0+ZGlkUmVjZWl2ZVJlc291cmNlUmVzcG9uc2UoKTsKIH0KQEAgLTcz Myw2ICs3MzQsOCBAQCBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb246OnJldHJpZXZlVGltZWxpbmVBZ2VudChJbnNwZWN0bwogCiBJbnNwZWN0b3JUaW1lbGlu ZUFnZW50KiBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnJldHJpZXZlVGltZWxpbmVBZ2VudChj b25zdCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUmIGNvb2tpZSkKIHsKKyAgICBpZiAo IWNvb2tpZS5maXJzdCkKKyAgICAgICAgcmV0dXJuIDA7CiAgICAgSW5zcGVjdG9yVGltZWxpbmVB Z2VudCogdGltZWxpbmVBZ2VudCA9IHJldHJpZXZlVGltZWxpbmVBZ2VudChjb29raWUuZmlyc3Qp OwogICAgIGlmICh0aW1lbGluZUFnZW50ICYmIHRpbWVsaW5lQWdlbnQtPmlkKCkgPT0gY29va2ll LnNlY29uZCkKICAgICAgICAgcmV0dXJuIHRpbWVsaW5lQWdlbnQ7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggMmVhNGU0 Zi4uMjc1OWMxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckluc3RydW1lbnRhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JJbnN0cnVtZW50YXRpb24uaApAQCAtNjcxLDggKzY3MSw4IEBAIGlubGluZSBJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb25Db29raWUgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUmVjZWl2 ZVJlc291CiBpbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2VpdmVS ZXNvdXJjZVJlc3BvbnNlKGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSYgY29v a2llLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIGNv bnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogewogI2lmIEVOQUJMRShJTlNQRUNUT1Ip Ci0gICAgaWYgKGhhc0Zyb250ZW5kcygpICYmIGNvb2tpZS5maXJzdCkKLSAgICAgICAgZGlkUmVj ZWl2ZVJlc291cmNlUmVzcG9uc2VJbXBsKGNvb2tpZSwgaWRlbnRpZmllciwgbG9hZGVyLCByZXNw b25zZSk7CisgICAgLy8gQ2FsbCB0aGlzIHVuY29uZGl0aW9uYWxseSBzbyB0aGF0IHdlJ3JlIGFi bGUgdG8gbG9nIHRvIGNvbnNvbGUgd2l0aCBubyBmcm9udC1lbmQgYXR0YWNoZWQuCisgICAgZGlk UmVjZWl2ZVJlc291cmNlUmVzcG9uc2VJbXBsKGNvb2tpZSwgaWRlbnRpZmllciwgbG9hZGVyLCBy ZXNwb25zZSk7CiAjZW5kaWYKIH0KIApAQCAtNjk1LDcgKzY5NSw3IEBAIGlubGluZSB2b2lkIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkRmluaXNoTG9hZGluZyhGcmFtZSogZnJhbWUsIHVu c2lnbmVkIGxvCiBpbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZEZhaWxM b2FkaW5nKEZyYW1lKiBmcmFtZSwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNv dXJjZUVycm9yJiBlcnJvcikKIHsKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIGlmIChJbnNw ZWN0b3JBZ2VudCogaW5zcGVjdG9yQWdlbnQgPSBpbnNwZWN0b3JBZ2VudFdpdGhGcm9udGVuZEZv ckZyYW1lKGZyYW1lKSkKKyAgICBpZiAoSW5zcGVjdG9yQWdlbnQqIGluc3BlY3RvckFnZW50ID0g aW5zcGVjdG9yQWdlbnRGb3JGcmFtZShmcmFtZSkpCiAgICAgICAgIGRpZEZhaWxMb2FkaW5nSW1w bChpbnNwZWN0b3JBZ2VudCwgaWRlbnRpZmllciwgZXJyb3IpOwogI2VuZGlmCiB9Cg==