54764 2011-02-18 12:10:47 -0800 Remove redundant code in qt/WebCoreSupport 2011-02-28 13:19:30 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED P2 Trivial --- 0 fabrizio.machado webkit-unassigned ademar commit-queue suresh.voruganti oldest_to_newest 353736 0 fabrizio.machado 2011-02-18 12:10:47 -0800 The source files NotificationPresenterClientQt.cpp and DumpRenderTreeSupportQt.cpp have redundant checks after static_cast. In NotificationPresenterClientQt.cpp, the final "if()" is not needed: ========================================================= if (!context || context->isWorkerContext()) return 0; Document* document = static_cast<Document*>(context); if (!document) return 0; ========================================================= The context pointer has already been checked, so it must be non-NULL when the static_cast occurs. Thus, document will not be NULL and the check is redundant. Similarly, in DumpRenderTreeSupportQt.cpp: ========================================================= if (!coreNode || !coreNode->renderer()) return false; HTMLInputElement* inputElement = static_cast<HTMLInputElement*>(coreNode); if (!inputElement) return false; ========================================================= coreNode has already been checked and is non-NULL when the static_cast to HTMLInputElement* occurs. The check after the cast is not needed. 353743 1 82995 fabrizio.machado 2011-02-18 12:20:54 -0800 Created attachment 82995 remove redundant checks 354060 2 82995 commit-queue 2011-02-18 21:58:06 -0800 Comment on attachment 82995 remove redundant checks Clearing flags on attachment: 82995 Committed r79098: <http://trac.webkit.org/changeset/79098> 354061 3 commit-queue 2011-02-18 21:58:11 -0800 All reviewed patches have been landed. Closing bug. 359050 4 suresh.voruganti 2011-02-28 07:49:37 -0800 Please cherry pick the fix to Qtwebkit 2.1.x 359278 5 ademar 2011-02-28 13:19:30 -0800 I don't see the point of adding refactorings like this to a stable branch (qtwebkit-2.1.x). Removing from meta-bug. If it fixes a real problem, let me know. 82995 2011-02-18 12:20:54 -0800 2011-02-18 21:58:06 -0800 remove redundant checks 54764.patch text/plain 1953 fabrizio.machado SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA3OTAxNykKKysrIFNvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDItMTggIEZh YnJpemlvIE1hY2hhZG8gIDxmYWJyaXppby5tYWNoYWRvQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgcmVkdW50YW50IGNo ZWNrcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0 NzY0CisgICAgICAgIAorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVT dXBwb3J0UXQuY3BwOgorICAgICAgICAoRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQ6OmVsZW1lbnRE b2VzQXV0b0NvbXBsZXRlRm9yRWxlbWVudFdpdGhJZCk6CisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Tm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6OnRvUGFnZSk6CisKIDIwMTEtMDItMTAgIEx1 aXogQWdvc3RpbmkgIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgQWRhbSBSb2Jlbi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBv cnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvcXQvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQuY3BwCShyZXZpc2lv biA3ODg1MSkKKysrIFNvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRy ZWVTdXBwb3J0UXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MDgsOCArNjA4LDYgQEAgYm9vbCBE dW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6ZWxlbWVudERvZQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICBIVE1MSW5wdXRFbGVtZW50KiBpbnB1dEVsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1M SW5wdXRFbGVtZW50Kj4oY29yZU5vZGUpOwotICAgIGlmICghaW5wdXRFbGVtZW50KQotICAgICAg ICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4gaW5wdXRFbGVtZW50LT5pc1RleHRGaWVsZCgp ICYmICFpbnB1dEVsZW1lbnQtPmlzUGFzc3dvcmRGaWVsZCgpICYmIGlucHV0RWxlbWVudC0+YXV0 b0NvbXBsZXRlKCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L05v dGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L3F0L1dlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0LmNwcAko cmV2aXNpb24gNzg4NTEpCisrKyBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L05vdGlm aWNhdGlvblByZXNlbnRlckNsaWVudFF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQwLDggKzQ0 MCw2IEBAIFFXZWJQYWdlKiBOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdDoKICAgICAgICAg cmV0dXJuIDA7CiAKICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBzdGF0aWNfY2FzdDxEb2N1bWVu dCo+KGNvbnRleHQpOwotICAgIGlmICghZG9jdW1lbnQpCi0gICAgICAgIHJldHVybiAwOwogCiAg ICAgUGFnZSogcGFnZSA9IGRvY3VtZW50LT5wYWdlKCk7CiAgICAgaWYgKCFwYWdlIHx8ICFwYWdl LT5tYWluRnJhbWUoKSkK