121708 2013-09-20 13:24:09 -0700 [CSS Shapes] Determining if a line is inside of a shape should only happen in one place 2013-11-13 09:45:30 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bjonesbe giles_joplin commit-queue esprehn+autocc glenn kling kondapallykalyan oldest_to_newest 931553 0 bjonesbe 2013-09-20 13:24:09 -0700 Right now, we are checking if a line is inside a shape both in the ShapeInfo classes and in the Shape classes. And right now, they're not doing is the same thing all the time. The expected behavior is that both lines and shapes are closed on the top and open on the bottom. Also, for the purposes of shape-outside, a zero height shape should still affect a line that it intersects. (eg. shapeTop == lineTop). 949831 1 216710 giles_joplin 2013-11-12 13:03:01 -0800 Created attachment 216710 Patch The ShapeInfo::lineOverlapsShapeBounds() methods now delegate to the Shape object. The logic for the Shape overlap test is now the same for ShapeInsideInfo and ShapeOutsideInfo. 949833 2 216711 giles_joplin 2013-11-12 13:10:37 -0800 Created attachment 216711 Patch Resync'd 950072 3 216711 zoltan 2013-11-13 01:05:01 -0800 Comment on attachment 216711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=216711&action=review I like the change. 2 comments from me: > Source/WebCore/rendering/shapes/Shape.h:90 > + bool lineOverlapsLayoutRect(LayoutUnit lineTop, LayoutUnit lineHeight, const LayoutRect& rect) const The naming of this function is a bit confusing to me, because we usually don't include the typename in the function, but rather the functionality. What do you think about lineOverlapsRectangle or lineOverlapsBoundingBox? > Source/WebCore/rendering/shapes/Shape.h:92 > + return !rect.isEmpty() && ((lineTop < rect.maxY() && lineTop + lineHeight > rect.y()) || (!lineHeight && lineTop == rect.y())); I would early return false for rect.isEmpty then the second part of the condition would be more straightforward in its own line. 950192 4 216809 giles_joplin 2013-11-13 09:09:17 -0800 Created attachment 216809 Patch Made the suggested changes. 950217 5 216809 commit-queue 2013-11-13 09:45:28 -0800 Comment on attachment 216809 Patch Clearing flags on attachment: 216809 Committed r159205: <http://trac.webkit.org/changeset/159205> 950218 6 commit-queue 2013-11-13 09:45:30 -0800 All reviewed patches have been landed. Closing bug. 216710 2013-11-12 13:03:01 -0800 2013-11-12 13:10:37 -0800 Patch tmp.patch text/plain 4269 giles_joplin ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzNWYwMThmLi4xMGNkYWFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTMtMTEtMTIgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAg ICAgW0NTUyBTaGFwZXNdIERldGVybWluaW5nIGlmIGEgbGluZSBpcyBpbnNpZGUgb2YgYSBzaGFw ZSBzaG91bGQgb25seSBoYXBwZW4gaW4gb25lIHBsYWNlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjE3MDgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgU2hhcGVJbmZvOjpsaW5lT3ZlcmxhcHNTaGFw ZUJvdW5kcygpIG1ldGhvZHMgbm93IGRlbGVnYXRlIHRvIHRoZSBTaGFwZSBvYmplY3QuIFRoZQor ICAgICAgICBsb2dpYyBmb3IgdGhlIFNoYXBlIG92ZXJsYXAgdGVzdCBpcyBub3cgdGhlIHNhbWUg Zm9yIFNoYXBlSW5zaWRlSW5mbyBhbmQgU2hhcGVPdXRzaWRlSW5mby4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIHRoaXMgaXMganVzdCBhIHJlZmFjdG9yaW5nIG9mIGV4aXN0aW5nIGNvZGUuCisK KyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmg6CisgICAgICAgIChXZWJDb3JlOjpT aGFwZTo6bGluZU92ZXJsYXBzU2hhcGVNYXJnaW5Cb3VuZHMpOiBBcHBseSBsaW5lT3ZlcmxhcHNM YXlvdXRSZWN0KCkgdG8gdGhlIHNoYXBlLW1hcmdpbiBib3VuZHMgTGF5b3V0UmVjdC4KKyAgICAg ICAgKFdlYkNvcmU6OlNoYXBlOjpsaW5lT3ZlcmxhcHNTaGFwZVBhZGRpbmdCb3VuZHMpOiBBcHBs eSBsaW5lT3ZlcmxhcHNMYXlvdXRSZWN0KCkgdG8gdGhlIHNoYXBlLXBhZGRpbmcgYm91bmRzIExh eW91dFJlY3QuCisgICAgICAgIChXZWJDb3JlOjpTaGFwZTo6bGluZU92ZXJsYXBzTGF5b3V0UmVj dCk6IFRoZSBjb21tb24gY29kZSBmb3IgY2hlY2tpbmcgaWYgYSBsaW5lIGFuZCBhIExheW91dFJl Y3Qgb3ZlcmxhcC4KKyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVzL1NoYXBlSW5zaWRlSW5mby5o OiBVc2UgbGluZU92ZXJsYXBzU2hhcGVQYWRkaW5nQm91bmRzKCkgZm9yIGxpbmVPdmVybGFwU2hh cGVCb3VuZHMoKS4KKyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lkZUluZm8u aDogVXNlIGxpbmVPdmVybGFwc1NoYXBlTWFyZ2luQm91bmRzKCkgZm9yIGxpbmVPdmVybGFwU2hh cGVCb3VuZHMoKS4KKwogMjAxMy0xMS0xMSAgSmF2aWVyIEZlcm5hbmRleiAgPGpmZXJuYW5kZXpA aWdhbGlhLmNvbT4KIAogICAgICAgICBbQ1NTIFJlZ2lvbnNdIFNlbGVjdGlvbiBmb2N1c05vZGUg c2V0IHRvIHRoZSAicmVnaW9uIiBibG9jaywgaW5zdGVhZCBvZiB0aGUgInNvdXJjZSIgYmxvY2sK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuaAppbmRleCBmNzc1ZTVlLi5lZTBk NzJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5oCkBAIC03MSwxMiAr NzEsMTkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBnZXRJbmNsdWRlZEludGVydmFscyhM YXlvdXRVbml0IGxvZ2ljYWxUb3AsIExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgU2VnbWVudExp c3QmKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGdldEV4Y2x1ZGVkSW50ZXJ2YWxzKExh eW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBTZWdtZW50TGlz dCYpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgZmlyc3RJbmNsdWRlZEludGVydmFsTG9n aWNhbFRvcChMYXlvdXRVbml0IG1pbkxvZ2ljYWxJbnRlcnZhbFRvcCwgY29uc3QgTGF5b3V0U2l6 ZSYgbWluTG9naWNhbEludGVydmFsU2l6ZSwgTGF5b3V0VW5pdCYgcmVzdWx0KSBjb25zdCA9IDA7 CisgICAgYm9vbCBsaW5lT3ZlcmxhcHNTaGFwZU1hcmdpbkJvdW5kcyhMYXlvdXRVbml0IGxpbmVU b3AsIExheW91dFVuaXQgbGluZUhlaWdodCkgY29uc3QgeyByZXR1cm4gbGluZU92ZXJsYXBzTGF5 b3V0UmVjdChsaW5lVG9wLCBsaW5lSGVpZ2h0LCBzaGFwZU1hcmdpbkxvZ2ljYWxCb3VuZGluZ0Jv eCgpKTsgfQorICAgIGJvb2wgbGluZU92ZXJsYXBzU2hhcGVQYWRkaW5nQm91bmRzKExheW91dFVu aXQgbGluZVRvcCwgTGF5b3V0VW5pdCBsaW5lSGVpZ2h0KSBjb25zdCB7IHJldHVybiBsaW5lT3Zl cmxhcHNMYXlvdXRSZWN0KGxpbmVUb3AsIGxpbmVIZWlnaHQsIHNoYXBlUGFkZGluZ0xvZ2ljYWxC b3VuZGluZ0JveCgpKTsgfQogCiBwcm90ZWN0ZWQ6CiAgICAgZmxvYXQgc2hhcGVNYXJnaW4oKSBj b25zdCB7IHJldHVybiBtX21hcmdpbjsgfQogICAgIGZsb2F0IHNoYXBlUGFkZGluZygpIGNvbnN0 IHsgcmV0dXJuIG1fcGFkZGluZzsgfQogCiBwcml2YXRlOgorICAgIGJvb2wgbGluZU92ZXJsYXBz TGF5b3V0UmVjdChMYXlvdXRVbml0IGxpbmVUb3AsIExheW91dFVuaXQgbGluZUhlaWdodCwgY29u c3QgTGF5b3V0UmVjdCYgcmVjdCkgY29uc3QKKyAgICB7CisgICAgICAgIHJldHVybiAhcmVjdC5p c0VtcHR5KCkgJiYgKChsaW5lVG9wIDwgcmVjdC5tYXhZKCkgJiYgbGluZVRvcCArIGxpbmVIZWln aHQgPiByZWN0LnkoKSkgfHwgKCFsaW5lSGVpZ2h0ICYmIGxpbmVUb3AgPT0gcmVjdC55KCkpKTsK KyAgICB9CisKICAgICBXcml0aW5nTW9kZSBtX3dyaXRpbmdNb2RlOwogICAgIGZsb2F0IG1fbWFy Z2luOwogICAgIGZsb2F0IG1fcGFkZGluZzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zaGFwZXMvU2hhcGVJbnNpZGVJbmZvLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc2hhcGVzL1NoYXBlSW5zaWRlSW5mby5oCmluZGV4IDA1ZDA0MGEuLmViYWY1MTYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVJbnNpZGVJbmZvLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluc2lkZUluZm8uaApA QCAtOTksOCArOTksNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIGJvb2wgbGluZU92ZXJsYXBz U2hhcGVCb3VuZHMoKSBjb25zdCBPVkVSUklERQogICAgIHsKLSAgICAgICAgLy8gVGhlIDw9IHRl c3QgaXMgdG8gaGFuZGxlIHRoZSBjYXNlIG9mIGEgemVybyBoZWlnaHQgbGluZSBvciBhIHplcm8g aGVpZ2h0IHNoYXBlLgotICAgICAgICByZXR1cm4gbG9naWNhbExpbmVUb3AoKSA8IHNoYXBlTG9n aWNhbEJvdHRvbSgpICYmIHNoYXBlTG9naWNhbFRvcCgpIDw9IGxvZ2ljYWxMaW5lQm90dG9tKCk7 CisgICAgICAgIHJldHVybiBjb21wdXRlZFNoYXBlKCktPmxpbmVPdmVybGFwc1NoYXBlUGFkZGlu Z0JvdW5kcyhtX3NoYXBlTGluZVRvcCwgbV9saW5lSGVpZ2h0KTsKICAgICB9CiAKIHByb3RlY3Rl ZDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVPdXRz aWRlSW5mby5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJ bmZvLmgKaW5kZXggNTMyMGVjOS4uNDdkNjI5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmgKQEAgLTUzLDggKzUzLDcgQEAgcHVi bGljOgogCiAgICAgdmlydHVhbCBib29sIGxpbmVPdmVybGFwc1NoYXBlQm91bmRzKCkgY29uc3Qg T1ZFUlJJREUKICAgICB7Ci0gICAgICAgIHJldHVybiAobG9naWNhbExpbmVUb3AoKSA8IHNoYXBl TG9naWNhbEJvdHRvbSgpICYmIHNoYXBlTG9naWNhbFRvcCgpIDwgbG9naWNhbExpbmVCb3R0b20o KSkKLSAgICAgICAgICAgIHx8IGxvZ2ljYWxMaW5lVG9wKCkgPT0gc2hhcGVMb2dpY2FsVG9wKCk7 IC8vIGNhc2Ugb2YgemVybyBoZWlnaHQgbGluZSBvciB6ZXJvIGhlaWdodCBzaGFwZQorICAgICAg ICByZXR1cm4gY29tcHV0ZWRTaGFwZSgpLT5saW5lT3ZlcmxhcHNTaGFwZU1hcmdpbkJvdW5kcyht X3NoYXBlTGluZVRvcCwgbV9saW5lSGVpZ2h0KTsKICAgICB9CiAKIHByb3RlY3RlZDoK 216711 2013-11-12 13:10:37 -0800 2013-11-13 09:09:17 -0800 Patch tmp.patch text/plain 4229 giles_joplin ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0OWNkNWFjLi43ODY4YjM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTMtMTEtMTIgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAg ICAgW0NTUyBTaGFwZXNdIERldGVybWluaW5nIGlmIGEgbGluZSBpcyBpbnNpZGUgb2YgYSBzaGFw ZSBzaG91bGQgb25seSBoYXBwZW4gaW4gb25lIHBsYWNlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjE3MDgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgU2hhcGVJbmZvOjpsaW5lT3ZlcmxhcHNTaGFw ZUJvdW5kcygpIG1ldGhvZHMgbm93IGRlbGVnYXRlIHRvIHRoZSBTaGFwZSBvYmplY3QuIFRoZQor ICAgICAgICBsb2dpYyBmb3IgdGhlIFNoYXBlIG92ZXJsYXAgdGVzdCBpcyBub3cgdGhlIHNhbWUg Zm9yIFNoYXBlSW5zaWRlSW5mbyBhbmQgU2hhcGVPdXRzaWRlSW5mby4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIHRoaXMgaXMganVzdCBhIHJlZmFjdG9yaW5nIG9mIGV4aXN0aW5nIGNvZGUuCisK KyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmg6CisgICAgICAgIChXZWJDb3JlOjpT aGFwZTo6bGluZU92ZXJsYXBzU2hhcGVNYXJnaW5Cb3VuZHMpOiBBcHBseSBsaW5lT3ZlcmxhcHNM YXlvdXRSZWN0KCkgdG8gdGhlIHNoYXBlLW1hcmdpbiBib3VuZHMgTGF5b3V0UmVjdC4KKyAgICAg ICAgKFdlYkNvcmU6OlNoYXBlOjpsaW5lT3ZlcmxhcHNTaGFwZVBhZGRpbmdCb3VuZHMpOiBBcHBs eSBsaW5lT3ZlcmxhcHNMYXlvdXRSZWN0KCkgdG8gdGhlIHNoYXBlLXBhZGRpbmcgYm91bmRzIExh eW91dFJlY3QuCisgICAgICAgIChXZWJDb3JlOjpTaGFwZTo6bGluZU92ZXJsYXBzTGF5b3V0UmVj dCk6IFRoZSBjb21tb24gY29kZSBmb3IgY2hlY2tpbmcgaWYgYSBsaW5lIGFuZCBhIExheW91dFJl Y3Qgb3ZlcmxhcC4KKyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVzL1NoYXBlSW5zaWRlSW5mby5o OiBVc2UgbGluZU92ZXJsYXBzU2hhcGVQYWRkaW5nQm91bmRzKCkgZm9yIGxpbmVPdmVybGFwU2hh cGVCb3VuZHMoKS4KKyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lkZUluZm8u aDogVXNlIGxpbmVPdmVybGFwc1NoYXBlTWFyZ2luQm91bmRzKCkgZm9yIGxpbmVPdmVybGFwU2hh cGVCb3VuZHMoKS4KKwogMjAxMy0xMS0xMiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNl bkB3ZWJraXQub3JnPgogCiAgICAgICAgIFtXaW5DYWlyb10gUHJlcGFyYXRpb24gZm9yIEVOQUJM RShWSURFTykuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1No YXBlLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmgKaW5kZXggYmQy ZDI5Ni4uNGY0YTYwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBl cy9TaGFwZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuaApA QCAtNzcsNiArNzcsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGdldEluY2x1ZGVkSW50 ZXJ2YWxzKExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBT ZWdtZW50TGlzdCYpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZ2V0RXhjbHVkZWRJbnRl cnZhbHMoTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIFNl Z21lbnRMaXN0JikgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBmaXJzdEluY2x1ZGVkSW50 ZXJ2YWxMb2dpY2FsVG9wKExheW91dFVuaXQgbWluTG9naWNhbEludGVydmFsVG9wLCBjb25zdCBM YXlvdXRTaXplJiBtaW5Mb2dpY2FsSW50ZXJ2YWxTaXplLCBMYXlvdXRVbml0JiByZXN1bHQpIGNv bnN0ID0gMDsKKyAgICBib29sIGxpbmVPdmVybGFwc1NoYXBlTWFyZ2luQm91bmRzKExheW91dFVu aXQgbGluZVRvcCwgTGF5b3V0VW5pdCBsaW5lSGVpZ2h0KSBjb25zdCB7IHJldHVybiBsaW5lT3Zl cmxhcHNMYXlvdXRSZWN0KGxpbmVUb3AsIGxpbmVIZWlnaHQsIHNoYXBlTWFyZ2luTG9naWNhbEJv dW5kaW5nQm94KCkpOyB9CisgICAgYm9vbCBsaW5lT3ZlcmxhcHNTaGFwZVBhZGRpbmdCb3VuZHMo TGF5b3V0VW5pdCBsaW5lVG9wLCBMYXlvdXRVbml0IGxpbmVIZWlnaHQpIGNvbnN0IHsgcmV0dXJu IGxpbmVPdmVybGFwc0xheW91dFJlY3QobGluZVRvcCwgbGluZUhlaWdodCwgc2hhcGVQYWRkaW5n TG9naWNhbEJvdW5kaW5nQm94KCkpOyB9CiAKICAgICB2aXJ0dWFsIFNoYXBlVHlwZSB0eXBlKCkg Y29uc3QgPSAwOwogCkBAIC04NSw2ICs4NywxMSBAQCBwcm90ZWN0ZWQ6CiAgICAgZmxvYXQgc2hh cGVQYWRkaW5nKCkgY29uc3QgeyByZXR1cm4gbV9wYWRkaW5nOyB9CiAKIHByaXZhdGU6CisgICAg Ym9vbCBsaW5lT3ZlcmxhcHNMYXlvdXRSZWN0KExheW91dFVuaXQgbGluZVRvcCwgTGF5b3V0VW5p dCBsaW5lSGVpZ2h0LCBjb25zdCBMYXlvdXRSZWN0JiByZWN0KSBjb25zdAorICAgIHsKKyAgICAg ICAgcmV0dXJuICFyZWN0LmlzRW1wdHkoKSAmJiAoKGxpbmVUb3AgPCByZWN0Lm1heFkoKSAmJiBs aW5lVG9wICsgbGluZUhlaWdodCA+IHJlY3QueSgpKSB8fCAoIWxpbmVIZWlnaHQgJiYgbGluZVRv cCA9PSByZWN0LnkoKSkpOworICAgIH0KKwogICAgIFdyaXRpbmdNb2RlIG1fd3JpdGluZ01vZGU7 CiAgICAgZmxvYXQgbV9tYXJnaW47CiAgICAgZmxvYXQgbV9wYWRkaW5nOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluc2lkZUluZm8uaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVJbnNpZGVJbmZvLmgKaW5kZXggMDVkMDQw YS4uZWJhZjUxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9T aGFwZUluc2lkZUluZm8uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1No YXBlSW5zaWRlSW5mby5oCkBAIC05OSw4ICs5OSw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwg Ym9vbCBsaW5lT3ZlcmxhcHNTaGFwZUJvdW5kcygpIGNvbnN0IE9WRVJSSURFCiAgICAgewotICAg ICAgICAvLyBUaGUgPD0gdGVzdCBpcyB0byBoYW5kbGUgdGhlIGNhc2Ugb2YgYSB6ZXJvIGhlaWdo dCBsaW5lIG9yIGEgemVybyBoZWlnaHQgc2hhcGUuCi0gICAgICAgIHJldHVybiBsb2dpY2FsTGlu ZVRvcCgpIDwgc2hhcGVMb2dpY2FsQm90dG9tKCkgJiYgc2hhcGVMb2dpY2FsVG9wKCkgPD0gbG9n aWNhbExpbmVCb3R0b20oKTsKKyAgICAgICAgcmV0dXJuIGNvbXB1dGVkU2hhcGUoKS0+bGluZU92 ZXJsYXBzU2hhcGVQYWRkaW5nQm91bmRzKG1fc2hhcGVMaW5lVG9wLCBtX2xpbmVIZWlnaHQpOwog ICAgIH0KIAogcHJvdGVjdGVkOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hh cGVzL1NoYXBlT3V0c2lkZUluZm8uaAppbmRleCA1MzIwZWM5Li40N2Q2MjliIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lkZUluZm8uaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lkZUluZm8uaApAQCAt NTMsOCArNTMsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIGJvb2wgbGluZU92ZXJsYXBzU2hh cGVCb3VuZHMoKSBjb25zdCBPVkVSUklERQogICAgIHsKLSAgICAgICAgcmV0dXJuIChsb2dpY2Fs TGluZVRvcCgpIDwgc2hhcGVMb2dpY2FsQm90dG9tKCkgJiYgc2hhcGVMb2dpY2FsVG9wKCkgPCBs b2dpY2FsTGluZUJvdHRvbSgpKQotICAgICAgICAgICAgfHwgbG9naWNhbExpbmVUb3AoKSA9PSBz aGFwZUxvZ2ljYWxUb3AoKTsgLy8gY2FzZSBvZiB6ZXJvIGhlaWdodCBsaW5lIG9yIHplcm8gaGVp Z2h0IHNoYXBlCisgICAgICAgIHJldHVybiBjb21wdXRlZFNoYXBlKCktPmxpbmVPdmVybGFwc1No YXBlTWFyZ2luQm91bmRzKG1fc2hhcGVMaW5lVG9wLCBtX2xpbmVIZWlnaHQpOwogICAgIH0KIAog cHJvdGVjdGVkOgo= 216809 2013-11-13 09:09:17 -0800 2013-11-13 09:45:28 -0800 Patch tmp.patch text/plain 4267 giles_joplin ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0OWNkNWFjLi43ODY4YjM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTMtMTEtMTIgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAg ICAgW0NTUyBTaGFwZXNdIERldGVybWluaW5nIGlmIGEgbGluZSBpcyBpbnNpZGUgb2YgYSBzaGFw ZSBzaG91bGQgb25seSBoYXBwZW4gaW4gb25lIHBsYWNlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjE3MDgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgU2hhcGVJbmZvOjpsaW5lT3ZlcmxhcHNTaGFw ZUJvdW5kcygpIG1ldGhvZHMgbm93IGRlbGVnYXRlIHRvIHRoZSBTaGFwZSBvYmplY3QuIFRoZQor ICAgICAgICBsb2dpYyBmb3IgdGhlIFNoYXBlIG92ZXJsYXAgdGVzdCBpcyBub3cgdGhlIHNhbWUg Zm9yIFNoYXBlSW5zaWRlSW5mbyBhbmQgU2hhcGVPdXRzaWRlSW5mby4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIHRoaXMgaXMganVzdCBhIHJlZmFjdG9yaW5nIG9mIGV4aXN0aW5nIGNvZGUuCisK KyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmg6CisgICAgICAgIChXZWJDb3JlOjpT aGFwZTo6bGluZU92ZXJsYXBzU2hhcGVNYXJnaW5Cb3VuZHMpOiBBcHBseSBsaW5lT3ZlcmxhcHNM YXlvdXRSZWN0KCkgdG8gdGhlIHNoYXBlLW1hcmdpbiBib3VuZHMgTGF5b3V0UmVjdC4KKyAgICAg ICAgKFdlYkNvcmU6OlNoYXBlOjpsaW5lT3ZlcmxhcHNTaGFwZVBhZGRpbmdCb3VuZHMpOiBBcHBs eSBsaW5lT3ZlcmxhcHNMYXlvdXRSZWN0KCkgdG8gdGhlIHNoYXBlLXBhZGRpbmcgYm91bmRzIExh eW91dFJlY3QuCisgICAgICAgIChXZWJDb3JlOjpTaGFwZTo6bGluZU92ZXJsYXBzTGF5b3V0UmVj dCk6IFRoZSBjb21tb24gY29kZSBmb3IgY2hlY2tpbmcgaWYgYSBsaW5lIGFuZCBhIExheW91dFJl Y3Qgb3ZlcmxhcC4KKyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVzL1NoYXBlSW5zaWRlSW5mby5o OiBVc2UgbGluZU92ZXJsYXBzU2hhcGVQYWRkaW5nQm91bmRzKCkgZm9yIGxpbmVPdmVybGFwU2hh cGVCb3VuZHMoKS4KKyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lkZUluZm8u aDogVXNlIGxpbmVPdmVybGFwc1NoYXBlTWFyZ2luQm91bmRzKCkgZm9yIGxpbmVPdmVybGFwU2hh cGVCb3VuZHMoKS4KKwogMjAxMy0xMS0xMiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNl bkB3ZWJraXQub3JnPgogCiAgICAgICAgIFtXaW5DYWlyb10gUHJlcGFyYXRpb24gZm9yIEVOQUJM RShWSURFTykuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1No YXBlLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmgKaW5kZXggYmQy ZDI5Ni4uNjIxNmFmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBl cy9TaGFwZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuaApA QCAtNzcsNiArNzcsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGdldEluY2x1ZGVkSW50 ZXJ2YWxzKExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBT ZWdtZW50TGlzdCYpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZ2V0RXhjbHVkZWRJbnRl cnZhbHMoTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIFNl Z21lbnRMaXN0JikgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBmaXJzdEluY2x1ZGVkSW50 ZXJ2YWxMb2dpY2FsVG9wKExheW91dFVuaXQgbWluTG9naWNhbEludGVydmFsVG9wLCBjb25zdCBM YXlvdXRTaXplJiBtaW5Mb2dpY2FsSW50ZXJ2YWxTaXplLCBMYXlvdXRVbml0JiByZXN1bHQpIGNv bnN0ID0gMDsKKyAgICBib29sIGxpbmVPdmVybGFwc1NoYXBlTWFyZ2luQm91bmRzKExheW91dFVu aXQgbGluZVRvcCwgTGF5b3V0VW5pdCBsaW5lSGVpZ2h0KSBjb25zdCB7IHJldHVybiBsaW5lT3Zl cmxhcHNCb3VuZGluZ0JveChsaW5lVG9wLCBsaW5lSGVpZ2h0LCBzaGFwZU1hcmdpbkxvZ2ljYWxC b3VuZGluZ0JveCgpKTsgfQorICAgIGJvb2wgbGluZU92ZXJsYXBzU2hhcGVQYWRkaW5nQm91bmRz KExheW91dFVuaXQgbGluZVRvcCwgTGF5b3V0VW5pdCBsaW5lSGVpZ2h0KSBjb25zdCB7IHJldHVy biBsaW5lT3ZlcmxhcHNCb3VuZGluZ0JveChsaW5lVG9wLCBsaW5lSGVpZ2h0LCBzaGFwZVBhZGRp bmdMb2dpY2FsQm91bmRpbmdCb3goKSk7IH0KIAogICAgIHZpcnR1YWwgU2hhcGVUeXBlIHR5cGUo KSBjb25zdCA9IDA7CiAKQEAgLTg1LDYgKzg3LDEzIEBAIHByb3RlY3RlZDoKICAgICBmbG9hdCBz aGFwZVBhZGRpbmcoKSBjb25zdCB7IHJldHVybiBtX3BhZGRpbmc7IH0KIAogcHJpdmF0ZToKKyAg ICBib29sIGxpbmVPdmVybGFwc0JvdW5kaW5nQm94KExheW91dFVuaXQgbGluZVRvcCwgTGF5b3V0 VW5pdCBsaW5lSGVpZ2h0LCBjb25zdCBMYXlvdXRSZWN0JiByZWN0KSBjb25zdAorICAgIHsKKyAg ICAgICAgaWYgKHJlY3QuaXNFbXB0eSgpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAg ICAgICByZXR1cm4gKGxpbmVUb3AgPCByZWN0Lm1heFkoKSAmJiBsaW5lVG9wICsgbGluZUhlaWdo dCA+IHJlY3QueSgpKSB8fCAoIWxpbmVIZWlnaHQgJiYgbGluZVRvcCA9PSByZWN0LnkoKSk7Cisg ICAgfQorCiAgICAgV3JpdGluZ01vZGUgbV93cml0aW5nTW9kZTsKICAgICBmbG9hdCBtX21hcmdp bjsKICAgICBmbG9hdCBtX3BhZGRpbmc7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc2hhcGVzL1NoYXBlSW5zaWRlSW5mby5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3NoYXBlcy9TaGFwZUluc2lkZUluZm8uaAppbmRleCAwNWQwNDBhLi5lYmFmNTE2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlSW5zaWRlSW5mby5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVJbnNpZGVJbmZvLmgKQEAg LTk5LDggKzk5LDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBib29sIGxpbmVPdmVybGFwc1No YXBlQm91bmRzKCkgY29uc3QgT1ZFUlJJREUKICAgICB7Ci0gICAgICAgIC8vIFRoZSA8PSB0ZXN0 IGlzIHRvIGhhbmRsZSB0aGUgY2FzZSBvZiBhIHplcm8gaGVpZ2h0IGxpbmUgb3IgYSB6ZXJvIGhl aWdodCBzaGFwZS4KLSAgICAgICAgcmV0dXJuIGxvZ2ljYWxMaW5lVG9wKCkgPCBzaGFwZUxvZ2lj YWxCb3R0b20oKSAmJiBzaGFwZUxvZ2ljYWxUb3AoKSA8PSBsb2dpY2FsTGluZUJvdHRvbSgpOwor ICAgICAgICByZXR1cm4gY29tcHV0ZWRTaGFwZSgpLT5saW5lT3ZlcmxhcHNTaGFwZVBhZGRpbmdC b3VuZHMobV9zaGFwZUxpbmVUb3AsIG1fbGluZUhlaWdodCk7CiAgICAgfQogCiBwcm90ZWN0ZWQ6 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lk ZUluZm8uaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVPdXRzaWRlSW5m by5oCmluZGV4IDUzMjBlYzkuLjQ3ZDYyOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zaGFwZXMvU2hhcGVPdXRzaWRlSW5mby5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zaGFwZXMvU2hhcGVPdXRzaWRlSW5mby5oCkBAIC01Myw4ICs1Myw3IEBAIHB1Ymxp YzoKIAogICAgIHZpcnR1YWwgYm9vbCBsaW5lT3ZlcmxhcHNTaGFwZUJvdW5kcygpIGNvbnN0IE9W RVJSSURFCiAgICAgewotICAgICAgICByZXR1cm4gKGxvZ2ljYWxMaW5lVG9wKCkgPCBzaGFwZUxv Z2ljYWxCb3R0b20oKSAmJiBzaGFwZUxvZ2ljYWxUb3AoKSA8IGxvZ2ljYWxMaW5lQm90dG9tKCkp Ci0gICAgICAgICAgICB8fCBsb2dpY2FsTGluZVRvcCgpID09IHNoYXBlTG9naWNhbFRvcCgpOyAv LyBjYXNlIG9mIHplcm8gaGVpZ2h0IGxpbmUgb3IgemVybyBoZWlnaHQgc2hhcGUKKyAgICAgICAg cmV0dXJuIGNvbXB1dGVkU2hhcGUoKS0+bGluZU92ZXJsYXBzU2hhcGVNYXJnaW5Cb3VuZHMobV9z aGFwZUxpbmVUb3AsIG1fbGluZUhlaWdodCk7CiAgICAgfQogCiBwcm90ZWN0ZWQ6Cg==