117216 2013-06-04 16:27:47 -0700 [GTK] Make precedence of logical operators explicit 2013-06-04 21:38:43 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 berto webkit-unassigned commit-queue mrobinson oldest_to_newest 897089 0 berto 2013-06-04 16:27:47 -0700 There's a couple of cases where we're mixing && and || in the same expression without using parentheses. In particular ChromeClient::contentsSizeChanged() has this: if (gtk_widget_get_realized(widget) && (requisition.height != size.height()) || (requisition.width != size.width())) Due to the operator precedence rules, this means if ((A && B) || C) rather than if (A && (B || C)) which is what we want. AcceleratedCompositingContext::renderLayersToWindow() has a similar case. If I'm not wrong here the parentheses are not really necessary but I'd suggest using them as well to make the precedence explicit. 897090 1 203739 berto 2013-06-04 16:33:28 -0700 Created attachment 203739 Patch 897129 2 203739 commit-queue 2013-06-04 21:38:41 -0700 Comment on attachment 203739 Patch Clearing flags on attachment: 203739 Committed r151198: <http://trac.webkit.org/changeset/151198> 897130 3 commit-queue 2013-06-04 21:38:43 -0700 All reviewed patches have been landed. Closing bug. 203739 2013-06-04 16:33:28 -0700 2013-06-04 21:38:41 -0700 Patch 117216.diff text/plain 2889 berto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCAwNWEyNmU2Li4zYWQ0N2ZjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTMtMDYtMDQgIEFsYmVydG8gR2FyY2lhICA8YWdhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEtdIE1ha2UgcHJlY2VkZW5jZSBvZiBsb2dpY2FsIG9wZXJh dG9ycyBleHBsaWNpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTE3MjE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhlcmUncyBhIGNvdXBsZSBvZiBjYXNlcyB3aGVyZSB3ZSBtaXggJiYgYW5kIHx8IGlu IHRoZSBzYW1lCisgICAgICAgIGV4cHJlc3Npb24uIEluIENocm9tZUNsaWVudDo6Y29udGVudHNT aXplQ2hhbmdlZCgpIHRoZSBsYWNrIG9mCisgICAgICAgIHBhcmVudGhlc2VzIGFjdHVhbGx5IG1h a2VzIHRoZSBleHByZXNzaW9uIHdyb25nLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRHTC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpyZW5kZXJMYXllcnNUb1dpbmRvdyk6CisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 Q2hyb21lQ2xpZW50Ojpjb250ZW50c1NpemVDaGFuZ2VkKToKKwogMjAxMy0wNS0zMCAgRW5yaXF1 ZSBPY2FuYSBHb256YWxleiAgPGVvY2FuaGFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBG aXggcGFzc19ieV92YWx1ZSBjb3Zlcml0eSB3YXJuaW5nIGluIENocm9tZUNsaWVudEd0awpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21w b3NpdGluZ0NvbnRleHRHTC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9B Y2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dEdMLmNwcAppbmRleCBlYTYxYjk4Li5hYTFiZWNl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRl ZENvbXBvc2l0aW5nQ29udGV4dEdMLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3Jl U3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dEdMLmNwcApAQCAtMTU2LDcgKzE1 Niw3IEBAIGJvb2wgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnJlbmRlckxheWVyc1Rv V2luZG93KGNhaXJvX3QqIGNyLCBjb25zdCBJbnRSCiAgICAgY2Fpcm9fc2V0X29wZXJhdG9yKGNy LCBDQUlST19PUEVSQVRPUl9TT1VSQ0UpOwogICAgIGNhaXJvX2ZpbGwoY3IpOwogCi0gICAgaWYg KCFtX2xheWVyRmx1c2hUaW1lckNhbGxiYWNrSWQgJiYgdG9UZXh0dXJlTWFwcGVyTGF5ZXIobV9y b290TGF5ZXIuZ2V0KCkpLT5kZXNjZW5kYW50c09yU2VsZkhhdmVSdW5uaW5nQW5pbWF0aW9ucygp IHx8IG1fbmVlZHNFeHRyYUZsdXNoKSB7CisgICAgaWYgKCghbV9sYXllckZsdXNoVGltZXJDYWxs YmFja0lkICYmIHRvVGV4dHVyZU1hcHBlckxheWVyKG1fcm9vdExheWVyLmdldCgpKS0+ZGVzY2Vu ZGFudHNPclNlbGZIYXZlUnVubmluZ0FuaW1hdGlvbnMoKSkgfHwgbV9uZWVkc0V4dHJhRmx1c2gp IHsKICAgICAgICAgbV9uZWVkc0V4dHJhRmx1c2ggPSBmYWxzZTsKICAgICAgICAgZG91YmxlIG5l eHRGbHVzaCA9IG1heCgoMSAvIGdGcmFtZXNQZXJTZWNvbmQpIC0gKGN1cnJlbnRUaW1lKCkgLSBt X2xhc3RGbHVzaFRpbWUpLCAwLjApOwogICAgICAgICBtX2xheWVyRmx1c2hUaW1lckNhbGxiYWNr SWQgPSBnX3RpbWVvdXRfYWRkX2Z1bGwoR0RLX1BSSU9SSVRZX0VWRU5UUywgMTAwMCAqIG5leHRG bHVzaCwgcmVpbnRlcnByZXRfY2FzdDxHU291cmNlRnVuYz4obGF5ZXJGbHVzaFRpbWVyRmlyZWRD YWxsYmFjayksIHRoaXMsIDApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29y ZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVT dXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAKaW5kZXggMmU0Mjk2MC4uNmZmYmIxMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsu Y3BwCkBAIC03MjIsOCArNzIyLDggQEAgdm9pZCBDaHJvbWVDbGllbnQ6OmNvbnRlbnRzU2l6ZUNo YW5nZWQoRnJhbWUqIGZyYW1lLCBjb25zdCBJbnRTaXplJiBzaXplKSBjb25zdAogICAgIEd0a1Jl cXVpc2l0aW9uIHJlcXVpc2l0aW9uOwogICAgIGd0a193aWRnZXRfZ2V0X3JlcXVpc2l0aW9uKHdp ZGdldCwgJnJlcXVpc2l0aW9uKTsKICAgICBpZiAoZ3RrX3dpZGdldF9nZXRfcmVhbGl6ZWQod2lk Z2V0KQotICAgICAgICAmJiAocmVxdWlzaXRpb24uaGVpZ2h0ICE9IHNpemUuaGVpZ2h0KCkpCi0g ICAgICAgIHx8IChyZXF1aXNpdGlvbi53aWR0aCAhPSBzaXplLndpZHRoKCkpKQorICAgICAgICAm JiAocmVxdWlzaXRpb24uaGVpZ2h0ICE9IHNpemUuaGVpZ2h0KCkKKyAgICAgICAgfHwgcmVxdWlz aXRpb24ud2lkdGggIT0gc2l6ZS53aWR0aCgpKSkKICAgICAgICAgZ3RrX3dpZGdldF9xdWV1ZV9y ZXNpemVfbm9fcmVkcmF3KHdpZGdldCk7CiAKICAgICAvLyBJZiB0aGlzIHdhcyBhIG1haW4gZnJh bWUgc2l6ZSBjaGFuZ2UsIHVwZGF0ZSB0aGUgc2Nyb2xsYmFycy4K