50498 2010-12-03 15:42:16 -0800 Clean up the BackingStore implementation 2010-12-03 16:05:35 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 317119 0 andersca 2010-12-03 15:42:16 -0800 Clean up the BackingStore implementation 317124 1 75563 andersca 2010-12-03 15:46:09 -0800 Created attachment 75563 Patch 317152 2 andersca 2010-12-03 16:05:35 -0800 Committed r73318: <http://trac.webkit.org/changeset/73318> 75563 2010-12-03 15:46:09 -0800 2010-12-03 16:01:38 -0800 Patch bug-50498-20101203154608.patch text/plain 7271 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ZDlhNDk4MjdjNDkyMGI2OWY2YjYzZGE0NGEzMzIwY2E3OTBjNjBlZS4uOGUzOTk1Nzg4MGY3ZTQ2 NTMxYTI4NmExOTg5NmNjNGQzNzE1YTY3ZCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAxMC0xMi0wMyAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENsZWFuIHVwIHRoZSBCYWNraW5nU3RvcmUgaW1w bGVtZW50YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTUwNDk4CisKKyAgICAgICAgKiBTaGFyZWQvQmFja2luZ1N0b3JlLmNwcDoKKyAgICAgICAg KFdlYktpdDo6QmFja2luZ1N0b3JlOjpjcmVhdGUpOgorICAgICAgICAoV2ViS2l0OjpCYWNraW5n U3RvcmU6OmNyZWF0ZVNoYXJhYmxlKToKKyAgICAgICAgKFdlYktpdDo6QmFja2luZ1N0b3JlOjpy ZXNpemUpOgorICAgICAgICBVc2UgbmV3IG51bUJ5dGVzRm9yU2l6ZSBoZWxwZXIgZnVuY3Rpb24u CisKKyAgICAgICAgKFdlYktpdDo6QmFja2luZ1N0b3JlOjpjcmVhdGVGbGlwcGVkR3JhcGhpY3ND b250ZXh0KToKKyAgICAgICAgTWFrZSB0aGlzIGZ1bmN0aW9uIHBsYXRmb3JtIGluZGVwZW5kZW50 LgorCisgICAgICAgICogU2hhcmVkL0JhY2tpbmdTdG9yZS5oOgorICAgICAgICAoV2ViS2l0OjpC YWNraW5nU3RvcmU6Om51bUJ5dGVzRm9yU2l6ZSk6CisgICAgICAgIEdpdmVuIGEgc2l6ZSwgcmV0 dXJuIHRoZSBudW1iZXIgb2YgYnl0ZXMgbmVlZGVkIGZvciBpdC4KKworICAgICAgICAoV2ViS2l0 OjpCYWNraW5nU3RvcmU6OnNpemVJbkJ5dGVzKToKKyAgICAgICAgSW1wbGVtZW50LgorCisgICAg ICAgICogU2hhcmVkL2NnL0JhY2tpbmdTdG9yZUNHLmNwcDoKKyAgICAgICAgKFdlYktpdDo6QmFj a2luZ1N0b3JlOjpwYWludCk6CisgICAgICAgIERvbid0IHVzZSBDR0JpdG1hcENvbnRleHRDcmVh dGVJbWFnZTsgaXQgY3JlYXRlcyBhbiBleHRyYSBjb3B5IG9mIHRoZSBpbWFnZSBkYXRhLgorCisg ICAgICAgICogU2hhcmVkL3F0L0JhY2tpbmdTdG9yZVF0LmNwcDoKKyAgICAgICAgUmVtb3ZlIGNy ZWF0ZUZsaXBwZWRHcmFwaGljc0NvbnRleHQuCisKIDIwMTAtMTItMDMgIEJyYWR5IEVpZHNvbiAg PGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IGdvb2Qgc2Vuc2UgaW4g Zml4aW5nIGJ1aWxkcy4KZGlmZiAtLWdpdCBhL1dlYktpdDIvU2hhcmVkL0JhY2tpbmdTdG9yZS5j cHAgYi9XZWJLaXQyL1NoYXJlZC9CYWNraW5nU3RvcmUuY3BwCmluZGV4IDdjOTU3NTgxOGI1Mjg2 MTFmZTFmMTI2NTBmZTNmYWIzYTEwMmI3YTMuLmY2NGMwYTdkYTI0OWVhOGJiYzhlODgzYWFkZTU2 ZDQ0OTEwYjg5ZDkgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvU2hhcmVkL0JhY2tpbmdTdG9yZS5jcHAK KysrIGIvV2ViS2l0Mi9TaGFyZWQvQmFja2luZ1N0b3JlLmNwcApAQCAtMjYsNiArMjYsNyBAQAog I2luY2x1ZGUgIkJhY2tpbmdTdG9yZS5oIgogCiAjaW5jbHVkZSAiU2hhcmVkTWVtb3J5LmgiCisj aW5jbHVkZSA8V2ViQ29yZS9HcmFwaGljc0NvbnRleHQuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdl YkNvcmU7CiAKQEAgLTMzLDcgKzM0LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIFBhc3NSZWZQ dHI8QmFja2luZ1N0b3JlPiBCYWNraW5nU3RvcmU6OmNyZWF0ZShjb25zdCBXZWJDb3JlOjpJbnRT aXplJiBzaXplKQogewotICAgIHNpemVfdCBudW1CeXRlcyA9IHNpemUud2lkdGgoKSAqIHNpemUu aGVpZ2h0KCkgKiA0OworICAgIHNpemVfdCBudW1CeXRlcyA9IG51bUJ5dGVzRm9yU2l6ZShzaXpl KTsKICAgICAKICAgICB2b2lkKiBkYXRhID0gMDsKICAgICBpZiAoIXRyeUZhc3RNYWxsb2MobnVt Qnl0ZXMpLmdldFZhbHVlKGRhdGEpKQpAQCAtNDQsNyArNDUsNyBAQCBQYXNzUmVmUHRyPEJhY2tp bmdTdG9yZT4gQmFja2luZ1N0b3JlOjpjcmVhdGUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2l6 ZSkKIAogUGFzc1JlZlB0cjxCYWNraW5nU3RvcmU+IEJhY2tpbmdTdG9yZTo6Y3JlYXRlU2hhcmFi bGUoY29uc3QgSW50U2l6ZSYgc2l6ZSkKIHsKLSAgICBzaXplX3QgbnVtQnl0ZXMgPSBzaXplLndp ZHRoKCkgKiBzaXplLmhlaWdodCgpICogNDsKKyAgICBzaXplX3QgbnVtQnl0ZXMgPSBudW1CeXRl c0ZvclNpemUoc2l6ZSk7CiAgICAgCiAgICAgUmVmUHRyPFNoYXJlZE1lbW9yeT4gc2hhcmVkTWVt b3J5ID0gU2hhcmVkTWVtb3J5OjpjcmVhdGUobnVtQnl0ZXMpOwogICAgIGlmICghc2hhcmVkTWVt b3J5KQpAQCAtNjAsNyArNjEsNyBAQCBQYXNzUmVmUHRyPEJhY2tpbmdTdG9yZT4gQmFja2luZ1N0 b3JlOjpjcmVhdGUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2l6ZSwgY29ucwogICAgIGlmICgh c2hhcmVkTWVtb3J5KQogICAgICAgICByZXR1cm4gMDsKIAotICAgIHNpemVfdCBudW1CeXRlcyA9 IHNpemUud2lkdGgoKSAqIHNpemUuaGVpZ2h0KCkgKiA0OworICAgIHNpemVfdCBudW1CeXRlcyA9 IG51bUJ5dGVzRm9yU2l6ZShzaXplKTsKICAgICBBU1NFUlRfVU5VU0VEKG51bUJ5dGVzLCBzaGFy ZWRNZW1vcnktPnNpemUoKSA+PSBudW1CeXRlcyk7CiAKICAgICByZXR1cm4gYWRvcHRSZWYobmV3 IEJhY2tpbmdTdG9yZShzaXplLCBzaGFyZWRNZW1vcnkpKTsKQEAgLTEwMCw3ICsxMDEsNyBAQCBi b29sIEJhY2tpbmdTdG9yZTo6cmVzaXplKGNvbnN0IEludFNpemUmIHNpemUpCiAgICAgaWYgKHNp emUgPT0gbV9zaXplKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIHNpemVfdCBuZXdOdW1C eXRlcyA9IHNpemUud2lkdGgoKSAqIHNpemUuaGVpZ2h0KCkgKiA0OworICAgIHNpemVfdCBuZXdO dW1CeXRlcyA9IG51bUJ5dGVzRm9yU2l6ZShzaXplKTsKICAgICAKICAgICAvLyBUcnkgdG8gcmVz aXplLgogICAgIGNoYXIqIG5ld0RhdGEgPSAwOwpAQCAtMTI0LDQgKzEyNSwxNSBAQCB2b2lkKiBC YWNraW5nU3RvcmU6OmRhdGEoKSBjb25zdAogICAgIHJldHVybiBtX2RhdGE7CiB9CiAKK1Bhc3NP d25QdHI8R3JhcGhpY3NDb250ZXh0PiBCYWNraW5nU3RvcmU6OmNyZWF0ZUZsaXBwZWRHcmFwaGlj c0NvbnRleHQoKQoreworICAgIE93blB0cjxHcmFwaGljc0NvbnRleHQ+IGdyYXBoaWNzQ29udGV4 dCA9IGNyZWF0ZUdyYXBoaWNzQ29udGV4dCgpOworCisgICAgLy8gRmxpcCB0aGUgY29vcmRpbmF0 ZSBzeXN0ZW0uCisgICAgZ3JhcGhpY3NDb250ZXh0LT50cmFuc2xhdGUoMCwgbV9zaXplLmhlaWdo dCgpKTsKKyAgICBncmFwaGljc0NvbnRleHQtPnNjYWxlKEZsb2F0U2l6ZSgxLCAtMSkpOworCisg ICAgcmV0dXJuIGdyYXBoaWNzQ29udGV4dC5yZWxlYXNlKCk7Cit9CisgICAgCiB9IC8vIG5hbWVz cGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1dlYktpdDIvU2hhcmVkL0JhY2tpbmdTdG9yZS5oIGIv V2ViS2l0Mi9TaGFyZWQvQmFja2luZ1N0b3JlLmgKaW5kZXggNDM1Y2ZkMzcwYmE0ZjIzYjhmZGUz YmFkMzY4NjgzMGQ4OGNjMGY5Ni4uZWU5MGQzYTBmNTVlZGNkZjM2ZGYzMDA4OWUxYWRlNDIxMDU2 YzMxMiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9TaGFyZWQvQmFja2luZ1N0b3JlLmgKKysrIGIvV2Vi S2l0Mi9TaGFyZWQvQmFja2luZ1N0b3JlLmgKQEAgLTcyLDcgKzcyLDEwIEBAIHByaXZhdGU6CiAg ICAgQmFja2luZ1N0b3JlKGNvbnN0IFdlYkNvcmU6OkludFNpemUmLCBQYXNzUmVmUHRyPFNoYXJl ZE1lbW9yeT4pOwogCiAgICAgYm9vbCBpc0JhY2tlZEJ5U2hhcmVkTWVtb3J5KCkgY29uc3QgeyBy ZXR1cm4gbV9zaGFyZWRNZW1vcnk7IH0KKyAgICBzdGF0aWMgc2l6ZV90IG51bUJ5dGVzRm9yU2l6 ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplKSB7IHJldHVybiBzaXplLndpZHRoKCkgKiBz aXplLmhlaWdodCgpICogNDsgfQorCiAgICAgdm9pZCogZGF0YSgpIGNvbnN0OworICAgIHNpemVf dCBzaXplSW5CeXRlcygpIGNvbnN0IHsgcmV0dXJuIG51bUJ5dGVzRm9yU2l6ZShtX3NpemUpOyB9 CiAKICAgICBXZWJDb3JlOjpJbnRTaXplIG1fc2l6ZTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9T aGFyZWQvY2cvQmFja2luZ1N0b3JlQ0cuY3BwIGIvV2ViS2l0Mi9TaGFyZWQvY2cvQmFja2luZ1N0 b3JlQ0cuY3BwCmluZGV4IGQ1NjMwMmI4OTdjYTI3Y2ZkYzRmM2JiOGI2Y2E4NjgxZTM4NzI4N2Mu Ljk3YzZhMDA5ZWEyZjc5ZjRkYzZhMjEzZjgzYmY5ZGVhN2VlYjQzNTQgMTAwNjQ0Ci0tLSBhL1dl YktpdDIvU2hhcmVkL2NnL0JhY2tpbmdTdG9yZUNHLmNwcAorKysgYi9XZWJLaXQyL1NoYXJlZC9j Zy9CYWNraW5nU3RvcmVDRy5jcHAKQEAgLTQ1LDIxICs0NSwyMSBAQCBQYXNzT3duUHRyPEdyYXBo aWNzQ29udGV4dD4gQmFja2luZ1N0b3JlOjpjcmVhdGVHcmFwaGljc0NvbnRleHQoKQogICAgIHJl dHVybiBhZG9wdFB0cihuZXcgR3JhcGhpY3NDb250ZXh0KGJpdG1hcENvbnRleHQuZ2V0KCkpKTsK IH0KIAotUGFzc093blB0cjxHcmFwaGljc0NvbnRleHQ+IEJhY2tpbmdTdG9yZTo6Y3JlYXRlRmxp cHBlZEdyYXBoaWNzQ29udGV4dCgpCi17Ci0gICAgUmV0YWluUHRyPENHQ29sb3JTcGFjZVJlZj4g Y29sb3JTcGFjZShBZG9wdENGLCBDR0NvbG9yU3BhY2VDcmVhdGVEZXZpY2VSR0IoKSk7Ci0gICAg UmV0YWluUHRyPENHQ29udGV4dFJlZj4gYml0bWFwQ29udGV4dChBZG9wdENGLCBDR0JpdG1hcENv bnRleHRDcmVhdGUoZGF0YSgpLCBtX3NpemUud2lkdGgoKSwgbV9zaXplLmhlaWdodCgpLCA4LCAg bV9zaXplLndpZHRoKCkgKiA0LCBjb2xvclNwYWNlLmdldCgpLCAKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBr Q0dJbWFnZUFscGhhUHJlbXVsdGlwbGllZEZpcnN0IHwga0NHQml0bWFwQnl0ZU9yZGVyMzJIb3N0 KSk7Ci0KLSAgICByZXR1cm4gYWRvcHRQdHIobmV3IEdyYXBoaWNzQ29udGV4dChiaXRtYXBDb250 ZXh0LmdldCgpKSk7Ci19Ci0KIHZvaWQgQmFja2luZ1N0b3JlOjpwYWludChXZWJDb3JlOjpHcmFw aGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBkc3RQb2ludCwg Y29uc3QgV2ViQ29yZTo6SW50UmVjdCYgc3JjUmVjdCkKIHsKICAgICBPd25QdHI8R3JhcGhpY3ND b250ZXh0PiBzb3VyY2VDb250ZXh0KGNyZWF0ZUdyYXBoaWNzQ29udGV4dCgpKTsKIAotICAgIC8v IEZJWE1FOiBUaGlzIGNyZWF0ZXMgYW4gZXh0cmEgY29weS4KLSAgICBSZXRhaW5QdHI8Q0dJbWFn ZVJlZj4gaW1hZ2UoQWRvcHRDRiwgQ0dCaXRtYXBDb250ZXh0Q3JlYXRlSW1hZ2Uoc291cmNlQ29u dGV4dC0+cGxhdGZvcm1Db250ZXh0KCkpKTsKKyAgICBDR0NvbnRleHRSZWYgc291cmNlQ0dDb250 ZXh0ID0gc291cmNlQ29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCk7CisKKyAgICBSZXRhaW5QdHI8 Q0dEYXRhUHJvdmlkZXJSZWY+IGRhdGFQcm92aWRlcihBZG9wdENGLCBDR0RhdGFQcm92aWRlckNy ZWF0ZVdpdGhEYXRhKDAsIGRhdGEoKSwgc2l6ZUluQnl0ZXMoKSwgMCkpOworICAgIFJldGFpblB0 cjxDR0ltYWdlUmVmPiBpbWFnZShBZG9wdENGLCBDR0ltYWdlQ3JlYXRlKENHQml0bWFwQ29udGV4 dEdldFdpZHRoKHNvdXJjZUNHQ29udGV4dCksIAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIENHQml0bWFwQ29udGV4dEdldEhlaWdodChzb3Vy Y2VDR0NvbnRleHQpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIENHQml0bWFwQ29udGV4dEdldEJpdHNQZXJDb21wb25lbnQoc291cmNlQ0dD b250ZXh0KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBDR0JpdG1hcENvbnRleHRHZXRCaXRzUGVyUGl4ZWwoc291cmNlQ0dDb250ZXh0KSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBD R0JpdG1hcENvbnRleHRHZXRCeXRlc1BlclJvdyhzb3VyY2VDR0NvbnRleHQpLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENHQml0bWFwQ29u dGV4dEdldENvbG9yU3BhY2Uoc291cmNlQ0dDb250ZXh0KSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDR0JpdG1hcENvbnRleHRHZXRCaXRt YXBJbmZvKHNvdXJjZUNHQ29udGV4dCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZGF0YVByb3ZpZGVyLmdldCgpLCAwLCBmYWxzZSwga0NH UmVuZGVyaW5nSW50ZW50RGVmYXVsdCkpOwogCiAgICAgQ0dDb250ZXh0UmVmIGNnQ29udGV4dCA9 IGNvbnRleHQucGxhdGZvcm1Db250ZXh0KCk7CiAgICAgCmRpZmYgLS1naXQgYS9XZWJLaXQyL1No YXJlZC9xdC9CYWNraW5nU3RvcmVRdC5jcHAgYi9XZWJLaXQyL1NoYXJlZC9xdC9CYWNraW5nU3Rv cmVRdC5jcHAKaW5kZXggYWZlYzRmMjBkYmI1MzE1ZTQ3Y2U0ZTI5MTBhMTQ1MzM4ZThjYWM3Yi4u YjJmNzY2YzU1ZDkwM2NjNDBmZTllZmJiNmExZGIxZDE3YzQ4YWU2NyAxMDA2NDQKLS0tIGEvV2Vi S2l0Mi9TaGFyZWQvcXQvQmFja2luZ1N0b3JlUXQuY3BwCisrKyBiL1dlYktpdDIvU2hhcmVkL3F0 L0JhY2tpbmdTdG9yZVF0LmNwcApAQCAtNDYsMTMgKzQ2LDYgQEAgUGFzc093blB0cjxHcmFwaGlj c0NvbnRleHQ+IEJhY2tpbmdTdG9yZTo6Y3JlYXRlR3JhcGhpY3NDb250ZXh0KCkKICAgICByZXR1 cm4gY29udGV4dDsKIH0KIAotUGFzc093blB0cjxHcmFwaGljc0NvbnRleHQ+IEJhY2tpbmdTdG9y ZTo6Y3JlYXRlRmxpcHBlZEdyYXBoaWNzQ29udGV4dCgpCi17Ci0gICAgLy8gVGhpcyBpcyBDRyBz cGVjaWZpYyBzbyB3ZSBzaG91bGQgbm90IHVzZSBpdC4KLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKLSAgICByZXR1cm4gMDsKLX0KLQogdm9pZCBCYWNraW5nU3RvcmU6OnBhaW50KEdyYXBoaWNz Q29udGV4dCYgY29udGV4dCwgY29uc3QgSW50UG9pbnQmIGRzdFBvaW50LCBjb25zdCBJbnRSZWN0 JiBzcmNSZWN0KQogewogICAgIFFJbWFnZSBpbWFnZSA9IGNyZWF0ZVFJbWFnZShkYXRhKCksIG1f c2l6ZS53aWR0aCgpLCBtX3NpemUuaGVpZ2h0KCkpOwo=