34332 2010-01-29 08:18:24 -0800 Web Inspector: Lazy-load resource contents in the Resources panel 2010-02-01 14:03:13 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov bweinstein commit-queue joepeck keishi pfeldman pmuellr rik timothy oldest_to_newest 185875 0 apavlov 2010-01-29 08:18:24 -0800 Recently, the resource data pane in the Resources panel was split into 2 tabs, one with the resource metainfo, the other with the resource contents. However, when a resource is selected and its metainfo tab is displayed, the resource contents retrieval starts. Once the contents of a long textual resource are retrieved, their handling takes some time and hangs the UI. Instead, such resource contents should be loaded only when the Contents tab is selected. 185877 1 joepeck 2010-01-29 08:36:34 -0800 Nice idea. Would this cause any problems with searching on the Resources tab? 185901 2 apavlov 2010-01-29 10:12:25 -0800 (In reply to comment #1) > Nice idea. Would this cause any problems with searching on the Resources tab? Good catch - I forgot about externally opening resources in the Scripts and Resources panels. When the search is performed, all resource contents should be retrieved. Now the solution should be good to review. 185902 3 47720 apavlov 2010-01-29 10:13:09 -0800 Created attachment 47720 [PATCH] Proposed solution 186027 4 47720 timothy 2010-01-29 17:52:38 -0800 Comment on attachment 47720 [PATCH] Proposed solution > + ensureResourceLoaded: function() ensureResourceIsLoaded would be a better name. > + if (resource._resourcesView && "setLazyLoad" in resource._resourcesView) > + resource._resourcesView.setLazyLoad(lazyLoad); Why not just set the property directly? When would the setLazyLoad function not exist? Use a setter instead of a function, or just set the property directly. Fix these before landing. 186187 5 47720 pfeldman 2010-01-31 04:41:39 -0800 Comment on attachment 47720 [PATCH] Proposed solution It is not clear to me why these changes are necessary. Why not to simply remove setupSourceFrameIfNeeded from the SourceView::show and call it as an abstract function from within ResourceView upon tab switch? Patch also seems to be wrong in a way that it does not load resource if lazy load is set to 'false'. 186350 6 47827 apavlov 2010-02-01 03:14:38 -0800 Created attachment 47827 [PATCH] A simplified solution 186567 7 47827 commit-queue 2010-02-01 14:03:05 -0800 Comment on attachment 47827 [PATCH] A simplified solution Clearing flags on attachment: 47827 Committed r54148: <http://trac.webkit.org/changeset/54148> 186568 8 commit-queue 2010-02-01 14:03:13 -0800 All reviewed patches have been landed. Closing bug. 47720 2010-01-29 10:13:09 -0800 2010-02-01 03:14:38 -0800 [PATCH] Proposed solution lazyload.patch text/plain 9883 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzJiYmM4Yi4uZGU4N2M1MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzNiBAQAogMjAxMC0wMS0yOSAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIExhenktbG9hZCB0ZXh0dWFsIHJlc291cmNlcyB0byBhdm9p ZCBVSSBoYW5ndXAgaW4gdGhlIFJlc291cmNlcyBwYW5lbAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQzMzIKKworICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNl Vmlldy5wcm90b3R5cGUuX3NlbGVjdENvbnRlbnRUYWIpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlJlc291cmNlVmlldy5wcm90b3R5cGUuZW5zdXJlUmVzb3VyY2VMb2FkZWQpOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLmdldCBzZWFyY2hhYmxlVmlld3MpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5hZGRNZXNzYWdlVG9S ZXNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBl LnNob3dSZXNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJv dG90eXBlLnJlc291cmNlVmlld0ZvclJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5S ZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuc291cmNlRnJhbWVGb3JSZXNvdXJjZSk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5zY3JpcHRWaWV3Rm9yU2NyaXB0KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLnNvdXJjZUZyYW1lRm9yU2Ny aXB0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9zb3Vy Y2VWaWV3Rm9yU2NyaXB0T3JSZXNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsLnByb3RvdHlwZS5fc2hvd1NjcmlwdE9yUmVzb3VyY2UpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvU291cmNlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3Vy Y2VWaWV3LnByb3RvdHlwZS5zaG93KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3 LnByb3RvdHlwZS5zZXRMYXp5TG9hZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlVmll dy5wcm90b3R5cGUuc2V0dXBTb3VyY2VGcmFtZUlmTmVlZGVkKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZS5sb2FkUmVzb3VyY2UpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlLl9yZXNvdXJjZUxvYWRpbmdGaW5pc2hlZCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUucGVyZm9ybVNlYXJjaCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUucmV2ZWFsTGluZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUuaGlnaGxpZ2h0TGlu ZSk6CisKKzIwMTAtMDEtMjkgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9y Zz4KKwogICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogU291cmNlIHZpZXcgZGlzcGxheXMgdGV4dCB1c2luZyB3cm9uZyBmb250cwpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKaW5kZXggMzM0ODQ3 ZS4uMmQyNDc2NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlVmlldy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3 LmpzCkBAIC0xNzMsNiArMTczLDE2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcucHJvdG90 eXBlID0gewogICAgIHsKICAgICAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnJlc291cmNlVmll d1RhYiA9ICJjb250ZW50IjsKICAgICAgICAgdGhpcy5faW5uZXJTZWxlY3RDb250ZW50VGFiKCk7 CisgICAgICAgIHRoaXMuZW5zdXJlUmVzb3VyY2VMb2FkZWQoKTsKKyAgICB9LAorCisgICAgZW5z dXJlUmVzb3VyY2VMb2FkZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5f cmVzb3VyY2VMb2FkZWQpIHsKKyAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlTG9hZGVkID0gdHJ1 ZTsKKyAgICAgICAgICAgIGlmICgibG9hZFJlc291cmNlIiBpbiB0aGlzKQorICAgICAgICAgICAg ICAgIHRoaXMubG9hZFJlc291cmNlKCk7CisgICAgICAgIH0KICAgICB9LAogCiAgICAgX2lubmVy U2VsZWN0Q29udGVudFRhYjogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IGUwYzU1MjEuLjFkYWQzOTMgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcworKysgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKQEAgLTIyNCw3ICsyMjQs NyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAg ICAgdmFyIHJlc291cmNlID0gdGhpcy5fcmVzb3VyY2VzW2ldOwogICAgICAgICAgICAgaWYgKCFy ZXNvdXJjZS5faXRlbXNUcmVlRWxlbWVudCkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAg ICAgICAgICAgIHZhciByZXNvdXJjZVZpZXcgPSB0aGlzLnJlc291cmNlVmlld0ZvclJlc291cmNl KHJlc291cmNlKTsKKyAgICAgICAgICAgIHZhciByZXNvdXJjZVZpZXcgPSB0aGlzLnJlc291cmNl Vmlld0ZvclJlc291cmNlKHJlc291cmNlLCB0cnVlKTsKICAgICAgICAgICAgIGlmICghcmVzb3Vy Y2VWaWV3LnBlcmZvcm1TZWFyY2ggfHwgcmVzb3VyY2VWaWV3ID09PSB2aXNpYmxlVmlldykKICAg ICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIHZpZXdzLnB1c2gocmVzb3VyY2VW aWV3KTsKQEAgLTM5NSw3ICszOTUsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJv dG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuY3VycmVudFF1ZXJ5ICYmIHJlc291cmNlLl9p dGVtc1RyZWVFbGVtZW50KQogICAgICAgICAgICAgcmVzb3VyY2UuX2l0ZW1zVHJlZUVsZW1lbnQu dXBkYXRlRXJyb3JzQW5kV2FybmluZ3MoKTsKIAotICAgICAgICB2YXIgdmlldyA9IHRoaXMucmVz b3VyY2VWaWV3Rm9yUmVzb3VyY2UocmVzb3VyY2UpOworICAgICAgICB2YXIgdmlldyA9IHRoaXMu cmVzb3VyY2VWaWV3Rm9yUmVzb3VyY2UocmVzb3VyY2UsIHRydWUpOwogICAgICAgICBpZiAodmll dy5hZGRNZXNzYWdlKQogICAgICAgICAgICAgdmlldy5hZGRNZXNzYWdlKG1zZyk7CiAgICAgfSwK QEAgLTQ3MSw3ICs0NzEsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBl ID0gewogICAgICAgICBpZiAodGhpcy52aXNpYmxlUmVzb3VyY2UgJiYgdGhpcy52aXNpYmxlUmVz b3VyY2UuX3Jlc291cmNlc1ZpZXcpCiAgICAgICAgICAgICB0aGlzLnZpc2libGVSZXNvdXJjZS5f cmVzb3VyY2VzVmlldy5oaWRlKCk7CiAKLSAgICAgICAgdmFyIHZpZXcgPSB0aGlzLnJlc291cmNl Vmlld0ZvclJlc291cmNlKHJlc291cmNlKTsKKyAgICAgICAgdmFyIHZpZXcgPSB0aGlzLnJlc291 cmNlVmlld0ZvclJlc291cmNlKHJlc291cmNlLCB0cnVlKTsKICAgICAgICAgdmlldy5oZWFkZXJz VmlzaWJsZSA9IHRydWU7CiAgICAgICAgIHZpZXcuc2hvdyh0aGlzLnZpZXdzQ29udGFpbmVyRWxl bWVudCk7CiAKQEAgLTUxMSwxOCArNTExLDIwIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5l bC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMudXBkYXRlU2lkZWJhcldpZHRoKCk7CiAgICAg fSwKIAotICAgIHJlc291cmNlVmlld0ZvclJlc291cmNlOiBmdW5jdGlvbihyZXNvdXJjZSkKKyAg ICByZXNvdXJjZVZpZXdGb3JSZXNvdXJjZTogZnVuY3Rpb24ocmVzb3VyY2UsIGxhenlMb2FkKQog ICAgIHsKICAgICAgICAgaWYgKCFyZXNvdXJjZSkKICAgICAgICAgICAgIHJldHVybiBudWxsOwog ICAgICAgICBpZiAoIXJlc291cmNlLl9yZXNvdXJjZXNWaWV3KQogICAgICAgICAgICAgcmVzb3Vy Y2UuX3Jlc291cmNlc1ZpZXcgPSB0aGlzLl9jcmVhdGVSZXNvdXJjZVZpZXcocmVzb3VyY2UpOwor ICAgICAgICBpZiAocmVzb3VyY2UuX3Jlc291cmNlc1ZpZXcgJiYgInNldExhenlMb2FkIiBpbiBy ZXNvdXJjZS5fcmVzb3VyY2VzVmlldykKKyAgICAgICAgICAgIHJlc291cmNlLl9yZXNvdXJjZXNW aWV3LnNldExhenlMb2FkKGxhenlMb2FkKTsKICAgICAgICAgcmV0dXJuIHJlc291cmNlLl9yZXNv dXJjZXNWaWV3OwogICAgIH0sCiAKICAgICBzb3VyY2VGcmFtZUZvclJlc291cmNlOiBmdW5jdGlv bihyZXNvdXJjZSkKICAgICB7Ci0gICAgICAgIHZhciB2aWV3ID0gdGhpcy5yZXNvdXJjZVZpZXdG b3JSZXNvdXJjZShyZXNvdXJjZSk7CisgICAgICAgIHZhciB2aWV3ID0gdGhpcy5yZXNvdXJjZVZp ZXdGb3JSZXNvdXJjZShyZXNvdXJjZSwgdHJ1ZSk7CiAgICAgICAgIGlmICghdmlldykKICAgICAg ICAgICAgIHJldHVybiBudWxsOwogCkBAIC01MzMsNyArNTM1LDcgQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCF0aGlzLmVsZW1lbnQucGFy ZW50Tm9kZSkKICAgICAgICAgICAgIHRoaXMuYXR0YWNoKCk7CiAKLSAgICAgICAgdmlldy5zZXR1 cFNvdXJjZUZyYW1lSWZOZWVkZWQoKTsKKyAgICAgICAgdmlldy5zZXR1cFNvdXJjZUZyYW1lSWZO ZWVkZWQodHJ1ZSk7CiAgICAgICAgIHJldHVybiB2aWV3LnNvdXJjZUZyYW1lOwogICAgIH0sCiAK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IGRhMjRl ZDIuLjZjMDYwMjIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHRzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5l bC5qcwpAQCAtNTU3LDYgKzU1Nyw4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90 eXBlID0gewogICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgICAgIGlmICghc2NyaXB0Ll9z Y3JpcHRWaWV3KQogICAgICAgICAgICAgc2NyaXB0Ll9zY3JpcHRWaWV3ID0gbmV3IFdlYkluc3Bl Y3Rvci5TY3JpcHRWaWV3KHNjcmlwdCk7CisgICAgICAgIGlmIChzY3JpcHQuX3NjcmlwdFZpZXcp CisgICAgICAgICAgICBzY3JpcHQuX3NjcmlwdFZpZXcuc2V0dXBTb3VyY2VGcmFtZUlmTmVlZGVk KHRydWUpOwogICAgICAgICByZXR1cm4gc2NyaXB0Ll9zY3JpcHRWaWV3OwogICAgIH0sCiAKQEAg LTU3MCw3ICs1NzIsNiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgaWYgKCF0aGlzLmVsZW1lbnQucGFyZW50Tm9kZSkKICAgICAgICAgICAgIHRoaXMu YXR0YWNoKCk7CiAKLSAgICAgICAgdmlldy5zZXR1cFNvdXJjZUZyYW1lSWZOZWVkZWQoKTsKICAg ICAgICAgcmV0dXJuIHZpZXcuc291cmNlRnJhbWU7CiAgICAgfSwKIApAQCAtNTc5LDcgKzU4MCw3 IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAo c2NyaXB0T3JSZXNvdXJjZSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZXNvdXJjZSkgewogICAg ICAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcykKICAgICAgICAgICAg ICAgICByZXR1cm4gbnVsbDsKLSAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IucGFuZWxz LnJlc291cmNlcy5yZXNvdXJjZVZpZXdGb3JSZXNvdXJjZShzY3JpcHRPclJlc291cmNlKTsKKyAg ICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcy5yZXNvdXJjZVZp ZXdGb3JSZXNvdXJjZShzY3JpcHRPclJlc291cmNlLCBmYWxzZSk7CiAgICAgICAgIH0KICAgICAg ICAgaWYgKHNjcmlwdE9yUmVzb3VyY2UgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU2NyaXB0KQog ICAgICAgICAgICAgcmV0dXJuIHRoaXMuc2NyaXB0Vmlld0ZvclNjcmlwdChzY3JpcHRPclJlc291 cmNlKTsKQEAgLTYwOSw3ICs2MTAsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3Rv dHlwZSA9IHsKICAgICAgICAgaWYgKHNjcmlwdE9yUmVzb3VyY2UgaW5zdGFuY2VvZiBXZWJJbnNw ZWN0b3IuUmVzb3VyY2UpIHsKICAgICAgICAgICAgIGlmICghV2ViSW5zcGVjdG9yLnBhbmVscy5y ZXNvdXJjZXMpCiAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGw7Ci0gICAgICAgICAgICB2aWV3 ID0gV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMucmVzb3VyY2VWaWV3Rm9yUmVzb3VyY2Uo c2NyaXB0T3JSZXNvdXJjZSk7CisgICAgICAgICAgICB2aWV3ID0gV2ViSW5zcGVjdG9yLnBhbmVs cy5yZXNvdXJjZXMucmVzb3VyY2VWaWV3Rm9yUmVzb3VyY2Uoc2NyaXB0T3JSZXNvdXJjZSwgZmFs c2UpOwogICAgICAgICAgICAgdmlldy5oZWFkZXJzVmlzaWJsZSA9IGZhbHNlOyAKIAogICAgICAg ICAgICAgaWYgKHNjcmlwdE9yUmVzb3VyY2UudXJsIGluIHRoaXMuX2JyZWFrcG9pbnRzVVJMTWFw KSB7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlVmlldy5q cyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzCmluZGV4IDI5MmI4 YWYuLjI0ZjM4NDQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3Vy Y2VWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3Lmpz CkBAIC00MSw3ICs0MSw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZSA9IHsK ICAgICBzaG93OiBmdW5jdGlvbihwYXJlbnRFbGVtZW50KQogICAgIHsKICAgICAgICAgV2ViSW5z cGVjdG9yLlJlc291cmNlVmlldy5wcm90b3R5cGUuc2hvdy5jYWxsKHRoaXMsIHBhcmVudEVsZW1l bnQpOwotICAgICAgICB0aGlzLnNldHVwU291cmNlRnJhbWVJZk5lZWRlZCgpOworICAgICAgICB0 aGlzLnNldHVwU291cmNlRnJhbWVJZk5lZWRlZCghdGhpcy5sYXp5TG9hZCk7CiAgICAgICAgIHRo aXMuc291cmNlRnJhbWUudmlzaWJsZSA9IHRydWU7CiAgICAgICAgIHRoaXMucmVzaXplKCk7CiAg ICAgfSwKQEAgLTU5LDYgKzU5LDExIEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIHRoaXMuc291cmNlRnJhbWUucmVzaXplKCk7CiAgICAgfSwKIAor ICAgIHNldExhenlMb2FkOiBmdW5jdGlvbihsYXp5TG9hZCkKKyAgICB7CisgICAgICAgIHRoaXMu bGF6eUxvYWQgPSBsYXp5TG9hZDsKKyAgICB9LAorCiAgICAgZGV0YWNoOiBmdW5jdGlvbigpCiAg ICAgewogICAgICAgICBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnByb3RvdHlwZS5kZXRhY2gu Y2FsbCh0aGlzKTsKQEAgLTY5LDcgKzc0LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcucHJv dG90eXBlID0gewogICAgICAgICB0aGlzLl9zb3VyY2VGcmFtZVNldHVwID0gZmFsc2U7CiAgICAg fSwKIAotICAgIHNldHVwU291cmNlRnJhbWVJZk5lZWRlZDogZnVuY3Rpb24oKQorICAgIHNldHVw U291cmNlRnJhbWVJZk5lZWRlZDogZnVuY3Rpb24oZW5zdXJlUmVzb3VyY2VMb2FkZWQpCiAgICAg ewogICAgICAgICBpZiAoIXRoaXMuX2ZyYW1lTmVlZHNTZXR1cCkKICAgICAgICAgICAgIHJldHVy bjsKQEAgLTc3LDYgKzgyLDEzIEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZSA9 IHsKICAgICAgICAgdGhpcy5hdHRhY2goKTsKIAogICAgICAgICBkZWxldGUgdGhpcy5fZnJhbWVO ZWVkc1NldHVwOworCisgICAgICAgIGlmIChlbnN1cmVSZXNvdXJjZUxvYWRlZCkKKyAgICAgICAg ICAgIHRoaXMuZW5zdXJlUmVzb3VyY2VMb2FkZWQoKTsKKyAgICB9LAorCisgICAgbG9hZFJlc291 cmNlOiBmdW5jdGlvbigpCisgICAgewogICAgICAgICBXZWJJbnNwZWN0b3IuZ2V0UmVzb3VyY2VD b250ZW50KHRoaXMucmVzb3VyY2UuaWRlbnRpZmllciwgdGhpcy5fY29udGVudExvYWRlZC5iaW5k KHRoaXMpKTsKICAgICB9LAogICAgIApAQCAtOTEsNyArMTAzLDcgQEAgV2ViSW5zcGVjdG9yLlNv dXJjZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9mcmFtZU5lZWRzU2V0dXAgPSB0 cnVlOwogICAgICAgICB0aGlzLl9zb3VyY2VGcmFtZVNldHVwID0gZmFsc2U7CiAgICAgICAgIGlm ICh0aGlzLnZpc2libGUpCi0gICAgICAgICAgICB0aGlzLnNldHVwU291cmNlRnJhbWVJZk5lZWRl ZCgpOworICAgICAgICAgICAgdGhpcy5zZXR1cFNvdXJjZUZyYW1lSWZOZWVkZWQodHJ1ZSk7CiAg ICAgICAgIHRoaXMucmVzb3VyY2UucmVtb3ZlRXZlbnRMaXN0ZW5lcigiZmluaXNoZWQiLCB0aGlz Ll9yZXNvdXJjZUxvYWRpbmdGaW5pc2hlZCwgdGhpcyk7CiAgICAgfSwKIApAQCAtMTQyLDcgKzE1 NCw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYg KCF0aGlzLl9zb3VyY2VGcmFtZVNldHVwKSB7CiAgICAgICAgICAgICAvLyBUaGUgc2VhcmNoIGlz IHBlcmZvcm1lZCBpbiBfc291cmNlRnJhbWVTZXR1cEZpbmlzaGVkIGJ5IGNhbGxpbmcgX2RlbGF5 ZWRGaW5kU2VhcmNoTWF0Y2hlcy4KICAgICAgICAgICAgIHRoaXMuX2RlbGF5ZWRGaW5kU2VhcmNo TWF0Y2hlcyA9IGZpbmRTZWFyY2hNYXRjaGVzLmJpbmQodGhpcywgcXVlcnksIGZpbmlzaGVkQ2Fs bGJhY2spOwotICAgICAgICAgICAgdGhpcy5zZXR1cFNvdXJjZUZyYW1lSWZOZWVkZWQoKTsKKyAg ICAgICAgICAgIHRoaXMuc2V0dXBTb3VyY2VGcmFtZUlmTmVlZGVkKHRydWUpOwogICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAgLTE5NSwxMyArMjA3LDEzIEBAIFdlYkluc3BlY3Rv ci5Tb3VyY2VWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIHJldmVhbExpbmU6IGZ1bmN0aW9uKGxp bmVOdW1iZXIpCiAgICAgewotICAgICAgICB0aGlzLnNldHVwU291cmNlRnJhbWVJZk5lZWRlZCgp OworICAgICAgICB0aGlzLnNldHVwU291cmNlRnJhbWVJZk5lZWRlZCh0cnVlKTsKICAgICAgICAg dGhpcy5zb3VyY2VGcmFtZS5yZXZlYWxMaW5lKGxpbmVOdW1iZXIpOwogICAgIH0sCiAKICAgICBo aWdobGlnaHRMaW5lOiBmdW5jdGlvbihsaW5lTnVtYmVyKQogICAgIHsKLSAgICAgICAgdGhpcy5z ZXR1cFNvdXJjZUZyYW1lSWZOZWVkZWQoKTsKKyAgICAgICAgdGhpcy5zZXR1cFNvdXJjZUZyYW1l SWZOZWVkZWQodHJ1ZSk7CiAgICAgICAgIHRoaXMuc291cmNlRnJhbWUuaGlnaGxpZ2h0TGluZShs aW5lTnVtYmVyKTsKICAgICB9LAogCg== 47827 2010-02-01 03:14:38 -0800 2010-02-01 14:03:05 -0800 [PATCH] A simplified solution lazyload.patch text/plain 2208 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTQyNTE0MC4uZDY4MmQzMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wMi0wMSAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGxhenktbG9hZCB0ZXh0dWFsIHJl c291cmNlcyB0byBhdm9pZCBVSSBoYW5ndXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM0MzMyCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1Jlc291cmNlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcucHJv dG90eXBlLl9pbm5lclNlbGVjdENvbnRlbnRUYWIpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvU291cmNlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnBy b3RvdHlwZS5zaG93KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlw ZS5jb250ZW50VGFiU2VsZWN0ZWQpOgorCiAyMDEwLTAyLTAxICBTdGV2ZSBCbG9jayAgPHN0ZXZl YmxvY2tAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBcml5YSBIaWRheWF0Lgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKaW5kZXggMzM0ODQ3 ZS4uYjdiMDFhYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlVmlldy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3 LmpzCkBAIC0xODMsNiArMTgzLDggQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHRoaXMuaGVhZGVyc0VsZW1lbnQuYWRkU3R5bGVDbGFzcygiaGlkZGVu Iik7CiAgICAgICAgIGlmICgicmVzaXplIiBpbiB0aGlzKQogICAgICAgICAgICAgdGhpcy5yZXNp emUoKTsKKyAgICAgICAgaWYgKCJjb250ZW50VGFiU2VsZWN0ZWQiIGluIHRoaXMpCisgICAgICAg ICAgICB0aGlzLmNvbnRlbnRUYWJTZWxlY3RlZCgpOwogICAgIH0sCiAKICAgICBfcmVmcmVzaFVS TDogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nv dXJjZVZpZXcuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlVmlldy5qcwpp bmRleCAyOTJiOGFmLi5kMmViNjk5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU291cmNlVmlldy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291 cmNlVmlldy5qcwpAQCAtNDEsNyArNDEsNiBAQCBXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90 b3R5cGUgPSB7CiAgICAgc2hvdzogZnVuY3Rpb24ocGFyZW50RWxlbWVudCkKICAgICB7CiAgICAg ICAgIFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcucHJvdG90eXBlLnNob3cuY2FsbCh0aGlzLCBw YXJlbnRFbGVtZW50KTsKLSAgICAgICAgdGhpcy5zZXR1cFNvdXJjZUZyYW1lSWZOZWVkZWQoKTsK ICAgICAgICAgdGhpcy5zb3VyY2VGcmFtZS52aXNpYmxlID0gdHJ1ZTsKICAgICAgICAgdGhpcy5y ZXNpemUoKTsKICAgICB9LApAQCAtNzksNyArNzgsMTIgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZVZp ZXcucHJvdG90eXBlID0gewogICAgICAgICBkZWxldGUgdGhpcy5fZnJhbWVOZWVkc1NldHVwOwog ICAgICAgICBXZWJJbnNwZWN0b3IuZ2V0UmVzb3VyY2VDb250ZW50KHRoaXMucmVzb3VyY2UuaWRl bnRpZmllciwgdGhpcy5fY29udGVudExvYWRlZC5iaW5kKHRoaXMpKTsKICAgICB9LAotICAgIAor CisgICAgY29udGVudFRhYlNlbGVjdGVkOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlz LnNldHVwU291cmNlRnJhbWVJZk5lZWRlZCgpOworICAgIH0sCisKICAgICBfY29udGVudExvYWRl ZDogZnVuY3Rpb24oY29udGVudCkKICAgICB7CiAgICAgICAgIHRoaXMuc291cmNlRnJhbWUuc2V0 Q29udGVudCh0aGlzLnJlc291cmNlLm1pbWVUeXBlLCBjb250ZW50KTsK