123868 2013-11-05 22:06:47 -0800 Change the order of conditions to avoid computing rendererIsEditable() 2013-11-05 22:12:46 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 1 rniwa rniwa benjamin commit-queue darin enrica esprehn+autocc kangil.han kling koivisto oldest_to_newest 947534 0 rniwa 2013-11-05 22:06:47 -0800 Merge https://chromium.googlesource.com/chromium/blink/+/c89b413ff0fc4aafa0c71d180b0b1e131bb37707 When we need both Node::renderer() and Node::rendererIsEditable() conditions to be true to perform some operation, it is more effective to check for renderer() first, so that if this condition fails we can avoid unnecessary computation of rendererIsEditable(). 947535 1 216132 rniwa 2013-11-05 22:10:06 -0800 Created attachment 216132 Merge the cleanup 947539 2 rniwa 2013-11-05 22:12:46 -0800 Committed r158723: <http://trac.webkit.org/changeset/158723> 216132 2013-11-05 22:10:06 -0800 2013-11-05 22:10:53 -0800 Merge the cleanup bug-123868-20131105221005.patch text/plain 3051 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1ODcyMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEzLTExLTA1ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIENoYW5nZSB0aGUgb3JkZXIgb2Yg Y29uZGl0aW9ucyB0byBhdm9pZCBjb21wdXRpbmcgcmVuZGVyZXJJc0VkaXRhYmxlKCkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzg2OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1lcmdlIGh0dHBzOi8v Y2hyb21pdW0uZ29vZ2xlc291cmNlLmNvbS9jaHJvbWl1bS9ibGluay8rL2M4OWI0MTNmZjBmYzRh YWZhMGM3MWQxODBiMGIxZTEzMWJiMzc3MDcKKworICAgICAgICBXaGVuIHdlIG5lZWQgYm90aCBO b2RlOjpyZW5kZXJlcigpIGFuZCBOb2RlOjpyZW5kZXJlcklzRWRpdGFibGUoKSBjb25kaXRpb25z IHRvIGJlIHRydWUgdG8gcGVyZm9ybQorICAgICAgICBzb21lIG9wZXJhdGlvbiwgaXQgaXMgbW9y ZSBlZmZlY3RpdmUgdG8gY2hlY2sgZm9yIHJlbmRlcmVyKCkgZmlyc3QsIHNvIHRoYXQgaWYgdGhp cyBjb25kaXRpb24gZmFpbHMKKyAgICAgICAgd2UgY2FuIGF2b2lkIHVubmVjZXNzYXJ5IGNvbXB1 dGF0aW9uIG9mIHJlbmRlcmVySXNFZGl0YWJsZSgpLgorCisgICAgICAgICogZG9tL1Bvc2l0aW9u LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om5leHRSZW5kZXJlZEVkaXRhYmxlKToKKyAgICAgICAg KFdlYkNvcmU6OnByZXZpb3VzUmVuZGVyZWRFZGl0YWJsZSk6CisgICAgICAgICogcGFnZS9FdmVu dEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpoYW5kbGVNb3Vz ZVJlbGVhc2VFdmVudCk6CisKIDIwMTMtMTEtMDUgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtp dC5vcmc+CiAKICAgICAgICAgc2ltcGxlVXNlckFnZW50U3R5bGVTaGVldCBkb2Vzbid0IGhhdmUg Zm9jdXMgcmluZyBvbiBhbmNob3IgZWxlbWVudApJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL1Bv c2l0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uY3Bw CShyZXZpc2lvbiAxNTg3MjIpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC02NSwxMCArNjUsOCBAQCBzdGF0aWMgYm9vbCBoYXNJbmxpbmVCb3hX cmFwcGVyKFJlbmRlck9iCiBzdGF0aWMgTm9kZSogbmV4dFJlbmRlcmVkRWRpdGFibGUoTm9kZSog bm9kZSkKIHsKICAgICB3aGlsZSAoKG5vZGUgPSBuZXh0TGVhZk5vZGUobm9kZSkpKSB7Ci0gICAg ICAgIGlmICghbm9kZS0+cmVuZGVyZXJJc0VkaXRhYmxlKCkpCi0gICAgICAgICAgICBjb250aW51 ZTsKICAgICAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG5vZGUtPnJlbmRlcmVyKCk7Ci0g ICAgICAgIGlmICghcmVuZGVyZXIpCisgICAgICAgIGlmICghcmVuZGVyZXIgfHwgIW5vZGUtPnJl bmRlcmVySXNFZGl0YWJsZSgpKQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIGlmICho YXNJbmxpbmVCb3hXcmFwcGVyKCpyZW5kZXJlcikpCiAgICAgICAgICAgICByZXR1cm4gbm9kZTsK QEAgLTc5LDEwICs3Nyw4IEBAIHN0YXRpYyBOb2RlKiBuZXh0UmVuZGVyZWRFZGl0YWJsZShOb2Rl KiAKIHN0YXRpYyBOb2RlKiBwcmV2aW91c1JlbmRlcmVkRWRpdGFibGUoTm9kZSogbm9kZSkKIHsK ICAgICB3aGlsZSAoKG5vZGUgPSBwcmV2aW91c0xlYWZOb2RlKG5vZGUpKSkgewotICAgICAgICBp ZiAoIW5vZGUtPnJlbmRlcmVySXNFZGl0YWJsZSgpKQotICAgICAgICAgICAgY29udGludWU7CiAg ICAgICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBub2RlLT5yZW5kZXJlcigpOwotICAgICAg ICBpZiAoIXJlbmRlcmVyKQorICAgICAgICBpZiAoIXJlbmRlcmVyIHx8ICFub2RlLT5yZW5kZXJl cklzRWRpdGFibGUoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBpZiAoaGFzSW5s aW5lQm94V3JhcHBlcigqcmVuZGVyZXIpKQogICAgICAgICAgICAgcmV0dXJuIG5vZGU7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCShyZXZpc2lvbiAxNTg3MjIpCisrKyBT b3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkz Nyw3ICs5MzcsNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VSZWxlYXNlRXZlCiAg ICAgICAgIFZpc2libGVTZWxlY3Rpb24gbmV3U2VsZWN0aW9uOwogICAgICAgICBOb2RlKiBub2Rl ID0gZXZlbnQudGFyZ2V0Tm9kZSgpOwogICAgICAgICBib29sIGNhcmV0QnJvd3NpbmcgPSBtX2Zy YW1lLnNldHRpbmdzKCkuY2FyZXRCcm93c2luZ0VuYWJsZWQoKTsKLSAgICAgICAgaWYgKG5vZGUg JiYgKGNhcmV0QnJvd3NpbmcgfHwgbm9kZS0+cmVuZGVyZXJJc0VkaXRhYmxlKCkpICYmIG5vZGUt PnJlbmRlcmVyKCkpIHsKKyAgICAgICAgaWYgKG5vZGUgJiYgbm9kZS0+cmVuZGVyZXIoKSAmJiAo Y2FyZXRCcm93c2luZyB8fCBub2RlLT5yZW5kZXJlcklzRWRpdGFibGUoKSkpIHsKICAgICAgICAg ICAgIFZpc2libGVQb3NpdGlvbiBwb3MgPSBub2RlLT5yZW5kZXJlcigpLT5wb3NpdGlvbkZvclBv aW50KGV2ZW50LmxvY2FsUG9pbnQoKSk7CiAgICAgICAgICAgICBuZXdTZWxlY3Rpb24gPSBWaXNp YmxlU2VsZWN0aW9uKHBvcyk7CiAgICAgICAgIH0K