71796 2011-11-08 04:29:36 -0800 CSSCanvasValue: Remove inheritance from CanvasObserver. 2011-11-08 05:22:26 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 71666 1 kling kling koivisto macpherson webkit.review.bot oldest_to_newest 497939 0 kling 2011-11-08 04:29:36 -0800 In order to remove the vptr from CSSCanvasValue, we need to remove the inheritance from CanvasObserver. I plan to do this in the same was as CSSImportRule, by adding a proxying observer as a member variable. 497944 1 114040 kling 2011-11-08 04:38:54 -0800 Created attachment 114040 Proposed patch 497957 2 114040 koivisto 2011-11-08 04:59:55 -0800 Comment on attachment 114040 Proposed patch r=me 497972 3 kling 2011-11-08 05:22:26 -0800 Committed r99555: <http://trac.webkit.org/changeset/99555> 114040 2011-11-08 04:38:54 -0800 2011-11-08 04:59:55 -0800 Proposed patch bug-71796.diff text/plain 4272 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2MGExNWM4Li4yOTFkZmMyIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTEtMTEtMDggIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCisgICAg ICAgIENTU0NhbnZhc1ZhbHVlOiBSZW1vdmUgaW5oZXJpdGFuY2UgZnJvbSBDYW52YXNPYnNlcnZl ci4KKyAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvNzE3OTY+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG8gY29tcGxldGVseSBkZXZpcnR1YWxp emUgYWxsIHRoZSBDU1NWYWx1ZXMsIHdlIG5lZWQgdG8gcmVtb3ZlCisgICAgICAgIENTU0NhbnZh c1ZhbHVlJ3MgaW5oZXJpdGFuY2UgZnJvbSBDYW52YXNPYnNlcnZlciwgYXMgdGhhdCBpcyBmb3Jj aW5nCisgICAgICAgIGEgdnB0ciBpbnRvIHRoZSBjbGFzcy4KKworICAgICAgICBVc2UgdGhlIHNh bWUgYXBwcm9hY2ggYXMgQ1NTSW1wb3J0UnVsZSBhbmQgbWFrZSBhIHNpbXBsZSBwcm94eWluZwor ICAgICAgICBDYW52YXNPYnNlcnZlciBzdWJjbGFzcyBhbmQgcHV0IHRoYXQgYXMgYSBtZW1iZXIg dmFyaWFibGUgb2YgdGhlIHZhbHVlLgorCisgICAgICAgICogY3NzL0NTU0NhbnZhc1ZhbHVlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0NhbnZhc1ZhbHVlOjp+Q1NTQ2FudmFzVmFsdWUpOgor ICAgICAgICAoV2ViQ29yZTo6Q1NTQ2FudmFzVmFsdWU6OmVsZW1lbnQpOgorICAgICAgICAqIGNz cy9DU1NDYW52YXNWYWx1ZS5oOgorICAgICAgICAoV2ViQ29yZTo6Q1NTQ2FudmFzVmFsdWU6OkNT U0NhbnZhc1ZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0NhbnZhc1ZhbHVlOjpDYW52YXNP YnNlcnZlclByb3h5OjpDYW52YXNPYnNlcnZlclByb3h5KToKKyAgICAgICAgKFdlYkNvcmU6OkNT U0NhbnZhc1ZhbHVlOjpDYW52YXNPYnNlcnZlclByb3h5Ojp+Q2FudmFzT2JzZXJ2ZXJQcm94eSk6 CisgICAgICAgIChXZWJDb3JlOjpDU1NDYW52YXNWYWx1ZTo6Q2FudmFzT2JzZXJ2ZXJQcm94eTo6 Y2FudmFzQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NDYW52YXNWYWx1ZTo6Q2FudmFz T2JzZXJ2ZXJQcm94eTo6Y2FudmFzUmVzaXplZCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NDYW52 YXNWYWx1ZTo6Q2FudmFzT2JzZXJ2ZXJQcm94eTo6Y2FudmFzRGVzdHJveWVkKToKKwogMjAxMS0x MS0wNyAgQW5kcmVhcyBLbGluZyAgPGtsaW5nQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQ1NTVmFs dWU6IERldmlydHVhbGl6ZSBpc0Zvb1R5cGUoKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NDYW52YXNWYWx1ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ2FudmFzVmFs dWUuY3BwCmluZGV4IDc2ZTc3ZjYuLjA1NmE1ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NDYW52YXNWYWx1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NhbnZh c1ZhbHVlLmNwcApAQCAtMzQsNyArMzQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBDU1NDYW52 YXNWYWx1ZTo6fkNTU0NhbnZhc1ZhbHVlKCkKIHsKICAgICBpZiAobV9lbGVtZW50KQotICAgICAg ICBtX2VsZW1lbnQtPnJlbW92ZU9ic2VydmVyKHRoaXMpOworICAgICAgICBtX2VsZW1lbnQtPnJl bW92ZU9ic2VydmVyKCZtX2NhbnZhc09ic2VydmVyKTsKIH0KIAogU3RyaW5nIENTU0NhbnZhc1Zh bHVlOjpjc3NUZXh0KCkgY29uc3QKQEAgLTc4LDcgKzc4LDcgQEAgSFRNTENhbnZhc0VsZW1lbnQq IENTU0NhbnZhc1ZhbHVlOjplbGVtZW50KERvY3VtZW50KiBkb2N1bWVudCkKICAgICAgICAgbV9l bGVtZW50ID0gZG9jdW1lbnQtPmdldENTU0NhbnZhc0VsZW1lbnQobV9uYW1lKTsKICAgICAgICAg aWYgKCFtX2VsZW1lbnQpCiAgICAgICAgICAgICByZXR1cm4gMDsKLSAgICAgICAgbV9lbGVtZW50 LT5hZGRPYnNlcnZlcih0aGlzKTsKKyAgICAgICAgbV9lbGVtZW50LT5hZGRPYnNlcnZlcigmbV9j YW52YXNPYnNlcnZlcik7CiAgICAgfQogICAgIHJldHVybiBtX2VsZW1lbnQ7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ2FudmFzVmFsdWUuaCBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NDYW52YXNWYWx1ZS5oCmluZGV4IDRjZWUyZjcuLjRmNmZlZjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDYW52YXNWYWx1ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NDYW52YXNWYWx1ZS5oCkBAIC0zMyw3ICszMyw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAogY2xhc3MgRG9jdW1lbnQ7CiAKLWNsYXNzIENTU0NhbnZhc1ZhbHVlIDogcHVibGljIENT U0ltYWdlR2VuZXJhdG9yVmFsdWUsIHByaXZhdGUgQ2FudmFzT2JzZXJ2ZXIgeworY2xhc3MgQ1NT Q2FudmFzVmFsdWUgOiBwdWJsaWMgQ1NTSW1hZ2VHZW5lcmF0b3JWYWx1ZSB7CiBwdWJsaWM6CiAg ICAgc3RhdGljIFBhc3NSZWZQdHI8Q1NTQ2FudmFzVmFsdWU+IGNyZWF0ZSgpIHsgcmV0dXJuIGFk b3B0UmVmKG5ldyBDU1NDYW52YXNWYWx1ZSk7IH0KICAgICB2aXJ0dWFsIH5DU1NDYW52YXNWYWx1 ZSgpOwpAQCAtNDksMTYgKzQ5LDQxIEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgQ1NTQ2FudmFz VmFsdWUoKQogICAgICAgICA6IENTU0ltYWdlR2VuZXJhdG9yVmFsdWUoQ2FudmFzQ2xhc3MpCisg ICAgICAgICwgbV9jYW52YXNPYnNlcnZlcih0aGlzKQogICAgICAgICAsIG1fZWxlbWVudCgwKQog ICAgIHsKICAgICB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgY2FudmFzQ2hhbmdlZChIVE1MQ2FudmFz RWxlbWVudCosIGNvbnN0IEZsb2F0UmVjdCYgY2hhbmdlZFJlY3QpOwotICAgIHZpcnR1YWwgdm9p ZCBjYW52YXNSZXNpemVkKEhUTUxDYW52YXNFbGVtZW50Kik7Ci0gICAgdmlydHVhbCB2b2lkIGNh bnZhc0Rlc3Ryb3llZChIVE1MQ2FudmFzRWxlbWVudCopOworICAgIC8vIE5PVEU6IFdlIHB1dCB0 aGUgQ2FudmFzT2JzZXJ2ZXIgaW4gYSBtZW1iZXIgaW5zdGVhZCBvZiBpbmhlcml0aW5nIGZyb20g aXQKKyAgICAvLyB0byBhdm9pZCBhZGRpbmcgYSB2cHRyIHRvIENTU0NhbnZhc1ZhbHVlLgorICAg IGNsYXNzIENhbnZhc09ic2VydmVyUHJveHkgOiBwdWJsaWMgQ2FudmFzT2JzZXJ2ZXIgeworICAg IHB1YmxpYzoKKyAgICAgICAgQ2FudmFzT2JzZXJ2ZXJQcm94eShDU1NDYW52YXNWYWx1ZSogb3du ZXJWYWx1ZSkgOiBtX293bmVyVmFsdWUob3duZXJWYWx1ZSkgeyB9CisgICAgICAgIHZpcnR1YWwg fkNhbnZhc09ic2VydmVyUHJveHkoKSB7IH0KKyAgICAgICAgdmlydHVhbCB2b2lkIGNhbnZhc0No YW5nZWQoSFRNTENhbnZhc0VsZW1lbnQqIGNhbnZhcywgY29uc3QgRmxvYXRSZWN0JiBjaGFuZ2Vk UmVjdCkKKyAgICAgICAgeworICAgICAgICAgICAgbV9vd25lclZhbHVlLT5jYW52YXNDaGFuZ2Vk KGNhbnZhcywgY2hhbmdlZFJlY3QpOworICAgICAgICB9CisgICAgICAgIHZpcnR1YWwgdm9pZCBj YW52YXNSZXNpemVkKEhUTUxDYW52YXNFbGVtZW50KiBjYW52YXMpCisgICAgICAgIHsKKyAgICAg ICAgICAgIG1fb3duZXJWYWx1ZS0+Y2FudmFzUmVzaXplZChjYW52YXMpOworICAgICAgICB9Cisg ICAgICAgIHZpcnR1YWwgdm9pZCBjYW52YXNEZXN0cm95ZWQoSFRNTENhbnZhc0VsZW1lbnQqIGNh bnZhcykKKyAgICAgICAgeworICAgICAgICAgICAgbV9vd25lclZhbHVlLT5jYW52YXNEZXN0cm95 ZWQoY2FudmFzKTsKKyAgICAgICAgfQorICAgIHByaXZhdGU6CisgICAgICAgIENTU0NhbnZhc1Zh bHVlKiBtX293bmVyVmFsdWU7CisgICAgfTsKKworICAgIHZvaWQgY2FudmFzQ2hhbmdlZChIVE1M Q2FudmFzRWxlbWVudCosIGNvbnN0IEZsb2F0UmVjdCYgY2hhbmdlZFJlY3QpOworICAgIHZvaWQg Y2FudmFzUmVzaXplZChIVE1MQ2FudmFzRWxlbWVudCopOworICAgIHZvaWQgY2FudmFzRGVzdHJv eWVkKEhUTUxDYW52YXNFbGVtZW50Kik7CiAKICAgICBIVE1MQ2FudmFzRWxlbWVudCogZWxlbWVu dChEb2N1bWVudCopOwogCisgICAgQ2FudmFzT2JzZXJ2ZXJQcm94eSBtX2NhbnZhc09ic2VydmVy OworCiAgICAgLy8gVGhlIG5hbWUgb2YgdGhlIGNhbnZhcy4KICAgICBTdHJpbmcgbV9uYW1lOwog ICAgIC8vIFRoZSBkb2N1bWVudCBzdXBwbGllcyB0aGUgZWxlbWVudCBhbmQgb3ducyBpdC4K