62867 2011-06-17 08:31:44 -0700 Update GraphicsContextSkia when the Chromium platform is Mac 2011-06-21 11:05:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 caryclark caryclark eric webkit.review.bot oldest_to_newest 422640 0 caryclark 2011-06-17 08:31:44 -0700 Update GraphicsContextSkia when the Chromium platform is Mac 422645 1 97604 caryclark 2011-06-17 08:36:38 -0700 Created attachment 97604 Patch 423920 2 97604 eric 2011-06-20 13:35:57 -0700 Comment on attachment 97604 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=97604&action=review It's very unclear to me what code we're trying to share vs. not here. Would be more clear if the #ifdefed code was pulled off into static functions. > Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp:556 > +#if PLATFORM(CHROMIUM) && OS(DARWIN) > + float radius = (width - 1) / 2.0f; > + int outer = width; > + float inner = (width) / 2.0f; > + const SkScalar focusRingOutset = (width / 2.0f) + 0.25f; > +#else > const SkScalar focusRingOutset = WebCoreFloatToSkScalar(0.5); > +#endif I think I would have abstracted this into a static inline focusRingOutset(width) function. 424453 3 97988 caryclark 2011-06-21 07:53:46 -0700 Created attachment 97988 Patch 424455 4 97604 caryclark 2011-06-21 07:56:17 -0700 Comment on attachment 97604 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=97604&action=review >> Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp:556 >> +#endif > > I think I would have abstracted this into a static inline focusRingOutset(width) function. Done. 424526 5 97988 eric 2011-06-21 10:31:09 -0700 Comment on attachment 97988 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=97988&action=review This looks much nicer. Thank you. > Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp:579 > + const SkScalar focusRingOutset = getFocusRingOutset(width); WebKit style doesn't use "get" in method names. 424528 6 eric 2011-06-21 10:31:53 -0700 I guess I generalized a little: http://www.webkit.org/coding/coding-style.html: Precede setters with the word "set". Use bare words for getters. Setter and getter names should match the names of the variables being set/gotten. Right: void setCount(size_t); // sets m_count size_t count(); // returns m_count Wrong: void setCount(size_t); // sets m_theCount size_t getCount(); 424536 7 97988 eric 2011-06-21 10:32:53 -0700 Comment on attachment 97988 Patch I'm not sure it's worth the round-trip for just the "get" though. 424542 8 caryclark 2011-06-21 10:37:23 -0700 I imagine I will have to continue to tweak this code to make the look of the focus ring better -- I'm happy to rename it to remove the 'get' the next time I'm in there. 424571 9 97988 webkit.review.bot 2011-06-21 11:05:20 -0700 Comment on attachment 97988 Patch Clearing flags on attachment: 97988 Committed r89366: <http://trac.webkit.org/changeset/89366> 424572 10 webkit.review.bot 2011-06-21 11:05:25 -0700 All reviewed patches have been landed. Closing bug. 97604 2011-06-17 08:36:38 -0700 2011-06-21 07:56:17 -0700 Patch bug-62867-20110617113636.patch text/plain 3756 caryclark SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5MTM4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDYtMTcgIENhcnkgQ2xh cmsgIDxjYXJ5Y2xhcmtAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgR3JhcGhpY3NDb250ZXh0U2tpYSB3aGVuIHRoZSBD aHJvbWl1bSBwbGF0Zm9ybSBpcyBNYWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTYyODY3CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGRvZXMg bm90IG1vZGlmeSBleGlzdGluZyBjb2RlOworICAgICAgICB0aGVyZSBpcyBubyBjaGFuZ2UgaW4g ZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhp Y3NDb250ZXh0U2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRy YXdGb2N1c1JpbmcpOgorICAgICAgICBUaGUgT1MgWCBmcmFtZXdvcmsgZHJhd3MgYSBmYXR0ZXIg Zm9jdXMgcmluZyB0aGFuIHRoZQorICAgICAgICBDaHJvbWl1bSBwb3J0LiBJbmNyZWFzZSB0aGUg ZGlhbWV0ZXIsIGFuZCBhZGQgYW4gaW5uZXIKKyAgICAgICAgc3Ryb2tlIHdpdGggbW9yZSB0cmFu c3BhcmVuY3ksIHRvIG1hdGNoIHRoZSBsb29rIG9mCisgICAgICAgIENocm9taXVtIG9uIE1hYyB3 aGVuIFNraWEgaXMgdGhlIHJlbmRlcmluZyBlbmdpbmUuCisKKyAgICAgICAgKFdlYkNvcmU6OmRl dmljZVJHQkNvbG9yU3BhY2VSZWYpOgorICAgICAgICBBZGQgZGV2aWNlUkdCQ29sb3JTcGFjZVJl ZiwgYSBzdGF0aWMgY2FjaGUgb2YKKyAgICAgICAgQ0dDb2xvclNwYWNlQ3JlYXRlRGV2aWNlUkdC KCkuIFRoaXMgaXMgY2FsbGVkIGJ5CisgICAgICAgIHRoZSBNYWMtc3BlY2lmaWMgVUkgd2hlbiBT a2lhIGlzIHRoZSByZW5kZXJpbmcgZW5naW5lLgorCiAyMDExLTA2LTE2ICBQYXZlbCBQb2Rpdmls b3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkg U2VtaWtoYXRza3kuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lh L0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAJKHJldmlzaW9uIDg5 MTM1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0Nv bnRleHRTa2lhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTcsNiArNTcsMTAgQEAKICNpbmNsdWRl IDx3dGYvTWF0aEV4dHJhcy5oPgogI2luY2x1ZGUgPHd0Zi9VbnVzZWRQYXJhbS5oPgogCisjaWYg UExBVEZPUk0oQ0hST01JVU0pICYmIE9TKERBUldJTikKKyNpbmNsdWRlIDxDb3JlR3JhcGhpY3Mv Q0dDb2xvclNwYWNlLmg+CisjZW5kaWYKKwogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogbmFtZXNw YWNlIFdlYkNvcmUgewpAQCAtNTMwLDcgKzUzNCw4IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojpk cmF3Rm9jdXNSaW5nKGNvbnMKICAgICAvLyBGSVhNRTogaW1wbGVtZW50CiB9CiAKLXZvaWQgR3Jh cGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5nKGNvbnN0IFZlY3RvcjxJbnRSZWN0PiYgcmVjdHMs IGludCAvKiB3aWR0aCAqLywgaW50IC8qIG9mZnNldCAqLywgY29uc3QgQ29sb3ImIGNvbG9yKQor Cit2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ZvY3VzUmluZyhjb25zdCBWZWN0b3I8SW50UmVj dD4mIHJlY3RzLCBpbnQgd2lkdGgsIGludCAvKiBvZmZzZXQgKi8sIGNvbnN0IENvbG9yJiBjb2xv cikKIHsKICAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47CkBAIC01 NDEsNyArNTQ2LDE0IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5nKGNvbnMK IAogICAgIHBsYXRmb3JtQ29udGV4dCgpLT5wcmVwYXJlRm9yU29mdHdhcmVEcmF3KCk7CiAgICAg U2tSZWdpb24gZm9jdXNSaW5nUmVnaW9uOworI2lmIFBMQVRGT1JNKENIUk9NSVVNKSAmJiBPUyhE QVJXSU4pCisgICAgZmxvYXQgcmFkaXVzID0gKHdpZHRoIC0gMSkgLyAyLjBmOworICAgIGludCBv dXRlciA9IHdpZHRoOworICAgIGZsb2F0IGlubmVyID0gKHdpZHRoKSAvIDIuMGY7CisgICAgY29u c3QgU2tTY2FsYXIgZm9jdXNSaW5nT3V0c2V0ID0gKHdpZHRoIC8gMi4wZikgKyAwLjI1ZjsKKyNl bHNlCiAgICAgY29uc3QgU2tTY2FsYXIgZm9jdXNSaW5nT3V0c2V0ID0gV2ViQ29yZUZsb2F0VG9T a1NjYWxhcigwLjUpOworI2VuZGlmCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHJlY3RD b3VudDsgaSsrKSB7CiAgICAgICAgIFNrSVJlY3QgciA9IHJlY3RzW2ldOwogICAgICAgICByLmlu c2V0KC1mb2N1c1JpbmdPdXRzZXQsIC1mb2N1c1JpbmdPdXRzZXQpOwpAQCAtNTU0LDEwICs1NjYs MjEgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdGb2N1c1JpbmcoY29ucwogICAgIHBhaW50 LnNldFN0eWxlKFNrUGFpbnQ6OmtTdHJva2VfU3R5bGUpOwogCiAgICAgcGFpbnQuc2V0Q29sb3Io Y29sb3IucmdiKCkpOworI2lmIFBMQVRGT1JNKENIUk9NSVVNKSAmJiBPUyhEQVJXSU4pCisgICAg cGFpbnQuc2V0QWxwaGEoNjQpOworICAgIHBhaW50LnNldFN0cm9rZVdpZHRoKG91dGVyKTsKKyAg ICBwYWludC5zZXRQYXRoRWZmZWN0KG5ldyBTa0Nvcm5lclBhdGhFZmZlY3QocmFkaXVzKSktPnVu cmVmKCk7CisjZWxzZQogICAgIHBhaW50LnNldFN0cm9rZVdpZHRoKGZvY3VzUmluZ091dHNldCAq IDIpOwogICAgIHBhaW50LnNldFBhdGhFZmZlY3QobmV3IFNrQ29ybmVyUGF0aEVmZmVjdChmb2N1 c1JpbmdPdXRzZXQgKiAyKSktPnVucmVmKCk7CisjZW5kaWYKICAgICBmb2N1c1JpbmdSZWdpb24u Z2V0Qm91bmRhcnlQYXRoKCZwYXRoKTsKICAgICBwbGF0Zm9ybUNvbnRleHQoKS0+Y2FudmFzKCkt PmRyYXdQYXRoKHBhdGgsIHBhaW50KTsKKyNpZiBQTEFURk9STShDSFJPTUlVTSkgJiYgT1MoREFS V0lOKQorICAgIHBhaW50LnNldEFscGhhKDEyOCk7CisgICAgcGFpbnQuc2V0U3Ryb2tlV2lkdGgo aW5uZXIpOworICAgIHBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKS0+ZHJhd1BhdGgocGF0aCwg cGFpbnQpOworI2VuZGlmCiB9CiAKIC8vIFRoaXMgaXMgb25seSB1c2VkIHRvIGRyYXcgYm9yZGVy cy4KQEAgLTEyODksNCArMTMxMiwxMiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6bWFya0RpcnR5 UmVjdChjb25zCiAgICAgcGxhdGZvcm1Db250ZXh0KCktPm1hcmtEaXJ0eVJlY3QocmVjdCk7CiB9 CiAKKyNpZiBQTEFURk9STShDSFJPTUlVTSkgJiYgT1MoREFSV0lOKQorQ0dDb2xvclNwYWNlUmVm IGRldmljZVJHQkNvbG9yU3BhY2VSZWYoKQoreworICAgIHN0YXRpYyBDR0NvbG9yU3BhY2VSZWYg ZGV2aWNlU3BhY2UgPSBDR0NvbG9yU3BhY2VDcmVhdGVEZXZpY2VSR0IoKTsKKyAgICByZXR1cm4g ZGV2aWNlU3BhY2U7Cit9CisjZW5kaWYKKwogfSAgLy8gbmFtZXNwYWNlIFdlYkNvcmUK 97988 2011-06-21 07:53:46 -0700 2011-06-21 11:05:20 -0700 Patch bug-62867-20110621105344.patch text/plain 4370 caryclark SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5MzU1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDYtMjEgIENhcnkgQ2xh cmsgIDxjYXJ5Y2xhcmtAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgR3JhcGhpY3NDb250ZXh0U2tpYSB3aGVuIHRoZSBD aHJvbWl1bSBwbGF0Zm9ybSBpcyBNYWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTYyODY3CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGRvZXMg bm90IG1vZGlmeSBleGlzdGluZyBjb2RlOworICAgICAgICB0aGVyZSBpcyBubyBjaGFuZ2UgaW4g ZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhp Y3NDb250ZXh0U2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkcmF3T3V0ZXJQYXRoKToKKyAg ICAgICAgKFdlYkNvcmU6OmRyYXdJbm5lclBhdGgpOgorICAgICAgICAoV2ViQ29yZTo6Z2V0Rm9j dXNSaW5nT3V0c2V0KToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0Zv Y3VzUmluZyk6CisgICAgICAgIFRoZSBPUyBYIGZyYW1ld29yayBkcmF3cyBhIGZhdHRlciBmb2N1 cyByaW5nIHRoYW4gdGhlCisgICAgICAgIENocm9taXVtIHBvcnQuIEluY3JlYXNlIHRoZSBkaWFt ZXRlciwgYW5kIGFkZCBhbiBpbm5lcgorICAgICAgICBzdHJva2Ugd2l0aCBtb3JlIHRyYW5zcGFy ZW5jeSwgdG8gbWF0Y2ggdGhlIGxvb2sgb2YKKyAgICAgICAgQ2hyb21pdW0gb24gTWFjIHdoZW4g U2tpYSBpcyB0aGUgcmVuZGVyaW5nIGVuZ2luZS4KKworICAgICAgICAoV2ViQ29yZTo6ZGV2aWNl UkdCQ29sb3JTcGFjZVJlZik6CisgICAgICAgIEFkZCBkZXZpY2VSR0JDb2xvclNwYWNlUmVmLCBh IHN0YXRpYyBjYWNoZSBvZgorICAgICAgICBDR0NvbG9yU3BhY2VDcmVhdGVEZXZpY2VSR0IoKS4g VGhpcyBpcyBjYWxsZWQgYnkKKyAgICAgICAgdGhlIE1hYy1zcGVjaWZpYyBVSSB3aGVuIFNraWEg aXMgdGhlIHJlbmRlcmluZyBlbmdpbmUuCisKIDIwMTEtMDYtMjAgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hh dHNreS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhp Y3NDb250ZXh0U2tpYS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcAkocmV2aXNpb24gODkyNTMpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dFNr aWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Nyw2ICs1NywxMCBAQAogI2luY2x1ZGUgPHd0Zi9N YXRoRXh0cmFzLmg+CiAjaW5jbHVkZSA8d3RmL1VudXNlZFBhcmFtLmg+CiAKKyNpZiBQTEFURk9S TShDSFJPTUlVTSkgJiYgT1MoREFSV0lOKQorI2luY2x1ZGUgPENvcmVHcmFwaGljcy9DR0NvbG9y U3BhY2UuaD4KKyNlbmRpZgorCiB1c2luZyBuYW1lc3BhY2Ugc3RkOwogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CkBAIC01MzAsNyArNTM0LDM4IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Rm9j dXNSaW5nKGNvbnMKICAgICAvLyBGSVhNRTogaW1wbGVtZW50CiB9CiAKLXZvaWQgR3JhcGhpY3ND b250ZXh0OjpkcmF3Rm9jdXNSaW5nKGNvbnN0IFZlY3RvcjxJbnRSZWN0PiYgcmVjdHMsIGludCAv KiB3aWR0aCAqLywgaW50IC8qIG9mZnNldCAqLywgY29uc3QgQ29sb3ImIGNvbG9yKQorc3RhdGlj IGlubGluZSB2b2lkIGRyYXdPdXRlclBhdGgoU2tDYW52YXMqIGNhbnZhcywgY29uc3QgU2tQYXRo JiBwYXRoLCBTa1BhaW50JiBwYWludCwgaW50IHdpZHRoKQoreworI2lmIFBMQVRGT1JNKENIUk9N SVVNKSAmJiBPUyhEQVJXSU4pCisgICAgcGFpbnQuc2V0QWxwaGEoNjQpOworICAgIHBhaW50LnNl dFN0cm9rZVdpZHRoKHdpZHRoKTsKKyAgICBwYWludC5zZXRQYXRoRWZmZWN0KG5ldyBTa0Nvcm5l clBhdGhFZmZlY3QoKHdpZHRoIC0gMSkgKiAwLjVmKSktPnVucmVmKCk7CisjZWxzZQorICAgIHBh aW50LnNldFN0cm9rZVdpZHRoKDEpOworICAgIHBhaW50LnNldFBhdGhFZmZlY3QobmV3IFNrQ29y bmVyUGF0aEVmZmVjdCgxKSktPnVucmVmKCk7CisjZW5kaWYKKyAgICBjYW52YXMtPmRyYXdQYXRo KHBhdGgsIHBhaW50KTsKK30KKworc3RhdGljIGlubGluZSB2b2lkIGRyYXdJbm5lclBhdGgoU2tD YW52YXMqIGNhbnZhcywgY29uc3QgU2tQYXRoJiBwYXRoLCBTa1BhaW50JiBwYWludCwgaW50IHdp ZHRoKQoreworI2lmIFBMQVRGT1JNKENIUk9NSVVNKSAmJiBPUyhEQVJXSU4pCisgICAgcGFpbnQu c2V0QWxwaGEoMTI4KTsKKyAgICBwYWludC5zZXRTdHJva2VXaWR0aCh3aWR0aCAqIDAuNWYpOwor ICAgIGNhbnZhcy0+ZHJhd1BhdGgocGF0aCwgcGFpbnQpOworI2VuZGlmCit9CisKK3N0YXRpYyBp bmxpbmUgU2tTY2FsYXIgZ2V0Rm9jdXNSaW5nT3V0c2V0KGludCB3aWR0aCkKK3sKKyNpZiBQTEFU Rk9STShDSFJPTUlVTSkgJiYgT1MoREFSV0lOKQorICAgIHJldHVybiAod2lkdGggKiAwLjVmKSAr IDAuMjVmOworI2Vsc2UKKyAgICByZXR1cm4gMC41ZjsKKyNlbmRpZgorfQorCit2b2lkIEdyYXBo aWNzQ29udGV4dDo6ZHJhd0ZvY3VzUmluZyhjb25zdCBWZWN0b3I8SW50UmVjdD4mIHJlY3RzLCBp bnQgd2lkdGgsIGludCAvKiBvZmZzZXQgKi8sIGNvbnN0IENvbG9yJiBjb2xvcikKIHsKICAgICBp ZiAocGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47CkBAIC01NDEsNyArNTc2LDcg QEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdGb2N1c1JpbmcoY29ucwogCiAgICAgcGxhdGZv cm1Db250ZXh0KCktPnByZXBhcmVGb3JTb2Z0d2FyZURyYXcoKTsKICAgICBTa1JlZ2lvbiBmb2N1 c1JpbmdSZWdpb247Ci0gICAgY29uc3QgU2tTY2FsYXIgZm9jdXNSaW5nT3V0c2V0ID0gV2ViQ29y ZUZsb2F0VG9Ta1NjYWxhcigwLjUpOworICAgIGNvbnN0IFNrU2NhbGFyIGZvY3VzUmluZ091dHNl dCA9IGdldEZvY3VzUmluZ091dHNldCh3aWR0aCk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsg aSA8IHJlY3RDb3VudDsgaSsrKSB7CiAgICAgICAgIFNrSVJlY3QgciA9IHJlY3RzW2ldOwogICAg ICAgICByLmluc2V0KC1mb2N1c1JpbmdPdXRzZXQsIC1mb2N1c1JpbmdPdXRzZXQpOwpAQCAtNTU0 LDEwICs1ODksMTAgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdGb2N1c1JpbmcoY29ucwog ICAgIHBhaW50LnNldFN0eWxlKFNrUGFpbnQ6OmtTdHJva2VfU3R5bGUpOwogCiAgICAgcGFpbnQu c2V0Q29sb3IoY29sb3IucmdiKCkpOwotICAgIHBhaW50LnNldFN0cm9rZVdpZHRoKGZvY3VzUmlu Z091dHNldCAqIDIpOwotICAgIHBhaW50LnNldFBhdGhFZmZlY3QobmV3IFNrQ29ybmVyUGF0aEVm ZmVjdChmb2N1c1JpbmdPdXRzZXQgKiAyKSktPnVucmVmKCk7CiAgICAgZm9jdXNSaW5nUmVnaW9u LmdldEJvdW5kYXJ5UGF0aCgmcGF0aCk7Ci0gICAgcGxhdGZvcm1Db250ZXh0KCktPmNhbnZhcygp LT5kcmF3UGF0aChwYXRoLCBwYWludCk7CisgICAgU2tDYW52YXMqIGNhbnZhcyA9IHBsYXRmb3Jt Q29udGV4dCgpLT5jYW52YXMoKTsKKyAgICBkcmF3T3V0ZXJQYXRoKGNhbnZhcywgcGF0aCwgcGFp bnQsIHdpZHRoKTsKKyAgICBkcmF3SW5uZXJQYXRoKGNhbnZhcywgcGF0aCwgcGFpbnQsIHdpZHRo KTsKIH0KIAogLy8gVGhpcyBpcyBvbmx5IHVzZWQgdG8gZHJhdyBib3JkZXJzLgpAQCAtMTI4OSw0 ICsxMzI0LDEyIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjptYXJrRGlydHlSZWN0KGNvbnMKICAg ICBwbGF0Zm9ybUNvbnRleHQoKS0+bWFya0RpcnR5UmVjdChyZWN0KTsKIH0KIAorI2lmIFBMQVRG T1JNKENIUk9NSVVNKSAmJiBPUyhEQVJXSU4pCitDR0NvbG9yU3BhY2VSZWYgZGV2aWNlUkdCQ29s b3JTcGFjZVJlZigpCit7CisgICAgc3RhdGljIENHQ29sb3JTcGFjZVJlZiBkZXZpY2VTcGFjZSA9 IENHQ29sb3JTcGFjZUNyZWF0ZURldmljZVJHQigpOworICAgIHJldHVybiBkZXZpY2VTcGFjZTsK K30KKyNlbmRpZgorCiB9ICAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=