117347 2013-06-07 07:18:54 -0700 [rendering] Use foreground color to render the overtype caret 2013-06-07 08:37:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 csaavedra csaavedra commit-queue esprehn+autocc glenn rniwa svillar oldest_to_newest 898162 0 csaavedra 2013-06-07 07:18:54 -0700 [rendering] Use foreground color to render the overtype caret 898164 1 204042 csaavedra 2013-06-07 07:22:21 -0700 Created attachment 204042 Patch 898166 2 204042 darin 2013-06-07 07:27:00 -0700 Comment on attachment 204042 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204042&action=review > Source/WebCore/rendering/RenderObject.cpp:1640 > + color = frame()->selection()->isFocusedAndActive() ? > theme()->activeSelectionBackgroundColor() : > theme()->inactiveSelectionBackgroundColor(); WebKit style guide says to put the "?" and ":" at the beginnings of lines, not the ends of lines, or this fits fine on one line, I think. > Source/WebCore/rendering/RenderView.h:344 > + bool m_selectionWasCaret; It would be better to initialize this when in the RenderView constructor, even if the code will work OK with an uninitialized boolean. If nothing else, the uninitialized read it will irritate people using memory tools like valgrind. 898191 3 csaavedra 2013-06-07 08:37:08 -0700 Committed r151322: <http://trac.webkit.org/changeset/151322> 204042 2013-06-07 07:22:21 -0700 2013-06-07 07:27:00 -0700 Patch bug-117347-20130607172146.patch text/plain 4569 csaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxMzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWE5ODM0MzQ4N2U5ZjNj MWFmM2Y5MGYwYzkwNzdkZTc1ZGVlYTBiNC4uMzM1YzI5N2I3YmRmMTgxYzQ5MDI2MTk1MWVjZjlk ODY4YjdhOWM0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTA2LTA3ICBDbGF1 ZGlvIFNhYXZlZHJhICA8Y3NhYXZlZHJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW3JlbmRlcmlu Z10gVXNlIGZvcmVncm91bmQgY29sb3IgdG8gcmVuZGVyIHRoZSBvdmVydHlwZSBjYXJldAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3MzQ3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5LCB0 aGUgb3ZlcnR5cGUgY2FyZXQgaXMgcmVuZGVyZWQgdXNpbmcgdGhlIGNvbG9ycyBvZgorICAgICAg ICBhIG5vcm1hbCBzZWxlY3Rpb24sIHdoaWNoIGlzIGNvbmZ1c2luZy4gVGhpcyBwYXRjaCBlbmFi bGVzIFJlbmRlck9iamVjdAorICAgICAgICB0byBkaWZmZXJlbnRpYXRlIGJldHdlZW4gYSBub3Jt YWwgYW5kIGEgb3ZlcnR5cGUgY2FyZXQgc2VsZWN0aW9uLAorICAgICAgICBpbiBvcmRlciB0byB1 c2UgYSBkaWZmZXJlbnQgY29sb3IgZm9yIHRoZSBsYXR0ZXIuCisKKyAgICAgICAgQWxzbywgbGV0 IFJlbmRlclZpZXcgdXBkYXRlIHRoZSBzZWxlY3Rpb24gaWYgdGhpcyBpcyB1bmNoYW5nZWQKKyAg ICAgICAgd2hlbiBnb2luZyBmcm9tIGEgb3ZlcnR5cGUgY2FyZXQgdG8gb25lIGNoYXJhY3RlciBz ZWxlY3Rpb24gYW5kCisgICAgICAgIHZpY2V2ZXJzYS4KKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpzZWxlY3Rp b25CYWNrZ3JvdW5kQ29sb3IpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OnNldFNlbGVjdGlvbik6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlclZpZXcuaDoKKwogMjAxMy0wNi0wNyAgWmFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIEZyYW1lIGZsYXR0ZW5pbmc6IGNyYXNoIHdoZW4gY2hp bGQgaWZyYW1lIGlzIHJlbW92ZWQgZHVyaW5nIGJlZm9yZWxvYWQuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IGVjMTY4YmQ0ZjkzZWMzYmRiMDhjOWRhNDMw Mzg5NTZmMjNmOTg3ZDIuLmJiNWQ0MmMzM2RjOGQ2MjM4MjU2OTVkZTRjMjY1MThiYzlmNWYxZTAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCkBAIC0xNjI4LDEz ICsxNjI4LDE3IEBAIENvbG9yIFJlbmRlck9iamVjdDo6c2VsZWN0aW9uQmFja2dyb3VuZENvbG9y KCkgY29uc3QKIHsKICAgICBDb2xvciBjb2xvcjsKICAgICBpZiAoc3R5bGUoKS0+dXNlclNlbGVj dCgpICE9IFNFTEVDVF9OT05FKSB7Ci0gICAgICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gcHNldWRv U3R5bGUgPSBnZXRVbmNhY2hlZFBzZXVkb1N0eWxlKFBzZXVkb1N0eWxlUmVxdWVzdChTRUxFQ1RJ T04pKTsKLSAgICAgICAgaWYgKHBzZXVkb1N0eWxlICYmIHBzZXVkb1N0eWxlLT52aXNpdGVkRGVw ZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpLmlzVmFsaWQoKSkKLSAgICAg ICAgICAgIGNvbG9yID0gcHNldWRvU3R5bGUtPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9w ZXJ0eUJhY2tncm91bmRDb2xvcikuYmxlbmRXaXRoV2hpdGUoKTsKLSAgICAgICAgZWxzZQotICAg ICAgICAgICAgY29sb3IgPSBmcmFtZSgpLT5zZWxlY3Rpb24oKS0+aXNGb2N1c2VkQW5kQWN0aXZl KCkgPworICAgICAgICBpZiAoZnJhbWUoKS0+c2VsZWN0aW9uKCktPnNob3VsZFNob3dCbG9ja0N1 cnNvcigpICYmIGZyYW1lKCktPnNlbGVjdGlvbigpLT5pc0NhcmV0KCkpCisgICAgICAgICAgICBj b2xvciA9IHN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUNvbG9yKS5i bGVuZFdpdGhXaGl0ZSgpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIFJlZlB0cjxSZW5k ZXJTdHlsZT4gcHNldWRvU3R5bGUgPSBnZXRVbmNhY2hlZFBzZXVkb1N0eWxlKFBzZXVkb1N0eWxl UmVxdWVzdChTRUxFQ1RJT04pKTsKKyAgICAgICAgICAgIGlmIChwc2V1ZG9TdHlsZSAmJiBwc2V1 ZG9TdHlsZS0+dmlzaXRlZERlcGVuZGVudENvbG9yKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9y KS5pc1ZhbGlkKCkpCisgICAgICAgICAgICAgICAgY29sb3IgPSBwc2V1ZG9TdHlsZS0+dmlzaXRl ZERlcGVuZGVudENvbG9yKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yKS5ibGVuZFdpdGhXaGl0 ZSgpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGNvbG9yID0gZnJhbWUoKS0+ c2VsZWN0aW9uKCktPmlzRm9jdXNlZEFuZEFjdGl2ZSgpID8KICAgICAgICAgICAgICAgICAgICAg dGhlbWUoKS0+YWN0aXZlU2VsZWN0aW9uQmFja2dyb3VuZENvbG9yKCkgOgogICAgICAgICAgICAg ICAgICAgICB0aGVtZSgpLT5pbmFjdGl2ZVNlbGVjdGlvbkJhY2tncm91bmRDb2xvcigpOworICAg ICAgICB9CiAgICAgfQogCiAgICAgcmV0dXJuIGNvbG9yOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclZpZXcuY3BwCmluZGV4IDU3NjhlZmE3YjczZDc2NjRkYjM4NmRlNzFjMTJlNWFmMWQ4 ZWVkZmYuLmJjM2ZhZmYxYTNmMDI0ODY4NjQ1YTRjYjJjNTAyMjllMmY3MjYzNWIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNs dWRlICJGbG9hdFF1YWQuaCIKICNpbmNsdWRlICJGbG93VGhyZWFkQ29udHJvbGxlci5oIgogI2lu Y2x1ZGUgIkZyYW1lLmgiCisjaW5jbHVkZSAiRnJhbWVTZWxlY3Rpb24uaCIKICNpbmNsdWRlICJG cmFtZVZpZXcuaCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJIVE1M RnJhbWVPd25lckVsZW1lbnQuaCIKQEAgLTY5MSw5ICs2OTIsMTEgQEAgdm9pZCBSZW5kZXJWaWV3 OjpzZXRTZWxlY3Rpb24oUmVuZGVyT2JqZWN0KiBzdGFydCwgaW50IHN0YXJ0UG9zLCBSZW5kZXJP YmplY3QqIGUKICAgICBpZiAoKHN0YXJ0ICYmICFlbmQpIHx8IChlbmQgJiYgIXN0YXJ0KSkKICAg ICAgICAgcmV0dXJuOwogCisgICAgYm9vbCBjYXJldENoYW5nZWQgPSBtX3NlbGVjdGlvbldhc0Nh cmV0ICE9IHZpZXcoKS0+ZnJhbWUoKS0+c2VsZWN0aW9uKCktPmlzQ2FyZXQoKTsKKyAgICBtX3Nl bGVjdGlvbldhc0NhcmV0ID0gdmlldygpLT5mcmFtZSgpLT5zZWxlY3Rpb24oKS0+aXNDYXJldCgp OwogICAgIC8vIEp1c3QgcmV0dXJuIGlmIHRoZSBzZWxlY3Rpb24gaGFzbid0IGNoYW5nZWQuCiAg ICAgaWYgKG1fc2VsZWN0aW9uU3RhcnQgPT0gc3RhcnQgJiYgbV9zZWxlY3Rpb25TdGFydFBvcyA9 PSBzdGFydFBvcyAmJgotICAgICAgICBtX3NlbGVjdGlvbkVuZCA9PSBlbmQgJiYgbV9zZWxlY3Rp b25FbmRQb3MgPT0gZW5kUG9zKQorICAgICAgICBtX3NlbGVjdGlvbkVuZCA9PSBlbmQgJiYgbV9z ZWxlY3Rpb25FbmRQb3MgPT0gZW5kUG9zICYmICFjYXJldENoYW5nZWQpCiAgICAgICAgIHJldHVy bjsKIAogICAgIGlmICgoc3RhcnQgJiYgZW5kKSAmJiAoc3RhcnQtPmZsb3dUaHJlYWRDb250YWlu aW5nQmxvY2soKSAhPSBlbmQtPmZsb3dUaHJlYWRDb250YWluaW5nQmxvY2soKSkpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaAppbmRleCA4OGEwOGI4OGEzNTZkZDc5NzQwZTZhZGFk NzkzNTM1ZWUyMWVkOTY1Li45OGQ5N2MyNTg5Y2MwMDBhNzY3ZDI3ZjVkOTBiN2NiOGQyNzRhMTRh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKQEAgLTM0MCw2ICszNDAsOCBA QCBwcml2YXRlOgogCiAgICAgUmVuZGVyUXVvdGUqIG1fcmVuZGVyUXVvdGVIZWFkOwogICAgIHVu c2lnbmVkIG1fcmVuZGVyQ291bnRlckNvdW50OworCisgICAgYm9vbCBtX3NlbGVjdGlvbldhc0Nh cmV0OwogfTsKIAogaW5saW5lIFJlbmRlclZpZXcqIHRvUmVuZGVyVmlldyhSZW5kZXJPYmplY3Qq IG9iamVjdCkK