47588 2010-10-13 06:37:53 -0700 [GTK] Small cleanup in PluginViewGtk 2010-10-14 12:29:56 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 xan.lopez webkit-unassigned commit-queue mrobinson xan.lopez oldest_to_newest 293392 0 xan.lopez 2010-10-13 06:37:53 -0700 SSIA. 293394 1 70605 xan.lopez 2010-10-13 06:40:02 -0700 Created attachment 70605 cleanup.diff 293901 2 mrobinson 2010-10-13 19:01:59 -0700 How did this code originate? Is it important to preserve the assertion? 293984 3 xan.lopez 2010-10-13 23:53:02 -0700 (In reply to comment #2) > How did this code originate? Is it important to preserve the assertion? The actualDepth was used before to see if we have an alpha channel, but in the current code we use cairo_surface_get_content for that. We can still keep the assertion (doing it differently) if you think it's important, I'm not very sure that it is. 293985 4 70605 mrobinson 2010-10-13 23:55:34 -0700 Comment on attachment 70605 cleanup.diff Seems reasonable. 294282 5 70605 commit-queue 2010-10-14 12:29:51 -0700 Comment on attachment 70605 cleanup.diff Clearing flags on attachment: 70605 Committed r69793: <http://trac.webkit.org/changeset/69793> 294283 6 commit-queue 2010-10-14 12:29:56 -0700 All reviewed patches have been landed. Closing bug. 70605 2010-10-13 06:40:02 -0700 2010-10-14 12:29:51 -0700 cleanup.diff cleanup.diff text/plain 4634 xan.lopez RnJvbSA4MTY1M2U4ZGRjNDIzOTAwYzA0MGVhZTRkMWI4YjM2ZWFiZGNhZTNlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBG cmksIDggT2N0IDIwMTAgMTU6MzI6MDAgKzA5MDAKU3ViamVjdDogW1BBVENIXSAyMDEwLTEwLTEz ICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCgogICAgICAgIFtHVEtdIFNtYWxsIGNsZWFudXAgaW4gUGx1Z2luVmlld0d0 awogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzU4OAoK ICAgICAgICBSZW1vdmUgc29tZSBkZWFkIGNvZGUgYW5kIHVzZSBQbGF0Zm9ybVJlZlB0ciBmb3Ig Y2Fpcm8gc3VyZmFjZXMuCgogICAgICAgIE5vIG5ldyB0ZXN0cywgb25seSByZWZhY3RvcmluZy4K CiAgICAgICAgKiBwbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcDoKICAgICAgICAoV2ViQ29y ZTo6UGx1Z2luVmlldzo6cGFpbnQpOgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAg ICAgICAgICAgfCAgIDE0ICsrKysrKysrKysrKysrCiBXZWJDb3JlL3BsdWdpbnMvZ3RrL1BsdWdp blZpZXdHdGsuY3BwIHwgICAyNiArKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBj aGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGJkZDFhY2IuLmJhODI5 NzEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMTAtMTMgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtH VEtdIFNtYWxsIGNsZWFudXAgaW4gUGx1Z2luVmlld0d0aworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc1ODgKKworICAgICAgICBSZW1vdmUgc29tZSBk ZWFkIGNvZGUgYW5kIHVzZSBQbGF0Zm9ybVJlZlB0ciBmb3IgY2Fpcm8gc3VyZmFjZXMuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLCBvbmx5IHJlZmFjdG9yaW5nLgorCisgICAgICAgICogcGx1Z2lu cy9ndGsvUGx1Z2luVmlld0d0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3Ojpw YWludCk6CisKIDIwMTAtMTAtMDcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9wbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcCBiL1dlYkNvcmUvcGx1Z2lu cy9ndGsvUGx1Z2luVmlld0d0ay5jcHAKaW5kZXggZDBiMzM5Ny4uMWI1ZmIwMiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcAorKysgYi9XZWJDb3JlL3Bs dWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwCkBAIC0xOTMsMjkgKzE5MywyMCBAQCB2b2lkIFBs dWdpblZpZXc6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYg cmVjdCkKICAgICBleHBvc2VkUmVjdC5pbnRlcnNlY3QoZnJhbWVSZWN0KCkpOwogICAgIGV4cG9z ZWRSZWN0Lm1vdmUoLWZyYW1lUmVjdCgpLngoKSwgLWZyYW1lUmVjdCgpLnkoKSk7CiAKLSAgICBX aW5kb3cgZHVtbXlXOwotICAgIGludCBkdW1teUk7Ci0gICAgdW5zaWduZWQgaW50IGR1bW15VUks IGFjdHVhbERlcHRoID0gMDsKLSAgICBYR2V0R2VvbWV0cnkoR0RLX0RJU1BMQVkoKSwgbV9kcmF3 YWJsZSwgJmR1bW15VywgJmR1bW15SSwgJmR1bW15SSwKLSAgICAgICAgICAgICAgICAgJmR1bW15 VUksICZkdW1teVVJLCAmZHVtbXlVSSwgJmFjdHVhbERlcHRoKTsKLQotICAgIGNvbnN0IHVuc2ln bmVkIGludCBkcmF3YWJsZURlcHRoID0gKChOUFNldFdpbmRvd0NhbGxiYWNrU3RydWN0KiltX25w V2luZG93LndzX2luZm8pLT5kZXB0aDsKLSAgICBBU1NFUlQoZHJhd2FibGVEZXB0aCA9PSBhY3R1 YWxEZXB0aCk7Ci0KLSAgICBjYWlyb19zdXJmYWNlX3QqIGRyYXdhYmxlU3VyZmFjZSA9IGNhaXJv X3hsaWJfc3VyZmFjZV9jcmVhdGUoR0RLX0RJU1BMQVkoKSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9kcmF3YWJsZSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbV92aXN1YWwsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fd2luZG93UmVjdC53aWR0aCgpLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBtX3dpbmRvd1JlY3QuaGVpZ2h0KCkpOworICAgIFBsYXRmb3JtUmVmUHRyPGNhaXJvX3N1cmZh Y2VfdD4gZHJhd2FibGVTdXJmYWNlID0gYWRvcHRQbGF0Zm9ybVJlZihjYWlyb194bGliX3N1cmZh Y2VfY3JlYXRlKEdES19ESVNQTEFZKCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbV9kcmF3YWJsZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBtX3Zpc3VhbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBt X3dpbmRvd1JlY3Qud2lkdGgoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBtX3dpbmRvd1JlY3QuaGVpZ2h0KCkpKTsKIAogICAgIGlmIChtX2lzVHJhbnNwYXJlbnQp IHsKICAgICAgICAgLy8gSWYgd2UgaGF2ZSBhIDMyIGJpdCBkcmF3YWJsZSBhbmQgdGhlIHBsdWdp biB3YW50cyB0cmFuc3BhcmVuY3ksCiAgICAgICAgIC8vIHdlJ2xsIGNsZWFyIHRoZSBleHBvc2Vk IGFyZWEgdG8gdHJhbnNwYXJlbnQgZmlyc3QuICBPdGhlcndpc2UsCiAgICAgICAgIC8vIHdlJ2Qg ZW5kIHVwIHdpdGgganVuayBpbiB0aGVyZSBmcm9tIHRoZSBsYXN0IHBhaW50LCBvciwgd29yc2Us CiAgICAgICAgIC8vIHVuaW5pdGlhbGl6ZWQgZGF0YS4KLSAgICAgICAgUGxhdGZvcm1SZWZQdHI8 Y2Fpcm9fdD4gY3IgPSBhZG9wdFBsYXRmb3JtUmVmKGNhaXJvX2NyZWF0ZShkcmF3YWJsZVN1cmZh Y2UpKTsKKyAgICAgICAgUGxhdGZvcm1SZWZQdHI8Y2Fpcm9fdD4gY3IgPSBhZG9wdFBsYXRmb3Jt UmVmKGNhaXJvX2NyZWF0ZShkcmF3YWJsZVN1cmZhY2UuZ2V0KCkpKTsKIAotICAgICAgICBpZiAo IShjYWlyb19zdXJmYWNlX2dldF9jb250ZW50KGRyYXdhYmxlU3VyZmFjZSkgJiBDQUlST19DT05U RU5UX0FMUEhBKSkgeworICAgICAgICBpZiAoIShjYWlyb19zdXJmYWNlX2dldF9jb250ZW50KGRy YXdhYmxlU3VyZmFjZS5nZXQoKSkgJiBDQUlST19DT05URU5UX0FMUEhBKSkgewogICAgICAgICAg ICAgLy8gQXR0ZW1wdCB0byBmYWtlIGl0IHdoZW4gd2UgZG9uJ3QgaGF2ZSBhbiBhbHBoYSBjaGFu bmVsIG9uIG91cgogICAgICAgICAgICAgLy8gcGl4bWFwLiAgSWYgdGhhdCdzIG5vdCBwb3NzaWJs ZSwgYXQgbGVhc3QgY2xlYXIgdGhlIHdpbmRvdyB0bwogICAgICAgICAgICAgLy8gYXZvaWQgZHJh d2luZyBhcnRpZmFjdHMuCkBAIC0yNTEsNyArMjQyLDcgQEAgdm9pZCBQbHVnaW5WaWV3OjpwYWlu dChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIHJlY3QpCiAgICAgY2Fp cm9fdCogY3IgPSBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKICAgICBjYWlyb19zYXZlKGNy KTsKIAotICAgIGNhaXJvX3NldF9zb3VyY2Vfc3VyZmFjZShjciwgZHJhd2FibGVTdXJmYWNlLCBm cmFtZVJlY3QoKS54KCksIGZyYW1lUmVjdCgpLnkoKSk7CisgICAgY2Fpcm9fc2V0X3NvdXJjZV9z dXJmYWNlKGNyLCBkcmF3YWJsZVN1cmZhY2UuZ2V0KCksIGZyYW1lUmVjdCgpLngoKSwgZnJhbWVS ZWN0KCkueSgpKTsKIAogICAgIGNhaXJvX3JlY3RhbmdsZShjciwKICAgICAgICAgICAgICAgICAg ICAgZnJhbWVSZWN0KCkueCgpICsgZXhwb3NlZFJlY3QueCgpLCBmcmFtZVJlY3QoKS55KCkgKyBl eHBvc2VkUmVjdC55KCksCkBAIC0yNjUsNyArMjU2LDYgQEAgdm9pZCBQbHVnaW5WaWV3OjpwYWlu dChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIHJlY3QpCiAgICAgY2Fp cm9fcGFpbnQoY3IpOwogCiAgICAgY2Fpcm9fcmVzdG9yZShjcik7Ci0gICAgY2Fpcm9fc3VyZmFj ZV9kZXN0cm95KGRyYXdhYmxlU3VyZmFjZSk7CiAjZW5kaWYgLy8gZGVmaW5lZChYUF9VTklYKQog fQogCi0tIAoxLjcuMi4zCgo=