141131 2015-01-31 17:29:25 -0800 Merge the iOS implementations of GraphicsContext::drawText and GraphicsContext::drawBidiText with the platform independent ones 2015-01-31 19:04:27 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam commit-queue oldest_to_newest 1065896 0 sam 2015-01-31 17:29:25 -0800 Merge the iOS implementations of GraphicsContext::drawText and GraphicsContext::drawBidiText with the platform independent ones 1065899 1 245811 sam 2015-01-31 17:35:06 -0800 Created attachment 245811 Patch 1065910 2 245811 commit-queue 2015-01-31 19:04:19 -0800 Comment on attachment 245811 Patch Clearing flags on attachment: 245811 Committed r179455: <http://trac.webkit.org/changeset/179455> 1065911 3 commit-queue 2015-01-31 19:04:27 -0800 All reviewed patches have been landed. Closing bug. 245811 2015-01-31 17:35:06 -0800 2015-01-31 19:04:19 -0800 Patch bug-141131-20150131173513.patch text/plain 7647 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3OTQ1MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE1LTAxLTMxICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWVyZ2UgdGhlIGlPUyBpbXBsZW1lbnRh dGlvbnMgb2YgR3JhcGhpY3NDb250ZXh0OjpkcmF3VGV4dCBhbmQgR3JhcGhpY3NDb250ZXh0Ojpk cmF3QmlkaVRleHQgd2l0aCB0aGUgcGxhdGZvcm0gaW5kZXBlbmRlbnQgb25lcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxMTMxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0 OjpkcmF3VGV4dCk6CisgICAgICAgIFRoZSBvbmx5IGRpZmZlcmVuY2UgYmV0d2VlbiB0aGUgdHdv IGltcGxlbWVudGF0aW9uIGhlcmUgd2FzIHRoZSBpT1Mgb25lIHJldHVybnMgdGhlIGxlbmd0aCBv ZgorICAgICAgICB0aGUgdGV4dCB0aGF0IHdhcyBkcmF3bi4gQXMgYWxsIHBsYXRmb3JtcyBub3cg c3VwcG9ydCB0aGF0LCB3ZSBjYW4gbWVyZ2UgYnkga2VlcGluZyB0aGUgaU9TIG9uZS4KKworICAg ICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3QmlkaVRleHQpOgorICAgICAgICBU aGlzIGZ1bmN0aW9uIGhhZCBhIGZldyBkaWZmZXJlbmNlczoKKyAgICAgICAgICAgIC0gaU9TIHJl dHVybnMgdGhlIGxlbmd0aCBvZiB0aGUgdGV4dCB0aGF0IHdhcyBkcmF3bi4KKyAgICAgICAgICAg ICAgICBTaW5jZSB0aGlzIGlzIG5vdCB1c2VkIGFueXdoZXJlLCBJIGRyb3BwZWQgdGhpcyBhYmls aXR5LgorICAgICAgICAgICAgLSBpT1MgdG9vayBhZGRpdGlvbmFsIGlucHV0cyBvZiBpbml0aWFs IGJpZGkgc3RhdHVzIGFuZCBydW4gbGVuZ3RoIChhbmQgcmV0dXJuZWQgdGhlCisgICAgICAgICAg ICAgIHRoZSBmaW5hbCBiaWRpIHN0YXR1cyBhcyBhbiBvdXQgcGFyYW1ldGVyKQorICAgICAgICAg ICAgICAgIFNpbmNlIHRoaXMgd2FzIGFsc28gdW51c2VkLCBJIGRyb3BwZWQgaXQuCisgICAgICAg ICAgICAtIGlPUyB1c2VkIHRoZSBmYWN0IHRoYXQgZm9udC5kcmF3VGV4dCgpIHJldHVybnMgdGhl IGxlbmd0aCB0aGF0IHdhcyBkcmF3biwgdG8gYXZvaWQKKyAgICAgICAgICAgICAgbWVhc3VyaW5n IHRoZSB0ZXh0IHR3aWNlLgorICAgICAgICAgICAgICAgIEkga2VwdCB0aGlzLCBzaW5jZSBhbGwg cGxhdGZvcm1zIG5vdyBzdXBwb3J0IHRoaXMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQuaDoKKyAgICAgICAgVXBkYXRlIHNpZ25hdHVyZXMuIFJlbW92ZSBX RUJDT1JFX0VYUE9SVCBmb3IgZnVuY3Rpb24gdGhhdCBpcyBub3QgdXNlZCBvdXRzaWRlIG9mIFdl YkNvcmUuCisKIDIwMTUtMDEtMzEgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBSZW1vdmUgZW1wdHkgI2lmLyNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCShyZXZpc2lvbiAxNzk0 NTEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MjYsMTkgKzQyNiw2IEBAIGJvb2wgR3JhcGhpY3NDb250 ZXh0OjpwYWludGluZ0Rpc2FibGVkKCkKICAgICByZXR1cm4gbV9zdGF0ZS5wYWludGluZ0Rpc2Fi bGVkOwogfQogCi0vLyBGSVhNRTogUmVwbGFjZSB0aGUgbm9uLWlPUyBpbXBsZW1lbnRhdGlvbiB3 aXRoIHRoZSBpT1MgaW1wbGVtZW50YXRpb24gc2luY2UgdGhlIGxhdHRlciBjb21wdXRlcyByZXR1 cm5zCi0vLyB0aGUgd2lkdGggb2YgdGhlIGRyYXduIHRleHQuIEVuc3VyZSB0aGF0IHRoZXJlIGFy ZW4ndCBub3RpY2VhYmxlIGRpZmZlcmVuY2VzIGluIGxheW91dC4KLSNpZiAhUExBVEZPUk0oSU9T KQotI2lmICFVU0UoV0lOR0RJKQotdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdUZXh0KGNvbnN0 IEZvbnRDYXNjYWRlJiBmb250LCBjb25zdCBUZXh0UnVuJiBydW4sIGNvbnN0IEZsb2F0UG9pbnQm IHBvaW50LCBpbnQgZnJvbSwgaW50IHRvKQotewotICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkp Ci0gICAgICAgIHJldHVybjsKLQotICAgIGZvbnQuZHJhd1RleHQodGhpcywgcnVuLCBwb2ludCwg ZnJvbSwgdG8pOwotfQotI2VuZGlmCi0jZWxzZQogZmxvYXQgR3JhcGhpY3NDb250ZXh0OjpkcmF3 VGV4dChjb25zdCBGb250Q2FzY2FkZSYgZm9udCwgY29uc3QgVGV4dFJ1biYgcnVuLCBjb25zdCBG bG9hdFBvaW50JiBwb2ludCwgaW50IGZyb20sIGludCB0bykKIHsKICAgICBpZiAocGFpbnRpbmdE aXNhYmxlZCgpKQpAQCAtNDQ2LDcgKzQzMyw2IEBAIGZsb2F0IEdyYXBoaWNzQ29udGV4dDo6ZHJh d1RleHQoY29uc3QgRm8KIAogICAgIHJldHVybiBmb250LmRyYXdUZXh0KHRoaXMsIHJ1biwgcG9p bnQsIGZyb20sIHRvKTsKIH0KLSNlbmRpZiAvLyAhUExBVEZPUk0oSU9TKQogCiB2b2lkIEdyYXBo aWNzQ29udGV4dDo6ZHJhd0dseXBocyhjb25zdCBGb250Q2FzY2FkZSYgZm9udENhc2NhZGUsIGNv bnN0IEZvbnQmIGZvbnQsIGNvbnN0IEdseXBoQnVmZmVyJiBidWZmZXIsIGludCBmcm9tLCBpbnQg bnVtR2x5cGhzLCBjb25zdCBGbG9hdFBvaW50JiBwb2ludCkKIHsKQEAgLTQ2NCw0NCArNDUwLDIy IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3RW1waGFzaXNNYXJrcygKICAgICBmb250LmRy YXdFbXBoYXNpc01hcmtzKHRoaXMsIHJ1biwgbWFyaywgcG9pbnQsIGZyb20sIHRvKTsKIH0KIAot Ly8gRklYTUU6IEJldHRlciBtZXJnZSB0aGUgaU9TIGFuZCBub24taU9TIGRpZmZlcmVuY2VzLiBJ biBwYXJ0aWN1bGFyLCBtYWtlIHRoaXMgbWV0aG9kIHVzZSB0aGUKLS8vIHJldHVybmVkIHdpZHRo IG9mIHRoZSBkcmF3biB0ZXh0LCBGb250Q2FzY2FkZTo6ZHJhd1RleHQoKSwgaW5zdGVhZCBvZiBj b21wdXRpbmcgaXQuIEVuc3VyZSB0aGF0IHRoZXJlCi0vLyBhcmVuJ3Qgbm90aWNlYWJsZSBkaWZm ZXJlbmNlcyBpbiBsYXlvdXQgd2l0aCBzdWNoIGEgY2hhbmdlLgotI2lmICFQTEFURk9STShJT1Mp CiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0JpZGlUZXh0KGNvbnN0IEZvbnRDYXNjYWRlJiBm b250LCBjb25zdCBUZXh0UnVuJiBydW4sIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50LCBGb250Q2Fz Y2FkZTo6Q3VzdG9tRm9udE5vdFJlYWR5QWN0aW9uIGN1c3RvbUZvbnROb3RSZWFkeUFjdGlvbikK LSNlbHNlCi1mbG9hdCBHcmFwaGljc0NvbnRleHQ6OmRyYXdCaWRpVGV4dChjb25zdCBGb250Q2Fz Y2FkZSYgZm9udCwgY29uc3QgVGV4dFJ1biYgcnVuLCBjb25zdCBGbG9hdFBvaW50JiBwb2ludCwg Rm9udENhc2NhZGU6OkN1c3RvbUZvbnROb3RSZWFkeUFjdGlvbiBjdXN0b21Gb250Tm90UmVhZHlB Y3Rpb24sIEJpZGlTdGF0dXMqIHN0YXR1cywgaW50IGxlbmd0aCkKLSNlbmRpZgogewogICAgIGlm IChwYWludGluZ0Rpc2FibGVkKCkpCi0jaWYgIVBMQVRGT1JNKElPUykKICAgICAgICAgcmV0dXJu OwotI2Vsc2UKLSAgICAgICAgcmV0dXJuIDA7Ci0jZW5kaWYKIAogICAgIEJpZGlSZXNvbHZlcjxU ZXh0UnVuSXRlcmF0b3IsIEJpZGlDaGFyYWN0ZXJSdW4+IGJpZGlSZXNvbHZlcjsKLSNpZiAhUExB VEZPUk0oSU9TKQogICAgIGJpZGlSZXNvbHZlci5zZXRTdGF0dXMoQmlkaVN0YXR1cyhydW4uZGly ZWN0aW9uKCksIHJ1bi5kaXJlY3Rpb25hbE92ZXJyaWRlKCkpKTsKLSNlbHNlCi0gICAgYmlkaVJl c29sdmVyLnNldFN0YXR1cyhzdGF0dXMgPyAqc3RhdHVzIDogQmlkaVN0YXR1cyhydW4uZGlyZWN0 aW9uKCksIHJ1bi5kaXJlY3Rpb25hbE92ZXJyaWRlKCkpKTsKLSNlbmRpZgogICAgIGJpZGlSZXNv bHZlci5zZXRQb3NpdGlvbklnbm9yaW5nTmVzdGVkSXNvbGF0ZXMoVGV4dFJ1bkl0ZXJhdG9yKCZy dW4sIDApKTsKIAogICAgIC8vIEZJWE1FOiBUaGlzIG93bmVyc2hpcCBzaG91bGQgYmUgcmV2ZXJz ZWQuIFdlIHNob3VsZCBwYXNzIEJpZGlSdW5MaXN0CiAgICAgLy8gdG8gQmlkaVJlc29sdmVyIGlu IGNyZWF0ZUJpZGlSdW5zRm9yTGluZS4KICAgICBCaWRpUnVuTGlzdDxCaWRpQ2hhcmFjdGVyUnVu PiYgYmlkaVJ1bnMgPSBiaWRpUmVzb2x2ZXIucnVucygpOwotI2lmICFQTEFURk9STShJT1MpCiAg ICAgYmlkaVJlc29sdmVyLmNyZWF0ZUJpZGlSdW5zRm9yTGluZShUZXh0UnVuSXRlcmF0b3IoJnJ1 biwgcnVuLmxlbmd0aCgpKSk7Ci0jZWxzZQotICAgIGJpZGlSZXNvbHZlci5jcmVhdGVCaWRpUnVu c0ZvckxpbmUoVGV4dFJ1bkl0ZXJhdG9yKCZydW4sIGxlbmd0aCA8IDAgPyBydW4ubGVuZ3RoKCkg OiBsZW5ndGgpKTsKLSNlbmRpZiAgICAKKwogICAgIGlmICghYmlkaVJ1bnMucnVuQ291bnQoKSkK LSNpZiAhUExBVEZPUk0oSU9TKQogICAgICAgICByZXR1cm47Ci0jZWxzZQotICAgICAgICByZXR1 cm4gMDsKLSNlbmRpZgogCiAgICAgRmxvYXRQb2ludCBjdXJyUG9pbnQgPSBwb2ludDsKICAgICBC aWRpQ2hhcmFjdGVyUnVuKiBiaWRpUnVuID0gYmlkaVJ1bnMuZmlyc3RSdW4oKTsKQEAgLTUxMSwz MCArNDc1LDEzIEBAIGZsb2F0IEdyYXBoaWNzQ29udGV4dDo6ZHJhd0JpZGlUZXh0KGNvbnMKICAg ICAgICAgc3VicnVuLnNldERpcmVjdGlvbihpc1JUTCA/IFJUTCA6IExUUik7CiAgICAgICAgIHN1 YnJ1bi5zZXREaXJlY3Rpb25hbE92ZXJyaWRlKGJpZGlSdW4tPmRpck92ZXJyaWRlKGZhbHNlKSk7 CiAKLSNpZiAhUExBVEZPUk0oSU9TKQotICAgICAgICBmb250LmRyYXdUZXh0KHRoaXMsIHN1YnJ1 biwgY3VyclBvaW50LCAwLCAtMSwgY3VzdG9tRm9udE5vdFJlYWR5QWN0aW9uKTsKLQotICAgICAg ICBiaWRpUnVuID0gYmlkaVJ1bi0+bmV4dCgpOwotICAgICAgICAvLyBGSVhNRTogSGF2ZSBGb250 Q2FzY2FkZTo6ZHJhd1RleHQgcmV0dXJuIHRoZSB3aWR0aCBvZiB3aGF0IGl0IGRyZXcgc28gdGhh dCB3ZSBkb24ndCBoYXZlIHRvIHJlLW1lYXN1cmUgaGVyZS4KLSAgICAgICAgaWYgKGJpZGlSdW4p Ci0gICAgICAgICAgICBjdXJyUG9pbnQubW92ZShmb250LndpZHRoKHN1YnJ1biksIDApOwotI2Vs c2UKICAgICAgICAgZmxvYXQgd2lkdGggPSBmb250LmRyYXdUZXh0KHRoaXMsIHN1YnJ1biwgY3Vy clBvaW50LCAwLCAtMSwgY3VzdG9tRm9udE5vdFJlYWR5QWN0aW9uKTsKICAgICAgICAgY3VyclBv aW50Lm1vdmUod2lkdGgsIDApOwogCiAgICAgICAgIGJpZGlSdW4gPSBiaWRpUnVuLT5uZXh0KCk7 Ci0jZW5kaWYKICAgICB9CiAKLSNpZiBQTEFURk9STShJT1MpCi0gICAgaWYgKHN0YXR1cykKLSAg ICAgICAgKnN0YXR1cyA9IGJpZGlSZXNvbHZlci5zdGF0dXMoKTsKLSNlbmRpZgogICAgIGJpZGlS dW5zLmRlbGV0ZVJ1bnMoKTsKLQotI2lmIFBMQVRGT1JNKElPUykKLSAgICByZXR1cm4gY3VyclBv aW50LngoKSAtIHN0YXRpY19jYXN0PGZsb2F0Pihwb2ludC54KCkpOwotI2VuZGlmCiB9CiAKIHZv aWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2UoSW1hZ2UqIGltYWdlLCBDb2xvclNwYWNlIGNv bG9yU3BhY2UsIGNvbnN0IEZsb2F0UG9pbnQmIGRlc3RpbmF0aW9uLCBjb25zdCBJbWFnZVBhaW50 aW5nT3B0aW9ucyYgaW1hZ2VQYWludGluZ09wdGlvbnMpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAkocmV2aXNpb24gMTc5 NDUxKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0 LmgJKHdvcmtpbmcgY29weSkKQEAgLTg0LDkgKzg0LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgIGNsYXNzIEdyYXBoaWNzQ29udGV4dDNEOwogICAgIGNsYXNzIFRleHRSdW47CiAgICAgY2xh c3MgVHJhbnNmb3JtYXRpb25NYXRyaXg7Ci0jaWYgUExBVEZPUk0oSU9TKQotICAgIHN0cnVjdCBC aWRpU3RhdHVzOwotI2VuZGlmCiAKICAgICBlbnVtIFRleHREcmF3aW5nTW9kZSB7CiAgICAgICAg IFRleHRNb2RlRmlsbCA9IDEgPDwgMCwKQEAgLTM0NCwxOCArMzQxLDExIEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgVGV4dERyYXdpbmdNb2RlRmxhZ3MgdGV4dERyYXdpbmdNb2RlKCkg Y29uc3Q7CiAgICAgICAgIHZvaWQgc2V0VGV4dERyYXdpbmdNb2RlKFRleHREcmF3aW5nTW9kZUZs YWdzKTsKICAgICAgICAgCi0jaWYgIVBMQVRGT1JNKElPUykKLSAgICAgICAgdm9pZCBkcmF3VGV4 dChjb25zdCBGb250Q2FzY2FkZSYsIGNvbnN0IFRleHRSdW4mLCBjb25zdCBGbG9hdFBvaW50Jiwg aW50IGZyb20gPSAwLCBpbnQgdG8gPSAtMSk7Ci0jZWxzZQogICAgICAgICBmbG9hdCBkcmF3VGV4 dChjb25zdCBGb250Q2FzY2FkZSYsIGNvbnN0IFRleHRSdW4mLCBjb25zdCBGbG9hdFBvaW50Jiwg aW50IGZyb20gPSAwLCBpbnQgdG8gPSAtMSk7Ci0jZW5kaWYKICAgICAgICAgdm9pZCBkcmF3R2x5 cGhzKGNvbnN0IEZvbnRDYXNjYWRlJiwgY29uc3QgRm9udCYsIGNvbnN0IEdseXBoQnVmZmVyJiwg aW50IGZyb20sIGludCBudW1HbHlwaHMsIGNvbnN0IEZsb2F0UG9pbnQmKTsKICAgICAgICAgdm9p ZCBkcmF3RW1waGFzaXNNYXJrcyhjb25zdCBGb250Q2FzY2FkZSYsIGNvbnN0IFRleHRSdW4mICwg Y29uc3QgQXRvbWljU3RyaW5nJiBtYXJrLCBjb25zdCBGbG9hdFBvaW50JiwgaW50IGZyb20gPSAw LCBpbnQgdG8gPSAtMSk7Ci0jaWYgIVBMQVRGT1JNKElPUykKICAgICAgICAgdm9pZCBkcmF3Qmlk aVRleHQoY29uc3QgRm9udENhc2NhZGUmLCBjb25zdCBUZXh0UnVuJiwgY29uc3QgRmxvYXRQb2lu dCYsIEZvbnRDYXNjYWRlOjpDdXN0b21Gb250Tm90UmVhZHlBY3Rpb24gPSBGb250Q2FzY2FkZTo6 RG9Ob3RQYWludElmRm9udE5vdFJlYWR5KTsKLSNlbHNlCi0gICAgICAgIFdFQkNPUkVfRVhQT1JU IGZsb2F0IGRyYXdCaWRpVGV4dChjb25zdCBGb250Q2FzY2FkZSYsIGNvbnN0IFRleHRSdW4mLCBj b25zdCBGbG9hdFBvaW50JiwgRm9udENhc2NhZGU6OkN1c3RvbUZvbnROb3RSZWFkeUFjdGlvbiA9 IEZvbnRDYXNjYWRlOjpEb05vdFBhaW50SWZGb250Tm90UmVhZHksIEJpZGlTdGF0dXMqID0gMCwg aW50IGxlbmd0aCA9IC0xKTsKLSNlbmRpZgorCiAgICAgICAgIGVudW0gUm91bmRpbmdNb2RlIHsK ICAgICAgICAgICAgIFJvdW5kQWxsU2lkZXMsCiAgICAgICAgICAgICBSb3VuZE9yaWdpbkFuZERp bWVuc2lvbnMK