78526 2012-02-13 13:42:46 -0800 Convert RenderFrameSet to LayoutUnits in preparation for turning on subpixel layout 2012-02-15 23:04:38 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63567 1 eae eae darin eric leviw simon.fraser webkit.review.bot oldest_to_newest 555535 0 eae 2012-02-13 13:42:46 -0800 Convert RenderFrameSet to use LayoutUnits internally. 555590 1 126834 eae 2012-02-13 14:14:05 -0800 Created attachment 126834 Patch 557492 2 126834 eric 2012-02-15 13:15:00 -0800 Comment on attachment 126834 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=126834&action=review > Source/WebCore/rendering/RenderFrameSet.cpp:85 > +void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect& borderRect) > { > - if (!paintInfo.rect.intersects(pixelSnappedIntRect(borderRect))) > + if (!paintInfo.rect.intersects(borderRect)) Why is this one ints? > Source/WebCore/rendering/RenderFrameSet.cpp:103 > void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const LayoutRect& borderRect) Did you intentionally leave this one LayoutRects? > Source/WebCore/rendering/RenderFrameSet.h:122 > + void paintRowBorder(const PaintInfo&, const IntRect&); This doesn't match the cpp side of your change. 557693 3 eae 2012-02-15 16:10:23 -0800 (In reply to comment #2) > (From update of attachment 126834 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=126834&action=review > > > Source/WebCore/rendering/RenderFrameSet.cpp:85 > > +void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect& borderRect) > > { > > - if (!paintInfo.rect.intersects(pixelSnappedIntRect(borderRect))) > > + if (!paintInfo.rect.intersects(borderRect)) > > Why is this one ints? paintInfo.rect is in device pixels and represents what will be painted. As such we are keeping it in ints. > > > Source/WebCore/rendering/RenderFrameSet.cpp:103 > > void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const LayoutRect& borderRect) > > Did you intentionally leave this one LayoutRects? No, my bad. The .h file is correct. > > > Source/WebCore/rendering/RenderFrameSet.h:122 > > + void paintRowBorder(const PaintInfo&, const IntRect&); > > This doesn't match the cpp side of your change. I'll fix the cpp side. 557744 4 127277 eae 2012-02-15 17:01:35 -0800 Created attachment 127277 Patch 557755 5 127277 eric 2012-02-15 17:13:10 -0800 Comment on attachment 127277 Patch OK. 557757 6 eae 2012-02-15 17:18:02 -0800 Thanks for catching the header/cpp mismatch, can't believe I missed that. 557920 7 127277 webkit.review.bot 2012-02-15 23:04:32 -0800 Comment on attachment 127277 Patch Clearing flags on attachment: 127277 Committed r107889: <http://trac.webkit.org/changeset/107889> 557921 8 webkit.review.bot 2012-02-15 23:04:38 -0800 All reviewed patches have been landed. Closing bug. 126834 2012-02-13 14:14:05 -0800 2012-02-15 17:01:32 -0800 Patch bug-78526-20120213141404.patch text/plain 4991 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNzYwMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAyLTEzICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBDb252ZXJ0IFJlbmRlckZyYW1l U2V0IHRvIExheW91dFVuaXRzIGluIHByZXBhcmF0aW9uIGZvciB0dXJuaW5nIG9uIHN1YnBpeGVs IGxheW91dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Nzg1MjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS ZXZlcnQgcGFpbnRDb2x1bW5Cb3JkZXIgYW5kIHBhaW50Um93Qm9yZGVyIHRvIEludFJlY3QgYW5k IHBpeGVsIHNuYXAgaW4KKyAgICAgICAgcGFpbnQgYmVmb3JlIGNhbGxpbmcgdGhlbS4gVGhpcyB3 YXkgdGhlIHJvdW5kaW5nIGxvZ2ljIGlzIGNvbnRhaW5lZCBpbiBhCisgICAgICAgIHNpbmdsZSBw bGFjZSAoaW4gcGFpbnQpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gbmV3IGZ1bmN0aW9u YWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRnJhbWVTZXQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyRnJhbWVTZXQ6OnBhaW50Q29sdW1uQm9yZGVyKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckZyYW1lU2V0OjpwYWludFJvd0JvcmRlcik6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJGcmFtZVNldDo6cGFpbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRnJh bWVTZXQ6OmdldEN1cnNvcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZyYW1lU2V0Lmg6 CisgICAgICAgIChSZW5kZXJGcmFtZVNldCk6CisKIDIwMTItMDItMTIgIEFuZHkgRXN0ZXMgIDxh ZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5kb3dzXSBBZGQgQVBJIHRvIGVuYWJsZSBp bnZlcnRlZCBjb2xvciBkcmF3aW5nIG9uIGEgV2ViVmlldwpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckZyYW1lU2V0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRnJhbWVTZXQuY3BwCShyZXZpc2lvbiAxMDc1OTYpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnJhbWVTZXQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC04MCw5ICs4MCw5IEBAIHN0YXRpYyBDb2xvciBib3JkZXJGaWxsQ29sb3IoKQogICAgIHJldHVy biBDb2xvcigyMDgsIDIwOCwgMjA4KTsKIH0KIAotdm9pZCBSZW5kZXJGcmFtZVNldDo6cGFpbnRD b2x1bW5Cb3JkZXIoY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFJlY3Qm IGJvcmRlclJlY3QpCit2b2lkIFJlbmRlckZyYW1lU2V0OjpwYWludENvbHVtbkJvcmRlcihjb25z dCBQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgYm9yZGVyUmVjdCkKIHsKLSAg ICBpZiAoIXBhaW50SW5mby5yZWN0LmludGVyc2VjdHMocGl4ZWxTbmFwcGVkSW50UmVjdChib3Jk ZXJSZWN0KSkpCisgICAgaWYgKCFwYWludEluZm8ucmVjdC5pbnRlcnNlY3RzKGJvcmRlclJlY3Qp KQogICAgICAgICByZXR1cm47CiAgICAgICAgIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgZG8g c29tZXRoaW5nIGNsZXZlciB3aGVuIGJvcmRlcnMgZnJvbSBkaXN0aW5jdCBmcmFtZXNldHMgbWVl dCBhdCBhIGpvaW4uCkBAIC0xMDIsNyArMTAyLDcgQEAgdm9pZCBSZW5kZXJGcmFtZVNldDo6cGFp bnRDb2x1bW5Cb3JkZXIoYwogCiB2b2lkIFJlbmRlckZyYW1lU2V0OjpwYWludFJvd0JvcmRlcihj b25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UmVjdCYgYm9yZGVyUmVjdCkK IHsKLSAgICBpZiAoIXBhaW50SW5mby5yZWN0LmludGVyc2VjdHMocGl4ZWxTbmFwcGVkSW50UmVj dChib3JkZXJSZWN0KSkpCisgICAgaWYgKCFwYWludEluZm8ucmVjdC5pbnRlcnNlY3RzKGJvcmRl clJlY3QpKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGRvIHNv bWV0aGluZyBjbGV2ZXIgd2hlbiBib3JkZXJzIGZyb20gZGlzdGluY3QgZnJhbWVzZXRzIG1lZXQg YXQgYSBqb2luLgpAQCAtMTQyLDcgKzE0Miw3IEBAIHZvaWQgUmVuZGVyRnJhbWVTZXQ6OnBhaW50 KFBhaW50SW5mbyYgcGEKICAgICAgICAgICAgIGNoaWxkLT5wYWludChwYWludEluZm8sIGFkanVz dGVkUGFpbnRPZmZzZXQpOwogICAgICAgICAgICAgeFBvcyArPSBtX2NvbHMubV9zaXplc1tjXTsK ICAgICAgICAgICAgIGlmIChib3JkZXJUaGlja25lc3MgJiYgbV9jb2xzLm1fYWxsb3dCb3JkZXJb YyArIDFdKSB7Ci0gICAgICAgICAgICAgICAgcGFpbnRDb2x1bW5Cb3JkZXIocGFpbnRJbmZvLCBM YXlvdXRSZWN0KGFkanVzdGVkUGFpbnRPZmZzZXQueCgpICsgeFBvcywgYWRqdXN0ZWRQYWludE9m ZnNldC55KCkgKyB5UG9zLCBib3JkZXJUaGlja25lc3MsIGhlaWdodCgpKSk7CisgICAgICAgICAg ICAgICAgcGFpbnRDb2x1bW5Cb3JkZXIocGFpbnRJbmZvLCBwaXhlbFNuYXBwZWRJbnRSZWN0KExh eW91dFJlY3QoYWRqdXN0ZWRQYWludE9mZnNldC54KCkgKyB4UG9zLCBhZGp1c3RlZFBhaW50T2Zm c2V0LnkoKSArIHlQb3MsIGJvcmRlclRoaWNrbmVzcywgaGVpZ2h0KCkpKSk7CiAgICAgICAgICAg ICAgICAgeFBvcyArPSBib3JkZXJUaGlja25lc3M7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpOwpAQCAtMTUxLDcgKzE1MSw3IEBAIHZvaWQg UmVuZGVyRnJhbWVTZXQ6OnBhaW50KFBhaW50SW5mbyYgcGEKICAgICAgICAgfQogICAgICAgICB5 UG9zICs9IG1fcm93cy5tX3NpemVzW3JdOwogICAgICAgICBpZiAoYm9yZGVyVGhpY2tuZXNzICYm IG1fcm93cy5tX2FsbG93Qm9yZGVyW3IgKyAxXSkgewotICAgICAgICAgICAgcGFpbnRSb3dCb3Jk ZXIocGFpbnRJbmZvLCBMYXlvdXRSZWN0KGFkanVzdGVkUGFpbnRPZmZzZXQueCgpLCBhZGp1c3Rl ZFBhaW50T2Zmc2V0LnkoKSArIHlQb3MsIHdpZHRoKCksIGJvcmRlclRoaWNrbmVzcykpOworICAg ICAgICAgICAgcGFpbnRSb3dCb3JkZXIocGFpbnRJbmZvLCBwaXhlbFNuYXBwZWRJbnRSZWN0KExh eW91dFJlY3QoYWRqdXN0ZWRQYWludE9mZnNldC54KCksIGFkanVzdGVkUGFpbnRPZmZzZXQueSgp ICsgeVBvcywgd2lkdGgoKSwgYm9yZGVyVGhpY2tuZXNzKSkpOwogICAgICAgICAgICAgeVBvcyAr PSBib3JkZXJUaGlja25lc3M7CiAgICAgICAgIH0KICAgICB9CkBAIC04MDIsMTEgKzgwMiwxMiBA QCBib29sIFJlbmRlckZyYW1lU2V0Ojppc0NoaWxkQWxsb3dlZChSZW5kCiAKIEN1cnNvckRpcmVj dGl2ZSBSZW5kZXJGcmFtZVNldDo6Z2V0Q3Vyc29yKGNvbnN0IExheW91dFBvaW50JiBwb2ludCwg Q3Vyc29yJiBjdXJzb3IpIGNvbnN0CiB7Ci0gICAgaWYgKGNhblJlc2l6ZVJvdyhyb3VuZGVkSW50 UG9pbnQocG9pbnQpKSkgeworICAgIEludFBvaW50IHJvdW5kZWRQb2ludCA9IHJvdW5kZWRJbnRQ b2ludChwb2ludCk7CisgICAgaWYgKGNhblJlc2l6ZVJvdyhyb3VuZGVkUG9pbnQpKSB7CiAgICAg ICAgIGN1cnNvciA9IHJvd1Jlc2l6ZUN1cnNvcigpOwogICAgICAgICByZXR1cm4gU2V0Q3Vyc29y OwogICAgIH0KLSAgICBpZiAoY2FuUmVzaXplQ29sdW1uKHBvaW50KSkgeworICAgIGlmIChjYW5S ZXNpemVDb2x1bW4ocm91bmRlZFBvaW50KSkgewogICAgICAgICBjdXJzb3IgPSBjb2x1bW5SZXNp emVDdXJzb3IoKTsKICAgICAgICAgcmV0dXJuIFNldEN1cnNvcjsKICAgICB9CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnJhbWVTZXQuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnJhbWVTZXQuaAkocmV2aXNpb24gMTA3NTk2KQor KysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZyYW1lU2V0LmgJKHdvcmtpbmcgY29w eSkKQEAgLTY4LDggKzY4LDggQEAgcHVibGljOgogICAgIGJvb2wgaXNSZXNpemluZ1JvdygpIGNv bnN0OwogICAgIGJvb2wgaXNSZXNpemluZ0NvbHVtbigpIGNvbnN0OwogCi0gICAgYm9vbCBjYW5S ZXNpemVSb3coY29uc3QgTGF5b3V0UG9pbnQmKSBjb25zdDsKLSAgICBib29sIGNhblJlc2l6ZUNv bHVtbihjb25zdCBMYXlvdXRQb2ludCYpIGNvbnN0OworICAgIGJvb2wgY2FuUmVzaXplUm93KGNv bnN0IEludFBvaW50JikgY29uc3Q7CisgICAgYm9vbCBjYW5SZXNpemVDb2x1bW4oY29uc3QgSW50 UG9pbnQmKSBjb25zdDsKIAogICAgIHZvaWQgbm90aWZ5RnJhbWVFZGdlSW5mb0NoYW5nZWQoKTsK IApAQCAtMTE5LDggKzExOSw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzdGFydFJlc2l6aW5nKEdy aWRBeGlzJiwgaW50IHBvc2l0aW9uKTsKICAgICB2b2lkIGNvbnRpbnVlUmVzaXppbmcoR3JpZEF4 aXMmLCBpbnQgcG9zaXRpb24pOwogCi0gICAgdm9pZCBwYWludFJvd0JvcmRlcihjb25zdCBQYWlu dEluZm8mLCBjb25zdCBMYXlvdXRSZWN0Jik7Ci0gICAgdm9pZCBwYWludENvbHVtbkJvcmRlcihj b25zdCBQYWludEluZm8mLCBjb25zdCBMYXlvdXRSZWN0Jik7CisgICAgdm9pZCBwYWludFJvd0Jv cmRlcihjb25zdCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7CisgICAgdm9pZCBwYWludENv bHVtbkJvcmRlcihjb25zdCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7CiAKICAgICBSZW5k ZXJPYmplY3RDaGlsZExpc3QgbV9jaGlsZHJlbjsKIAo= 127277 2012-02-15 17:01:35 -0800 2012-02-15 23:04:32 -0800 Patch bug-78526-20120215170134.patch text/plain 5097 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNzg0MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAyLTE1ICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBDb252ZXJ0IFJlbmRlckZyYW1l U2V0IHRvIExheW91dFVuaXRzIGluIHByZXBhcmF0aW9uIGZvciB0dXJuaW5nIG9uIHN1YnBpeGVs IGxheW91dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Nzg1MjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS ZXZlcnQgcGFpbnRDb2x1bW5Cb3JkZXIgYW5kIHBhaW50Um93Qm9yZGVyIHRvIEludFJlY3QgYW5k IHBpeGVsIHNuYXAgaW4KKyAgICAgICAgcGFpbnQgYmVmb3JlIGNhbGxpbmcgdGhlbS4gVGhpcyB3 YXkgdGhlIHJvdW5kaW5nIGxvZ2ljIGlzIGNvbnRhaW5lZCBpbiBhCisgICAgICAgIHNpbmdsZSBw bGFjZSAoaW4gcGFpbnQpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gbmV3IGZ1bmN0aW9u YWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRnJhbWVTZXQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyRnJhbWVTZXQ6OnBhaW50Q29sdW1uQm9yZGVyKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckZyYW1lU2V0OjpwYWludFJvd0JvcmRlcik6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJGcmFtZVNldDo6cGFpbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRnJh bWVTZXQ6OmdldEN1cnNvcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZyYW1lU2V0Lmg6 CisgICAgICAgIChSZW5kZXJGcmFtZVNldCk6CisKIDIwMTItMDItMTUgIEFuZGVycyBDYXJsc3Nv biAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBXaGVlbCBldmVudHMgc2hvdWxkIGJl IHJlLWRpc3BhdGNoZWQgdG8gdGhlIHNjcm9sbGluZyB0aHJlYWQKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGcmFtZVNldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZyYW1lU2V0LmNwcAkocmV2aXNpb24gMTA3ODQxKQorKysg U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZyYW1lU2V0LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtODAsOSArODAsOSBAQCBzdGF0aWMgQ29sb3IgYm9yZGVyRmlsbENvbG9yKCkKICAgICBy ZXR1cm4gQ29sb3IoMjA4LCAyMDgsIDIwOCk7CiB9CiAKLXZvaWQgUmVuZGVyRnJhbWVTZXQ6OnBh aW50Q29sdW1uQm9yZGVyKGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRS ZWN0JiBib3JkZXJSZWN0KQordm9pZCBSZW5kZXJGcmFtZVNldDo6cGFpbnRDb2x1bW5Cb3JkZXIo Y29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIGJvcmRlclJlY3QpCiB7 Ci0gICAgaWYgKCFwYWludEluZm8ucmVjdC5pbnRlcnNlY3RzKHBpeGVsU25hcHBlZEludFJlY3Qo Ym9yZGVyUmVjdCkpKQorICAgIGlmICghcGFpbnRJbmZvLnJlY3QuaW50ZXJzZWN0cyhib3JkZXJS ZWN0KSkKICAgICAgICAgcmV0dXJuOwogICAgICAgICAKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxk IGRvIHNvbWV0aGluZyBjbGV2ZXIgd2hlbiBib3JkZXJzIGZyb20gZGlzdGluY3QgZnJhbWVzZXRz IG1lZXQgYXQgYSBqb2luLgpAQCAtMTAwLDkgKzEwMCw5IEBAIHZvaWQgUmVuZGVyRnJhbWVTZXQ6 OnBhaW50Q29sdW1uQm9yZGVyKGMKICAgICB9CiB9CiAKLXZvaWQgUmVuZGVyRnJhbWVTZXQ6OnBh aW50Um93Qm9yZGVyKGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRSZWN0 JiBib3JkZXJSZWN0KQordm9pZCBSZW5kZXJGcmFtZVNldDo6cGFpbnRSb3dCb3JkZXIoY29uc3Qg UGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIGJvcmRlclJlY3QpCiB7Ci0gICAg aWYgKCFwYWludEluZm8ucmVjdC5pbnRlcnNlY3RzKHBpeGVsU25hcHBlZEludFJlY3QoYm9yZGVy UmVjdCkpKQorICAgIGlmICghcGFpbnRJbmZvLnJlY3QuaW50ZXJzZWN0cyhib3JkZXJSZWN0KSkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBkbyBzb21ldGhpbmcg Y2xldmVyIHdoZW4gYm9yZGVycyBmcm9tIGRpc3RpbmN0IGZyYW1lc2V0cyBtZWV0IGF0IGEgam9p bi4KQEAgLTE0Miw3ICsxNDIsNyBAQCB2b2lkIFJlbmRlckZyYW1lU2V0OjpwYWludChQYWludElu Zm8mIHBhCiAgICAgICAgICAgICBjaGlsZC0+cGFpbnQocGFpbnRJbmZvLCBhZGp1c3RlZFBhaW50 T2Zmc2V0KTsKICAgICAgICAgICAgIHhQb3MgKz0gbV9jb2xzLm1fc2l6ZXNbY107CiAgICAgICAg ICAgICBpZiAoYm9yZGVyVGhpY2tuZXNzICYmIG1fY29scy5tX2FsbG93Qm9yZGVyW2MgKyAxXSkg ewotICAgICAgICAgICAgICAgIHBhaW50Q29sdW1uQm9yZGVyKHBhaW50SW5mbywgTGF5b3V0UmVj dChhZGp1c3RlZFBhaW50T2Zmc2V0LngoKSArIHhQb3MsIGFkanVzdGVkUGFpbnRPZmZzZXQueSgp ICsgeVBvcywgYm9yZGVyVGhpY2tuZXNzLCBoZWlnaHQoKSkpOworICAgICAgICAgICAgICAgIHBh aW50Q29sdW1uQm9yZGVyKHBhaW50SW5mbywgcGl4ZWxTbmFwcGVkSW50UmVjdChMYXlvdXRSZWN0 KGFkanVzdGVkUGFpbnRPZmZzZXQueCgpICsgeFBvcywgYWRqdXN0ZWRQYWludE9mZnNldC55KCkg KyB5UG9zLCBib3JkZXJUaGlja25lc3MsIGhlaWdodCgpKSkpOwogICAgICAgICAgICAgICAgIHhQ b3MgKz0gYm9yZGVyVGhpY2tuZXNzOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgY2hpbGQg PSBjaGlsZC0+bmV4dFNpYmxpbmcoKTsKQEAgLTE1MSw3ICsxNTEsNyBAQCB2b2lkIFJlbmRlckZy YW1lU2V0OjpwYWludChQYWludEluZm8mIHBhCiAgICAgICAgIH0KICAgICAgICAgeVBvcyArPSBt X3Jvd3MubV9zaXplc1tyXTsKICAgICAgICAgaWYgKGJvcmRlclRoaWNrbmVzcyAmJiBtX3Jvd3Mu bV9hbGxvd0JvcmRlcltyICsgMV0pIHsKLSAgICAgICAgICAgIHBhaW50Um93Qm9yZGVyKHBhaW50 SW5mbywgTGF5b3V0UmVjdChhZGp1c3RlZFBhaW50T2Zmc2V0LngoKSwgYWRqdXN0ZWRQYWludE9m ZnNldC55KCkgKyB5UG9zLCB3aWR0aCgpLCBib3JkZXJUaGlja25lc3MpKTsKKyAgICAgICAgICAg IHBhaW50Um93Qm9yZGVyKHBhaW50SW5mbywgcGl4ZWxTbmFwcGVkSW50UmVjdChMYXlvdXRSZWN0 KGFkanVzdGVkUGFpbnRPZmZzZXQueCgpLCBhZGp1c3RlZFBhaW50T2Zmc2V0LnkoKSArIHlQb3Ms IHdpZHRoKCksIGJvcmRlclRoaWNrbmVzcykpKTsKICAgICAgICAgICAgIHlQb3MgKz0gYm9yZGVy VGhpY2tuZXNzOwogICAgICAgICB9CiAgICAgfQpAQCAtODAyLDExICs4MDIsMTIgQEAgYm9vbCBS ZW5kZXJGcmFtZVNldDo6aXNDaGlsZEFsbG93ZWQoUmVuZAogCiBDdXJzb3JEaXJlY3RpdmUgUmVu ZGVyRnJhbWVTZXQ6OmdldEN1cnNvcihjb25zdCBMYXlvdXRQb2ludCYgcG9pbnQsIEN1cnNvciYg Y3Vyc29yKSBjb25zdAogewotICAgIGlmIChjYW5SZXNpemVSb3cocm91bmRlZEludFBvaW50KHBv aW50KSkpIHsKKyAgICBJbnRQb2ludCByb3VuZGVkUG9pbnQgPSByb3VuZGVkSW50UG9pbnQocG9p bnQpOworICAgIGlmIChjYW5SZXNpemVSb3cocm91bmRlZFBvaW50KSkgewogICAgICAgICBjdXJz b3IgPSByb3dSZXNpemVDdXJzb3IoKTsKICAgICAgICAgcmV0dXJuIFNldEN1cnNvcjsKICAgICB9 Ci0gICAgaWYgKGNhblJlc2l6ZUNvbHVtbihwb2ludCkpIHsKKyAgICBpZiAoY2FuUmVzaXplQ29s dW1uKHJvdW5kZWRQb2ludCkpIHsKICAgICAgICAgY3Vyc29yID0gY29sdW1uUmVzaXplQ3Vyc29y KCk7CiAgICAgICAgIHJldHVybiBTZXRDdXJzb3I7CiAgICAgfQpJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZyYW1lU2V0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZyYW1lU2V0LmgJKHJldmlzaW9uIDEwNzg0MSkKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGcmFtZVNldC5oCSh3b3JraW5nIGNvcHkpCkBAIC02 OCw4ICs2OCw4IEBAIHB1YmxpYzoKICAgICBib29sIGlzUmVzaXppbmdSb3coKSBjb25zdDsKICAg ICBib29sIGlzUmVzaXppbmdDb2x1bW4oKSBjb25zdDsKIAotICAgIGJvb2wgY2FuUmVzaXplUm93 KGNvbnN0IExheW91dFBvaW50JikgY29uc3Q7Ci0gICAgYm9vbCBjYW5SZXNpemVDb2x1bW4oY29u c3QgTGF5b3V0UG9pbnQmKSBjb25zdDsKKyAgICBib29sIGNhblJlc2l6ZVJvdyhjb25zdCBJbnRQ b2ludCYpIGNvbnN0OworICAgIGJvb2wgY2FuUmVzaXplQ29sdW1uKGNvbnN0IEludFBvaW50Jikg Y29uc3Q7CiAKICAgICB2b2lkIG5vdGlmeUZyYW1lRWRnZUluZm9DaGFuZ2VkKCk7CiAKQEAgLTEx OSw4ICsxMTksOCBAQCBwcml2YXRlOgogICAgIHZvaWQgc3RhcnRSZXNpemluZyhHcmlkQXhpcyYs IGludCBwb3NpdGlvbik7CiAgICAgdm9pZCBjb250aW51ZVJlc2l6aW5nKEdyaWRBeGlzJiwgaW50 IHBvc2l0aW9uKTsKIAotICAgIHZvaWQgcGFpbnRSb3dCb3JkZXIoY29uc3QgUGFpbnRJbmZvJiwg Y29uc3QgTGF5b3V0UmVjdCYpOwotICAgIHZvaWQgcGFpbnRDb2x1bW5Cb3JkZXIoY29uc3QgUGFp bnRJbmZvJiwgY29uc3QgTGF5b3V0UmVjdCYpOworICAgIHZvaWQgcGFpbnRSb3dCb3JkZXIoY29u c3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOworICAgIHZvaWQgcGFpbnRDb2x1bW5Cb3Jk ZXIoY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwogCiAgICAgUmVuZGVyT2JqZWN0 Q2hpbGRMaXN0IG1fY2hpbGRyZW47CiAK