52331 2011-01-12 15:47:49 -0800 Get the new drawing area painting to the screen 2011-01-12 16:41:27 -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 333373 0 andersca 2011-01-12 15:47:49 -0800 Get the new drawing area painting to the screen 333378 1 78750 andersca 2011-01-12 15:51:48 -0800 Created attachment 78750 Patch 333381 2 78750 sam 2011-01-12 15:55:50 -0800 Comment on attachment 78750 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=78750&action=review > WebKit2/UIProcess/mac/BackingStoreMac.mm:51 > + size_t sizeInBytes = CGBitmapContextGetBytesPerRow(m_bitmapContext.get()) * CGBitmapContextGetHeight(m_bitmapContext.get()); > + RetainPtr<CGDataProviderRef> dataProvider(AdoptCF, CGDataProviderCreateWithData(0, CGBitmapContextGetData(m_bitmapContext.get()), sizeInBytes, 0)); > + CGBitmapContextGetHeight(m_bitmapContext.get()), > + CGBitmapContextGetBitsPerPixel(m_bitmapContext.get()), > + CGBitmapContextGetBytesPerRow(m_bitmapContext.get()), > + CGBitmapContextGetColorSpace(m_bitmapContext.get()), > + CGBitmapContextGetBitmapInfo(m_bitmapContext.get()), > + dataProvider.get(), 0, false, kCGRenderingIntentDefault)); > + > + CGFloat imageWidth = CGImageGetWidth(image.get()); We should move this code to a shared function at somepoint. Please add a fixme. 333418 3 andersca 2011-01-12 16:41:27 -0800 Committed r75657: <http://trac.webkit.org/changeset/75657> 78750 2011-01-12 15:51:48 -0800 2011-01-12 15:55:50 -0800 Patch bug-52331-20110112155146.patch text/plain 5012 andersca SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NTY0OSkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTEtMDEtMTIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBHZXQgdGhlIG5ldyBkcmF3aW5nIGFyZWEgcGFpbnRpbmcgdG8gdGhlIHNjcmVlbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTIzMzEKKworICAgICAg ICAqIFVJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OkRyYXdpbmdBcmVhUHJveHlJbXBsOjppbmNvcnBvcmF0ZVVwZGF0ZSk6CisgICAgICAgIENhbGwg c2V0Vmlld05lZWRzRGlzcGxheSBvbiBhbGwgdGhlIHVwZGF0ZSByZWN0cy4KKworICAgICAgICAq IFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OnNldFZpZXdOZWVkc0Rpc3BsYXkpOgorICAgICAgICBDYWxsIHRocm91Z2ggdG8gdGhlIHBh Z2UgY2xpZW50LgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cHJvY2Vzc0RpZENy YXNoKToKKyAgICAgICAgTnVsbCBvdXQgdGhlIGRyYXdpbmcgYXJlYSBwcm94eS4KKyAgICAgICAg CisgICAgICAgICogVUlQcm9jZXNzL21hYy9CYWNraW5nU3RvcmVNYWMubW06CisgICAgICAgIChX ZWJLaXQ6OkJhY2tpbmdTdG9yZTo6cGFpbnQpOgorICAgICAgICBQYWludC4KKwogMjAxMS0wMS0x MiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVBy b3h5SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQ cm94eUltcGwuY3BwCShyZXZpc2lvbiA3NTY0MSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL0RyYXdp bmdBcmVhUHJveHlJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE2LDYgKzExNiw5IEBAIHZv aWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OmluY29ycG9yYXRlVXAKICAgICAgICAgbV9iYWNraW5n U3RvcmUgPSBCYWNraW5nU3RvcmU6OmNyZWF0ZSh1cGRhdGVJbmZvLnZpZXdTaXplKTsKIAogICAg IG1fYmFja2luZ1N0b3JlLT5pbmNvcnBvcmF0ZVVwZGF0ZSh1cGRhdGVJbmZvKTsKKworICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgdXBkYXRlSW5mby51cGRhdGVSZWN0cy5zaXplKCk7ICsraSkK KyAgICAgICAgbV93ZWJQYWdlUHJveHktPnNldFZpZXdOZWVkc0Rpc3BsYXkodXBkYXRlSW5mby51 cGRhdGVSZWN0c1tpXSk7CiB9CiAKIHZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OnNlbmRTZXRT aXplKCkKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gNzU2MTUp CisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC00MzcsNiArNDM3LDExIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzZXREcmF3c1RyYW5zcGFyZW50 QmEKICAgICAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXREcmF3c1Ry YW5zcGFyZW50QmFja2dyb3VuZChkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCksIG1fcGFnZUlE KTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OnNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3QgSW50 UmVjdCYgcmVjdCkKK3sKKyAgICBtX3BhZ2VDbGllbnQtPnNldFZpZXdOZWVkc0Rpc3BsYXkocmVj dCk7Cit9CisKIHZvaWQgV2ViUGFnZVByb3h5Ojp2aWV3U3RhdGVEaWRDaGFuZ2UoVmlld1N0YXRl RmxhZ3MgZmxhZ3MpCiB7CiAgICAgaWYgKCFpc1ZhbGlkKCkpCkBAIC0yMTA4LDYgKzIxMTMsOCBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6cHJvY2Vzc0RpZENyYXNoKCkKIAogICAgIG1fbWFpbkZyYW1l ID0gMDsKIAorICAgIG1fZHJhd2luZ0FyZWEgPSBudWxscHRyOworCiAjaWYgRU5BQkxFKElOU1BF Q1RPUikKICAgICBpZiAobV9pbnNwZWN0b3IpIHsKICAgICAgICAgbV9pbnNwZWN0b3ItPmludmFs aWRhdGUoKTsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiA3NTYxNSkK KysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0x NjgsNiArMTY4LDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0SW5pdGlhbEZvY3VzKGJvb2wpOwog ICAgIHZvaWQgc2V0V2luZG93UmVzaXplclNpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpOwog CisgICAgdm9pZCBzZXRWaWV3TmVlZHNEaXNwbGF5KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsK KwogICAgIGVudW0gewogICAgICAgICBWaWV3V2luZG93SXNBY3RpdmUgPSAxIDw8IDAsCiAgICAg ICAgIFZpZXdJc0ZvY3VzZWQgPSAxIDw8IDEsCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9tYWMv QmFja2luZ1N0b3JlTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL21hYy9C YWNraW5nU3RvcmVNYWMubW0JKHJldmlzaW9uIDc1NjQ3KQorKysgV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL0JhY2tpbmdTdG9yZU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMzMsOSArMzMsMzEgQEAg dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi12b2lkIEJh Y2tpbmdTdG9yZTo6cGFpbnQoUGxhdGZvcm1HcmFwaGljc0NvbnRleHQsIGNvbnN0IEludFJlY3Qm KQordm9pZCBCYWNraW5nU3RvcmU6OnBhaW50KFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0IGNvbnRl eHQsIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudC4KKyAg ICBBU1NFUlQobV9iaXRtYXBDb250ZXh0KTsKKworICAgIHNpemVfdCBzaXplSW5CeXRlcyA9IENH Qml0bWFwQ29udGV4dEdldEJ5dGVzUGVyUm93KG1fYml0bWFwQ29udGV4dC5nZXQoKSkgKiBDR0Jp dG1hcENvbnRleHRHZXRIZWlnaHQobV9iaXRtYXBDb250ZXh0LmdldCgpKTsKKyAgICBSZXRhaW5Q dHI8Q0dEYXRhUHJvdmlkZXJSZWY+IGRhdGFQcm92aWRlcihBZG9wdENGLCBDR0RhdGFQcm92aWRl ckNyZWF0ZVdpdGhEYXRhKDAsIENHQml0bWFwQ29udGV4dEdldERhdGEobV9iaXRtYXBDb250ZXh0 LmdldCgpKSwgc2l6ZUluQnl0ZXMsIDApKTsKKyAgICBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gaW1h Z2UoQWRvcHRDRiwgQ0dJbWFnZUNyZWF0ZShDR0JpdG1hcENvbnRleHRHZXRXaWR0aChtX2JpdG1h cENvbnRleHQuZ2V0KCkpLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBDR0JpdG1hcENvbnRleHRHZXRIZWlnaHQobV9iaXRtYXBDb250ZXh0 LmdldCgpKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBDR0JpdG1hcENvbnRleHRHZXRCaXRzUGVyQ29tcG9uZW50KG1fYml0bWFwQ29udGV4 dC5nZXQoKSksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgQ0dCaXRtYXBDb250ZXh0R2V0Qml0c1BlclBpeGVsKG1fYml0bWFwQ29udGV4dC5n ZXQoKSksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgQ0dCaXRtYXBDb250ZXh0R2V0Qnl0ZXNQZXJSb3cobV9iaXRtYXBDb250ZXh0LmdldCgp KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBDR0JpdG1hcENvbnRleHRHZXRDb2xvclNwYWNlKG1fYml0bWFwQ29udGV4dC5nZXQoKSksCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ0dC aXRtYXBDb250ZXh0R2V0Qml0bWFwSW5mbyhtX2JpdG1hcENvbnRleHQuZ2V0KCkpLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFQcm92 aWRlci5nZXQoKSwgMCwgZmFsc2UsIGtDR1JlbmRlcmluZ0ludGVudERlZmF1bHQpKTsKKworICAg IENHRmxvYXQgaW1hZ2VXaWR0aCA9IENHSW1hZ2VHZXRXaWR0aChpbWFnZS5nZXQoKSk7CisgICAg Q0dGbG9hdCBpbWFnZUhlaWdodCA9IENHSW1hZ2VHZXRIZWlnaHQoaW1hZ2UuZ2V0KCkpOworICAg IAorICAgIENHQ29udGV4dFNhdmVHU3RhdGUoY29udGV4dCk7CisgICAgCisgICAgQ0dDb250ZXh0 Q2xpcFRvUmVjdChjb250ZXh0LCByZWN0KTsKKyAgICBDR0NvbnRleHRTY2FsZUNUTShjb250ZXh0 LCAxLCAtMSk7CisKKyAgICBDR0NvbnRleHREcmF3SW1hZ2UoY29udGV4dCwgQ0dSZWN0TWFrZSgw LCAtaW1hZ2VIZWlnaHQsIGltYWdlV2lkdGgsIGltYWdlSGVpZ2h0KSwgaW1hZ2UuZ2V0KCkpOwor ICAgIENHQ29udGV4dFJlc3RvcmVHU3RhdGUoY29udGV4dCk7CiB9CiAKIHZvaWQgQmFja2luZ1N0 b3JlOjppbmNvcnBvcmF0ZVVwZGF0ZShjb25zdCBVcGRhdGVJbmZvJiB1cGRhdGVJbmZvKQo=