132359 2014-04-29 15:00:58 -0700 [iOS] -[WebHTMLView selectionImageForcingBlackText:] returns blank image on iOS 2014-04-30 10:27:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam commit-queue oldest_to_newest 1005140 0 sam 2014-04-29 15:00:58 -0700 [iOS] -[WebHTMLView selectionImageForcingBlackText:] returns blank image on iOS 1005145 1 230425 sam 2014-04-29 15:03:59 -0700 Created attachment 230425 Patch 1005147 2 commit-queue 2014-04-29 15:06:27 -0700 Attachment 230425 did not pass style-queue: ERROR: Source/WebKit/mac/WebView/WebHTMLView.mm:6588: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1005413 3 sam 2014-04-30 10:27:09 -0700 Committed r168029: <http://trac.webkit.org/changeset/168029> 230425 2014-04-29 15:03:59 -0700 2014-04-29 15:10:29 -0700 Patch bug-132359-20140429150337.patch text/plain 6477 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2Nzk1NykKKysrIFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE0LTA0LTI5 ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW2lPU10gLVtXZWJIVE1M VmlldyBzZWxlY3Rpb25JbWFnZUZvcmNpbmdCbGFja1RleHQ6XSByZXR1cm5zIGJsYW5rIGltYWdl IG9uIGlPUworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTMyMzU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBXZWJWaWV3L1dlYkhUTUxWaWV3Lm1tOgorICAgICAgICAoaW1hZ2VGcm9tUmVjdCk6CisgICAg ICAgIChzZWxlY3Rpb25JbWFnZSk6CisgICAgICAgICgtW1dlYkhUTUxWaWV3IHNlbGVjdGlvbklt YWdlRm9yY2luZ0JsYWNrVGV4dDpzZWxlY3Rpb25JbWFnZUZvcmNpbmdCbGFja1RleHQ6XSk6Cisg ICAgICAgIEJyaW5nIGJhY2sgdGhlIG9sZCBGcmFtZVNuYXBzaG90dGluZ01hYyBjb2RlIGZvciBk cmF3aW5nIHRoZSBzZWxlY3Rpb24gaW1hZ2UgYXMgZHJhZyBjb2RlIGZvciB0aGlzCisgICAgICAg IGlzIHN0aWxsIHVuaW1wbGVtZW50ZWQgb24gaU9TLgorCisgICAgICAgICogV2ViVmlldy9XZWJW aWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IGluaXRTaW1wbGVIVE1MRG9jdW1lbnRXaXRoU3R5 bGU6ZnJhbWU6cHJlZmVyZW5jZXM6Z3JvdXBOYW1lOl0pOgorICAgICAgICBTZXQgdGhlIHBhZ2Ug c2NhbGUgZm9yICJzaW1wbGUgSFRNTCBkb2N1bWVudHMiICh0aGlzIGlzIGFscmVhZHkgZG9uZSBm b3IgdGhlIGFsbCBvdGhlciBkb2N1bWVudHMpLCAKKyAgICAgICAgdG8gZW5zdXJlIHRoYXQgdGhl IHNuYXBzaG90IGlzIHRoZSBjb3JyZWN0IHNpemUuCisKIDIwMTQtMDQtMjkgIEJyYWR5IEVpZHNv biAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIENoYW5nZSBJbWFnZSBDb250cm9scyBy ZXBsYWNlbWVudCB0byB1c2Ugc2VsZWN0aW9uIGFuZCBwYXN0ZQpJbmRleDogU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCShyZXZpc2lvbiAxNjc4NjApCisrKyBTb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC02OSw2 ICs2OSw3IEBACiAjaW1wb3J0ICJXZWJUeXBlc0ludGVybmFsLmgiCiAjaW1wb3J0ICJXZWJVSURl bGVnYXRlUHJpdmF0ZS5oIgogI2ltcG9ydCAiV2ViVmlld0ludGVybmFsLmgiCisjaW1wb3J0IDxX ZWJDb3JlL0Jsb2NrRXhjZXB0aW9ucy5oPgogI2ltcG9ydCA8V2ViQ29yZS9DU1NTdHlsZURlY2xh cmF0aW9uLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0NhY2hlZEltYWdlLmg+CiAjaW1wb3J0IDxXZWJD b3JlL0NhY2hlZFJlc291cmNlQ2xpZW50Lmg+CkBAIC0xNDUsNiArMTQ2LDcgQEAKICNpbXBvcnQg PFdlYkNvcmUvV0FLU2Nyb2xsVmlldy5oPgogI2ltcG9ydCA8V2ViQ29yZS9XQUtWaWV3UHJpdmF0 ZS5oPgogI2ltcG9ydCA8V2ViQ29yZS9XQUtXaW5kb3cuaD4KKyNpbXBvcnQgPFdlYkNvcmUvV0tH cmFwaGljcy5oPgogI2ltcG9ydCA8V2ViQ29yZS9XZWJFdmVudC5oPgogI2VuZGlmCiAKQEAgLTY1 NTUsNiArNjU1Nyw4NSBAQCAtIChOU1ZpZXcgKilzZWxlY3Rpb25WaWV3CiAgICAgcmV0dXJuIHNl bGY7CiB9CiAKKyNpZiBQTEFURk9STShJT1MpCitzdGF0aWMgQ0dJbWFnZVJlZiBpbWFnZUZyb21S ZWN0KEZyYW1lKiBmcmFtZSwgQ0dSZWN0IHJlY3QpCit7CisgICAgUGFnZSogcGFnZSA9IGZyYW1l LT5wYWdlKCk7CisgICAgaWYgKCFwYWdlKQorICAgICAgICByZXR1cm4gbmlsOworICAgIFdBS1Zp ZXcqIGRvY3VtZW50VmlldyA9IGZyYW1lLT52aWV3KCktPmRvY3VtZW50VmlldygpOworICAgIGlm ICghZG9jdW1lbnRWaWV3KQorICAgICAgICByZXR1cm4gbmlsOworICAgIGlmICghW2RvY3VtZW50 VmlldyBpc0tpbmRPZkNsYXNzOltXZWJIVE1MVmlldyBjbGFzc11dKQorICAgICAgICByZXR1cm4g bmlsOworICAgIAorICAgIFdlYkhUTUxWaWV3ICp2aWV3ID0gKFdlYkhUTUxWaWV3ICopZG9jdW1l bnRWaWV3OworICAgIAorICAgIFBhaW50QmVoYXZpb3Igb2xkUGFpbnRCZWhhdmlvciA9IGZyYW1l LT52aWV3KCktPnBhaW50QmVoYXZpb3IoKTsKKyAgICBmcmFtZS0+dmlldygpLT5zZXRQYWludEJl aGF2aW9yKG9sZFBhaW50QmVoYXZpb3IgfCBQYWludEJlaGF2aW9yRmxhdHRlbkNvbXBvc2l0aW5n TGF5ZXJzKTsKKyAgICAKKyAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CisgICAgCisg ICAgQ0dSZWN0IGJvdW5kcyA9IFt2aWV3IGJvdW5kc107CisgICAgCisgICAgZmxvYXQgc2NhbGUg PSBwYWdlLT5wYWdlU2NhbGVGYWN0b3IoKSAqIHBhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCk7Cisg ICAgCisgICAgLy8gUm91bmQgaW1hZ2UgcmVjdCBzaXplIGluIHdpbmRvdyBjb29yZGluYXRlIHNw YWNlIHRvIGF2b2lkIHBpeGVsIGNyYWNrcyBhdCBIaURQSSAoNDYyMjc5NCkKKyAgICByZWN0ID0g W3ZpZXcgY29udmVydFJlY3Q6cmVjdCB0b1ZpZXc6bmlsXTsKKyAgICByZWN0LnNpemUuaGVpZ2h0 ID0gcm91bmRmKHJlY3Quc2l6ZS5oZWlnaHQpOworICAgIHJlY3Quc2l6ZS53aWR0aCA9IHJvdW5k ZihyZWN0LnNpemUud2lkdGgpOworICAgIHJlY3QgPSBbdmlldyBjb252ZXJ0UmVjdDpyZWN0IGZy b21WaWV3Om5pbF07CisgICAgaWYgKHJlY3Quc2l6ZS53aWR0aCA9PSAwIHx8IHJlY3Quc2l6ZS5o ZWlnaHQgPT0gMCkKKyAgICAgICAgcmV0dXJuIG5pbDsKKyAgICAKKyAgICBzaXplX3Qgd2lkdGgg PSBzdGF0aWNfY2FzdDxzaXplX3Q+KHJlY3Quc2l6ZS53aWR0aCAqIHNjYWxlKTsKKyAgICBzaXpl X3QgaGVpZ2h0ID0gc3RhdGljX2Nhc3Q8c2l6ZV90PihyZWN0LnNpemUuaGVpZ2h0ICogc2NhbGUp OworICAgIHNpemVfdCBiaXRzUGVyQ29tcG9uZW50ID0gODsKKyAgICBzaXplX3QgYml0c1BlclBp eGVsID0gNCAqIGJpdHNQZXJDb21wb25lbnQ7CisgICAgc2l6ZV90IGJ5dGVzUGVyUm93ID0gKChi aXRzUGVyUGl4ZWwgKyA3KSAvIDgpICogd2lkdGg7CisgICAgUmV0YWluUHRyPENHQ29sb3JTcGFj ZVJlZj4gY29sb3JTcGFjZShBZG9wdENGLCBDR0NvbG9yU3BhY2VDcmVhdGVEZXZpY2VSR0IoKSk7 CisgICAgUmV0YWluUHRyPENHQ29udGV4dFJlZj4gY29udGV4dChBZG9wdENGLCBDR0JpdG1hcENv bnRleHRDcmVhdGUoTlVMTCwgd2lkdGgsIGhlaWdodCwgYml0c1BlckNvbXBvbmVudCwgYnl0ZXNQ ZXJSb3csIGNvbG9yU3BhY2UuZ2V0KCksIGtDR0ltYWdlQWxwaGFQcmVtdWx0aXBsaWVkTGFzdCkp OworICAgIGlmICghY29udGV4dCkKKyAgICAgICAgcmV0dXJuIG5pbDsKKyAgICAKKyAgICBDR0Nv bnRleHRSZWYgb2xkQ29udGV4dCA9IFdLR2V0Q3VycmVudEdyYXBoaWNzQ29udGV4dCgpOworICAg IENHQ29udGV4dFJlZiBjb250ZXh0UmVmID0gY29udGV4dC5nZXQoKTsKKyAgICBXS1NldEN1cnJl bnRHcmFwaGljc0NvbnRleHQoY29udGV4dFJlZik7CisgICAgCisgICAgQ0dDb250ZXh0Q2xlYXJS ZWN0KGNvbnRleHRSZWYsIENHUmVjdE1ha2UoMCwgMCwgd2lkdGgsIGhlaWdodCkpOworICAgIENH Q29udGV4dFNhdmVHU3RhdGUoY29udGV4dFJlZik7CisgICAgQ0dDb250ZXh0U2NhbGVDVE0oY29u dGV4dFJlZiwgc2NhbGUsIHNjYWxlKTsKKyAgICBDR0NvbnRleHRTZXRCYXNlQ1RNKGNvbnRleHRS ZWYsIENHQWZmaW5lVHJhbnNmb3JtTWFrZVNjYWxlKHNjYWxlLCBzY2FsZSkpOworICAgIENHQ29u dGV4dFRyYW5zbGF0ZUNUTShjb250ZXh0UmVmLCBib3VuZHMub3JpZ2luLnggLSByZWN0Lm9yaWdp bi54LCAgYm91bmRzLm9yaWdpbi55IC0gcmVjdC5vcmlnaW4ueSk7CisgICAgCisgICAgW3ZpZXcg ZHJhd1NpbmdsZVJlY3Q6cmVjdF07CisgICAgCisgICAgQ0dDb250ZXh0UmVzdG9yZUdTdGF0ZShj b250ZXh0UmVmKTsKKyAgICAKKyAgICBDR0ltYWdlUmVmIHJlc3VsdEltYWdlID0gQ0dCaXRtYXBD b250ZXh0Q3JlYXRlSW1hZ2UoY29udGV4dFJlZik7CisgICAgCisgICAgV0tTZXRDdXJyZW50R3Jh cGhpY3NDb250ZXh0KG9sZENvbnRleHQpOworICAgIGZyYW1lLT52aWV3KCktPnNldFBhaW50QmVo YXZpb3Iob2xkUGFpbnRCZWhhdmlvcik7CisgICAgCisgICAgcmV0dXJuIChDR0ltYWdlUmVmKUNG QnJpZGdpbmdSZWxlYXNlKHJlc3VsdEltYWdlKTsKKyAgICAKKyAgICBFTkRfQkxPQ0tfT0JKQ19F WENFUFRJT05TOworCisgICAgZnJhbWUtPnZpZXcoKS0+c2V0UGFpbnRCZWhhdmlvcihvbGRQYWlu dEJlaGF2aW9yKTsKKyAgICByZXR1cm4gbmlsOworfQorCitzdGF0aWMgQ0dJbWFnZVJlZiBzZWxl Y3Rpb25JbWFnZShGcmFtZSogZnJhbWUsIGJvb2wgZm9yY2VCbGFja1RleHQpCit7CisgICAgQVNT RVJUKCFXZWJUaHJlYWRJc0VuYWJsZWQoKSB8fCBXZWJUaHJlYWRJc0xvY2tlZCgpKTsKKyAgICBm cmFtZS0+dmlldygpLT5zZXRQYWludEJlaGF2aW9yKFBhaW50QmVoYXZpb3JTZWxlY3Rpb25Pbmx5 IHwgKGZvcmNlQmxhY2tUZXh0ID8gUGFpbnRCZWhhdmlvckZvcmNlQmxhY2tUZXh0IDogMCkpOwor ICAgIGZyYW1lLT5kb2N1bWVudCgpLT51cGRhdGVMYXlvdXQoKTsKKyAgICBDR0ltYWdlUmVmIHJl c3VsdCA9IGltYWdlRnJvbVJlY3QoZnJhbWUsIGZyYW1lLT5zZWxlY3Rpb24oKS5zZWxlY3Rpb25C b3VuZHMoKSk7CisgICAgZnJhbWUtPnZpZXcoKS0+c2V0UGFpbnRCZWhhdmlvcihQYWludEJlaGF2 aW9yTm9ybWFsKTsKKyAgICByZXR1cm4gcmVzdWx0OworfQorI2VuZGlmCisKICNpZiAhUExBVEZP Uk0oSU9TKQogLSAoTlNJbWFnZSAqKXNlbGVjdGlvbkltYWdlRm9yY2luZ0JsYWNrVGV4dDooQk9P TClmb3JjZUJsYWNrVGV4dAogI2Vsc2UKQEAgLTY1NjksOCArNjY1MCw3IEBAIC0gKENHSW1hZ2VS ZWYpc2VsZWN0aW9uSW1hZ2VGb3JjaW5nQmxhY2sKICAgICAgICAgcmV0dXJuIG5pbDsKIAogI2lm IFBMQVRGT1JNKElPUykKLSAgICBDR0ltYWdlUmVmIGRyYWdJbWFnZSA9IGNyZWF0ZURyYWdJbWFn ZUZvclNlbGVjdGlvbigqY29yZUZyYW1lLCBmb3JjZUJsYWNrVGV4dCkubGVha1JlZigpOwotICAg IHJldHVybiBkcmFnSW1hZ2UgPyAoQ0dJbWFnZVJlZilDRkF1dG9yZWxlYXNlKGRyYWdJbWFnZSkg OiBuaWw7CisgICAgcmV0dXJuIHNlbGVjdGlvbkltYWdlKGNvcmVGcmFtZSwgZm9yY2VCbGFja1Rl eHQpOwogI2Vsc2UKICAgICByZXR1cm4gW2NyZWF0ZURyYWdJbWFnZUZvclNlbGVjdGlvbigqY29y ZUZyYW1lLCBmb3JjZUJsYWNrVGV4dCkubGVha1JlZigpIGF1dG9yZWxlYXNlXTsKICNlbmRpZgpJ bmRleDogU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24gMTY3ODYwKQor KysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBA IC0xMTk4LDYgKzExOTgsMTAgQEAgLSAoaWQpaW5pdFNpbXBsZUhUTUxEb2N1bWVudFdpdGhTdHls ZTooTgogICAgICAgICBfcHJpdmF0ZS0+cGFnZS0+c2V0UmVtb3RlSW5zcGVjdGlvbkFsbG93ZWQo dGV4dEZpZWxkSW5zcGVjdGlvbkVuYWJsZWQpOwogICAgIH0KICNlbmRpZgorICAgIAorICAgIFtz ZWxmIF91cGRhdGVTY3JlZW5TY2FsZUZyb21XaW5kb3ddOworICAgIFtbTlNOb3RpZmljYXRpb25D ZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3Io X3dha1dpbmRvd1NjcmVlblNjYWxlQ2hhbmdlZDopIG5hbWU6V0FLV2luZG93U2NyZWVuU2NhbGVE aWRDaGFuZ2VOb3RpZmljYXRpb24gb2JqZWN0Om5pbF07CisgICAgW1tOU05vdGlmaWNhdGlvbkNl bnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rvcihf d2FrV2luZG93VmlzaWJpbGl0eUNoYW5nZWQ6KSBuYW1lOldBS1dpbmRvd1Zpc2liaWxpdHlEaWRD aGFuZ2VOb3RpZmljYXRpb24gb2JqZWN0Om5pbF07CiAKICAgICBbV2ViRnJhbWUgX2NyZWF0ZU1h aW5GcmFtZVdpdGhTaW1wbGVIVE1MRG9jdW1lbnRXaXRoUGFnZTpfcHJpdmF0ZS0+cGFnZSBmcmFt ZVZpZXc6ZnJhbWVWaWV3IHN0eWxlOnN0eWxlXTsKICAgICAK