62156 2011-06-06 15:14:53 -0700 Switch InlineFlowBox::paintMask to use IntPoint 2011-06-06 15:27:26 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw darin eae eric simon.fraser oldest_to_newest 416056 0 leviw 2011-06-06 15:14:53 -0700 Ongoing tx/ty removal. 416058 1 96138 leviw 2011-06-06 15:18:13 -0700 Created attachment 96138 Patch 416062 2 96138 eric 2011-06-06 15:23:26 -0700 Comment on attachment 96138 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=96138&action=review > Source/WebCore/rendering/InlineFlowBox.cpp:1223 > + int stripX = adjustedPaintOffset.x() - (isHorizontal() ? logicalOffsetOnLine : 0); > + int stripY = adjustedPaintOffset.y() - (isHorizontal() ? 0 : logicalOffsetOnLine); > int stripWidth = isHorizontal() ? totalLogicalWidth : frameRect.width(); > int stripHeight = isHorizontal() ? frameRect.height() : totalLogicalWidth; I suspect we can clean this up more in a later pass. 416065 3 96138 leviw 2011-06-06 15:27:23 -0700 Comment on attachment 96138 Patch Clearing flags on attachment: 96138 Committed r88196: <http://trac.webkit.org/changeset/88196> 416066 4 leviw 2011-06-06 15:27:26 -0700 All reviewed patches have been landed. Closing bug. 96138 2011-06-06 15:18:13 -0700 2011-06-06 15:27:22 -0700 Patch bug-62156-20110606151812.patch text/plain 5109 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MTk1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDYtMDYgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBJbmxpbmVGbG93Qm94OjpwYWludE1hc2sgdG8g dXNlIEludFBvaW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02MjE1NgorCisgICAgICAgIFN3aXRjaGluZyBJbmxpbmVGbG93Qm94OjpwYWludE1hc2sg dG8gdGFrZSBhbiBJbnRQb2ludCByZXByZXNlbnRpbmcgdGhlIHBhaW50CisgICAgICAgIG9mZnNl dCBpbnN0ZWFkIG9mIGEgcGFpciBvZiBpbnRzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBhcyB0 aGlzIGlzIHNpbXBsZSByZWZhY3RvcmluZy4KKworICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVG bG93Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUZsb3dCb3g6OnBhaW50KToKKyAg ICAgICAgKFdlYkNvcmU6OklubGluZUZsb3dCb3g6OnBhaW50TWFzayk6CisgICAgICAgICogcmVu ZGVyaW5nL0lubGluZUZsb3dCb3guaDoKKwogMjAxMS0wNi0wNiAgRW1pbCBBIEVrbHVuZCAgPGVh ZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3BwCShyZXZpc2lvbiA4 ODE4OSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcAkod29y a2luZyBjb3B5KQpAQCAtOTkxLDcgKzk5MSw3IEBAIHZvaWQgSW5saW5lRmxvd0JveDo6cGFpbnQo UGFpbnRJbmZvJiBwYWkKICAgICAgICAgICAgICAgICAgICAgcGFpbnRJbmZvLm91dGxpbmVPYmpl Y3RzLT5hZGQoaW5saW5lRmxvdyk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSBpZiAo cGFpbnRJbmZvLnBoYXNlID09IFBhaW50UGhhc2VNYXNrKSB7Ci0gICAgICAgICAgICBwYWludE1h c2socGFpbnRJbmZvLCBwYWludE9mZnNldC54KCksIHBhaW50T2Zmc2V0LnkoKSk7CisgICAgICAg ICAgICBwYWludE1hc2socGFpbnRJbmZvLCBwYWludE9mZnNldCk7CiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAvLyBQYWludCBvdXIgYmFja2dyb3Vu ZCwgYm9yZGVyIGFuZCBib3gtc2hhZG93LgpAQCAtMTE2Myw3ICsxMTYzLDcgQEAgdm9pZCBJbmxp bmVGbG93Qm94OjpwYWludEJveERlY29yYXRpb25zKAogICAgIH0KIH0KIAotdm9pZCBJbmxpbmVG bG93Qm94OjpwYWludE1hc2soUGFpbnRJbmZvJiBwYWludEluZm8sIGludCB0eCwgaW50IHR5KQor dm9pZCBJbmxpbmVGbG93Qm94OjpwYWludE1hc2soUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0 IEludFBvaW50JiBwYWludE9mZnNldCkKIHsKICAgICBpZiAoIXBhaW50SW5mby5zaG91bGRQYWlu dFdpdGhpblJvb3QocmVuZGVyZXIoKSkgfHwgcmVuZGVyZXIoKS0+c3R5bGUoKS0+dmlzaWJpbGl0 eSgpICE9IFZJU0lCTEUgfHwgcGFpbnRJbmZvLnBoYXNlICE9IFBhaW50UGhhc2VNYXNrKQogICAg ICAgICByZXR1cm47CkBAIC0xMTc2LDggKzExNzYsNyBAQCB2b2lkIElubGluZUZsb3dCb3g6OnBh aW50TWFzayhQYWludEluZm8mCiAgICAgLy8gTW92ZSB4L3kgdG8gb3VyIGNvb3JkaW5hdGVzLgog ICAgIEludFJlY3QgbG9jYWxSZWN0KGZyYW1lUmVjdCk7CiAgICAgZmxpcEZvcldyaXRpbmdNb2Rl KGxvY2FsUmVjdCk7Ci0gICAgdHggKz0gbG9jYWxSZWN0LngoKTsKLSAgICB0eSArPSBsb2NhbFJl Y3QueSgpOworICAgIEludFBvaW50IGFkanVzdGVkUGFpbnRPZmZzZXQgPSBwYWludE9mZnNldCAr IGxvY2FsUmVjdC5sb2NhdGlvbigpOwogCiAgICAgY29uc3QgTmluZVBpZWNlSW1hZ2UmIG1hc2tO aW5lUGllY2VJbWFnZSA9IHJlbmRlcmVyKCktPnN0eWxlKCktPm1hc2tCb3hJbWFnZSgpOwogICAg IFN0eWxlSW1hZ2UqIG1hc2tCb3hJbWFnZSA9IHJlbmRlcmVyKCktPnN0eWxlKCktPm1hc2tCb3hJ bWFnZSgpLmltYWdlKCk7CkBAIC0xMTk4LDcgKzExOTcsNyBAQCB2b2lkIElubGluZUZsb3dCb3g6 OnBhaW50TWFzayhQYWludEluZm8mCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBJbnRSZWN0IHBh aW50UmVjdCA9IEludFJlY3QoSW50UG9pbnQodHgsIHR5KSwgZnJhbWVSZWN0LnNpemUoKSk7Cisg ICAgSW50UmVjdCBwYWludFJlY3QgPSBJbnRSZWN0KGFkanVzdGVkUGFpbnRPZmZzZXQsIGZyYW1l UmVjdC5zaXplKCkpOwogICAgIHBhaW50RmlsbExheWVycyhwYWludEluZm8sIENvbG9yKCksIHJl bmRlcmVyKCktPnN0eWxlKCktPm1hc2tMYXllcnMoKSwgcGFpbnRSZWN0LCBjb21wb3NpdGVPcCk7 CiAgICAgCiAgICAgYm9vbCBoYXNCb3hJbWFnZSA9IG1hc2tCb3hJbWFnZSAmJiBtYXNrQm94SW1h Z2UtPmNhblJlbmRlcihyZW5kZXJlcigpLT5zdHlsZSgpLT5lZmZlY3RpdmVab29tKCkpOwpAQCAt MTIwOCw3ICsxMjA3LDcgQEAgdm9pZCBJbmxpbmVGbG93Qm94OjpwYWludE1hc2soUGFpbnRJbmZv JgogICAgIC8vIFRoZSBzaW1wbGUgY2FzZSBpcyB3aGVyZSB3ZSBhcmUgdGhlIG9ubHkgYm94IGZv ciB0aGlzIG9iamVjdC4gIEluIHRob3NlCiAgICAgLy8gY2FzZXMgb25seSBhIHNpbmdsZSBjYWxs IHRvIGRyYXcgaXMgcmVxdWlyZWQuCiAgICAgaWYgKCFwcmV2TGluZUJveCgpICYmICFuZXh0TGlu ZUJveCgpKSB7Ci0gICAgICAgIGJveE1vZGVsT2JqZWN0KCktPnBhaW50TmluZVBpZWNlSW1hZ2Uo cGFpbnRJbmZvLmNvbnRleHQsIEludFJlY3QoSW50UG9pbnQodHgsIHR5KSwgZnJhbWVSZWN0LnNp emUoKSksIHJlbmRlcmVyKCktPnN0eWxlKCksIG1hc2tOaW5lUGllY2VJbWFnZSwgY29tcG9zaXRl T3ApOworICAgICAgICBib3hNb2RlbE9iamVjdCgpLT5wYWludE5pbmVQaWVjZUltYWdlKHBhaW50 SW5mby5jb250ZXh0LCBJbnRSZWN0KGFkanVzdGVkUGFpbnRPZmZzZXQsIGZyYW1lUmVjdC5zaXpl KCkpLCByZW5kZXJlcigpLT5zdHlsZSgpLCBtYXNrTmluZVBpZWNlSW1hZ2UsIGNvbXBvc2l0ZU9w KTsKICAgICB9IGVsc2UgewogICAgICAgICAvLyBXZSBoYXZlIGEgbWFzayBpbWFnZSB0aGF0IHNw YW5zIG11bHRpcGxlIGxpbmVzLgogICAgICAgICAvLyBXZSBuZWVkIHRvIGFkanVzdCBfdHggYW5k IF90eSBieSB0aGUgd2lkdGggb2YgYWxsIHByZXZpb3VzIGxpbmVzLgpAQCAtMTIxOCw4ICsxMjE3 LDggQEAgdm9pZCBJbmxpbmVGbG93Qm94OjpwYWludE1hc2soUGFpbnRJbmZvJgogICAgICAgICBp bnQgdG90YWxMb2dpY2FsV2lkdGggPSBsb2dpY2FsT2Zmc2V0T25MaW5lOwogICAgICAgICBmb3Ig KElubGluZUZsb3dCb3gqIGN1cnIgPSB0aGlzOyBjdXJyOyBjdXJyID0gY3Vyci0+bmV4dExpbmVC b3goKSkKICAgICAgICAgICAgIHRvdGFsTG9naWNhbFdpZHRoICs9IGN1cnItPmxvZ2ljYWxXaWR0 aCgpOwotICAgICAgICBpbnQgc3RyaXBYID0gdHggLSAoaXNIb3Jpem9udGFsKCkgPyBsb2dpY2Fs T2Zmc2V0T25MaW5lIDogMCk7Ci0gICAgICAgIGludCBzdHJpcFkgPSB0eSAtIChpc0hvcml6b250 YWwoKSA/IDAgOiBsb2dpY2FsT2Zmc2V0T25MaW5lKTsKKyAgICAgICAgaW50IHN0cmlwWCA9IGFk anVzdGVkUGFpbnRPZmZzZXQueCgpIC0gKGlzSG9yaXpvbnRhbCgpID8gbG9naWNhbE9mZnNldE9u TGluZSA6IDApOworICAgICAgICBpbnQgc3RyaXBZID0gYWRqdXN0ZWRQYWludE9mZnNldC55KCkg LSAoaXNIb3Jpem9udGFsKCkgPyAwIDogbG9naWNhbE9mZnNldE9uTGluZSk7CiAgICAgICAgIGlu dCBzdHJpcFdpZHRoID0gaXNIb3Jpem9udGFsKCkgPyB0b3RhbExvZ2ljYWxXaWR0aCA6IGZyYW1l UmVjdC53aWR0aCgpOwogICAgICAgICBpbnQgc3RyaXBIZWlnaHQgPSBpc0hvcml6b250YWwoKSA/ IGZyYW1lUmVjdC5oZWlnaHQoKSA6IHRvdGFsTG9naWNhbFdpZHRoOwogCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmgJKHJldmlzaW9uIDg4MTg5KQorKysgU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guaAkod29ya2luZyBjb3B5KQpAQCAt MTA0LDcgKzEwNCw3IEBAIHB1YmxpYzoKICAgICBJbnRSZWN0IHJvdW5kZWRGcmFtZVJlY3QoKSBj b25zdDsKICAgICAKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRCb3hEZWNvcmF0aW9ucyhQYWludElu Zm8mLCBjb25zdCBJbnRQb2ludCYpOwotICAgIHZpcnR1YWwgdm9pZCBwYWludE1hc2soUGFpbnRJ bmZvJiwgaW50IHR4LCBpbnQgdHkpOworICAgIHZpcnR1YWwgdm9pZCBwYWludE1hc2soUGFpbnRJ bmZvJiwgY29uc3QgSW50UG9pbnQmKTsKICAgICB2b2lkIHBhaW50RmlsbExheWVycyhjb25zdCBQ YWludEluZm8mLCBjb25zdCBDb2xvciYsIGNvbnN0IEZpbGxMYXllciosIGNvbnN0IEludFJlY3Qm LCBDb21wb3NpdGVPcGVyYXRvciA9IENvbXBvc2l0ZVNvdXJjZU92ZXIpOwogICAgIHZvaWQgcGFp bnRGaWxsTGF5ZXIoY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgQ29sb3ImLCBjb25zdCBGaWxsTGF5 ZXIqLCBjb25zdCBJbnRSZWN0JiwgQ29tcG9zaXRlT3BlcmF0b3IgPSBDb21wb3NpdGVTb3VyY2VP dmVyKTsKICAgICB2b2lkIHBhaW50Qm94U2hhZG93KEdyYXBoaWNzQ29udGV4dCosIFJlbmRlclN0 eWxlKiwgU2hhZG93U3R5bGUsIGNvbnN0IEludFJlY3QmKTsK