63503 2011-06-27 19:01:59 -0700 [Chromium] Pass an optional WebNode that is the node receiving the context menu action. 2011-06-29 07:23:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 jhawkins webkit-unassigned fishd oldest_to_newest 428562 0 jhawkins 2011-06-27 19:01:59 -0700 [Chromium] Pass an optional WebNode that is the node receiving the context menu action. 428563 1 98843 jhawkins 2011-06-27 19:02:36 -0700 Created attachment 98843 Patch 428566 2 jhawkins 2011-06-27 19:05:17 -0700 +Darin 428629 3 98843 fishd 2011-06-27 22:08:00 -0700 Comment on attachment 98843 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98843&action=review OK, R=me > Source/WebKit/chromium/src/WebFrameImpl.cpp:1138 > + pluginContainer = pluginContainerFromNode(node); nit: indentation 428936 4 jhawkins 2011-06-28 09:57:05 -0700 (In reply to comment #3) > (From update of attachment 98843 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=98843&action=review > > OK, R=me > > > Source/WebKit/chromium/src/WebFrameImpl.cpp:1138 > > + pluginContainer = pluginContainerFromNode(node); > > nit: indentation Done. 428938 5 jhawkins 2011-06-28 09:58:12 -0700 Committed r89939: <http://trac.webkit.org/changeset/89939> 429591 6 98843 pfeldman 2011-06-29 07:23:38 -0700 Comment on attachment 98843 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98843&action=review > Source/WebKit/chromium/src/WebFrameImpl.cpp:291 > + if (coreNode->hasTagName(HTMLNames::objectTag) || coreNode->hasTagName(HTMLNames::embedTag)) { This call fails with coreNode == 0 in the "Copy" branch. 98843 2011-06-27 19:02:36 -0700 2011-06-29 07:23:38 -0700 Patch bug-63503-20110627190235.patch text/plain 5188 jhawkins SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA4OTg4NSkKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDYtMjcgIEphbWVzIEhhd2tpbnMgIDxqaGF3a2luc0BjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVt XSBQYXNzIGFuIG9wdGlvbmFsIFdlYk5vZGUgdGhhdCBpcyB0aGUgbm9kZSByZWNlaXZpbmcgdGhl IGNvbnRleHQgbWVudSBhY3Rpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02MzUwMworCisgICAgICAgICogcHVibGljL1dlYkZyYW1lLmg6CisgICAg ICAgICogc3JjL1dlYkZyYW1lSW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OnBsdWdpbkNvbnRh aW5lckZyb21Ob2RlKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVJbXBsOjpleGVjdXRlQ29t bWFuZCk6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6cHJpbnRCZWdpbik6CisgICAg ICAgICogc3JjL1dlYkZyYW1lSW1wbC5oOgorCiAyMDExLTA2LTI3ICBSeW9zdWtlIE5pd2EgIDxy bml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJvbGxlZCBERVBTLgpJbmRleDogU291cmNlL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oCShyZXZpc2lvbiA4OTg4NCkKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTM5 Miw3ICszOTIsNyBAQCBwdWJsaWM6CiAgICAgLy8gU3VwcG9ydHMgY29tbWFuZHMgbGlrZSBVbmRv LCBSZWRvLCBDdXQsIENvcHksIFBhc3RlLCBTZWxlY3RBbGwsCiAgICAgLy8gVW5zZWxlY3QsIGV0 Yy4gU2VlIEVkaXRvckNvbW1hbmQuY3BwIGZvciB0aGUgZnVsbCBsaXN0IG9mIHN1cHBvcnRlZAog ICAgIC8vIGNvbW1hbmRzLgotICAgIHZpcnR1YWwgYm9vbCBleGVjdXRlQ29tbWFuZChjb25zdCBX ZWJTdHJpbmcmKSA9IDA7CisgICAgdmlydHVhbCBib29sIGV4ZWN1dGVDb21tYW5kKGNvbnN0IFdl YlN0cmluZyYsIGNvbnN0IFdlYk5vZGUmID0gV2ViTm9kZSgpKSA9IDA7CiAgICAgdmlydHVhbCBi b29sIGV4ZWN1dGVDb21tYW5kKGNvbnN0IFdlYlN0cmluZyYsIGNvbnN0IFdlYlN0cmluZyYgdmFs dWUpID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgaXNDb21tYW5kRW5hYmxlZChjb25zdCBXZWJTdHJp bmcmKSBjb25zdCA9IDA7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZy YW1lSW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi RnJhbWVJbXBsLmNwcAkocmV2aXNpb24gODk4ODQpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJGcmFtZUltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yODUsNiArMjg1LDIwIEBA IHN0YXRpYyBsb25nIGxvbmcgZ2VuZXJhdGVGcmFtZUlkZW50aWZpZXIKICAgICByZXR1cm4gKytu ZXh0OwogfQogCitzdGF0aWMgV2ViUGx1Z2luQ29udGFpbmVySW1wbCogcGx1Z2luQ29udGFpbmVy RnJvbU5vZGUoY29uc3QgV2ViTm9kZSYgbm9kZSkKK3sKKyAgICBjb25zdCBOb2RlKiBjb3JlTm9k ZSA9IG5vZGUuY29uc3RVbndyYXA8Tm9kZT4oKTsKKyAgICBpZiAoY29yZU5vZGUtPmhhc1RhZ05h bWUoSFRNTE5hbWVzOjpvYmplY3RUYWcpIHx8IGNvcmVOb2RlLT5oYXNUYWdOYW1lKEhUTUxOYW1l czo6ZW1iZWRUYWcpKSB7CisgICAgICAgIFJlbmRlck9iamVjdCogb2JqZWN0ID0gY29yZU5vZGUt PnJlbmRlcmVyKCk7CisgICAgICAgIGlmIChvYmplY3QgJiYgb2JqZWN0LT5pc1dpZGdldCgpKSB7 CisgICAgICAgICAgICBXaWRnZXQqIHdpZGdldCA9IHRvUmVuZGVyV2lkZ2V0KG9iamVjdCktPndp ZGdldCgpOworICAgICAgICAgICAgaWYgKHdpZGdldCAmJiB3aWRnZXQtPmlzUGx1Z2luQ29udGFp bmVyKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFdlYlBsdWdpbkNvbnRh aW5lckltcGwqPih3aWRnZXQpOworICAgICAgICB9CisgICAgfQorICAgIHJldHVybiAwOworfQor CiBXZWJQbHVnaW5Db250YWluZXJJbXBsKiBXZWJGcmFtZUltcGw6OnBsdWdpbkNvbnRhaW5lckZy b21GcmFtZShGcmFtZSogZnJhbWUpCiB7CiAgICAgaWYgKCFmcmFtZSkKQEAgLTI5Niw3ICszMTAs NyBAQCBXZWJQbHVnaW5Db250YWluZXJJbXBsKiBXZWJGcmFtZUltcGw6OnBsCiB9CiAKIC8vIFNp bXBsZSBjbGFzcyB0byBvdmVycmlkZSBzb21lIG9mIFByaW50Q29udGV4dCBiZWhhdmlvci4gU29t ZSBvZiB0aGUgbWV0aG9kcwotLy8gbWFkZSB2aXJ0dWFsIHNvIHRoYXQgdGhleSBjYW4gYmUgb3Zl cnJpZGVuIGJ5IENocm9tZVBsdWdpblByaW50Q29udGV4dC4KKy8vIG1hZGUgdmlydHVhbCBzbyB0 aGF0IHRoZXkgY2FuIGJlIG92ZXJyaWRkZW4gYnkgQ2hyb21lUGx1Z2luUHJpbnRDb250ZXh0Lgog Y2xhc3MgQ2hyb21lUHJpbnRDb250ZXh0IDogcHVibGljIFByaW50Q29udGV4dCB7CiAgICAgV1RG X01BS0VfTk9OQ09QWUFCTEUoQ2hyb21lUHJpbnRDb250ZXh0KTsKIHB1YmxpYzoKQEAgLTExMDAs NyArMTExNCw3IEBAIHNpemVfdCBXZWJGcmFtZUltcGw6OmNoYXJhY3RlckluZGV4Rm9yUG8KICAg ICByZXR1cm4gbG9jYXRpb247CiB9CiAKLWJvb2wgV2ViRnJhbWVJbXBsOjpleGVjdXRlQ29tbWFu ZChjb25zdCBXZWJTdHJpbmcmIG5hbWUpCitib29sIFdlYkZyYW1lSW1wbDo6ZXhlY3V0ZUNvbW1h bmQoY29uc3QgV2ViU3RyaW5nJiBuYW1lLCBjb25zdCBXZWJOb2RlJiBub2RlKQogewogICAgIEFT U0VSVChmcmFtZSgpKTsKIApAQCAtMTEyMCw2ICsxMTM0LDggQEAgYm9vbCBXZWJGcmFtZUltcGw6 OmV4ZWN1dGVDb21tYW5kKGNvbnN0IAogCiAgICAgaWYgKGNvbW1hbmQgPT0gIkNvcHkiKSB7CiAg ICAgICAgIFdlYlBsdWdpbkNvbnRhaW5lckltcGwqIHBsdWdpbkNvbnRhaW5lciA9IHBsdWdpbkNv bnRhaW5lckZyb21GcmFtZShmcmFtZSgpKTsKKyAgICAgICAgaWYgKCFwbHVnaW5Db250YWluZXIp CisgICAgICAgICAgcGx1Z2luQ29udGFpbmVyID0gcGx1Z2luQ29udGFpbmVyRnJvbU5vZGUobm9k ZSk7CiAgICAgICAgIGlmIChwbHVnaW5Db250YWluZXIpIHsKICAgICAgICAgICAgIHBsdWdpbkNv bnRhaW5lci0+Y29weSgpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0xMzA3LDE1ICsx MzIzLDcgQEAgaW50IFdlYkZyYW1lSW1wbDo6cHJpbnRCZWdpbihjb25zdCBXZWJTaQogICAgICAg ICBwbHVnaW5Db250YWluZXIgPSBwbHVnaW5Db250YWluZXJGcm9tRnJhbWUoZnJhbWUoKSk7CiAg ICAgfSBlbHNlIHsKICAgICAgICAgLy8gV2Ugb25seSBzdXBwb3J0IHByaW50aW5nIHBsdWdpbiBu b2RlcyBmb3Igbm93LgotICAgICAgICBjb25zdCBOb2RlKiBjb3JlTm9kZSA9IGNvbnN0cmFpblRv Tm9kZS5jb25zdFVud3JhcDxOb2RlPigpOwotICAgICAgICBpZiAoY29yZU5vZGUtPmhhc1RhZ05h bWUoSFRNTE5hbWVzOjpvYmplY3RUYWcpIHx8IGNvcmVOb2RlLT5oYXNUYWdOYW1lKEhUTUxOYW1l czo6ZW1iZWRUYWcpKSB7Ci0gICAgICAgICAgICBSZW5kZXJPYmplY3QqIG9iamVjdCA9IGNvcmVO b2RlLT5yZW5kZXJlcigpOwotICAgICAgICAgICAgaWYgKG9iamVjdCAmJiBvYmplY3QtPmlzV2lk Z2V0KCkpIHsKLSAgICAgICAgICAgICAgICBXaWRnZXQqIHdpZGdldCA9IHRvUmVuZGVyV2lkZ2V0 KG9iamVjdCktPndpZGdldCgpOwotICAgICAgICAgICAgICAgIGlmICh3aWRnZXQgJiYgd2lkZ2V0 LT5pc1BsdWdpbkNvbnRhaW5lcigpKQotICAgICAgICAgICAgICAgICAgICBwbHVnaW5Db250YWlu ZXIgPSAgc3RhdGljX2Nhc3Q8V2ViUGx1Z2luQ29udGFpbmVySW1wbCo+KHdpZGdldCk7Ci0gICAg ICAgICAgICB9Ci0gICAgICAgIH0KKyAgICAgICAgcGx1Z2luQ29udGFpbmVyID0gcGx1Z2luQ29u dGFpbmVyRnJvbU5vZGUoY29uc3RyYWluVG9Ob2RlKTsKICAgICB9CiAKICAgICBpZiAocGx1Z2lu Q29udGFpbmVyICYmIHBsdWdpbkNvbnRhaW5lci0+c3VwcG9ydHNQYWdpbmF0ZWRQcmludCgpKQpJ bmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmgJKHJldmlzaW9u IDg5ODg0KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmgJKHdv cmtpbmcgY29weSkKQEAgLTE0OSw3ICsxNDksNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBXZWJS YW5nZSBtYXJrZWRSYW5nZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBmaXJzdFJlY3RGb3JD aGFyYWN0ZXJSYW5nZSh1bnNpZ25lZCBsb2NhdGlvbiwgdW5zaWduZWQgbGVuZ3RoLCBXZWJSZWN0 JikgY29uc3Q7CiAgICAgdmlydHVhbCBzaXplX3QgY2hhcmFjdGVySW5kZXhGb3JQb2ludChjb25z dCBXZWJQb2ludCYpIGNvbnN0OwotICAgIHZpcnR1YWwgYm9vbCBleGVjdXRlQ29tbWFuZChjb25z dCBXZWJTdHJpbmcmKTsKKyAgICB2aXJ0dWFsIGJvb2wgZXhlY3V0ZUNvbW1hbmQoY29uc3QgV2Vi U3RyaW5nJiwgY29uc3QgV2ViTm9kZSYgPSBXZWJOb2RlKCkpOwogICAgIHZpcnR1YWwgYm9vbCBl eGVjdXRlQ29tbWFuZChjb25zdCBXZWJTdHJpbmcmLCBjb25zdCBXZWJTdHJpbmcmIHZhbHVlKTsK ICAgICB2aXJ0dWFsIGJvb2wgaXNDb21tYW5kRW5hYmxlZChjb25zdCBXZWJTdHJpbmcmKSBjb25z dDsKICAgICB2aXJ0dWFsIHZvaWQgZW5hYmxlQ29udGludW91c1NwZWxsQ2hlY2tpbmcoYm9vbCk7 Cg==