47367 2010-10-07 11:41:35 -0700 [GTK] Remove duplicate code in WebKit/gtk/WebCoreSupport/DragClientGtk.cpp 2010-10-08 09:02:37 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson webkit-unassigned cgarcia xan.lopez oldest_to_newest 291167 0 mrobinson 2010-10-07 11:41:35 -0700 r69290 introduced some duplicate code into WebKit/gtk/WebCoreSupport/DragClientGtk.cpp. This bug tracks removing it. 291170 1 70126 mrobinson 2010-10-07 11:46:07 -0700 Created attachment 70126 Patch for this issue 291478 2 cgarcia 2010-10-08 00:01:49 -0700 In if (!gdk_cairo_get_clip_rectangle(cr, &clipRect)). Since we are not using clipRect and gdk_cairo_get_clip_rectangle() accepts NULL, Xan suggested to use NULL rather than a varaible. 291534 3 70126 xan.lopez 2010-10-08 03:13:27 -0700 Comment on attachment 70126 Patch for this issue Looks good to me, you can do what carlos suggests when committing. 291682 4 mrobinson 2010-10-08 09:02:11 -0700 Thanks for the review. I will make the change before landing. 291683 5 mrobinson 2010-10-08 09:02:37 -0700 Committed r69403: <http://trac.webkit.org/changeset/69403> 70126 2010-10-07 11:46:07 -0700 2010-10-08 03:13:27 -0700 Patch for this issue bug-47367-20101007114604.patch text/plain 6004 mrobinson ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggNjIwZGQ0NTEzMjM2YTAwZDE5NGViY2I3MmU4ZWRiYWE2ZmZiY2NjMS4uNTQ5ODg1ZmFl OWM3YzM3MWI5ODhhNjUwYzViNjRiYzI0MjQzM2JjZSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAx MC0xMC0wNyAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gUmVtb3ZlIGR1 cGxpY2F0ZSBjb2RlIGluIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRHJhZ0NsaWVudEd0ay5j cHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3MzY3 CisKKyAgICAgICAgUmVtb3ZlIGFzIG11Y2ggZHVwbGljYXRlIGNvZGUgYXMgcG9zc2libGUgZnJv bSBEcmFnQ2xpZW50R3RrLiBNb3N0IG9mIHRoaXMgY29kZQorICAgICAgICBpcyBHVEsyL0dUSzMg aW5kZXBlbmRlbnQsIHNvIG9ubHkgdGhlIGJpdHMgdGhhdCBhcmVuJ3Qgc2hvdWxkIGJlIHByb3Rl Y3RlZCBieQorICAgICAgICAjaWZkZWZzLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRHJh Z0NsaWVudEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OmRyYWdJY29uV2luZG93RHJhd0V2ZW50 Q2FsbGJhY2spOiBNb2RpZmllZCB0aGUgbmFtZSBvZiB0aGlzIGNhbGxiYWNrCisgICAgICAgIHNv IHRoYXQgaXQgaXMgc2hhcmVkIGJldHdlZW4gYnVpbGQgdHlwZXMuCisgICAgICAgIChXZWJLaXQ6 OkRyYWdDbGllbnQ6OkRyYWdDbGllbnQpOiBVcGRhdGVkIHRoZSBzaWduYWwgY29ubmVjdG9ycyB0 byByZWZsZWN0IHRoZSBjaGFuZ2UgYWJvdmUuCisgICAgICAgIChXZWJLaXQ6OkRyYWdDbGllbnQ6 On5EcmFnQ2xpZW50KTogVGhlIGJ1aWxkIHR5cGVzIHNoYXJlIHRoZSBjYWxsYmFjayBuYW1lLCBz byByZW1vdmUKKyAgICAgICAgdGhlICNpZmRlZiBoZXJlLgorICAgICAgICAoV2ViS2l0OjpEcmFn Q2xpZW50OjpkcmF3RHJhZ0ljb25XaW5kb3cpOiBDaGFuZ2VkIHRoZSBuYW1lIG9mIHRoaXMgbWV0 aG9kIGFuZCBtYWtlIGl0CisgICAgICAgIGluZGVwZW5kZW50IG9mIHRoZSBidWlsZCB0eXBlLgor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0RyYWdDbGllbnRHdGsuaDogVXBkYXRlIG1ldGhvZCBk ZWNsYXJhdGlvbiBhbmQgcmVtb3ZlICNpZmRlZnMuCisKIDIwMTAtMTAtMDcgIENhcmxvcyBHYXJj aWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFhh biBMb3Blei4KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRHJhZ0NsaWVu dEd0ay5jcHAgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0RyYWdDbGllbnRHdGsuY3BwCmlu ZGV4IGMwNTUwYTJkMTFjZTU4YThlZWYwMDAxYTBjMDlhN2Y4MWRjNjIxYTcuLjNjOWIzOGVhZmNk NmJmNzdlYmRjNmM4MTJmNTgzZjNmZDcxZTNlYWIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2Vi Q29yZVN1cHBvcnQvRHJhZ0NsaWVudEd0ay5jcHAKKysrIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3Vw cG9ydC9EcmFnQ2xpZW50R3RrLmNwcApAQCAtNDIsMTkgKzQyLDE5IEBAIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogbmFtZXNwYWNlIFdlYktpdCB7CiAKICNpZmRlZiBHVEtfQVBJX1ZFUlNJT05f Mgotc3RhdGljIGdib29sZWFuIGRyYWdJY29uV2luZG93RXhwb3NlRXZlbnRDYWxsYmFjayhHdGtX aWRnZXQqIHdpZGdldCwgR2RrRXZlbnRFeHBvc2UqIGV2ZW50LCBEcmFnQ2xpZW50KiBjbGllbnQp CitzdGF0aWMgZ2Jvb2xlYW4gZHJhZ0ljb25XaW5kb3dEcmF3RXZlbnRDYWxsYmFjayhHdGtXaWRn ZXQqIHdpZGdldCwgR2RrRXZlbnRFeHBvc2UqIGV2ZW50LCBEcmFnQ2xpZW50KiBjbGllbnQpCiB7 Ci0gICAgY2xpZW50LT5kcmFnSWNvbldpbmRvd0V4cG9zZUV2ZW50KHdpZGdldCwgZXZlbnQpOwor ICAgIFBsYXRmb3JtUmVmUHRyPGNhaXJvX3Q+IGNvbnRleHQgPSBhZG9wdFBsYXRmb3JtUmVmKGdk a19jYWlyb19jcmVhdGUoZXZlbnQtPndpbmRvdykpOworICAgIGNsaWVudC0+ZHJhd0RyYWdJY29u V2luZG93KHdpZGdldCwgY29udGV4dC5nZXQoKSk7CiAgICAgcmV0dXJuIFRSVUU7CiB9CiAjZWxz ZQotc3RhdGljIGdib29sZWFuIGRyYWdJY29uV2luZG93RHJhd0NhbGxiYWNrKEd0a1dpZGdldCog d2lkZ2V0LCBjYWlyb190KiBjciwgRHJhZ0NsaWVudCogY2xpZW50KQorc3RhdGljIGdib29sZWFu IGRyYWdJY29uV2luZG93RHJhd0V2ZW50Q2FsbGJhY2soR3RrV2lkZ2V0KiB3aWRnZXQsIGNhaXJv X3QqIGNvbnRleHQsIERyYWdDbGllbnQqIGNsaWVudCkKIHsKICAgICBHZGtSZWN0YW5nbGUgY2xp cFJlY3Q7Ci0KLSAgICBpZiAoIWdka19jYWlyb19nZXRfY2xpcF9yZWN0YW5nbGUoY3IsICZjbGlw UmVjdCkpCisgICAgaWYgKCFnZGtfY2Fpcm9fZ2V0X2NsaXBfcmVjdGFuZ2xlKGNvbnRleHQsICZj bGlwUmVjdCkpCiAgICAgICAgIHJldHVybiBGQUxTRTsKLSAgICBjbGllbnQtPmRyYWdJY29uV2lu ZG93RHJhdyh3aWRnZXQsIGNyKTsKKyAgICBjbGllbnQtPmRyYXdEcmFnSWNvbldpbmRvdyh3aWRn ZXQsIGNvbnRleHQpOwogICAgIHJldHVybiBUUlVFOwogfQogI2VuZGlmIC8vIEdUS19BUElfVkVS U0lPTl8yCkBAIC02NSwxOSArNjUsMTUgQEAgRHJhZ0NsaWVudDo6RHJhZ0NsaWVudChXZWJLaXRX ZWJWaWV3KiB3ZWJWaWV3KQogICAgICwgbV9kcmFnSWNvbldpbmRvdyhndGtfd2luZG93X25ldyhH VEtfV0lORE9XX1BPUFVQKSkKIHsKICNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgotICAgIGdfc2ln bmFsX2Nvbm5lY3QobV9kcmFnSWNvbldpbmRvdy5nZXQoKSwgImV4cG9zZS1ldmVudCIsIEdfQ0FM TEJBQ0soZHJhZ0ljb25XaW5kb3dFeHBvc2VFdmVudENhbGxiYWNrKSwgdGhpcyk7CisgICAgZ19z aWduYWxfY29ubmVjdChtX2RyYWdJY29uV2luZG93LmdldCgpLCAiZXhwb3NlLWV2ZW50IiwgR19D QUxMQkFDSyhkcmFnSWNvbldpbmRvd0RyYXdFdmVudENhbGxiYWNrKSwgdGhpcyk7CiAjZWxzZQot ICAgIGdfc2lnbmFsX2Nvbm5lY3QobV9kcmFnSWNvbldpbmRvdy5nZXQoKSwgImRyYXciLCBHX0NB TExCQUNLKGRyYWdJY29uV2luZG93RHJhd0NhbGxiYWNrKSwgdGhpcyk7CisgICAgZ19zaWduYWxf Y29ubmVjdChtX2RyYWdJY29uV2luZG93LmdldCgpLCAiZHJhdyIsIEdfQ0FMTEJBQ0soZHJhZ0lj b25XaW5kb3dEcmF3RXZlbnRDYWxsYmFjayksIHRoaXMpOwogI2VuZGlmCiB9CiAKIERyYWdDbGll bnQ6On5EcmFnQ2xpZW50KCkKIHsKLSNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgotICAgIGdfc2ln bmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfYnlfZnVuYyhtX2RyYWdJY29uV2luZG93LmdldCgpLCAo Z3BvaW50ZXIpIGRyYWdJY29uV2luZG93RXhwb3NlRXZlbnRDYWxsYmFjaywgdGhpcyk7Ci0jZWxz ZQotICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfYnlfZnVuYyhtX2RyYWdJY29uV2lu ZG93LmdldCgpLCAoZ3BvaW50ZXIpIGRyYWdJY29uV2luZG93RHJhd0NhbGxiYWNrLCB0aGlzKTsK LSNlbmRpZgorICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfYnlfZnVuYyhtX2RyYWdJ Y29uV2luZG93LmdldCgpLCAoZ3BvaW50ZXIpIGRyYWdJY29uV2luZG93RHJhd0V2ZW50Q2FsbGJh Y2ssIHRoaXMpOwogfQogCiB2b2lkIERyYWdDbGllbnQ6OndpbGxQZXJmb3JtRHJhZ0Rlc3RpbmF0 aW9uQWN0aW9uKERyYWdEZXN0aW5hdGlvbkFjdGlvbiwgRHJhZ0RhdGEqKQpAQCAtMTQ0LDI4ICsx NDAsMTYgQEAgdm9pZCBEcmFnQ2xpZW50OjpzdGFydERyYWcoRHJhZ0ltYWdlUmVmIGltYWdlLCBj b25zdCBJbnRQb2ludCYgZHJhZ0ltYWdlT3JpZ2luLAogICAgIH0gZWxzZQogICAgICAgICBndGtf ZHJhZ19zZXRfaWNvbl9kZWZhdWx0KGNvbnRleHQpOwogfQotI2lmZGVmIEdUS19BUElfVkVSU0lP Tl8yCi12b2lkIERyYWdDbGllbnQ6OmRyYWdJY29uV2luZG93RXhwb3NlRXZlbnQoR3RrV2lkZ2V0 KiB3aWRnZXQsIEdka0V2ZW50RXhwb3NlKiBldmVudCkKLXsKLSAgICBQbGF0Zm9ybVJlZlB0cjxj YWlyb190PiBjb250ZXh0ID0gYWRvcHRQbGF0Zm9ybVJlZihnZGtfY2Fpcm9fY3JlYXRlKGV2ZW50 LT53aW5kb3cpKTsKLSAgICBjYWlyb19yZWN0YW5nbGUoY29udGV4dC5nZXQoKSwgMCwgMCwKLSAg ICAgICAgICAgICAgICAgICAgY2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRfd2lkdGgobV9kcmFnSW1h Z2UuZ2V0KCkpLAotICAgICAgICAgICAgICAgICAgICBjYWlyb19pbWFnZV9zdXJmYWNlX2dldF9o ZWlnaHQobV9kcmFnSW1hZ2UuZ2V0KCkpKTsKLSAgICBjYWlyb19zZXRfb3BlcmF0b3IoY29udGV4 dC5nZXQoKSwgQ0FJUk9fT1BFUkFUT1JfU09VUkNFKTsKLSAgICBjYWlyb19zZXRfc291cmNlX3N1 cmZhY2UoY29udGV4dC5nZXQoKSwgbV9kcmFnSW1hZ2UuZ2V0KCksIDAsIDApOwotICAgIGNhaXJv X2ZpbGwoY29udGV4dC5nZXQoKSk7Ci19Ci0jZWxzZQotdm9pZCBEcmFnQ2xpZW50OjpkcmFnSWNv bldpbmRvd0RyYXcoR3RrV2lkZ2V0KiB3aWRnZXQsIGNhaXJvX3QqIGNyKQorCit2b2lkIERyYWdD bGllbnQ6OmRyYXdEcmFnSWNvbldpbmRvdyhHdGtXaWRnZXQqIHdpZGdldCwgY2Fpcm9fdCogY29u dGV4dCkKIHsKLSAgICBjYWlyb19yZWN0YW5nbGUoY3IsIDAsIDAsCisgICAgY2Fpcm9fcmVjdGFu Z2xlKGNvbnRleHQsIDAsIDAsCiAgICAgICAgICAgICAgICAgICAgIGNhaXJvX2ltYWdlX3N1cmZh Y2VfZ2V0X3dpZHRoKG1fZHJhZ0ltYWdlLmdldCgpKSwKICAgICAgICAgICAgICAgICAgICAgY2Fp cm9faW1hZ2Vfc3VyZmFjZV9nZXRfaGVpZ2h0KG1fZHJhZ0ltYWdlLmdldCgpKSk7Ci0gICAgY2Fp cm9fc2V0X29wZXJhdG9yKGNyLCBDQUlST19PUEVSQVRPUl9TT1VSQ0UpOwotICAgIGNhaXJvX3Nl dF9zb3VyY2Vfc3VyZmFjZShjciwgbV9kcmFnSW1hZ2UuZ2V0KCksIDAsIDApOwotICAgIGNhaXJv X2ZpbGwoY3IpOworICAgIGNhaXJvX3NldF9vcGVyYXRvcihjb250ZXh0LCBDQUlST19PUEVSQVRP Ul9TT1VSQ0UpOworICAgIGNhaXJvX3NldF9zb3VyY2Vfc3VyZmFjZShjb250ZXh0LCBtX2RyYWdJ bWFnZS5nZXQoKSwgMCwgMCk7CisgICAgY2Fpcm9fZmlsbChjb250ZXh0KTsKIH0KLSNlbmRpZiAv LyBHVEtfQVBJX1ZFUlNJT05fMgogCiBEcmFnSW1hZ2VSZWYgRHJhZ0NsaWVudDo6Y3JlYXRlRHJh Z0ltYWdlRm9yTGluayhLVVJMJiwgY29uc3QgU3RyaW5nJiwgRnJhbWUqKQogewpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EcmFnQ2xpZW50R3RrLmggYi9XZWJLaXQvZ3Rr L1dlYkNvcmVTdXBwb3J0L0RyYWdDbGllbnRHdGsuaAppbmRleCAzMGFjYmM0ZjFmMmMyNDRhNWZi NDY5MGZlYWU4YzlkMjdkMjliY2U4Li4wZDA3Yzg4MWVmZmY4YTc4YmUzNzU4ZDJjNjVhMzNjNjFk NmZkNTJkIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0RyYWdDbGllbnRH dGsuaAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0RyYWdDbGllbnRHdGsuaApAQCAt NTQsMTEgKzU0LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKICAgICAgICAgdmlydHVhbCB2b2lk IGRyYWdDb250cm9sbGVyRGVzdHJveWVkKCk7CiAKLSNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgot ICAgICAgICB2b2lkIGRyYWdJY29uV2luZG93RXhwb3NlRXZlbnQoR3RrV2lkZ2V0KiwgR2RrRXZl bnRFeHBvc2UqKTsKLSNlbHNlCi0gICAgICAgIHZvaWQgZHJhZ0ljb25XaW5kb3dEcmF3KEd0a1dp ZGdldCosIGNhaXJvX3QqKTsKLSNlbmRpZgorICAgICAgICB2b2lkIGRyYXdEcmFnSWNvbldpbmRv dyhHdGtXaWRnZXQqLCBjYWlyb190Kik7CiAKICAgICBwcml2YXRlOgogICAgICAgICBXZWJLaXRX ZWJWaWV3KiBtX3dlYlZpZXc7Cg==