47338 2010-10-07 04:11:53 -0700 [GTK] Use draw instead of expose_event in WebView when building with gtk3 2010-10-08 05:37:58 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 cgarcia webkit-unassigned commit-queue mrobinson oldest_to_newest 290913 0 cgarcia 2010-10-07 04:11:53 -0700 expose_event has been removed in gtk3 290914 1 70066 cgarcia 2010-10-07 04:28:06 -0700 Created attachment 70066 Use draw instead of expose_event 290919 2 70066 xan.lopez 2010-10-07 04:40:02 -0700 Comment on attachment 70066 Use draw instead of expose_event Good! 290948 3 70066 commit-queue 2010-10-07 05:57:54 -0700 Comment on attachment 70066 Use draw instead of expose_event Clearing flags on attachment: 70066 Committed r69302: <http://trac.webkit.org/changeset/69302> 290949 4 commit-queue 2010-10-07 05:57:58 -0700 All reviewed patches have been landed. Closing bug. 291119 5 mrobinson 2010-10-07 10:44:29 -0700 Instead of duplicating the entire method the event handlers should be small shims which call a helper function. 291584 6 cgarcia 2010-10-08 05:37:58 -0700 (In reply to comment #5) > Instead of duplicating the entire method the event handlers should be small shims which call a helper function. I've done something like that in patch attached to bug #47411 70066 2010-10-07 04:28:06 -0700 2010-10-07 05:57:54 -0700 Use draw instead of expose_event draw-webview.diff text/plain 3436 cgarcia ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggYzYwMmFjMS4uZGIyYjBhMiAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0xMC0wNyAg Q2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gVXNlIGRyYXcgaW5zdGVh ZCBvZiBleHBvc2VfZXZlbnQgaW4gV2ViVmlldyB3aGVuIGJ1aWxkaW5nIHdpdGggZ3RrMworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDczMzgKKworICAg ICAgICAqIHdlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJfdmll d19leHBvc2VfZXZlbnQpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2RyYXcpOgorICAgICAg ICAod2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQpOgorCiAyMDEwLTA5LTI4ICBKZW5uIEJyYWl0 aHdhaXRlICA8amVubmJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERtaXRy eSBUaXRvdi4KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3Bw IGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKaW5kZXggNjIzNWI4ZC4uNDQ2 YjNiNyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysr IGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTQ4Myw2ICs0ODMsNyBA QCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfc2V0X3Byb3BlcnR5KEdPYmplY3QqIG9iamVj dCwgZ3VpbnQgcHJvcF9pZCwgY29uc3QgRwogICAgIH0KIH0KIAorI2lmZGVmIEdUS19BUElfVkVS U0lPTl8yCiBzdGF0aWMgYm9vbCBzaG91bGRDb2FsZXNjZShHZGtSZWN0YW5nbGUgcmVjdCwgR2Rr UmVjdGFuZ2xlKiByZWN0cywgaW50IGNvdW50KQogewogICAgIGNvbnN0IGludCBjUmVjdFRocmVz aG9sZCA9IDEwOwpAQCAtNTE4LDE1ICs1MTksOSBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dl Yl92aWV3X2V4cG9zZV9ldmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRFeHBvc2UqCiAg ICAgICAgIGN0eC5zZXRHZGtFeHBvc2VFdmVudChldmVudCk7CiAKICAgICAgICAgaW50IHJlY3RD b3VudDsKLSNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgogICAgICAgICBHT3duUHRyPEdka1JlY3Rh bmdsZT4gcmVjdHM7CiAgICAgICAgIGdka19yZWdpb25fZ2V0X3JlY3RhbmdsZXMoZXZlbnQtPnJl Z2lvbiwgJnJlY3RzLm91dFB0cigpLCAmcmVjdENvdW50KTsKLSNlbHNlCi0gICAgICAgIHJlY3RD b3VudCA9IGNhaXJvX3JlZ2lvbl9udW1fcmVjdGFuZ2xlcyhldmVudC0+cmVnaW9uKTsKLSAgICAg ICAgR093blB0cjxHZGtSZWN0YW5nbGU+IHJlY3RzKGdfbmV3KEdka1JlY3RhbmdsZSwgcmVjdENv dW50KSk7Ci0gICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgcmVjdENvdW50OyBpKyspCi0gICAg ICAgICAgICBjYWlyb19yZWdpb25fZ2V0X3JlY3RhbmdsZShldmVudC0+cmVnaW9uLCBpLCByZWN0 cy5nZXQoKStpKTsKLSNlbmRpZgorCiAgICAgICAgIC8vIEF2b2lkIHJlY3Vyc2luZyBpbnRvIHRo ZSByZW5kZXIgdHJlZSBleGNlc3NpdmVseQogICAgICAgICBib29sIGNvYWxlc2NlID0gc2hvdWxk Q29hbGVzY2UoZXZlbnQtPmFyZWEsIHJlY3RzLmdldCgpLCByZWN0Q291bnQpOwogCkBAIC01NTYs NiArNTUxLDMzIEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfZXhwb3NlX2V2ZW50 KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudEV4cG9zZSoKIAogICAgIHJldHVybiBGQUxTRTsK IH0KKyNlbHNlCitzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2RyYXcoR3RrV2lkZ2V0 KiB3aWRnZXQsIGNhaXJvX3QqIGNyKQoreworICAgIFdlYktpdFdlYlZpZXcqIHdlYlZpZXcgPSBX RUJLSVRfV0VCX1ZJRVcod2lkZ2V0KTsKKyAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9 IHdlYlZpZXctPnByaXY7CisgICAgR2RrUmVjdGFuZ2xlIGNsaXBSZWN0OworCisgICAgaWYgKCFn ZGtfY2Fpcm9fZ2V0X2NsaXBfcmVjdGFuZ2xlKGNyLCAmY2xpcFJlY3QpKQorICAgICAgICByZXR1 cm4gRkFMU0U7CisKKyAgICBGcmFtZSogZnJhbWUgPSBjb3JlKHdlYlZpZXcpLT5tYWluRnJhbWUo KTsKKyAgICBpZiAoZnJhbWUtPmNvbnRlbnRSZW5kZXJlcigpICYmIGZyYW1lLT52aWV3KCkpIHsK KyAgICAgICAgR3JhcGhpY3NDb250ZXh0IGN0eChjcik7CisgICAgICAgIEludFJlY3QgcmVjdCA9 IGNsaXBSZWN0OworCisgICAgICAgIGZyYW1lLT52aWV3KCktPnVwZGF0ZUxheW91dEFuZFN0eWxl SWZOZWVkZWRSZWN1cnNpdmUoKTsKKyAgICAgICAgaWYgKHByaXYtPnRyYW5zcGFyZW50KQorICAg ICAgICAgICAgY3R4LmNsZWFyUmVjdChyZWN0KTsKKyAgICAgICAgZnJhbWUtPnZpZXcoKS0+cGFp bnQoJmN0eCwgcmVjdCk7CisgICAgICAgIGN0eC5zYXZlKCk7CisgICAgICAgIGZyYW1lLT5wYWdl KCktPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+ZHJhd05vZGVIaWdobGlnaHQoY3R4KTsKKyAgICAg ICAgY3R4LnJlc3RvcmUoKTsKKyAgICB9CisKKyAgICByZXR1cm4gRkFMU0U7Cit9CisjZW5kaWYg Ly8gR1RLX0FQSV9WRVJTSU9OXzIKIAogc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19r ZXlfcHJlc3NfZXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50S2V5KiBldmVudCkKIHsK QEAgLTI0NTQsNyArMjQ3NiwxMSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xhc3Nf aW5pdChXZWJLaXRXZWJWaWV3Q2xhc3MqIHdlYlZpZXdDbGFzcykKIAogICAgIEd0a1dpZGdldENs YXNzKiB3aWRnZXRDbGFzcyA9IEdUS19XSURHRVRfQ0xBU1Mod2ViVmlld0NsYXNzKTsKICAgICB3 aWRnZXRDbGFzcy0+cmVhbGl6ZSA9IHdlYmtpdF93ZWJfdmlld19yZWFsaXplOworI2lmZGVmIEdU S19BUElfVkVSU0lPTl8yCiAgICAgd2lkZ2V0Q2xhc3MtPmV4cG9zZV9ldmVudCA9IHdlYmtpdF93 ZWJfdmlld19leHBvc2VfZXZlbnQ7CisjZWxzZQorICAgIHdpZGdldENsYXNzLT5kcmF3ID0gd2Vi a2l0X3dlYl92aWV3X2RyYXc7CisjZW5kaWYKICAgICB3aWRnZXRDbGFzcy0+a2V5X3ByZXNzX2V2 ZW50ID0gd2Via2l0X3dlYl92aWV3X2tleV9wcmVzc19ldmVudDsKICAgICB3aWRnZXRDbGFzcy0+ a2V5X3JlbGVhc2VfZXZlbnQgPSB3ZWJraXRfd2ViX3ZpZXdfa2V5X3JlbGVhc2VfZXZlbnQ7CiAg ICAgd2lkZ2V0Q2xhc3MtPmJ1dHRvbl9wcmVzc19ldmVudCA9IHdlYmtpdF93ZWJfdmlld19idXR0 b25fcHJlc3NfZXZlbnQ7Cg==