141668 2015-02-16 15:05:23 -0800 RenderTableRow should check if it has access to its ancestor chain. 2015-02-16 17:02:34 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan cdumez commit-queue esprehn+autocc glenn kling kondapallykalyan oldest_to_newest 1069609 0 zalan 2015-02-16 15:05:23 -0800 It might be in detached state. 1069611 1 246687 zalan 2015-02-16 15:08:59 -0800 Created attachment 246687 Patch 1069612 2 246687 kling 2015-02-16 15:11:06 -0800 Comment on attachment 246687 Patch r=me 1069615 3 246687 cdumez 2015-02-16 15:14:39 -0800 Comment on attachment 246687 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=246687&action=review r=me % nits. > Source/WebCore/rendering/RenderTableRow.h:46 > + RenderTable* table() const Now that this is no longer a one-liner, we may want to move it outside the class and mark it as inline. > Source/WebCore/rendering/RenderTableRow.h:121 > + RenderTableSection* section() const { return downcast<RenderTableSection>(parent()); } Even though they are no outside callers now, I could imagine this getter being useful. Why not keep it public? 1069616 4 cdumez 2015-02-16 15:15:10 -0800 Andreas beat me to it :) 1069629 5 zalan 2015-02-16 15:32:55 -0800 (In reply to comment #3) > Comment on attachment 246687 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=246687&action=review > > r=me % nits. > > > Source/WebCore/rendering/RenderTableRow.h:46 > > + RenderTable* table() const > > Now that this is no longer a one-liner, we may want to move it outside the > class and mark it as inline. > Sure. > > Source/WebCore/rendering/RenderTableRow.h:121 > > + RenderTableSection* section() const { return downcast<RenderTableSection>(parent()); } > > Even though they are no outside callers now, I could imagine this getter > being useful. Why not keep it public? I prefer the not public until required policy. 1069630 6 246690 zalan 2015-02-16 15:37:24 -0800 Created attachment 246690 Patch 1069638 7 246692 zalan 2015-02-16 15:50:21 -0800 Created attachment 246692 Patch 1069674 8 246692 commit-queue 2015-02-16 17:02:27 -0800 Comment on attachment 246692 Patch Clearing flags on attachment: 246692 Committed r180190: <http://trac.webkit.org/changeset/180190> 1069675 9 commit-queue 2015-02-16 17:02:34 -0800 All reviewed patches have been landed. Closing bug. 246687 2015-02-16 15:08:59 -0800 2015-02-16 15:37:19 -0800 Patch bug-141668-20150216150854.patch text/plain 4759 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwMTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzdjMGMwYzI4MmZkN2Iz YjgzMWFjMWZlYzNhZTRjMzcxNjFiZDdmYy4uZTA2NzI5MDEyOTQ0ZTJmYTM1MTRkMzllMTVlMWI1 NWFiNDhiNDhjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTAyLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuZGVyVGFibGVSb3cgc2hv dWxkIGNoZWNrIGlmIGl0IGhhcyBhY2Nlc3MgdG8gaXRzIGFuY2VzdG9yIGNoYWluLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxNjY4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJldmVudGl2ZSBmaXgu CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGVSb3cuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVGFibGVSb3c6OnN0eWxlRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRhYmxlUm93OjphZGRDaGlsZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRh YmxlUm93Lmg6CisKIDIwMTUtMDItMTYgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBpZmRlZnMgdG8gYXZvaWQgYWRqdXN0aW5nIFJ1Ynkgc2VsZWN0aW9uIHJl Y3RzIHRvIGF2b2lkIG92ZXJsYXAgb24gaU9TLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRhYmxlUm93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUYWJsZVJvdy5jcHAKaW5kZXggYWY5MmEzNTcxMTkwNTg0Yzg0YjNmNDcwMmYyNzUyMjU2 NzliNDY3OS4uMzk0NDkzNWQ5ZmU2MDQ4ZGQ1ZmJmNjgzNzkzMzI3YzI1YjJkODEwZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlUm93LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVSb3cuY3BwCkBAIC03OCwxMiArNzgs MTEgQEAgdm9pZCBSZW5kZXJUYWJsZVJvdzo6c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNl IGRpZmYsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGQKICAgICAgICAgc2VjdGlvbigpLT5yb3dMb2dp Y2FsSGVpZ2h0Q2hhbmdlZChyb3dJbmRleCgpKTsKIAogICAgIC8vIElmIGJvcmRlciB3YXMgY2hh bmdlZCwgbm90aWZ5IHRhYmxlLgotICAgIGlmIChwYXJlbnQoKSkgewotICAgICAgICBSZW5kZXJU YWJsZSogdGFibGUgPSB0aGlzLT50YWJsZSgpOwotICAgICAgICBpZiAodGFibGUgJiYgIXRhYmxl LT5zZWxmTmVlZHNMYXlvdXQoKSAmJiAhdGFibGUtPm5vcm1hbENoaWxkTmVlZHNMYXlvdXQoKSAm JiBvbGRTdHlsZSAmJiBvbGRTdHlsZS0+Ym9yZGVyKCkgIT0gc3R5bGUoKS5ib3JkZXIoKSkKKyAg ICBpZiAoUmVuZGVyVGFibGUqIHRhYmxlID0gdGhpcy0+dGFibGUoKSkgeworICAgICAgICBpZiAo IXRhYmxlLT5zZWxmTmVlZHNMYXlvdXQoKSAmJiAhdGFibGUtPm5vcm1hbENoaWxkTmVlZHNMYXlv dXQoKSAmJiBvbGRTdHlsZSAmJiBvbGRTdHlsZS0+Ym9yZGVyKCkgIT0gc3R5bGUoKS5ib3JkZXIo KSkKICAgICAgICAgICAgIHRhYmxlLT5pbnZhbGlkYXRlQ29sbGFwc2VkQm9yZGVycygpOwogICAg ICAgICAKLSAgICAgICAgaWYgKHRhYmxlICYmIG9sZFN0eWxlICYmIGRpZmYgPT0gU3R5bGVEaWZm ZXJlbmNlTGF5b3V0ICYmIG5lZWRzTGF5b3V0KCkgJiYgdGFibGUtPmNvbGxhcHNlQm9yZGVycygp ICYmIGJvcmRlcldpZHRoQ2hhbmdlZChvbGRTdHlsZSwgJnN0eWxlKCkpKSB7CisgICAgICAgIGlm IChvbGRTdHlsZSAmJiBkaWZmID09IFN0eWxlRGlmZmVyZW5jZUxheW91dCAmJiBuZWVkc0xheW91 dCgpICYmIHRhYmxlLT5jb2xsYXBzZUJvcmRlcnMoKSAmJiBib3JkZXJXaWR0aENoYW5nZWQob2xk U3R5bGUsICZzdHlsZSgpKSkgewogICAgICAgICAgICAgLy8gSWYgdGhlIGJvcmRlciB3aWR0aCBj aGFuZ2VzIG9uIGEgcm93LCB3ZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGUgY2VsbHMgaW4gdGhlIHJv dyBrbm93IHRvIGxheSBvdXQgYWdhaW4uCiAgICAgICAgICAgICAvLyBUaGlzIG9ubHkgaGFwcGVu cyB3aGVuIGJvcmRlcnMgYXJlIGNvbGxhcHNlZCwgc2luY2UgdGhleSBlbmQgdXAgYWZmZWN0aW5n IHRoZSBib3JkZXIgc2lkZXMgb2YgdGhlIGNlbGwKICAgICAgICAgICAgIC8vIGl0c2VsZi4KQEAg LTE0Nyw4ICsxNDYsOCBAQCB2b2lkIFJlbmRlclRhYmxlUm93OjphZGRDaGlsZChSZW5kZXJPYmpl Y3QqIGNoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQogICAgIFJlbmRlclRhYmxlQ2Vs bCYgY2VsbCA9IGRvd25jYXN0PFJlbmRlclRhYmxlQ2VsbD4oKmNoaWxkKTsKIAogICAgIC8vIEdl bmVyYXRlZCBjb250ZW50IGNhbiByZXN1bHQgaW4gdXMgaGF2aW5nIGEgbnVsbCBzZWN0aW9uIHNv IG1ha2Ugc3VyZSB0byBudWxsIGNoZWNrIG91ciBwYXJlbnQuCi0gICAgaWYgKHBhcmVudCgpKQot ICAgICAgICBzZWN0aW9uKCktPmFkZENlbGwoJmNlbGwsIHRoaXMpOworICAgIGlmIChSZW5kZXJU YWJsZVNlY3Rpb24qIHNlY3Rpb24gPSB0aGlzLT5zZWN0aW9uKCkpCisgICAgICAgIHNlY3Rpb24t PmFkZENlbGwoJmNlbGwsIHRoaXMpOwogCiAgICAgQVNTRVJUKCFiZWZvcmVDaGlsZCB8fCBpczxS ZW5kZXJUYWJsZUNlbGw+KCpiZWZvcmVDaGlsZCkpOwogICAgIFJlbmRlckJveDo6YWRkQ2hpbGQo JmNlbGwsIGJlZm9yZUNoaWxkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUYWJsZVJvdy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxl Um93LmgKaW5kZXggZWYxN2ZmOTg4YWQ5Nzc5MzdmNmNiNTE4OTY0NTAxYzM3YmNjNDY0My4uMjY5 ZTFlOWMxYjFjZGYwY2IxMGEyZGM1YWEyYTBjOTA5MTkzZmEyOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlUm93LmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRhYmxlUm93LmgKQEAgLTQzLDggKzQzLDEzIEBAIHB1YmxpYzoKICAg ICBSZW5kZXJUYWJsZUNlbGwqIGZpcnN0Q2VsbCgpIGNvbnN0OwogICAgIFJlbmRlclRhYmxlQ2Vs bCogbGFzdENlbGwoKSBjb25zdDsKIAotICAgIFJlbmRlclRhYmxlU2VjdGlvbiogc2VjdGlvbigp IGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PFJlbmRlclRhYmxlU2VjdGlvbj4ocGFyZW50KCkpOyB9 Ci0gICAgUmVuZGVyVGFibGUqIHRhYmxlKCkgY29uc3QgeyByZXR1cm4gZG93bmNhc3Q8UmVuZGVy VGFibGU+KHBhcmVudCgpLT5wYXJlbnQoKSk7IH0KKyAgICBSZW5kZXJUYWJsZSogdGFibGUoKSBj b25zdAorICAgIHsKKyAgICAgICAgUmVuZGVyVGFibGVTZWN0aW9uKiBzZWN0aW9uID0gdGhpcy0+ c2VjdGlvbigpOworICAgICAgICBpZiAoIXNlY3Rpb24pCisgICAgICAgICAgICByZXR1cm4gbnVs bHB0cjsKKyAgICAgICAgcmV0dXJuIGRvd25jYXN0PFJlbmRlclRhYmxlPihzZWN0aW9uLT5wYXJl bnQoKSk7CisgICAgfQogCiAgICAgdm9pZCBwYWludE91dGxpbmVGb3JSb3dJZk5lZWRlZChQYWlu dEluZm8mLCBjb25zdCBMYXlvdXRQb2ludCYpOwogCkBAIC03MSw3ICs3Niw4IEBAIHB1YmxpYzoK IAogICAgIGNvbnN0IEJvcmRlclZhbHVlJiBib3JkZXJBZGpvaW5pbmdUYWJsZVN0YXJ0KCkgY29u c3QKICAgICB7Ci0gICAgICAgIGlmIChzZWN0aW9uKCktPmhhc1NhbWVEaXJlY3Rpb25Bcyh0YWJs ZSgpKSkKKyAgICAgICAgUmVuZGVyVGFibGVTZWN0aW9uKiBzZWN0aW9uID0gdGhpcy0+c2VjdGlv bigpOworICAgICAgICBpZiAoc2VjdGlvbiAmJiBzZWN0aW9uLT5oYXNTYW1lRGlyZWN0aW9uQXMo dGFibGUoKSkpCiAgICAgICAgICAgICByZXR1cm4gc3R5bGUoKS5ib3JkZXJTdGFydCgpOwogCiAg ICAgICAgIHJldHVybiBzdHlsZSgpLmJvcmRlckVuZCgpOwpAQCAtNzksNyArODUsOCBAQCBwdWJs aWM6CiAKICAgICBjb25zdCBCb3JkZXJWYWx1ZSYgYm9yZGVyQWRqb2luaW5nVGFibGVFbmQoKSBj b25zdAogICAgIHsKLSAgICAgICAgaWYgKHNlY3Rpb24oKS0+aGFzU2FtZURpcmVjdGlvbkFzKHRh YmxlKCkpKQorICAgICAgICBSZW5kZXJUYWJsZVNlY3Rpb24qIHNlY3Rpb24gPSB0aGlzLT5zZWN0 aW9uKCk7CisgICAgICAgIGlmIChzZWN0aW9uICYmIHNlY3Rpb24tPmhhc1NhbWVEaXJlY3Rpb25B cyh0YWJsZSgpKSkKICAgICAgICAgICAgIHJldHVybiBzdHlsZSgpLmJvcmRlckVuZCgpOwogCiAg ICAgICAgIHJldHVybiBzdHlsZSgpLmJvcmRlclN0YXJ0KCk7CkBAIC0xMTEsNiArMTE4LDggQEAg cHJpdmF0ZToKIAogICAgIHZpcnR1YWwgdm9pZCBzdHlsZURpZENoYW5nZShTdHlsZURpZmZlcmVu Y2UsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSkgb3ZlcnJpZGU7CiAKKyAgICBSZW5kZXJU YWJsZVNlY3Rpb24qIHNlY3Rpb24oKSBjb25zdCB7IHJldHVybiBkb3duY2FzdDxSZW5kZXJUYWJs ZVNlY3Rpb24+KHBhcmVudCgpKTsgfQorCiAgICAgdm9pZCBmaXJzdENoaWxkKCkgY29uc3QgPSBk ZWxldGU7CiAgICAgdm9pZCBsYXN0Q2hpbGQoKSBjb25zdCA9IGRlbGV0ZTsKICAgICB2b2lkIG5l eHRTaWJsaW5nKCkgY29uc3QgPSBkZWxldGU7Cg== 246690 2015-02-16 15:37:24 -0800 2015-02-16 15:45:12 -0800 Patch bug-141668-20150216153718.patch text/plain 5050 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwMTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWVmMDg5YjVlNjk5ZWRh NjY4Y2JmYTZlMDFkYzFiMGViNGZiYTk4My4uZThjZThiZTM2YTYxMGI2NmVmZDYwMjhiYzk2MWQy OWUwMjhjZDA0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTAyLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuZGVyVGFibGVSb3cgc2hv dWxkIGNoZWNrIGlmIGl0IGhhcyBhY2Nlc3MgdG8gaXRzIGFuY2VzdG9yIGNoYWluLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxNjY4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KKworICAgICAgICBQcmV2ZW50aXZlIGZpeC4K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUYWJsZVJvdzo6c3R5bGVEaWRDaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVGFibGVSb3c6OmFkZENoaWxkKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFi bGVSb3cuaDoKKwogMjAxNS0wMi0xNiAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWJvdWhhbGxhd2FA YXBwbGUuY29tPgogCiAgICAgICAgIFJldmVydCBhIGNoYW5nZSBpbiBTVkdSZW5kZXJTdXBwb3J0 OjptYXBMb2NhbFRvQ29udGFpbmVyIGNvbW1pdHRlZCBmb3IgZml4aW5nIDxodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5NjI2Pi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGFibGVSb3cuY3BwCmluZGV4IGFmOTJhMzU3MTE5MDU4NGM4NGIzZjQ3MDJm Mjc1MjI1Njc5YjQ2NzkuLjM5NDQ5MzVkOWZlNjA0OGRkNWZiZjY4Mzc5MzMyN2MyNWIyZDgxMGYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlUm93LmNwcApAQCAtNzgs MTIgKzc4LDExIEBAIHZvaWQgUmVuZGVyVGFibGVSb3c6OnN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlm ZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSogb2xkCiAgICAgICAgIHNlY3Rpb24oKS0+ cm93TG9naWNhbEhlaWdodENoYW5nZWQocm93SW5kZXgoKSk7CiAKICAgICAvLyBJZiBib3JkZXIg d2FzIGNoYW5nZWQsIG5vdGlmeSB0YWJsZS4KLSAgICBpZiAocGFyZW50KCkpIHsKLSAgICAgICAg UmVuZGVyVGFibGUqIHRhYmxlID0gdGhpcy0+dGFibGUoKTsKLSAgICAgICAgaWYgKHRhYmxlICYm ICF0YWJsZS0+c2VsZk5lZWRzTGF5b3V0KCkgJiYgIXRhYmxlLT5ub3JtYWxDaGlsZE5lZWRzTGF5 b3V0KCkgJiYgb2xkU3R5bGUgJiYgb2xkU3R5bGUtPmJvcmRlcigpICE9IHN0eWxlKCkuYm9yZGVy KCkpCisgICAgaWYgKFJlbmRlclRhYmxlKiB0YWJsZSA9IHRoaXMtPnRhYmxlKCkpIHsKKyAgICAg ICAgaWYgKCF0YWJsZS0+c2VsZk5lZWRzTGF5b3V0KCkgJiYgIXRhYmxlLT5ub3JtYWxDaGlsZE5l ZWRzTGF5b3V0KCkgJiYgb2xkU3R5bGUgJiYgb2xkU3R5bGUtPmJvcmRlcigpICE9IHN0eWxlKCku Ym9yZGVyKCkpCiAgICAgICAgICAgICB0YWJsZS0+aW52YWxpZGF0ZUNvbGxhcHNlZEJvcmRlcnMo KTsKICAgICAgICAgCi0gICAgICAgIGlmICh0YWJsZSAmJiBvbGRTdHlsZSAmJiBkaWZmID09IFN0 eWxlRGlmZmVyZW5jZUxheW91dCAmJiBuZWVkc0xheW91dCgpICYmIHRhYmxlLT5jb2xsYXBzZUJv cmRlcnMoKSAmJiBib3JkZXJXaWR0aENoYW5nZWQob2xkU3R5bGUsICZzdHlsZSgpKSkgeworICAg ICAgICBpZiAob2xkU3R5bGUgJiYgZGlmZiA9PSBTdHlsZURpZmZlcmVuY2VMYXlvdXQgJiYgbmVl ZHNMYXlvdXQoKSAmJiB0YWJsZS0+Y29sbGFwc2VCb3JkZXJzKCkgJiYgYm9yZGVyV2lkdGhDaGFu Z2VkKG9sZFN0eWxlLCAmc3R5bGUoKSkpIHsKICAgICAgICAgICAgIC8vIElmIHRoZSBib3JkZXIg d2lkdGggY2hhbmdlcyBvbiBhIHJvdywgd2UgbmVlZCB0byBtYWtlIHN1cmUgdGhlIGNlbGxzIGlu IHRoZSByb3cga25vdyB0byBsYXkgb3V0IGFnYWluLgogICAgICAgICAgICAgLy8gVGhpcyBvbmx5 IGhhcHBlbnMgd2hlbiBib3JkZXJzIGFyZSBjb2xsYXBzZWQsIHNpbmNlIHRoZXkgZW5kIHVwIGFm ZmVjdGluZyB0aGUgYm9yZGVyIHNpZGVzIG9mIHRoZSBjZWxsCiAgICAgICAgICAgICAvLyBpdHNl bGYuCkBAIC0xNDcsOCArMTQ2LDggQEAgdm9pZCBSZW5kZXJUYWJsZVJvdzo6YWRkQ2hpbGQoUmVu ZGVyT2JqZWN0KiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkKICAgICBSZW5kZXJU YWJsZUNlbGwmIGNlbGwgPSBkb3duY2FzdDxSZW5kZXJUYWJsZUNlbGw+KCpjaGlsZCk7CiAKICAg ICAvLyBHZW5lcmF0ZWQgY29udGVudCBjYW4gcmVzdWx0IGluIHVzIGhhdmluZyBhIG51bGwgc2Vj dGlvbiBzbyBtYWtlIHN1cmUgdG8gbnVsbCBjaGVjayBvdXIgcGFyZW50LgotICAgIGlmIChwYXJl bnQoKSkKLSAgICAgICAgc2VjdGlvbigpLT5hZGRDZWxsKCZjZWxsLCB0aGlzKTsKKyAgICBpZiAo UmVuZGVyVGFibGVTZWN0aW9uKiBzZWN0aW9uID0gdGhpcy0+c2VjdGlvbigpKQorICAgICAgICBz ZWN0aW9uLT5hZGRDZWxsKCZjZWxsLCB0aGlzKTsKIAogICAgIEFTU0VSVCghYmVmb3JlQ2hpbGQg fHwgaXM8UmVuZGVyVGFibGVDZWxsPigqYmVmb3JlQ2hpbGQpKTsKICAgICBSZW5kZXJCb3g6OmFk ZENoaWxkKCZjZWxsLCBiZWZvcmVDaGlsZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGFibGVSb3cuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUYWJsZVJvdy5oCmluZGV4IGVmMTdmZjk4OGFkOTc3OTM3ZjZjYjUxODk2NDUwMWMzN2JjYzQ2 NDMuLjFkYjY4MjE0N2UxYjZhNDMzNjc1ZGY0OGFlOWNkYTEyNDJmOGMwMzkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5oCkBAIC00Myw4ICs0Myw3IEBAIHB1Ymxp YzoKICAgICBSZW5kZXJUYWJsZUNlbGwqIGZpcnN0Q2VsbCgpIGNvbnN0OwogICAgIFJlbmRlclRh YmxlQ2VsbCogbGFzdENlbGwoKSBjb25zdDsKIAotICAgIFJlbmRlclRhYmxlU2VjdGlvbiogc2Vj dGlvbigpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PFJlbmRlclRhYmxlU2VjdGlvbj4ocGFyZW50 KCkpOyB9Ci0gICAgUmVuZGVyVGFibGUqIHRhYmxlKCkgY29uc3QgeyByZXR1cm4gZG93bmNhc3Q8 UmVuZGVyVGFibGU+KHBhcmVudCgpLT5wYXJlbnQoKSk7IH0KKyAgICBSZW5kZXJUYWJsZSogdGFi bGUoKSBjb25zdDsKIAogICAgIHZvaWQgcGFpbnRPdXRsaW5lRm9yUm93SWZOZWVkZWQoUGFpbnRJ bmZvJiwgY29uc3QgTGF5b3V0UG9pbnQmKTsKIApAQCAtNzEsNyArNzAsOCBAQCBwdWJsaWM6CiAK ICAgICBjb25zdCBCb3JkZXJWYWx1ZSYgYm9yZGVyQWRqb2luaW5nVGFibGVTdGFydCgpIGNvbnN0 CiAgICAgewotICAgICAgICBpZiAoc2VjdGlvbigpLT5oYXNTYW1lRGlyZWN0aW9uQXModGFibGUo KSkpCisgICAgICAgIFJlbmRlclRhYmxlU2VjdGlvbiogc2VjdGlvbiA9IHRoaXMtPnNlY3Rpb24o KTsKKyAgICAgICAgaWYgKHNlY3Rpb24gJiYgc2VjdGlvbi0+aGFzU2FtZURpcmVjdGlvbkFzKHRh YmxlKCkpKQogICAgICAgICAgICAgcmV0dXJuIHN0eWxlKCkuYm9yZGVyU3RhcnQoKTsKIAogICAg ICAgICByZXR1cm4gc3R5bGUoKS5ib3JkZXJFbmQoKTsKQEAgLTc5LDcgKzc5LDggQEAgcHVibGlj OgogCiAgICAgY29uc3QgQm9yZGVyVmFsdWUmIGJvcmRlckFkam9pbmluZ1RhYmxlRW5kKCkgY29u c3QKICAgICB7Ci0gICAgICAgIGlmIChzZWN0aW9uKCktPmhhc1NhbWVEaXJlY3Rpb25Bcyh0YWJs ZSgpKSkKKyAgICAgICAgUmVuZGVyVGFibGVTZWN0aW9uKiBzZWN0aW9uID0gdGhpcy0+c2VjdGlv bigpOworICAgICAgICBpZiAoc2VjdGlvbiAmJiBzZWN0aW9uLT5oYXNTYW1lRGlyZWN0aW9uQXMo dGFibGUoKSkpCiAgICAgICAgICAgICByZXR1cm4gc3R5bGUoKS5ib3JkZXJFbmQoKTsKIAogICAg ICAgICByZXR1cm4gc3R5bGUoKS5ib3JkZXJTdGFydCgpOwpAQCAtMTExLDYgKzExMiw4IEBAIHBy aXZhdGU6CiAKICAgICB2aXJ0dWFsIHZvaWQgc3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNl LCBjb25zdCBSZW5kZXJTdHlsZSogb2xkU3R5bGUpIG92ZXJyaWRlOwogCisgICAgUmVuZGVyVGFi bGVTZWN0aW9uKiBzZWN0aW9uKCkgY29uc3QgeyByZXR1cm4gZG93bmNhc3Q8UmVuZGVyVGFibGVT ZWN0aW9uPihwYXJlbnQoKSk7IH0KKwogICAgIHZvaWQgZmlyc3RDaGlsZCgpIGNvbnN0ID0gZGVs ZXRlOwogICAgIHZvaWQgbGFzdENoaWxkKCkgY29uc3QgPSBkZWxldGU7CiAgICAgdm9pZCBuZXh0 U2libGluZygpIGNvbnN0ID0gZGVsZXRlOwpAQCAtMTE5LDYgKzEyMiwxNCBAQCBwcml2YXRlOgog ICAgIHVuc2lnbmVkIG1fcm93SW5kZXggOiAzMTsKIH07CiAKK2lubGluZSBSZW5kZXJUYWJsZSog UmVuZGVyVGFibGVTZWN0aW9uOjp0YWJsZSgpIGNvbnN0Cit7CisgICAgUmVuZGVyVGFibGVTZWN0 aW9uKiBzZWN0aW9uID0gdGhpcy0+c2VjdGlvbigpOworICAgIGlmICghc2VjdGlvbikKKyAgICAg ICAgcmV0dXJuIG51bGxwdHI7CisgICAgcmV0dXJuIGRvd25jYXN0PFJlbmRlclRhYmxlPihzZWN0 aW9uLT5wYXJlbnQoKSk7Cit9CisKIGlubGluZSBSZW5kZXJUYWJsZVJvdyogUmVuZGVyVGFibGVT ZWN0aW9uOjpmaXJzdFJvdygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGRvd25jYXN0PFJlbmRlclRh YmxlUm93PihSZW5kZXJCb3g6OmZpcnN0Q2hpbGQoKSk7Cg== 246692 2015-02-16 15:50:21 -0800 2015-02-16 17:02:27 -0800 Patch bug-141668-20150216155016.patch text/plain 5046 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwMTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWVmMDg5YjVlNjk5ZWRh NjY4Y2JmYTZlMDFkYzFiMGViNGZiYTk4My4uZThjZThiZTM2YTYxMGI2NmVmZDYwMjhiYzk2MWQy OWUwMjhjZDA0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTAyLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuZGVyVGFibGVSb3cgc2hv dWxkIGNoZWNrIGlmIGl0IGhhcyBhY2Nlc3MgdG8gaXRzIGFuY2VzdG9yIGNoYWluLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxNjY4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KKworICAgICAgICBQcmV2ZW50aXZlIGZpeC4K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUYWJsZVJvdzo6c3R5bGVEaWRDaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVGFibGVSb3c6OmFkZENoaWxkKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFi bGVSb3cuaDoKKwogMjAxNS0wMi0xNiAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWJvdWhhbGxhd2FA YXBwbGUuY29tPgogCiAgICAgICAgIFJldmVydCBhIGNoYW5nZSBpbiBTVkdSZW5kZXJTdXBwb3J0 OjptYXBMb2NhbFRvQ29udGFpbmVyIGNvbW1pdHRlZCBmb3IgZml4aW5nIDxodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5NjI2Pi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGFibGVSb3cuY3BwCmluZGV4IGFmOTJhMzU3MTE5MDU4NGM4NGIzZjQ3MDJm Mjc1MjI1Njc5YjQ2NzkuLjM5NDQ5MzVkOWZlNjA0OGRkNWZiZjY4Mzc5MzMyN2MyNWIyZDgxMGYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlUm93LmNwcApAQCAtNzgs MTIgKzc4LDExIEBAIHZvaWQgUmVuZGVyVGFibGVSb3c6OnN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlm ZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSogb2xkCiAgICAgICAgIHNlY3Rpb24oKS0+ cm93TG9naWNhbEhlaWdodENoYW5nZWQocm93SW5kZXgoKSk7CiAKICAgICAvLyBJZiBib3JkZXIg d2FzIGNoYW5nZWQsIG5vdGlmeSB0YWJsZS4KLSAgICBpZiAocGFyZW50KCkpIHsKLSAgICAgICAg UmVuZGVyVGFibGUqIHRhYmxlID0gdGhpcy0+dGFibGUoKTsKLSAgICAgICAgaWYgKHRhYmxlICYm ICF0YWJsZS0+c2VsZk5lZWRzTGF5b3V0KCkgJiYgIXRhYmxlLT5ub3JtYWxDaGlsZE5lZWRzTGF5 b3V0KCkgJiYgb2xkU3R5bGUgJiYgb2xkU3R5bGUtPmJvcmRlcigpICE9IHN0eWxlKCkuYm9yZGVy KCkpCisgICAgaWYgKFJlbmRlclRhYmxlKiB0YWJsZSA9IHRoaXMtPnRhYmxlKCkpIHsKKyAgICAg ICAgaWYgKCF0YWJsZS0+c2VsZk5lZWRzTGF5b3V0KCkgJiYgIXRhYmxlLT5ub3JtYWxDaGlsZE5l ZWRzTGF5b3V0KCkgJiYgb2xkU3R5bGUgJiYgb2xkU3R5bGUtPmJvcmRlcigpICE9IHN0eWxlKCku Ym9yZGVyKCkpCiAgICAgICAgICAgICB0YWJsZS0+aW52YWxpZGF0ZUNvbGxhcHNlZEJvcmRlcnMo KTsKICAgICAgICAgCi0gICAgICAgIGlmICh0YWJsZSAmJiBvbGRTdHlsZSAmJiBkaWZmID09IFN0 eWxlRGlmZmVyZW5jZUxheW91dCAmJiBuZWVkc0xheW91dCgpICYmIHRhYmxlLT5jb2xsYXBzZUJv cmRlcnMoKSAmJiBib3JkZXJXaWR0aENoYW5nZWQob2xkU3R5bGUsICZzdHlsZSgpKSkgeworICAg ICAgICBpZiAob2xkU3R5bGUgJiYgZGlmZiA9PSBTdHlsZURpZmZlcmVuY2VMYXlvdXQgJiYgbmVl ZHNMYXlvdXQoKSAmJiB0YWJsZS0+Y29sbGFwc2VCb3JkZXJzKCkgJiYgYm9yZGVyV2lkdGhDaGFu Z2VkKG9sZFN0eWxlLCAmc3R5bGUoKSkpIHsKICAgICAgICAgICAgIC8vIElmIHRoZSBib3JkZXIg d2lkdGggY2hhbmdlcyBvbiBhIHJvdywgd2UgbmVlZCB0byBtYWtlIHN1cmUgdGhlIGNlbGxzIGlu IHRoZSByb3cga25vdyB0byBsYXkgb3V0IGFnYWluLgogICAgICAgICAgICAgLy8gVGhpcyBvbmx5 IGhhcHBlbnMgd2hlbiBib3JkZXJzIGFyZSBjb2xsYXBzZWQsIHNpbmNlIHRoZXkgZW5kIHVwIGFm ZmVjdGluZyB0aGUgYm9yZGVyIHNpZGVzIG9mIHRoZSBjZWxsCiAgICAgICAgICAgICAvLyBpdHNl bGYuCkBAIC0xNDcsOCArMTQ2LDggQEAgdm9pZCBSZW5kZXJUYWJsZVJvdzo6YWRkQ2hpbGQoUmVu ZGVyT2JqZWN0KiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkKICAgICBSZW5kZXJU YWJsZUNlbGwmIGNlbGwgPSBkb3duY2FzdDxSZW5kZXJUYWJsZUNlbGw+KCpjaGlsZCk7CiAKICAg ICAvLyBHZW5lcmF0ZWQgY29udGVudCBjYW4gcmVzdWx0IGluIHVzIGhhdmluZyBhIG51bGwgc2Vj dGlvbiBzbyBtYWtlIHN1cmUgdG8gbnVsbCBjaGVjayBvdXIgcGFyZW50LgotICAgIGlmIChwYXJl bnQoKSkKLSAgICAgICAgc2VjdGlvbigpLT5hZGRDZWxsKCZjZWxsLCB0aGlzKTsKKyAgICBpZiAo UmVuZGVyVGFibGVTZWN0aW9uKiBzZWN0aW9uID0gdGhpcy0+c2VjdGlvbigpKQorICAgICAgICBz ZWN0aW9uLT5hZGRDZWxsKCZjZWxsLCB0aGlzKTsKIAogICAgIEFTU0VSVCghYmVmb3JlQ2hpbGQg fHwgaXM8UmVuZGVyVGFibGVDZWxsPigqYmVmb3JlQ2hpbGQpKTsKICAgICBSZW5kZXJCb3g6OmFk ZENoaWxkKCZjZWxsLCBiZWZvcmVDaGlsZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGFibGVSb3cuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUYWJsZVJvdy5oCmluZGV4IGVmMTdmZjk4OGFkOTc3OTM3ZjZjYjUxODk2NDUwMWMzN2JjYzQ2 NDMuLmU4MjM2MDg5MjBiZDkzOWMzNmYxZjQxZDIxNDViMjkwMDZiOGQ0ZTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5oCkBAIC00Myw4ICs0Myw3IEBAIHB1Ymxp YzoKICAgICBSZW5kZXJUYWJsZUNlbGwqIGZpcnN0Q2VsbCgpIGNvbnN0OwogICAgIFJlbmRlclRh YmxlQ2VsbCogbGFzdENlbGwoKSBjb25zdDsKIAotICAgIFJlbmRlclRhYmxlU2VjdGlvbiogc2Vj dGlvbigpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PFJlbmRlclRhYmxlU2VjdGlvbj4ocGFyZW50 KCkpOyB9Ci0gICAgUmVuZGVyVGFibGUqIHRhYmxlKCkgY29uc3QgeyByZXR1cm4gZG93bmNhc3Q8 UmVuZGVyVGFibGU+KHBhcmVudCgpLT5wYXJlbnQoKSk7IH0KKyAgICBSZW5kZXJUYWJsZSogdGFi bGUoKSBjb25zdDsKIAogICAgIHZvaWQgcGFpbnRPdXRsaW5lRm9yUm93SWZOZWVkZWQoUGFpbnRJ bmZvJiwgY29uc3QgTGF5b3V0UG9pbnQmKTsKIApAQCAtNzEsNyArNzAsOCBAQCBwdWJsaWM6CiAK ICAgICBjb25zdCBCb3JkZXJWYWx1ZSYgYm9yZGVyQWRqb2luaW5nVGFibGVTdGFydCgpIGNvbnN0 CiAgICAgewotICAgICAgICBpZiAoc2VjdGlvbigpLT5oYXNTYW1lRGlyZWN0aW9uQXModGFibGUo KSkpCisgICAgICAgIFJlbmRlclRhYmxlU2VjdGlvbiogc2VjdGlvbiA9IHRoaXMtPnNlY3Rpb24o KTsKKyAgICAgICAgaWYgKHNlY3Rpb24gJiYgc2VjdGlvbi0+aGFzU2FtZURpcmVjdGlvbkFzKHRh YmxlKCkpKQogICAgICAgICAgICAgcmV0dXJuIHN0eWxlKCkuYm9yZGVyU3RhcnQoKTsKIAogICAg ICAgICByZXR1cm4gc3R5bGUoKS5ib3JkZXJFbmQoKTsKQEAgLTc5LDcgKzc5LDggQEAgcHVibGlj OgogCiAgICAgY29uc3QgQm9yZGVyVmFsdWUmIGJvcmRlckFkam9pbmluZ1RhYmxlRW5kKCkgY29u c3QKICAgICB7Ci0gICAgICAgIGlmIChzZWN0aW9uKCktPmhhc1NhbWVEaXJlY3Rpb25Bcyh0YWJs ZSgpKSkKKyAgICAgICAgUmVuZGVyVGFibGVTZWN0aW9uKiBzZWN0aW9uID0gdGhpcy0+c2VjdGlv bigpOworICAgICAgICBpZiAoc2VjdGlvbiAmJiBzZWN0aW9uLT5oYXNTYW1lRGlyZWN0aW9uQXMo dGFibGUoKSkpCiAgICAgICAgICAgICByZXR1cm4gc3R5bGUoKS5ib3JkZXJFbmQoKTsKIAogICAg ICAgICByZXR1cm4gc3R5bGUoKS5ib3JkZXJTdGFydCgpOwpAQCAtMTExLDYgKzExMiw4IEBAIHBy aXZhdGU6CiAKICAgICB2aXJ0dWFsIHZvaWQgc3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNl LCBjb25zdCBSZW5kZXJTdHlsZSogb2xkU3R5bGUpIG92ZXJyaWRlOwogCisgICAgUmVuZGVyVGFi bGVTZWN0aW9uKiBzZWN0aW9uKCkgY29uc3QgeyByZXR1cm4gZG93bmNhc3Q8UmVuZGVyVGFibGVT ZWN0aW9uPihwYXJlbnQoKSk7IH0KKwogICAgIHZvaWQgZmlyc3RDaGlsZCgpIGNvbnN0ID0gZGVs ZXRlOwogICAgIHZvaWQgbGFzdENoaWxkKCkgY29uc3QgPSBkZWxldGU7CiAgICAgdm9pZCBuZXh0 U2libGluZygpIGNvbnN0ID0gZGVsZXRlOwpAQCAtMTE5LDYgKzEyMiwxNCBAQCBwcml2YXRlOgog ICAgIHVuc2lnbmVkIG1fcm93SW5kZXggOiAzMTsKIH07CiAKK2lubGluZSBSZW5kZXJUYWJsZSog UmVuZGVyVGFibGVSb3c6OnRhYmxlKCkgY29uc3QKK3sKKyAgICBSZW5kZXJUYWJsZVNlY3Rpb24q IHNlY3Rpb24gPSB0aGlzLT5zZWN0aW9uKCk7CisgICAgaWYgKCFzZWN0aW9uKQorICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKKyAgICByZXR1cm4gZG93bmNhc3Q8UmVuZGVyVGFibGU+KHNlY3Rpb24t PnBhcmVudCgpKTsKK30KKwogaW5saW5lIFJlbmRlclRhYmxlUm93KiBSZW5kZXJUYWJsZVNlY3Rp b246OmZpcnN0Um93KCkgY29uc3QKIHsKICAgICByZXR1cm4gZG93bmNhc3Q8UmVuZGVyVGFibGVS b3c+KFJlbmRlckJveDo6Zmlyc3RDaGlsZCgpKTsK