45213 2010-09-03 16:06:35 -0700 [GTK] Small code cleanup in DumpRenderTreeGtk.cpp 2010-09-06 09:14:47 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson webkit-unassigned oldest_to_newest 274240 0 mrobinson 2010-09-03 16:06:35 -0700 Attached is a small code cleanup which matches the structure of the Mac version. 274259 1 66564 mrobinson 2010-09-03 16:48:48 -0700 Created attachment 66564 Patch 274441 2 66564 xan.lopez 2010-09-05 10:18:50 -0700 Comment on attachment 66564 Patch Looks good. 274662 3 66564 mrobinson 2010-09-06 09:14:43 -0700 Comment on attachment 66564 Patch Clearing flags on attachment: 66564 Committed r66834: <http://trac.webkit.org/changeset/66834> 274663 4 mrobinson 2010-09-06 09:14:47 -0700 All reviewed patches have been landed. Closing bug. 66564 2010-09-03 16:48:48 -0700 2010-09-06 09:14:43 -0700 Patch bug-45213-20100903164849.patch text/plain 5836 mrobinson ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyZTkyN2ViZjI4ZDY1NWIwZDExZDVlMGIwODk3ZmIxM2VlMzgzZDZhLi43MmIxMTUx MWNmYWRlOWRmYzFjNTAyODhlYjAxZTEyYjg4YjUwNjFkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTAtMDktMDMgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIFNtYWxs IGNvZGUgY2xlYW51cCBpbiBEdW1wUmVuZGVyVHJlZUd0ay5jcHAKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1MjEzCisKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwOgorICAgICAgICAoaW5pdGlhbGl6ZUZvbnRz KTogTWFkZSB0aGlzIGZ1bmN0aW9uIGRvIG5vdGhpbmcgZm9yIG5vbi1YMTEgcGxhdGZvcm1zLCBz byB3ZSBkb24ndAorICAgICAgICBoYXZlIHRvIHN1cnJvdW5kIHRoZSBpbnZvY2F0aW9uIHdpdGgg I2lmZGVmcy4KKyAgICAgICAgKHVzZUxvbmdSdW5uaW5nU2VydmVyTW9kZSk6IEFkZGVkLgorICAg ICAgICAocnVuVGVzdGluZ1NlcnZlckxvb3ApOiBBZGRlZC4KKyAgICAgICAgKGluaXRpYWxpemVH bG9iYWxzRnJvbUNvbW1hbmRMaW5lT3B0aW9ucyk6IEFkZGVkLgorICAgICAgICAocnVuVGVzdCk6 IFJlbW92ZWQgaWZkZWZzLgorICAgICAgICAobWFpbik6IFVzZSBuZXcgaGVscGVyIGZ1bmN0aW9u cy4KKwogMjAxMC0wOS0wMyAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwIGIvV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcAppbmRleCBiZDljMGM5MWY1NmJi ZDRlZGIzNTVhNTVjYmNlNWFhNDA0MGFlZjQ1Li5hZjJlNDAzNTc4MzYzMDE2MGE5ZTQ1NjMyNzVi YWRhNGUxYjM0Y2MyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9ndGsv RHVtcFJlbmRlclRyZWUuY3BwCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9E dW1wUmVuZGVyVHJlZS5jcHAKQEAgLTk2LDYgKzk2LDggQEAgc3RhdGljIFdlYktpdFdlYkhpc3Rv cnlJdGVtKiBwcmV2VGVzdEJGSXRlbSA9IE5VTEw7CiAKIGNvbnN0IHVuc2lnbmVkIGhpc3RvcnlJ dGVtSW5kZW50ID0gODsKIAorc3RhdGljIHZvaWQgcnVuVGVzdChjb25zdCBzdHJpbmcmIHRlc3RQ YXRoT3JVUkwpOworCiBzdGF0aWMgYm9vbCBzaG91bGRMb2dGcmFtZUxvYWREZWxlZ2F0ZXMoY29u c3Qgc3RyaW5nJiBwYXRoT3JVUkwpCiB7CiAgICAgcmV0dXJuIHBhdGhPclVSTC5maW5kKCJsb2Fk aW5nLyIpICE9IHN0cmluZzo6bnBvczsKQEAgLTEyOCwxMSArMTMwLDEzIEBAIHN0YXRpYyB2b2lk IGFwcGVuZFN0cmluZyhnY2hhciomIHRhcmdldCwgZ2NoYXIqIHN0cmluZykKICAgICBnX2ZyZWUo b2xkU3RyaW5nKTsKIH0KIAotI2lmIFBMQVRGT1JNKFgxMSkKIHN0YXRpYyB2b2lkIGluaXRpYWxp emVGb250cygpCiB7CisjaWYgUExBVEZPUk0oWDExKQogICAgIHN0YXRpYyBpbnQgbnVtRm9udHMg PSAtMTsKIAorICAgIEZjSW5pdCgpOworCiAgICAgLy8gU29tZSB0ZXN0cyBtYXkgYWRkIG9yIHJl bW92ZSBmb250cyB2aWEgdGhlIEBmb250LWZhY2UgcnVsZS4KICAgICAvLyBJZiB0aGF0IGhhcHBl bnMsIGZvbnQgY29uZmlnIHNob3VsZCBiZSByZS1jcmVhdGVkIHRvIHN1cHByZXNzIGFueSB1bndh bnRlZCBjaGFuZ2UuCiAgICAgRmNGb250U2V0KiBhcHBGb250U2V0ID0gRmNDb25maWdHZXRGb250 cygwLCBGY1NldEFwcGxpY2F0aW9uKTsKQEAgLTE2MCw4ICsxNjQsOCBAQCBzdGF0aWMgdm9pZCBp bml0aWFsaXplRm9udHMoKQogCiAgICAgYXBwRm9udFNldCA9IEZjQ29uZmlnR2V0Rm9udHMoY29u ZmlnLCBGY1NldEFwcGxpY2F0aW9uKTsKICAgICBudW1Gb250cyA9IGFwcEZvbnRTZXQtPm5mb250 OwotfQogI2VuZGlmCit9CiAKIHN0YXRpYyBnY2hhciogZHVtcEZyYW1lc0FzVGV4dChXZWJLaXRX ZWJGcmFtZSogZnJhbWUpCiB7CkBAIC0zNTcsNiArMzYxLDUwIEBAIHN0YXRpYyB2b2lkIHJlc2V0 RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXMoKQogICAgIHNldGxvY2FsZShMQ19BTEwsICIiKTsK IH0KIAorc3RhdGljIGJvb2wgdXNlTG9uZ1J1bm5pbmdTZXJ2ZXJNb2RlKGludCBhcmdjLCBjaGFy ICphcmd2W10pCit7CisgICAgLy8gVGhpcyBhc3N1bWVzIHlvdSd2ZSBhbHJlYWR5IGNhbGxlZCBn ZXRvcHRfbG9uZworICAgIHJldHVybiAoYXJnYyA9PSBvcHRpbmQrMSAmJiAhc3RyY21wKGFyZ3Zb b3B0aW5kXSwgIi0iKSk7Cit9CisKK3N0YXRpYyB2b2lkIHJ1blRlc3RpbmdTZXJ2ZXJMb29wKCkK K3sKKyAgICAvLyBXaGVuIER1bXBSZW5kZXJUcmVlIHJ1bnMgaW4gc2VydmVyIG1vZGUsIHdlIGp1 c3Qgd2FpdCBhcm91bmQgZm9yIGZpbGUgbmFtZXMKKyAgICAvLyB0byBiZSBwYXNzZWQgdG8gdXMg YW5kIHJlYWQgZWFjaCBpbiB0dXJuLCBwYXNzaW5nIHRoZSByZXN1bHRzIGJhY2sgdG8gdGhlIGNs aWVudAorICAgIGNoYXIgZmlsZW5hbWVCdWZmZXJbMjA0OF07CisgICAgd2hpbGUgKGZnZXRzKGZp bGVuYW1lQnVmZmVyLCBzaXplb2YoZmlsZW5hbWVCdWZmZXIpLCBzdGRpbikpIHsKKyAgICAgICAg Y2hhciogbmV3TGluZUNoYXJhY3RlciA9IHN0cmNocihmaWxlbmFtZUJ1ZmZlciwgJ1xuJyk7Cisg ICAgICAgIGlmIChuZXdMaW5lQ2hhcmFjdGVyKQorICAgICAgICAgICAgKm5ld0xpbmVDaGFyYWN0 ZXIgPSAnXDAnOworCisgICAgICAgIGlmICghc3RybGVuKGZpbGVuYW1lQnVmZmVyKSkKKyAgICAg ICAgICAgIGNvbnRpbnVlOworCisgICAgICAgIHJ1blRlc3QoZmlsZW5hbWVCdWZmZXIpOworICAg IH0KK30KKworc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUdsb2JhbHNGcm9tQ29tbWFuZExpbmVPcHRp b25zKGludCBhcmdjLCBjaGFyICphcmd2W10pCit7CisgICAgc3RydWN0IG9wdGlvbiBvcHRpb25z W10gPSB7CisgICAgICAgIHsibm90cmVlIiwgbm9fYXJndW1lbnQsICZkdW1wVHJlZSwgZmFsc2V9 LAorICAgICAgICB7InBpeGVsLXRlc3RzIiwgbm9fYXJndW1lbnQsICZkdW1wUGl4ZWxzLCB0cnVl fSwKKyAgICAgICAgeyJ0cmVlIiwgbm9fYXJndW1lbnQsICZkdW1wVHJlZSwgdHJ1ZX0sCisgICAg ICAgIHtOVUxMLCAwLCBOVUxMLCAwfQorICAgIH07CisgICAgCisgICAgaW50IG9wdGlvbjsKKyAg ICB3aGlsZSAoKG9wdGlvbiA9IGdldG9wdF9sb25nKGFyZ2MsIChjaGFyICogY29uc3QgKilhcmd2 LCAiIiwgb3B0aW9ucywgTlVMTCkpICE9IC0xKSB7CisgICAgICAgIHN3aXRjaCAob3B0aW9uKSB7 CisgICAgICAgIGNhc2UgJz8nOiAvLyB1bmtub3duIG9yIGFtYmlndW91cyBvcHRpb24KKyAgICAg ICAgY2FzZSAnOic6IC8vIG1pc3NpbmcgYXJndW1lbnQKKyAgICAgICAgICAgIGV4aXQoMSk7Cisg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0KK30KKworCiB2b2lkIGR1bXAoKQog ewogICAgIGludmFsaWRhdGVBbnlQcmV2aW91c1dhaXRUb0R1bXBXYXRjaGRvZygpOwpAQCAtNTE2 LDkgKzU2NCw3IEBAIHN0YXRpYyB2b2lkIHJ1blRlc3QoY29uc3Qgc3RyaW5nJiB0ZXN0UGF0aE9y VVJMKQogICAgIGlmIChwcmV2VGVzdEJGSXRlbSkKICAgICAgICAgZ19vYmplY3RfcmVmKHByZXZU ZXN0QkZJdGVtKTsKIAotI2lmIFBMQVRGT1JNKFgxMSkKICAgICBpbml0aWFsaXplRm9udHMoKTsK LSNlbmRpZgogCiAgICAgLy8gRm9jdXMgdGhlIHdlYiB2aWV3IGJlZm9yZSBsb2FkaW5nIHRoZSB0 ZXN0IHRvIGF2b2lkIGZvY3VzaW5nIHByb2JsZW1zCiAgICAgZ3RrX3dpZGdldF9ncmFiX2ZvY3Vz KEdUS19XSURHRVQod2ViVmlldykpOwpAQCAtOTQxLDI2ICs5ODcsOCBAQCBpbnQgbWFpbihpbnQg YXJnYywgY2hhciogYXJndltdKQogICAgIC8vIFdlIHNxdWVsY2ggYWxsIGRlYnVnIG1lc3NhZ2Vz IHNlbnQgdG8gdGhlIGxvZ2dlci4KICAgICBnX2xvZ19zZXRfZGVmYXVsdF9oYW5kbGVyKGxvZ0hh bmRsZXIsIDApOwogCi0jaWYgUExBVEZPUk0oWDExKQotICAgIEZjSW5pdCgpOworICAgIGluaXRp YWxpemVHbG9iYWxzRnJvbUNvbW1hbmRMaW5lT3B0aW9ucyhhcmdjLCBhcmd2KTsKICAgICBpbml0 aWFsaXplRm9udHMoKTsKLSNlbmRpZgotCi0gICAgc3RydWN0IG9wdGlvbiBvcHRpb25zW10gPSB7 Ci0gICAgICAgIHsibm90cmVlIiwgbm9fYXJndW1lbnQsICZkdW1wVHJlZSwgZmFsc2V9LAotICAg ICAgICB7InBpeGVsLXRlc3RzIiwgbm9fYXJndW1lbnQsICZkdW1wUGl4ZWxzLCB0cnVlfSwKLSAg ICAgICAgeyJ0cmVlIiwgbm9fYXJndW1lbnQsICZkdW1wVHJlZSwgdHJ1ZX0sCi0gICAgICAgIHtO VUxMLCAwLCBOVUxMLCAwfQotICAgIH07Ci0KLSAgICBpbnQgb3B0aW9uOwotICAgIHdoaWxlICgo b3B0aW9uID0gZ2V0b3B0X2xvbmcoYXJnYywgKGNoYXIqIGNvbnN0Kilhcmd2LCAiIiwgb3B0aW9u cywgTlVMTCkpICE9IC0xKQotICAgICAgICBzd2l0Y2ggKG9wdGlvbikgewotICAgICAgICAgICAg Y2FzZSAnPyc6ICAgLy8gdW5rbm93biBvciBhbWJpZ3VvdXMgb3B0aW9uCi0gICAgICAgICAgICBj YXNlICc6JzogICAvLyBtaXNzaW5nIGFyZ3VtZW50Ci0gICAgICAgICAgICAgICAgZXhpdCgxKTsK LSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgfQogCiAgICAgd2luZG93ID0gZ3RrX3dp bmRvd19uZXcoR1RLX1dJTkRPV19QT1BVUCk7CiAgICAgY29udGFpbmVyID0gR1RLX1dJREdFVChn dGtfc2Nyb2xsZWRfd2luZG93X25ldyhOVUxMLCBOVUxMKSk7CkBAIC05ODAsMTkgKzEwMDgsOSBA QCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgIGdjQ29udHJvbGxlciA9IG5l dyBHQ0NvbnRyb2xsZXIoKTsKICAgICBheENvbnRyb2xsZXIgPSBuZXcgQWNjZXNzaWJpbGl0eUNv bnRyb2xsZXIoKTsKIAotICAgIGlmIChhcmdjID09IG9wdGluZCsxICYmIHN0cmNtcChhcmd2W29w dGluZF0sICItIikgPT0gMCkgewotICAgICAgICBjaGFyIGZpbGVuYW1lQnVmZmVyWzIwNDhdOwor ICAgIGlmICh1c2VMb25nUnVubmluZ1NlcnZlck1vZGUoYXJnYywgYXJndikpIHsKICAgICAgICAg cHJpbnRTZXBhcmF0b3JzID0gdHJ1ZTsKLSAgICAgICAgd2hpbGUgKGZnZXRzKGZpbGVuYW1lQnVm ZmVyLCBzaXplb2YoZmlsZW5hbWVCdWZmZXIpLCBzdGRpbikpIHsKLSAgICAgICAgICAgIGNoYXIq IG5ld0xpbmVDaGFyYWN0ZXIgPSBzdHJjaHIoZmlsZW5hbWVCdWZmZXIsICdcbicpOwotICAgICAg ICAgICAgaWYgKG5ld0xpbmVDaGFyYWN0ZXIpCi0gICAgICAgICAgICAgICAgKm5ld0xpbmVDaGFy YWN0ZXIgPSAnXDAnOwotCi0gICAgICAgICAgICBpZiAoc3RybGVuKGZpbGVuYW1lQnVmZmVyKSA9 PSAwKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAgICAgICBydW5UZXN0KGZp bGVuYW1lQnVmZmVyKTsKLSAgICAgICAgfQorICAgICAgICBydW5UZXN0aW5nU2VydmVyTG9vcCgp OwogICAgIH0gZWxzZSB7CiAgICAgICAgIHByaW50U2VwYXJhdG9ycyA9IChvcHRpbmQgPCBhcmdj LTEgfHwgKGR1bXBQaXhlbHMgJiYgZHVtcFRyZWUpKTsKICAgICAgICAgZm9yIChpbnQgaSA9IG9w dGluZDsgaSAhPSBhcmdjOyArK2kpCg==