74367 2011-12-12 16:09:31 -0800 WebCore has two (disconnected) ways to keep track of updated widgets, should be unified 2012-01-30 17:37:19 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 77167 1 eric eric abarth andersca bdakin webkit.review.bot oldest_to_newest 519643 0 eric 2011-12-12 16:09:31 -0800 WebCore has two (disconnected) ways to keep track of updated widgets, should be unified I added a comment about this a while back, but finally looking at fixing it: void HTMLObjectElement::updateWidget(PluginCreationOption pluginCreationOption) { ASSERT(!renderEmbeddedObject()->pluginCrashedOrWasMissing()); // FIXME: We should ASSERT(needsWidgetUpdate()), but currently // FrameView::updateWidget() calls updateWidget(false) without checking if // the widget actually needs updating! setNeedsWidgetUpdate(false); void HTMLEmbedElement::updateWidget(PluginCreationOption pluginCreationOption) { ASSERT(!renderEmbeddedObject()->pluginCrashedOrWasMissing()); // FIXME: We should ASSERT(needsWidgetUpdate()), but currently // FrameView::updateWidget() calls updateWidget(false) without checking if // the widget actually needs updating! The comment is slightly out of date since updateWidget now takes an enum (yay!) but the point is the same. The DOM-based "is this widget dirty" bool has been with us since the original kde import: http://trac.webkit.org/browser/trunk/WebCore/khtml/html/html_objectimpl.h?annotate=blame&rev=8844#L140 The FrameView "dirty widgets" list was added by bdakin in: http://trac.webkit.org/changeset/25726 (in a sekret radar). The FrameView need makes sense. So maybe what should happen is that void FrameView::addWidgetToUpdate(RenderEmbeddedObject* object) should just also call setNeedsWidgetUpdate() and that updateWidgets() should check to make sure that the update is still needed when its run. It's unclear if this list makes sense on FrameView long-term, as we move more plugin stuff out of the renderers and onto DOM objects like HTMLPluginElement/HTMLPluginImageElement, etc. 519704 1 118912 eric 2011-12-12 17:06:11 -0800 Created attachment 118912 Patch 522223 2 118912 webkit.review.bot 2011-12-15 14:00:28 -0800 Comment on attachment 118912 Patch Clearing flags on attachment: 118912 Committed r102983: <http://trac.webkit.org/changeset/102983> 522224 3 webkit.review.bot 2011-12-15 14:00:32 -0800 All reviewed patches have been landed. Closing bug. 118912 2011-12-12 17:06:11 -0800 2011-12-15 14:00:27 -0800 Patch bug-74367-20111212170610.patch text/plain 6210 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFhMmJiNWIzM2YxM2Zk YzY0YWZkMjhhNDJjOTIwYjE4YjY3NDZhNC4uNTAxNGJjYzEzYjU4NGI4YmQ5NjFlYmQyZWQ5MjRl NmRhN2M5NTEwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDExLTEyLTEyICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAorICAgICAgICBXZWJDb3JlIGhhcyB0d28gKGRp c2Nvbm5lY3RlZCkgd2F5cyB0byBrZWVwIHRyYWNrIG9mIHVwZGF0ZWQgd2lkZ2V0cywgc2hvdWxk IGJlIHVuaWZpZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTc0MzY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSXQgc2VlbXMgdGhlIEZyYW1lVmlldyB1cGRhdGVXaWRnZXRzIHNldCBpcyBuZWVkZWQgZm9y IG5vdywKKyAgICAgICAgc28ganVzdCBtYWtpbmcgRnJhbWVWaWV3OjphZGRXaWRnZXRUb1VwZGF0 ZSBtYXJrIHRoZSBET00gbm9kZQorICAgICAgICBhcyBuZWVkaW5nIGEgd2lkZ2V0IHVwZGF0ZSBh bmQgbGF0ZXIgd2hlbiBpdCBnb2VzIHRvIGNhbGwKKyAgICAgICAgdXBkYXRlV2lkZ2V0KCkgY2hl Y2tpbmcgZmlyc3QgaWYgaXQgbmVlZHMgYW4gdXBkYXRlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cywganVzdCBhZGRpbmcgYW4gYXNzZXJ0LgorCisgICAgICAgICogaHRtbC9IVE1MRW1iZWRFbGVt ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbWJlZEVsZW1lbnQ6OnVwZGF0ZVdpZGdl dCk6CisgICAgICAgICogaHRtbC9IVE1MT2JqZWN0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpIVE1MT2JqZWN0RWxlbWVudDo6dXBkYXRlV2lkZ2V0KToKKyAgICAgICAgKiBodG1sL0hU TUxQbHVnSW5JbWFnZUVsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQbHVnSW5JbWFn ZUVsZW1lbnQ6Om5lZWRzV2lkZ2V0VXBkYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQbHVn SW5JbWFnZUVsZW1lbnQ6OnNldE5lZWRzV2lkZ2V0VXBkYXRlKToKKyAgICAgICAgKiBwYWdlL0Zy YW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmFkZFdpZGdldFRvVXBk YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6dXBkYXRlV2lkZ2V0KToKKworMjAx MS0xMi0xMiAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKICAgICAgICAgSFRNTEVt YmVkT2JqZWN0IHNob3VsZCBtYXRjaCBIVE1MT2JqZWN0RWxlbWVudCBieSBzdG9wcGluZyBhbnkg bG9hZCB3aGVuIGl0IGlzIHJlbW92ZWQgZnJvbSBiZWZvcmVsb2FkCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDM2MAogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxFbWJlZEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MRW1iZWRFbGVtZW50LmNwcAppbmRleCA2OWRlMGZjM2E0NDc5NTJiMmY1YzU4YmFkNTNi ZGRhNGFhOGUwNGQ1Li4wZGExMTVkMWE5ZjJmYzE4OTk3Y2RlMmQ5NThlNzNiYTMzNDRkNTIxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbWJlZEVsZW1lbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxlbWVudC5jcHAKQEAgLTE0MSw5ICsxNDEs NyBAQCB2b2lkIEhUTUxFbWJlZEVsZW1lbnQ6OnBhcmFtZXRlcnNGb3JQbHVnaW4oVmVjdG9yPFN0 cmluZz4mIHBhcmFtTmFtZXMsIFZlY3RvcjxTdAogdm9pZCBIVE1MRW1iZWRFbGVtZW50Ojp1cGRh dGVXaWRnZXQoUGx1Z2luQ3JlYXRpb25PcHRpb24gcGx1Z2luQ3JlYXRpb25PcHRpb24pCiB7CiAg ICAgQVNTRVJUKCFyZW5kZXJFbWJlZGRlZE9iamVjdCgpLT5wbHVnaW5DcmFzaGVkT3JXYXNNaXNz aW5nKCkpOwotICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgQVNTRVJUKG5lZWRzV2lkZ2V0VXBkYXRl KCkpLCBidXQgY3VycmVudGx5Ci0gICAgLy8gRnJhbWVWaWV3Ojp1cGRhdGVXaWRnZXQoKSBjYWxs cyB1cGRhdGVXaWRnZXQoZmFsc2UpIHdpdGhvdXQgY2hlY2tpbmcgaWYKLSAgICAvLyB0aGUgd2lk Z2V0IGFjdHVhbGx5IG5lZWRzIHVwZGF0aW5nIQorICAgIEFTU0VSVChuZWVkc1dpZGdldFVwZGF0 ZSgpKTsKICAgICBzZXROZWVkc1dpZGdldFVwZGF0ZShmYWxzZSk7CiAKICAgICBpZiAobV91cmwu aXNFbXB0eSgpICYmIG1fc2VydmljZVR5cGUuaXNFbXB0eSgpKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MT2JqZWN0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxPYmplY3RFbGVtZW50LmNwcAppbmRleCAxN2UwMTAyNDExZGJjNzU1NjYzMDA0OTYyYzI2 YjZlNzk4ODc5NDI3Li5lOWIwNTFkNDBlZDAwNjNjZDhkOTA3MTQ0ZTE1MjNhOTI4MmZmMDQ3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcApAQCAtMjkwLDkgKzI5 MCw3IEBAIGJvb2wgSFRNTE9iamVjdEVsZW1lbnQ6Omhhc1ZhbGlkQ2xhc3NJZCgpCiB2b2lkIEhU TUxPYmplY3RFbGVtZW50Ojp1cGRhdGVXaWRnZXQoUGx1Z2luQ3JlYXRpb25PcHRpb24gcGx1Z2lu Q3JlYXRpb25PcHRpb24pCiB7CiAgICAgQVNTRVJUKCFyZW5kZXJFbWJlZGRlZE9iamVjdCgpLT5w bHVnaW5DcmFzaGVkT3JXYXNNaXNzaW5nKCkpOwotICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgQVNT RVJUKG5lZWRzV2lkZ2V0VXBkYXRlKCkpLCBidXQgY3VycmVudGx5Ci0gICAgLy8gRnJhbWVWaWV3 Ojp1cGRhdGVXaWRnZXQoKSBjYWxscyB1cGRhdGVXaWRnZXQoZmFsc2UpIHdpdGhvdXQgY2hlY2tp bmcgaWYKLSAgICAvLyB0aGUgd2lkZ2V0IGFjdHVhbGx5IG5lZWRzIHVwZGF0aW5nIQorICAgIEFT U0VSVChuZWVkc1dpZGdldFVwZGF0ZSgpKTsKICAgICBzZXROZWVkc1dpZGdldFVwZGF0ZShmYWxz ZSk7CiAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIEFTU0VSVCBpc0ZpbmlzaGVkUGFyc2luZ0No aWxkcmVuKCkgaW5zdGVhZC4KICAgICBpZiAoIWlzRmluaXNoZWRQYXJzaW5nQ2hpbGRyZW4oKSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5o IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmgKaW5kZXggZWIy ZDE3ZTJhNzgxY2ZmNTI4Nzc2YjU0ZmRlYTkwNzVhMDA2YWM0NS4uNjU2NGM0N2RjYjFiNTdmYjhk MDllMjQwNzUwNmFlYjBlN2IzNTg5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MUGx1Z0luSW1hZ2VFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1 Z0luSW1hZ2VFbGVtZW50LmgKQEAgLTUwLDYgKzUwLDEwIEBAIHB1YmxpYzoKICAgICBjb25zdCBT dHJpbmcmIHVybCgpIGNvbnN0IHsgcmV0dXJuIG1fdXJsOyB9CiAgICAgYm9vbCBzaG91bGRQcmVm ZXJQbHVnSW5zRm9ySW1hZ2VzKCkgY29uc3QgeyByZXR1cm4gbV9zaG91bGRQcmVmZXJQbHVnSW5z Rm9ySW1hZ2VzOyB9CiAKKyAgICAvLyBQdWJsaWMgZm9yIEZyYW1lVmlldzo6YWRkV2lkZ2V0VG9V cGRhdGUoKQorICAgIGJvb2wgbmVlZHNXaWRnZXRVcGRhdGUoKSBjb25zdCB7IHJldHVybiBtX25l ZWRzV2lkZ2V0VXBkYXRlOyB9CisgICAgdm9pZCBzZXROZWVkc1dpZGdldFVwZGF0ZShib29sIG5l ZWRzV2lkZ2V0VXBkYXRlKSB7IG1fbmVlZHNXaWRnZXRVcGRhdGUgPSBuZWVkc1dpZGdldFVwZGF0 ZTsgfQorCiBwcm90ZWN0ZWQ6CiAgICAgSFRNTFBsdWdJbkltYWdlRWxlbWVudChjb25zdCBRdWFs aWZpZWROYW1lJiB0YWdOYW1lLCBEb2N1bWVudCosIGJvb2wgY3JlYXRlZEJ5UGFyc2VyLCBQcmVm ZXJQbHVnSW5zRm9ySW1hZ2VzT3B0aW9uKTsKIApAQCAtNjMsOSArNjcsNiBAQCBwcm90ZWN0ZWQ6 CiAgICAgdmlydHVhbCB2b2lkIGF0dGFjaCgpOwogICAgIHZpcnR1YWwgdm9pZCBkZXRhY2goKTsK IAotICAgIGJvb2wgbmVlZHNXaWRnZXRVcGRhdGUoKSBjb25zdCB7IHJldHVybiBtX25lZWRzV2lk Z2V0VXBkYXRlOyB9Ci0gICAgdm9pZCBzZXROZWVkc1dpZGdldFVwZGF0ZShib29sIG5lZWRzV2lk Z2V0VXBkYXRlKSB7IG1fbmVlZHNXaWRnZXRVcGRhdGUgPSBuZWVkc1dpZGdldFVwZGF0ZTsgfQot CiAgICAgYm9vbCBhbGxvd2VkVG9Mb2FkRnJhbWVVUkwoY29uc3QgU3RyaW5nJiB1cmwpOwogICAg IGJvb2wgd291bGRMb2FkQXNOZXRzY2FwZVBsdWdpbihjb25zdCBTdHJpbmcmIHVybCwgY29uc3Qg U3RyaW5nJiBzZXJ2aWNlVHlwZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCBl MWVkOTRhNmQ1N2IxNjQ5MzlkYmM2MzZiNjY5ZDhiOTUxYzBhMzI2Li5jZTg5NTQxNjE5ZDQwZGVh ZjBkNjM3MmJlYmVmNzNjYTIyN2IwOTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBA IC0xMjMwLDYgKzEyMzAsMTMgQEAgdm9pZCBGcmFtZVZpZXc6OmFkZFdpZGdldFRvVXBkYXRlKFJl bmRlckVtYmVkZGVkT2JqZWN0KiBvYmplY3QpCiAgICAgaWYgKCFtX3dpZGdldFVwZGF0ZVNldCkK ICAgICAgICAgbV93aWRnZXRVcGRhdGVTZXQgPSBhZG9wdFB0cihuZXcgUmVuZGVyRW1iZWRkZWRP YmplY3RTZXQpOwogCisgICAgLy8gVGVsbCB0aGUgRE9NIGVsZW1lbnQgdGhhdCBpdCBuZWVkcyBh IHdpZGdldCB1cGRhdGUuCisgICAgTm9kZSogbm9kZSA9IG9iamVjdC0+bm9kZSgpOworICAgIGlm IChub2RlLT5oYXNUYWdOYW1lKG9iamVjdFRhZykgfHwgbm9kZS0+aGFzVGFnTmFtZShlbWJlZFRh ZykpIHsKKyAgICAgICAgSFRNTFBsdWdJbkltYWdlRWxlbWVudCogcGx1Z2luRWxlbWVudCA9IHN0 YXRpY19jYXN0PEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQqPihub2RlKTsKKyAgICAgICAgcGx1Z2lu RWxlbWVudC0+c2V0TmVlZHNXaWRnZXRVcGRhdGUodHJ1ZSk7CisgICAgfQorCiAgICAgbV93aWRn ZXRVcGRhdGVTZXQtPmFkZChvYmplY3QpOwogfQogCkBAIC0yMjExLDkgKzIyMTgsMTIgQEAgdm9p ZCBGcmFtZVZpZXc6OnVwZGF0ZVdpZGdldChSZW5kZXJFbWJlZGRlZE9iamVjdCogb2JqZWN0KQog ICAgICAgICByZXR1cm47CiAKICAgICAvLyBGSVhNRTogVGhpcyBjb3VsZCB0dXJuIGludG8gYSBy ZWFsIHZpcnR1YWwgZGlzcGF0Y2ggaWYgd2UgZGVmaW5lZAotICAgIC8vIHVwZGF0ZVdpZGdldChi b29sKSBvbiBIVE1MRWxlbWVudC4KLSAgICBpZiAob3duZXJFbGVtZW50LT5oYXNUYWdOYW1lKG9i amVjdFRhZykgfHwgb3duZXJFbGVtZW50LT5oYXNUYWdOYW1lKGVtYmVkVGFnKSkKLSAgICAgICAg c3RhdGljX2Nhc3Q8SFRNTFBsdWdJbkltYWdlRWxlbWVudCo+KG93bmVyRWxlbWVudCktPnVwZGF0 ZVdpZGdldChDcmVhdGVBbnlXaWRnZXRUeXBlKTsKKyAgICAvLyB1cGRhdGVXaWRnZXQoUGx1Z2lu Q3JlYXRpb25PcHRpb24pIG9uIEhUTUxFbGVtZW50LgorICAgIGlmIChvd25lckVsZW1lbnQtPmhh c1RhZ05hbWUob2JqZWN0VGFnKSB8fCBvd25lckVsZW1lbnQtPmhhc1RhZ05hbWUoZW1iZWRUYWcp KSB7CisgICAgICAgIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQqIHBsdWdpbkVsZW1lbnQgPSBzdGF0 aWNfY2FzdDxIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Kj4ob3duZXJFbGVtZW50KTsKKyAgICAgICAg aWYgKHBsdWdpbkVsZW1lbnQtPm5lZWRzV2lkZ2V0VXBkYXRlKCkpCisgICAgICAgICAgICBwbHVn aW5FbGVtZW50LT51cGRhdGVXaWRnZXQoQ3JlYXRlQW55V2lkZ2V0VHlwZSk7CisgICAgfQogICAg IC8vIEZJWE1FOiBJdCBpcyBub3QgY2xlYXIgdGhhdCBNZWRpYSBlbGVtZW50cyBuZWVkIG9yIHdh bnQgdGhpcyB1cGRhdGVXaWRnZXQoKSBjYWxsLgogI2lmIEVOQUJMRShQTFVHSU5fUFJPWFlfRk9S X1ZJREVPKQogICAgIGVsc2UgaWYgKG93bmVyRWxlbWVudC0+aXNNZWRpYUVsZW1lbnQoKSkK