114769 2013-04-17 15:13:09 -0700 Content inside frames and scrollbars in overflow areas hit-tests incorrectly when the WKView has a header 2013-04-17 16:22:54 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin bdakin bdakin sam simon.fraser oldest_to_newest 877515 0 bdakin 2013-04-17 15:13:09 -0700 Content inside frames and scrollbars in overflow areas hit-tests incorrectly when the WKView has a header. <rdar://problem/13581721> 877528 1 198619 bdakin 2013-04-17 15:34:12 -0700 Created attachment 198619 Patch 877539 2 198619 simon.fraser 2013-04-17 15:51:31 -0700 Comment on attachment 198619 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=198619&action=review > LayoutTests/platform/mac/platform/mac-wk2/tiled-drawing/header-and-footer-hit-testing-in-frame-expected.txt:16 > +layer at (0,0) size 785x600 > + RenderView at (0,0) size 785x600 > +layer at (0,0) size 785x600 > + RenderBlock {HTML} at (0,0) size 785x600 > + RenderBody {BODY} at (8,8) size 769x584 > + RenderPartObject {IFRAME} at (0,0) size 600x300 > + layer at (0,0) size 600x300 > + RenderView at (0,0) size 600x300 > + layer at (0,0) size 600x300 > + RenderBlock {HTML} at (0,0) size 600x300 > + RenderBody {BODY} at (8,8) size 584x284 > + RenderBlock {DIV} at (0,0) size 25x25 [bgcolor=#800080] > + RenderBlock {DIV} at (0,25) size 584x18 > + RenderText {#text} at (0,0) size 33x18 > + text run at (0,0) width 33: "Pass!" > + RenderText {#text} at (0,0) size 0x0 This should be a text test. 877554 3 bdakin 2013-04-17 16:13:07 -0700 (In reply to comment #2) > (From update of attachment 198619 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=198619&action=review > > > LayoutTests/platform/mac/platform/mac-wk2/tiled-drawing/header-and-footer-hit-testing-in-frame-expected.txt:16 > > +layer at (0,0) size 785x600 > > + RenderView at (0,0) size 785x600 > > +layer at (0,0) size 785x600 > > + RenderBlock {HTML} at (0,0) size 785x600 > > + RenderBody {BODY} at (8,8) size 769x584 > > + RenderPartObject {IFRAME} at (0,0) size 600x300 > > + layer at (0,0) size 600x300 > > + RenderView at (0,0) size 600x300 > > + layer at (0,0) size 600x300 > > + RenderBlock {HTML} at (0,0) size 600x300 > > + RenderBody {BODY} at (8,8) size 584x284 > > + RenderBlock {DIV} at (0,0) size 25x25 [bgcolor=#800080] > > + RenderBlock {DIV} at (0,25) size 584x18 > > + RenderText {#text} at (0,0) size 33x18 > > + text run at (0,0) width 33: "Pass!" > > + RenderText {#text} at (0,0) size 0x0 > > This should be a text test. Yes, it should! This was much easier to do than I initially though. New patch in a moment. 877555 4 198627 bdakin 2013-04-17 16:15:08 -0700 Created attachment 198627 Patch 877558 5 bdakin 2013-04-17 16:22:54 -0700 Thank you! http://trac.webkit.org/changeset/148643 198619 2013-04-17 15:34:12 -0700 2013-04-17 16:15:08 -0700 Patch for-review.txt text/plain 7832 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0ODYzOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEzLTA0LTE3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBDb250ZW50IGluc2lkZSBmcmFtZXMg YW5kIHNjcm9sbGJhcnMgaW4gb3ZlcmZsb3cgYXJlYXMgaGl0LXRlc3RzIGluY29ycmVjdGx5IHdo ZW4gCisgICAgICAgIHRoZSBXS1ZpZXcgaGFzIGEgaGVhZGVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQ3NjkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBjb252ZXJ0VG9SZW5kZXJlcigpIGFuZCBjb252 ZXJ0RnJvbVJlbmRlcmVyKCkgbmVlZCB0byBmYWN0b3IgaW4gdGhlIGhlYWRlckhlaWdodCwgCisg ICAgICAgIG11Y2ggbGlrZSBhbGwgb2YgdGhlIGNvbnZlcnNpb24gZnVuY3Rpb25zIG9uIFNjcm9s bFZpZXcuIAorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lVmlldzo6Y29udmVydEZyb21SZW5kZXJlcik6CisgICAgICAgIChXZWJDb3JlOjpGcmFt ZVZpZXc6OmNvbnZlcnRUb1JlbmRlcmVyKToKKworICAgICAgICBUaGUgc2Nyb2xsUG9zaXRpb24g ZXF1aXZhbGVudCBvZiB0aGUgZXhpc3Rpbmcgc2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb0RvY3VtZW50 KCkgCisgICAgICAgIGZ1bmN0aW9uLiAKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnNjcm9sbFBvc2l0aW9uUmVsYXRpdmVU b0RvY3VtZW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3Lmg6CisgICAgICAgIChT Y3JvbGxWaWV3KToKKwogMjAxMy0wNC0xNiAgSmVyIE5vYmxlIDxqZXIubm9ibGVAYXBwbGUuY29t PgogCiAgICAgICAgIENyYXNoIGluIFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6On5IVE1MTWVk aWFFbGVtZW50LgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gMTQ4 NjE3KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zODAzLDcgKzM4MDMsNyBAQCBJbnRSZWN0IEZyYW1lVmlldzo6Y29udmVydEZyb21SZW5k ZXJlcihjCiAKICAgICAvLyBDb252ZXJ0IGZyb20gcGFnZSAoImFic29sdXRlIikgdG8gRnJhbWVW aWV3IGNvb3JkaW5hdGVzLgogICAgIGlmICghZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCi0gICAgICAg IHJlY3QubW92ZUJ5KC1zY3JvbGxQb3NpdGlvbigpKTsKKyAgICAgICAgcmVjdC5tb3ZlQnkoLXNj cm9sbFBvc2l0aW9uKCkgKyBJbnRQb2ludCgwLCBoZWFkZXJIZWlnaHQoKSkpOwogCiAgICAgcmV0 dXJuIHJlY3Q7CiB9CkBAIC0zODE0LDcgKzM4MTQsNyBAQCBJbnRSZWN0IEZyYW1lVmlldzo6Y29u dmVydFRvUmVuZGVyZXIoY29uCiAgICAgCiAgICAgLy8gQ29udmVydCBmcm9tIEZyYW1lVmlldyBj b29yZHMgaW50byBwYWdlICgiYWJzb2x1dGUiKSBjb29yZGluYXRlcy4KICAgICBpZiAoIWRlbGVn YXRlc1Njcm9sbGluZygpKQotICAgICAgICByZWN0Lm1vdmVCeShzY3JvbGxQb3NpdGlvbigpKTsK KyAgICAgICAgcmVjdC5tb3ZlQnkoc2Nyb2xsUG9zaXRpb25SZWxhdGl2ZVRvRG9jdW1lbnQoKSk7 CiAKICAgICAvLyBGSVhNRTogd2UgZG9uJ3QgaGF2ZSBhIHdheSB0byBtYXAgYW4gYWJzb2x1dGUg cmVjdCBkb3duIHRvIGEgbG9jYWwgcXVhZCwgc28ganVzdAogICAgIC8vIG1vdmUgdGhlIHJlY3Qg Zm9yIG5vdy4KQEAgLTM4MjgsNyArMzgyOCw3IEBAIEludFBvaW50IEZyYW1lVmlldzo6Y29udmVy dEZyb21SZW5kZXJlcigKIAogICAgIC8vIENvbnZlcnQgZnJvbSBwYWdlICgiYWJzb2x1dGUiKSB0 byBGcmFtZVZpZXcgY29vcmRpbmF0ZXMuCiAgICAgaWYgKCFkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkK LSAgICAgICAgcG9pbnQubW92ZUJ5KC1zY3JvbGxQb3NpdGlvbigpKTsKKyAgICAgICAgcG9pbnQu bW92ZUJ5KC1zY3JvbGxQb3NpdGlvbigpICsgSW50UG9pbnQoMCwgaGVhZGVySGVpZ2h0KCkpKTsK ICAgICByZXR1cm4gcG9pbnQ7CiB9CiAKQEAgLTM4MzgsNyArMzgzOCw3IEBAIEludFBvaW50IEZy YW1lVmlldzo6Y29udmVydFRvUmVuZGVyZXIoY28KIAogICAgIC8vIENvbnZlcnQgZnJvbSBGcmFt ZVZpZXcgY29vcmRzIGludG8gcGFnZSAoImFic29sdXRlIikgY29vcmRpbmF0ZXMuCiAgICAgaWYg KCFkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKLSAgICAgICAgcG9pbnQgKz0gSW50U2l6ZShzY3JvbGxY KCksIHNjcm9sbFkoKSk7CisgICAgICAgIHBvaW50ID0gcG9pbnQgKyBzY3JvbGxQb3NpdGlvblJl bGF0aXZlVG9Eb2N1bWVudCgpOwogCiAgICAgcmV0dXJuIHJvdW5kZWRJbnRQb2ludChyZW5kZXJl ci0+YWJzb2x1dGVUb0xvY2FsKHBvaW50LCBVc2VUcmFuc2Zvcm1zKSk7CiB9CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAkocmV2aXNpb24gMTQ4NjE3KQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0 MSw2ICszNDEsMTIgQEAgSW50U2l6ZSBTY3JvbGxWaWV3OjpzY3JvbGxPZmZzZXRSZWxhdGl2ZQog ICAgIHJldHVybiBJbnRTaXplKHNjcm9sbE9mZnNldC53aWR0aCgpLCBzY3JvbGxPZmZzZXQuaGVp Z2h0KCkgLSBoZWFkZXJIZWlnaHQoKSk7CiB9CiAKK0ludFBvaW50IFNjcm9sbFZpZXc6OnNjcm9s bFBvc2l0aW9uUmVsYXRpdmVUb0RvY3VtZW50KCkgY29uc3QKK3sKKyAgICBJbnRQb2ludCBzY3Jv bGxQb3NpdGlvbiA9IHRoaXMtPnNjcm9sbFBvc2l0aW9uKCk7CisgICAgcmV0dXJuIEludFBvaW50 KHNjcm9sbFBvc2l0aW9uLngoKSwgc2Nyb2xsUG9zaXRpb24ueSgpIC0gaGVhZGVySGVpZ2h0KCkp OworfQorCiBpbnQgU2Nyb2xsVmlldzo6c2Nyb2xsU2l6ZShTY3JvbGxiYXJPcmllbnRhdGlvbiBv cmllbnRhdGlvbikgY29uc3QKIHsKICAgICAvLyBJZiBubyBzY3JvbGxiYXJzIGFyZSBwcmVzZW50 LCBpdCBkb2VzIG5vdCBpbmRpY2F0ZSBjb250ZW50IGlzIG5vdCBiZSBzY3JvbGxhYmxlLgpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAkocmV2aXNpb24gMTQ4NjE3KQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC0x OTAsNiArMTkwLDcgQEAgcHVibGljOgogICAgIC8vIGFuY2hvcnMgKDAsMCkgYXQgdGhlIHRvcCBv ZiB0aGUgRG9jdW1lbnQsIHdoaWNoIHdpbGwgYmUgYmVuZWF0aCBhbnkgaGVhZGVycywgc28gaXQg aXMgcmVsYXRpdmUKICAgICAvLyB0byBjb250ZW50c1NpemUoKS4KICAgICBJbnRTaXplIHNjcm9s bE9mZnNldFJlbGF0aXZlVG9Eb2N1bWVudCgpIGNvbnN0OworICAgIEludFBvaW50IHNjcm9sbFBv c2l0aW9uUmVsYXRpdmVUb0RvY3VtZW50KCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIEludFNpemUg b3ZlcmhhbmdBbW91bnQoKSBjb25zdCBPVkVSUklERTsKIApJbmRleDogTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ4 NjM4KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTUgQEAKKzIwMTMtMDQtMTcgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAg ICAgIENvbnRlbnQgaW5zaWRlIGZyYW1lcyBhbmQgc2Nyb2xsYmFycyBpbiBvdmVyZmxvdyBhcmVh cyBoaXQtdGVzdHMgaW5jb3JyZWN0bHkgd2hlbiAKKyAgICAgICAgdGhlIFdLVmlldyBoYXMgYSBo ZWFkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx NDc2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog cGxhdGZvcm0vbWFjLXdrMi90aWxlZC1kcmF3aW5nL2hlYWRlci1hbmQtZm9vdGVyLWhpdC10ZXN0 aW5nLWluLWZyYW1lLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy13azIvdGls ZWQtZHJhd2luZy9yZXNvdXJjZXMvaWZyYW1lLXRvLWhpdC10ZXN0Lmh0bWw6IEFkZGVkLgorICAg ICAgICAqIHBsYXRmb3JtL21hYy9wbGF0Zm9ybS9tYWMtd2syL3RpbGVkLWRyYXdpbmcvaGVhZGVy LWFuZC1mb290ZXItaGl0LXRlc3RpbmctaW4tZnJhbWUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKwog MjAxMy0wNC0xNyAgSmVzc2llIEJlcmxpbiAgPGpiZXJsaW5AYXBwbGUuY29tPgogCiAgICAgICAg IFJlbW92ZSBtb3JlIHRlc3RzIGZyb20gdGhlIFNraXBwZWQgbGlzdCB0aGF0IHdlcmUgc2tpcHBl ZCBlYXJseSBvbiB3aXRoIGEgYnVuY2ggb2YgZXZlbnRTZW5kZXIKSW5kZXg6IExheW91dFRlc3Rz L3BsYXRmb3JtL21hYy13azIvdGlsZWQtZHJhd2luZy9oZWFkZXItYW5kLWZvb3Rlci1oaXQtdGVz dGluZy1pbi1mcmFtZS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21h Yy13azIvdGlsZWQtZHJhd2luZy9oZWFkZXItYW5kLWZvb3Rlci1oaXQtdGVzdGluZy1pbi1mcmFt ZS5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi90aWxl ZC1kcmF3aW5nL2hlYWRlci1hbmQtZm9vdGVyLWhpdC10ZXN0aW5nLWluLWZyYW1lLmh0bWwJKHdv cmtpbmcgY29weSkKQEAgLTAsMCArMSwxOSBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQ+Cisg ICAgZnVuY3Rpb24gcnVuVGVzdCgpIHsKKyAgICAgICAgaWYgKCF3aW5kb3cuZXZlbnRTZW5kZXIp CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAg ICAgICAgICAgd2luZG93LmludGVybmFscy5zZXRIZWFkZXJIZWlnaHQoZG9jdW1lbnQsIDEwMCk7 CisKKyAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oMjAsIDEyMCk7CisgICAgICAgIGV2 ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgICAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7Cisg ICAgfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+CisgICAg PGlmcmFtZSBzcmM9InJlc291cmNlcy9pZnJhbWUtdG8taGl0LXRlc3QuaHRtbCIgc2Nyb2xsaW5n PSJubyIgZnJhbWVib3JkZXI9Im5vIiBoZWlnaHQ9IjMwMCIgd2lkdGg9IjYwMCI+PC9pZnJhbWU+ Cis8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL3Rp bGVkLWRyYXdpbmcvcmVzb3VyY2VzL2lmcmFtZS10by1oaXQtdGVzdC5odG1sCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvdGlsZWQtZHJhd2luZy9yZXNvdXJjZXMv aWZyYW1lLXRvLWhpdC10ZXN0Lmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMtd2syL3RpbGVkLWRyYXdpbmcvcmVzb3VyY2VzL2lmcmFtZS10by1oaXQtdGVzdC5o dG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMjEgQEAKKzxodG1sPgorPGhlYWQ+Cis8c3R5 bGU+CisgICAgI3RhcmdldCB7CisgICAgICAgIGJhY2tncm91bmQtY29sb3I6cHVycGxlOworICAg ICAgICB3aWR0aDoyNXB4OworICAgICAgICBoZWlnaHQ6MjVweDsKKyAgICB9Cis8L3N0eWxlPgor PHNjcmlwdD4KKyAgICBmdW5jdGlvbiBjbGlja2VkKCkgeworICAgICAgICB2YXIgcmVzdWx0ID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInJlc3VsdCIpOworICAgICAgICByZXN1bHQuaW5uZXJI VE1MID0gIlBhc3MhIjsKKyAgICB9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxk aXYgaWQ9InRhcmdldCIgb25jbGljaz0iY2xpY2tlZCgpIj48L2Rpdj4KKyAgICA8ZGl2IGlkPSJy ZXN1bHQiPlRoaXMgdGVzdCBuZWVkcyB0byBiZSBydW4gdGhyb3VnaCBXZWJLaXRUZXN0UnVubmVy LjwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFj L3BsYXRmb3JtL21hYy13azIvdGlsZWQtZHJhd2luZy9oZWFkZXItYW5kLWZvb3Rlci1oaXQtdGVz dGluZy1pbi1mcmFtZS1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjL3BsYXRmb3JtL21hYy13azIvdGlsZWQtZHJhd2luZy9oZWFkZXItYW5kLWZvb3Rl ci1oaXQtdGVzdGluZy1pbi1mcmFtZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlv dXRUZXN0cy9wbGF0Zm9ybS9tYWMvcGxhdGZvcm0vbWFjLXdrMi90aWxlZC1kcmF3aW5nL2hlYWRl ci1hbmQtZm9vdGVyLWhpdC10ZXN0aW5nLWluLWZyYW1lLWV4cGVjdGVkLnR4dAkod29ya2luZyBj b3B5KQpAQCAtMCwwICsxLDE2IEBACitsYXllciBhdCAoMCwwKSBzaXplIDc4NXg2MDAKKyAgUmVu ZGVyVmlldyBhdCAoMCwwKSBzaXplIDc4NXg2MDAKK2xheWVyIGF0ICgwLDApIHNpemUgNzg1eDYw MAorICBSZW5kZXJCbG9jayB7SFRNTH0gYXQgKDAsMCkgc2l6ZSA3ODV4NjAwCisgICAgUmVuZGVy Qm9keSB7Qk9EWX0gYXQgKDgsOCkgc2l6ZSA3Njl4NTg0CisgICAgICBSZW5kZXJQYXJ0T2JqZWN0 IHtJRlJBTUV9IGF0ICgwLDApIHNpemUgNjAweDMwMAorICAgICAgICBsYXllciBhdCAoMCwwKSBz aXplIDYwMHgzMDAKKyAgICAgICAgICBSZW5kZXJWaWV3IGF0ICgwLDApIHNpemUgNjAweDMwMAor ICAgICAgICBsYXllciBhdCAoMCwwKSBzaXplIDYwMHgzMDAKKyAgICAgICAgICBSZW5kZXJCbG9j ayB7SFRNTH0gYXQgKDAsMCkgc2l6ZSA2MDB4MzAwCisgICAgICAgICAgICBSZW5kZXJCb2R5IHtC T0RZfSBhdCAoOCw4KSBzaXplIDU4NHgyODQKKyAgICAgICAgICAgICAgUmVuZGVyQmxvY2sge0RJ Vn0gYXQgKDAsMCkgc2l6ZSAyNXgyNSBbYmdjb2xvcj0jODAwMDgwXQorICAgICAgICAgICAgICBS ZW5kZXJCbG9jayB7RElWfSBhdCAoMCwyNSkgc2l6ZSA1ODR4MTgKKyAgICAgICAgICAgICAgICBS ZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAzM3gxOAorICAgICAgICAgICAgICAgICAg dGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMzM6ICJQYXNzISIKKyAgICAgIFJlbmRlclRleHQgeyN0 ZXh0fSBhdCAoMCwwKSBzaXplIDB4MAo= 198627 2013-04-17 16:15:08 -0700 2013-04-17 16:17:49 -0700 Patch for-review-2.txt text/plain 7118 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0ODYzOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEzLTA0LTE3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBDb250ZW50IGluc2lkZSBmcmFtZXMg YW5kIHNjcm9sbGJhcnMgaW4gb3ZlcmZsb3cgYXJlYXMgaGl0LXRlc3RzIGluY29ycmVjdGx5IHdo ZW4gCisgICAgICAgIHRoZSBXS1ZpZXcgaGFzIGEgaGVhZGVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQ3NjkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBjb252ZXJ0VG9SZW5kZXJlcigpIGFuZCBjb252 ZXJ0RnJvbVJlbmRlcmVyKCkgbmVlZCB0byBmYWN0b3IgaW4gdGhlIGhlYWRlckhlaWdodCwgCisg ICAgICAgIG11Y2ggbGlrZSBhbGwgb2YgdGhlIGNvbnZlcnNpb24gZnVuY3Rpb25zIG9uIFNjcm9s bFZpZXcuIAorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lVmlldzo6Y29udmVydEZyb21SZW5kZXJlcik6CisgICAgICAgIChXZWJDb3JlOjpGcmFt ZVZpZXc6OmNvbnZlcnRUb1JlbmRlcmVyKToKKworICAgICAgICBUaGUgc2Nyb2xsUG9zaXRpb24g ZXF1aXZhbGVudCBvZiB0aGUgZXhpc3Rpbmcgc2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb0RvY3VtZW50 KCkgCisgICAgICAgIGZ1bmN0aW9uLiAKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnNjcm9sbFBvc2l0aW9uUmVsYXRpdmVU b0RvY3VtZW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3Lmg6CisgICAgICAgIChT Y3JvbGxWaWV3KToKKwogMjAxMy0wNC0xNiAgSmVyIE5vYmxlIDxqZXIubm9ibGVAYXBwbGUuY29t PgogCiAgICAgICAgIENyYXNoIGluIFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6On5IVE1MTWVk aWFFbGVtZW50LgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gMTQ4 NjE3KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zODAzLDcgKzM4MDMsNyBAQCBJbnRSZWN0IEZyYW1lVmlldzo6Y29udmVydEZyb21SZW5k ZXJlcihjCiAKICAgICAvLyBDb252ZXJ0IGZyb20gcGFnZSAoImFic29sdXRlIikgdG8gRnJhbWVW aWV3IGNvb3JkaW5hdGVzLgogICAgIGlmICghZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCi0gICAgICAg IHJlY3QubW92ZUJ5KC1zY3JvbGxQb3NpdGlvbigpKTsKKyAgICAgICAgcmVjdC5tb3ZlQnkoLXNj cm9sbFBvc2l0aW9uKCkgKyBJbnRQb2ludCgwLCBoZWFkZXJIZWlnaHQoKSkpOwogCiAgICAgcmV0 dXJuIHJlY3Q7CiB9CkBAIC0zODE0LDcgKzM4MTQsNyBAQCBJbnRSZWN0IEZyYW1lVmlldzo6Y29u dmVydFRvUmVuZGVyZXIoY29uCiAgICAgCiAgICAgLy8gQ29udmVydCBmcm9tIEZyYW1lVmlldyBj b29yZHMgaW50byBwYWdlICgiYWJzb2x1dGUiKSBjb29yZGluYXRlcy4KICAgICBpZiAoIWRlbGVn YXRlc1Njcm9sbGluZygpKQotICAgICAgICByZWN0Lm1vdmVCeShzY3JvbGxQb3NpdGlvbigpKTsK KyAgICAgICAgcmVjdC5tb3ZlQnkoc2Nyb2xsUG9zaXRpb25SZWxhdGl2ZVRvRG9jdW1lbnQoKSk7 CiAKICAgICAvLyBGSVhNRTogd2UgZG9uJ3QgaGF2ZSBhIHdheSB0byBtYXAgYW4gYWJzb2x1dGUg cmVjdCBkb3duIHRvIGEgbG9jYWwgcXVhZCwgc28ganVzdAogICAgIC8vIG1vdmUgdGhlIHJlY3Qg Zm9yIG5vdy4KQEAgLTM4MjgsNyArMzgyOCw3IEBAIEludFBvaW50IEZyYW1lVmlldzo6Y29udmVy dEZyb21SZW5kZXJlcigKIAogICAgIC8vIENvbnZlcnQgZnJvbSBwYWdlICgiYWJzb2x1dGUiKSB0 byBGcmFtZVZpZXcgY29vcmRpbmF0ZXMuCiAgICAgaWYgKCFkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkK LSAgICAgICAgcG9pbnQubW92ZUJ5KC1zY3JvbGxQb3NpdGlvbigpKTsKKyAgICAgICAgcG9pbnQu bW92ZUJ5KC1zY3JvbGxQb3NpdGlvbigpICsgSW50UG9pbnQoMCwgaGVhZGVySGVpZ2h0KCkpKTsK ICAgICByZXR1cm4gcG9pbnQ7CiB9CiAKQEAgLTM4MzgsNyArMzgzOCw3IEBAIEludFBvaW50IEZy YW1lVmlldzo6Y29udmVydFRvUmVuZGVyZXIoY28KIAogICAgIC8vIENvbnZlcnQgZnJvbSBGcmFt ZVZpZXcgY29vcmRzIGludG8gcGFnZSAoImFic29sdXRlIikgY29vcmRpbmF0ZXMuCiAgICAgaWYg KCFkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKLSAgICAgICAgcG9pbnQgKz0gSW50U2l6ZShzY3JvbGxY KCksIHNjcm9sbFkoKSk7CisgICAgICAgIHBvaW50ID0gcG9pbnQgKyBzY3JvbGxQb3NpdGlvblJl bGF0aXZlVG9Eb2N1bWVudCgpOwogCiAgICAgcmV0dXJuIHJvdW5kZWRJbnRQb2ludChyZW5kZXJl ci0+YWJzb2x1dGVUb0xvY2FsKHBvaW50LCBVc2VUcmFuc2Zvcm1zKSk7CiB9CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAkocmV2aXNpb24gMTQ4NjE3KQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0 MSw2ICszNDEsMTIgQEAgSW50U2l6ZSBTY3JvbGxWaWV3OjpzY3JvbGxPZmZzZXRSZWxhdGl2ZQog ICAgIHJldHVybiBJbnRTaXplKHNjcm9sbE9mZnNldC53aWR0aCgpLCBzY3JvbGxPZmZzZXQuaGVp Z2h0KCkgLSBoZWFkZXJIZWlnaHQoKSk7CiB9CiAKK0ludFBvaW50IFNjcm9sbFZpZXc6OnNjcm9s bFBvc2l0aW9uUmVsYXRpdmVUb0RvY3VtZW50KCkgY29uc3QKK3sKKyAgICBJbnRQb2ludCBzY3Jv bGxQb3NpdGlvbiA9IHRoaXMtPnNjcm9sbFBvc2l0aW9uKCk7CisgICAgcmV0dXJuIEludFBvaW50 KHNjcm9sbFBvc2l0aW9uLngoKSwgc2Nyb2xsUG9zaXRpb24ueSgpIC0gaGVhZGVySGVpZ2h0KCkp OworfQorCiBpbnQgU2Nyb2xsVmlldzo6c2Nyb2xsU2l6ZShTY3JvbGxiYXJPcmllbnRhdGlvbiBv cmllbnRhdGlvbikgY29uc3QKIHsKICAgICAvLyBJZiBubyBzY3JvbGxiYXJzIGFyZSBwcmVzZW50 LCBpdCBkb2VzIG5vdCBpbmRpY2F0ZSBjb250ZW50IGlzIG5vdCBiZSBzY3JvbGxhYmxlLgpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAkocmV2aXNpb24gMTQ4NjE3KQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC0x OTAsNiArMTkwLDcgQEAgcHVibGljOgogICAgIC8vIGFuY2hvcnMgKDAsMCkgYXQgdGhlIHRvcCBv ZiB0aGUgRG9jdW1lbnQsIHdoaWNoIHdpbGwgYmUgYmVuZWF0aCBhbnkgaGVhZGVycywgc28gaXQg aXMgcmVsYXRpdmUKICAgICAvLyB0byBjb250ZW50c1NpemUoKS4KICAgICBJbnRTaXplIHNjcm9s bE9mZnNldFJlbGF0aXZlVG9Eb2N1bWVudCgpIGNvbnN0OworICAgIEludFBvaW50IHNjcm9sbFBv c2l0aW9uUmVsYXRpdmVUb0RvY3VtZW50KCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIEludFNpemUg b3ZlcmhhbmdBbW91bnQoKSBjb25zdCBPVkVSUklERTsKIApJbmRleDogTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ4 NjQyKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTUgQEAKKzIwMTMtMDQtMTcgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAg ICAgIENvbnRlbnQgaW5zaWRlIGZyYW1lcyBhbmQgc2Nyb2xsYmFycyBpbiBvdmVyZmxvdyBhcmVh cyBoaXQtdGVzdHMgaW5jb3JyZWN0bHkgd2hlbiAKKyAgICAgICAgdGhlIFdLVmlldyBoYXMgYSBo ZWFkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx NDc2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog cGxhdGZvcm0vbWFjLXdrMi90aWxlZC1kcmF3aW5nL2hlYWRlci1hbmQtZm9vdGVyLWhpdC10ZXN0 aW5nLWluLWZyYW1lLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFj LXdrMi90aWxlZC1kcmF3aW5nL2hlYWRlci1hbmQtZm9vdGVyLWhpdC10ZXN0aW5nLWluLWZyYW1l Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy13azIvdGlsZWQtZHJhd2luZy9y ZXNvdXJjZXMvaWZyYW1lLXRvLWhpdC10ZXN0Lmh0bWw6IEFkZGVkLgorCiAyMDEzLTA0LTE3ICBK ZXNzaWUgQmVybGluICA8amJlcmxpbkBhcHBsZS5jb20+CiAKICAgICAgICAgVW5za2lwIHNvbWUg dGVzdHMgZm9yIHdrMiB3aGVyZSB0aGUgdW5kZXJseWluZyBjYXVzZSBvZiB0aGVtIGJlaW5nIHNr aXBwZWQgaGFzIHNpbmNlIGJlZW4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIv dGlsZWQtZHJhd2luZy9oZWFkZXItYW5kLWZvb3Rlci1oaXQtdGVzdGluZy1pbi1mcmFtZS1leHBl Y3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi90aWxl ZC1kcmF3aW5nL2hlYWRlci1hbmQtZm9vdGVyLWhpdC10ZXN0aW5nLWluLWZyYW1lLWV4cGVjdGVk LnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvdGlsZWQt ZHJhd2luZy9oZWFkZXItYW5kLWZvb3Rlci1oaXQtdGVzdGluZy1pbi1mcmFtZS1leHBlY3RlZC50 eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwyIEBACisKK1Bhc3MhCkluZGV4OiBMYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMtd2syL3RpbGVkLWRyYXdpbmcvaGVhZGVyLWFuZC1mb290ZXItaGl0 LXRlc3RpbmctaW4tZnJhbWUuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMtd2syL3RpbGVkLWRyYXdpbmcvaGVhZGVyLWFuZC1mb290ZXItaGl0LXRlc3RpbmctaW4t ZnJhbWUuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIv dGlsZWQtZHJhd2luZy9oZWFkZXItYW5kLWZvb3Rlci1oaXQtdGVzdGluZy1pbi1mcmFtZS5odG1s CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMjIgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0 PgorICAgIGZ1bmN0aW9uIHJ1blRlc3QoKSB7CisgICAgICAgIGlmICghd2luZG93LmV2ZW50U2Vu ZGVyKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBpZiAod2luZG93LmludGVybmFscykK KyAgICAgICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0SGVhZGVySGVpZ2h0KGRvY3VtZW50LCAx MDApOworICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgICAgICB0ZXN0UnVu bmVyLmR1bXBBc1RleHQoKTsKKworICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbygyMCwg MTIwKTsKKyAgICAgICAgZXZlbnRTZW5kZXIubW91c2VEb3duKCk7CisgICAgICAgIGV2ZW50U2Vu ZGVyLm1vdXNlVXAoKTsKKyAgICB9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0i cnVuVGVzdCgpIj4KKyAgICA8aWZyYW1lIHNyYz0icmVzb3VyY2VzL2lmcmFtZS10by1oaXQtdGVz dC5odG1sIiBzY3JvbGxpbmc9Im5vIiBmcmFtZWJvcmRlcj0ibm8iIGhlaWdodD0iMzAwIiB3aWR0 aD0iNjAwIj48L2lmcmFtZT4KKyAgICA8ZGl2IGlkPSJyZXN1bHQiPlRoaXMgdGVzdCBuZWVkcyB0 byBiZSBydW4gdGhyb3VnaCBXZWJLaXRUZXN0UnVubmVyLjwvZGl2PgorPC9ib2R5PgorPC9odG1s PgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi90aWxlZC1kcmF3aW5nL3Jlc291 cmNlcy9pZnJhbWUtdG8taGl0LXRlc3QuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMtd2syL3RpbGVkLWRyYXdpbmcvcmVzb3VyY2VzL2lmcmFtZS10by1oaXQtdGVz dC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi90aWxl ZC1kcmF3aW5nL3Jlc291cmNlcy9pZnJhbWUtdG8taGl0LXRlc3QuaHRtbAkod29ya2luZyBjb3B5 KQpAQCAtMCwwICsxLDIwIEBACis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorICAgICN0YXJnZXQg eworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOnB1cnBsZTsKKyAgICAgICAgd2lkdGg6MjVweDsK KyAgICAgICAgaGVpZ2h0OjI1cHg7CisgICAgfQorPC9zdHlsZT4KKzxzY3JpcHQ+CisgICAgZnVu Y3Rpb24gY2xpY2tlZCgpIHsKKyAgICAgICAgdmFyIHJlc3VsdCA9IHBhcmVudC5kb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgicmVzdWx0Iik7CisgICAgICAgIHJlc3VsdC5pbm5lckhUTUwgPSAiUGFz cyEiOworICAgIH0KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRpdiBpZD0idGFy Z2V0IiBvbmNsaWNrPSJjbGlja2VkKCkiPjwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo=