125482 2013-12-09 21:16:24 -0800 Set m_nextBreakablePosition as private in InlineIterator, and use it 2013-12-11 00:28:34 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gyuyoung.kim gyuyoung.kim commit-queue esprehn+autocc glenn kling kondapallykalyan oldest_to_newest 958191 0 gyuyoung.kim 2013-12-09 21:16:24 -0800 InlineIterator has been exported m_nextBreakablePosition as public though it is member variable. This patch set it as private, and add getter/setter functions for it. 958193 1 218829 gyuyoung.kim 2013-12-09 21:19:50 -0800 Created attachment 218829 Patch 958207 2 gyuyoung.kim 2013-12-09 21:57:30 -0800 CC'ing Kling. 958615 3 218829 commit-queue 2013-12-11 00:28:31 -0800 Comment on attachment 218829 Patch Clearing flags on attachment: 218829 Committed r160413: <http://trac.webkit.org/changeset/160413> 958616 4 commit-queue 2013-12-11 00:28:34 -0800 All reviewed patches have been landed. Closing bug. 218829 2013-12-09 21:19:50 -0800 2013-12-11 00:28:31 -0800 Patch bug-125482-20131210141948.patch text/plain 9327 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwMzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQyZGRiZDFmZGVhZjJj YjY1YjM4ZmZkMDE0MzRmYzk4ZTllYWY3ZC4uZDEwZGVmZTNjMTkzMzQ0NTc5OGMwM2Y1OTMwYzJl NTkwYjI1YzdkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTEyLTA5ICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgU2V0IG1fbmV4 dEJyZWFrYWJsZVBvc2l0aW9uIGFzIHByaXZhdGUgaW4gSW5saW5lSXRlcmF0b3IsIGFuZCB1c2Ug aXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjU0 ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbmxp bmVJdGVyYXRvciBoYXMgYmVlbiBleHBvcnRlZCBtX25leHRCcmVha2FibGVQb3NpdGlvbiBhcyBw dWJsaWMgdGhvdWdoIGl0IGlzIG1lbWJlciB2YXJpYWJsZS4KKyAgICAgICAgVGhpcyBwYXRjaCBz ZXQgaXQgYXMgcHJpdmF0ZSwgYW5kIGFkZCBnZXR0ZXIvc2V0dGVyIGZ1bmN0aW9ucyBmb3IgaXQu CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2VzLgorCisgICAgICAg ICogcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJ dGVyYXRvcjo6SW5saW5lSXRlcmF0b3IpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0 b3I6Om5leHRCcmVha2FibGVQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVy YXRvcjo6c2V0TmV4dEJyZWFrYWJsZVBvc2l0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvbGlu ZS9CcmVha2luZ0NvbnRleHRJbmxpbmVIZWFkZXJzLmg6CisgICAgICAgIChXZWJDb3JlOjpCcmVh a2luZ0NvbnRleHQ6OmhhbmRsZVRleHQpOgorCiAyMDEzLTEyLTA5ICBTZW9ranUgS3dvbiAgPHNl b2tqdUB3ZWJraXQub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSBlbmFibGVk KCkgaW4gSW5zcGVjdG9yUnVudGltZUFnZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5s aW5lSXRlcmF0b3IuaAppbmRleCA2MDNkZjFkOGM3NDNiYTAwYjQyMjdhZGM0MTgwOTMyODg5ZWFk ODI0Li5hYTg1ZjU3ZTkwOThmMWZiNjFhZmE2MzJkYTJlYWYwMjhmNjIzNDA0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaApAQCAtMzksMTYgKzM5LDE2IEBAIHB1 YmxpYzoKICAgICBJbmxpbmVJdGVyYXRvcigpCiAgICAgICAgIDogbV9yb290KDApCiAgICAgICAg ICwgbV9yZW5kZXJlcigwKQotICAgICAgICAsIG1fcG9zKDApCiAgICAgICAgICwgbV9uZXh0QnJl YWthYmxlUG9zaXRpb24oLTEpCisgICAgICAgICwgbV9wb3MoMCkKICAgICB7CiAgICAgfQogCiAg ICAgSW5saW5lSXRlcmF0b3IoUmVuZGVyRWxlbWVudCogcm9vdCwgUmVuZGVyT2JqZWN0KiBvLCB1 bnNpZ25lZCBwKQogICAgICAgICA6IG1fcm9vdChyb290KQogICAgICAgICAsIG1fcmVuZGVyZXIo bykKLSAgICAgICAgLCBtX3BvcyhwKQogICAgICAgICAsIG1fbmV4dEJyZWFrYWJsZVBvc2l0aW9u KC0xKQorICAgICAgICAsIG1fcG9zKHApCiAgICAgewogICAgIH0KIApAQCAtNzAsNiArNzAsOCBA QCBwdWJsaWM6CiAgICAgdm9pZCBzZXRSZW5kZXJlcihSZW5kZXJPYmplY3QqIHJlbmRlcmVyKSB7 IG1fcmVuZGVyZXIgPSByZW5kZXJlcjsgfQogICAgIHVuc2lnbmVkIG9mZnNldCgpIGNvbnN0IHsg cmV0dXJuIG1fcG9zOyB9CiAgICAgUmVuZGVyRWxlbWVudCogcm9vdCgpIGNvbnN0IHsgcmV0dXJu IG1fcm9vdDsgfQorICAgIGludCBuZXh0QnJlYWthYmxlUG9zaXRpb24oKSBjb25zdCB7IHJldHVy biBtX25leHRCcmVha2FibGVQb3NpdGlvbjsgfQorICAgIHZvaWQgc2V0TmV4dEJyZWFrYWJsZVBv c2l0aW9uKGludCBwb3NpdGlvbikgeyBtX25leHRCcmVha2FibGVQb3NpdGlvbiA9IHBvc2l0aW9u OyB9CiAKICAgICB2b2lkIGZhc3RJbmNyZW1lbnRJblRleHROb2RlKCk7CiAgICAgdm9pZCBpbmNy ZW1lbnQoSW5saW5lQmlkaVJlc29sdmVyKiA9IDApOwpAQCAtOTUsMTAgKzk3LDExIEBAIHByaXZh dGU6CiAgICAgUmVuZGVyRWxlbWVudCogbV9yb290OwogICAgIFJlbmRlck9iamVjdCogbV9yZW5k ZXJlcjsKIAorICAgIGludCBtX25leHRCcmVha2FibGVQb3NpdGlvbjsKKwogLy8gRklYTUU6IFRo ZXNlIHNob3VsZCBiZSBwcml2YXRlLgogcHVibGljOgogICAgIHVuc2lnbmVkIG1fcG9zOwotICAg IGludCBtX25leHRCcmVha2FibGVQb3NpdGlvbjsKIH07CiAKIGlubGluZSBib29sIG9wZXJhdG9y PT0oY29uc3QgSW5saW5lSXRlcmF0b3ImIGl0MSwgY29uc3QgSW5saW5lSXRlcmF0b3ImIGl0MikK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0JyZWFraW5nQ29udGV4 dElubGluZUhlYWRlcnMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0JyZWFraW5n Q29udGV4dElubGluZUhlYWRlcnMuaAppbmRleCBjYzk2ZDhmODgzZWNlZGM0OWM4ZDk3YmViNTVi YmIwMGJlYmI0OWE3Li45MTYwYjc1MzRiNGNhMmFkNGY4MGQyNWNjNGZhYWQ5NGJjNjE2MGYyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHRJ bmxpbmVIZWFkZXJzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtp bmdDb250ZXh0SW5saW5lSGVhZGVycy5oCkBAIC03MzMsOCArNzMzLDEwIEBAIGlubGluZSBib29s IEJyZWFraW5nQ29udGV4dDo6aGFuZGxlVGV4dChXb3JkTWVhc3VyZW1lbnRzJiB3b3JkTWVhc3Vy ZW1lbnRzLCBib29sCiAgICAgICAgICAgICBtaWRXb3JkQnJlYWsgPSBtX3dpZHRoLmNvbW1pdHRl ZFdpZHRoKCkgKyB3cmFwVyArIGNoYXJXaWR0aCA+IG1fd2lkdGguYXZhaWxhYmxlV2lkdGgoKTsK ICAgICAgICAgfQogCi0gICAgICAgIGJvb2wgYmV0d2VlbldvcmRzID0gYyA9PSAnXG4nIHx8ICht X2N1cnJXUyAhPSBQUkUgJiYgIW1fYXRTdGFydCAmJiBpc0JyZWFrYWJsZShtX3JlbmRlclRleHRJ bmZvLm1fbGluZUJyZWFrSXRlcmF0b3IsIG1fY3VycmVudC5tX3BvcywgbV9jdXJyZW50Lm1fbmV4 dEJyZWFrYWJsZVBvc2l0aW9uLCBicmVha05CU1ApCisgICAgICAgIGludCBuZXh0QnJlYWthYmxl UG9zaXRpb24gPSBtX2N1cnJlbnQubmV4dEJyZWFrYWJsZVBvc2l0aW9uKCk7CisgICAgICAgIGJv b2wgYmV0d2VlbldvcmRzID0gYyA9PSAnXG4nIHx8IChtX2N1cnJXUyAhPSBQUkUgJiYgIW1fYXRT dGFydCAmJiBpc0JyZWFrYWJsZShtX3JlbmRlclRleHRJbmZvLm1fbGluZUJyZWFrSXRlcmF0b3Is IG1fY3VycmVudC5tX3BvcywgbmV4dEJyZWFrYWJsZVBvc2l0aW9uLCBicmVha05CU1ApCiAgICAg ICAgICAgICAmJiAoc3R5bGUuaHlwaGVucygpICE9IEh5cGhlbnNOb25lIHx8IChtX2N1cnJlbnQu cHJldmlvdXNJblNhbWVOb2RlKCkgIT0gc29mdEh5cGhlbikpKTsKKyAgICAgICAgbV9jdXJyZW50 LnNldE5leHRCcmVha2FibGVQb3NpdGlvbihuZXh0QnJlYWthYmxlUG9zaXRpb24pOwogCiAgICAg ICAgIGlmIChiZXR3ZWVuV29yZHMgfHwgbWlkV29yZEJyZWFrKSB7CiAgICAgICAgICAgICBib29s IHN0b3BwZWRJZ25vcmluZ1NwYWNlcyA9IGZhbHNlOwpAQCAtODA2LDEzICs4MDgsMTMgQEAgaW5s aW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdv cmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICAgICAgICAgICAgICAgICAgLy8gYWRkaXRpb25hbCB3 aGl0ZXNwYWNlLgogICAgICAgICAgICAgICAgICAgICBpZiAoIW1fd2lkdGguZml0c09uTGluZUlu Y2x1ZGluZ0V4dHJhV2lkdGgoY2hhcldpZHRoKSkgewogICAgICAgICAgICAgICAgICAgICAgICAg bGluZVdhc1Rvb1dpZGUgPSB0cnVlOwotICAgICAgICAgICAgICAgICAgICAgICAgbV9saW5lQnJl YWsubW92ZVRvKG1fY3VycmVudC5yZW5kZXJlcigpLCBtX2N1cnJlbnQubV9wb3MsIG1fY3VycmVu dC5tX25leHRCcmVha2FibGVQb3NpdGlvbik7CisgICAgICAgICAgICAgICAgICAgICAgICBtX2xp bmVCcmVhay5tb3ZlVG8obV9jdXJyZW50LnJlbmRlcmVyKCksIG1fY3VycmVudC5tX3BvcywgbV9j dXJyZW50Lm5leHRCcmVha2FibGVQb3NpdGlvbigpKTsKICAgICAgICAgICAgICAgICAgICAgICAg IG1fbGluZUJyZWFrZXIuc2tpcFRyYWlsaW5nV2hpdGVzcGFjZShtX2xpbmVCcmVhaywgbV9saW5l SW5mbyk7CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9CiAgICAgICAg ICAgICAgICAgaWYgKGxpbmVXYXNUb29XaWRlIHx8ICFtX3dpZHRoLmZpdHNPbkxpbmUoKSkgewog ICAgICAgICAgICAgICAgICAgICBpZiAoY2FuSHlwaGVuYXRlICYmICFtX3dpZHRoLmZpdHNPbkxp bmUoKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgdHJ5SHlwaGVuYXRpbmcocmVuZGVyVGV4 dCwgZm9udCwgc3R5bGUubG9jYWxlKCksIGNvbnNlY3V0aXZlSHlwaGVuYXRlZExpbmVzLCBtX2Js b2NrU3R5bGUuaHlwaGVuYXRpb25MaW1pdExpbmVzKCksIHN0eWxlLmh5cGhlbmF0aW9uTGltaXRC ZWZvcmUoKSwgc3R5bGUuaHlwaGVuYXRpb25MaW1pdEFmdGVyKCksIGxhc3RTcGFjZSwgbV9jdXJy ZW50Lm1fcG9zLCBtX3dpZHRoLmN1cnJlbnRXaWR0aCgpIC0gYWRkaXRpb25hbFRlbXBXaWR0aCwg bV93aWR0aC5hdmFpbGFibGVXaWR0aCgpLCBpc0ZpeGVkUGl0Y2gsIG1fY29sbGFwc2VXaGl0ZVNw YWNlLCBsYXN0U3BhY2VXb3JkU3BhY2luZywgbV9saW5lQnJlYWssIG1fY3VycmVudC5tX25leHRC cmVha2FibGVQb3NpdGlvbiwgbV9saW5lQnJlYWtlci5tX2h5cGhlbmF0ZWQpOworICAgICAgICAg ICAgICAgICAgICAgICAgdHJ5SHlwaGVuYXRpbmcocmVuZGVyVGV4dCwgZm9udCwgc3R5bGUubG9j YWxlKCksIGNvbnNlY3V0aXZlSHlwaGVuYXRlZExpbmVzLCBtX2Jsb2NrU3R5bGUuaHlwaGVuYXRp b25MaW1pdExpbmVzKCksIHN0eWxlLmh5cGhlbmF0aW9uTGltaXRCZWZvcmUoKSwgc3R5bGUuaHlw aGVuYXRpb25MaW1pdEFmdGVyKCksIGxhc3RTcGFjZSwgbV9jdXJyZW50Lm1fcG9zLCBtX3dpZHRo LmN1cnJlbnRXaWR0aCgpIC0gYWRkaXRpb25hbFRlbXBXaWR0aCwgbV93aWR0aC5hdmFpbGFibGVX aWR0aCgpLCBpc0ZpeGVkUGl0Y2gsIG1fY29sbGFwc2VXaGl0ZVNwYWNlLCBsYXN0U3BhY2VXb3Jk U3BhY2luZywgbV9saW5lQnJlYWssIG1fY3VycmVudC5uZXh0QnJlYWthYmxlUG9zaXRpb24oKSwg bV9saW5lQnJlYWtlci5tX2h5cGhlbmF0ZWQpOwogICAgICAgICAgICAgICAgICAgICAgICAgaWYg KG1fbGluZUJyZWFrZXIubV9oeXBoZW5hdGVkKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbV9hdEVuZCA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwpAQCAtODUyLDcgKzg1NCw3IEBAIGlubGluZSBib29sIEJyZWFraW5nQ29udGV4dDo6aGFu ZGxlVGV4dChXb3JkTWVhc3VyZW1lbnRzJiB3b3JkTWVhc3VyZW1lbnRzLCBib29sCiAgICAgICAg ICAgICBpZiAoYyA9PSAnXG4nICYmIG1fcHJlc2VydmVzTmV3bGluZSkgewogICAgICAgICAgICAg ICAgIGlmICghc3RvcHBlZElnbm9yaW5nU3BhY2VzICYmIG1fY3VycmVudC5tX3BvcyA+IDApCiAg ICAgICAgICAgICAgICAgICAgIGVuc3VyZUNoYXJhY3RlckdldHNMaW5lQm94KG1fbGluZU1pZHBv aW50U3RhdGUsIG1fY3VycmVudCk7Ci0gICAgICAgICAgICAgICAgbV9saW5lQnJlYWsubW92ZVRv KG1fY3VycmVudC5yZW5kZXJlcigpLCBtX2N1cnJlbnQubV9wb3MsIG1fY3VycmVudC5tX25leHRC cmVha2FibGVQb3NpdGlvbik7CisgICAgICAgICAgICAgICAgbV9saW5lQnJlYWsubW92ZVRvKG1f Y3VycmVudC5yZW5kZXJlcigpLCBtX2N1cnJlbnQubV9wb3MsIG1fY3VycmVudC5uZXh0QnJlYWth YmxlUG9zaXRpb24oKSk7CiAgICAgICAgICAgICAgICAgbV9saW5lQnJlYWsuaW5jcmVtZW50KCk7 CiAgICAgICAgICAgICAgICAgbV9saW5lSW5mby5zZXRQcmV2aW91c0xpbmVCcm9rZUNsZWFubHko dHJ1ZSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC04NjEsNyArODYzLDcgQEAg aW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KFdvcmRNZWFzdXJlbWVudHMm IHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICAgICAgICAgIGlmIChtX2F1dG9XcmFwICYmIGJl dHdlZW5Xb3JkcykgewogICAgICAgICAgICAgICAgIG1fd2lkdGguY29tbWl0KCk7CiAgICAgICAg ICAgICAgICAgd3JhcFcgPSAwOwotICAgICAgICAgICAgICAgIG1fbGluZUJyZWFrLm1vdmVUbyht X2N1cnJlbnQucmVuZGVyZXIoKSwgbV9jdXJyZW50Lm1fcG9zLCBtX2N1cnJlbnQubV9uZXh0QnJl YWthYmxlUG9zaXRpb24pOworICAgICAgICAgICAgICAgIG1fbGluZUJyZWFrLm1vdmVUbyhtX2N1 cnJlbnQucmVuZGVyZXIoKSwgbV9jdXJyZW50Lm1fcG9zLCBtX2N1cnJlbnQubmV4dEJyZWFrYWJs ZVBvc2l0aW9uKCkpOwogICAgICAgICAgICAgICAgIC8vIEF1dG8td3JhcHBpbmcgdGV4dCBzaG91 bGQgbm90IHdyYXAgaW4gdGhlIG1pZGRsZSBvZiBhIHdvcmQgb25jZSBpdCBoYXMgaGFkIGFuCiAg ICAgICAgICAgICAgICAgLy8gb3Bwb3J0dW5pdHkgdG8gYnJlYWsgYWZ0ZXIgYSB3b3JkLgogICAg ICAgICAgICAgICAgIGJyZWFrV29yZHMgPSBmYWxzZTsKQEAgLTg3MCw3ICs4NzIsNyBAQCBpbmxp bmUgYm9vbCBCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRleHQoV29yZE1lYXN1cmVtZW50cyYgd29y ZE1lYXN1cmVtZW50cywgYm9vbAogICAgICAgICAgICAgaWYgKG1pZFdvcmRCcmVhayAmJiAhVTE2 X0lTX1RSQUlMKGMpICYmICEoVV9HRVRfR0NfTUFTSyhjKSAmIFVfR0NfTV9NQVNLKSkgewogICAg ICAgICAgICAgICAgIC8vIFJlbWVtYmVyIHRoaXMgYXMgYSBicmVha2FibGUgcG9zaXRpb24gaW4g Y2FzZQogICAgICAgICAgICAgICAgIC8vIGFkZGluZyB0aGUgZW5kIHdpZHRoIGZvcmNlcyBhIGJy ZWFrLgotICAgICAgICAgICAgICAgIG1fbGluZUJyZWFrLm1vdmVUbyhtX2N1cnJlbnQucmVuZGVy ZXIoKSwgbV9jdXJyZW50Lm1fcG9zLCBtX2N1cnJlbnQubV9uZXh0QnJlYWthYmxlUG9zaXRpb24p OworICAgICAgICAgICAgICAgIG1fbGluZUJyZWFrLm1vdmVUbyhtX2N1cnJlbnQucmVuZGVyZXIo KSwgbV9jdXJyZW50Lm1fcG9zLCBtX2N1cnJlbnQubmV4dEJyZWFrYWJsZVBvc2l0aW9uKCkpOwog ICAgICAgICAgICAgICAgIG1pZFdvcmRCcmVhayAmPSAoYnJlYWtXb3JkcyB8fCBicmVha0FsbCk7 CiAgICAgICAgICAgICB9CiAKQEAgLTkyNyw3ICs5MjksNyBAQCBpbmxpbmUgYm9vbCBCcmVha2lu Z0NvbnRleHQ6OmhhbmRsZVRleHQoV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cywg Ym9vbAogCiAgICAgICAgIGlmICghbV9jdXJyZW50Q2hhcmFjdGVySXNTcGFjZSAmJiBwcmV2aW91 c0NoYXJhY3RlcklzV1MpIHsKICAgICAgICAgICAgIGlmIChtX2F1dG9XcmFwICYmIG1fY3VycmVu dFN0eWxlLT5icmVha09ubHlBZnRlcldoaXRlU3BhY2UoKSkKLSAgICAgICAgICAgICAgICBtX2xp bmVCcmVhay5tb3ZlVG8obV9jdXJyZW50LnJlbmRlcmVyKCksIG1fY3VycmVudC5tX3BvcywgbV9j dXJyZW50Lm1fbmV4dEJyZWFrYWJsZVBvc2l0aW9uKTsKKyAgICAgICAgICAgICAgICBtX2xpbmVC cmVhay5tb3ZlVG8obV9jdXJyZW50LnJlbmRlcmVyKCksIG1fY3VycmVudC5tX3BvcywgbV9jdXJy ZW50Lm5leHRCcmVha2FibGVQb3NpdGlvbigpKTsKICAgICAgICAgfQogCiAgICAgICAgIGlmICht X2NvbGxhcHNlV2hpdGVTcGFjZSAmJiBtX2N1cnJlbnRDaGFyYWN0ZXJJc1NwYWNlICYmICFtX2ln bm9yaW5nU3BhY2VzKQpAQCAtOTY2LDcgKzk2OCw3IEBAIGlubGluZSBib29sIEJyZWFraW5nQ29u dGV4dDo6aGFuZGxlVGV4dChXb3JkTWVhc3VyZW1lbnRzJiB3b3JkTWVhc3VyZW1lbnRzLCBib29s CiAKICAgICBpZiAoIW1fd2lkdGguZml0c09uTGluZSgpKSB7CiAgICAgICAgIGlmIChjYW5IeXBo ZW5hdGUpCi0gICAgICAgICAgICB0cnlIeXBoZW5hdGluZyhyZW5kZXJUZXh0LCBmb250LCBzdHls ZS5sb2NhbGUoKSwgY29uc2VjdXRpdmVIeXBoZW5hdGVkTGluZXMsIG1fYmxvY2tTdHlsZS5oeXBo ZW5hdGlvbkxpbWl0TGluZXMoKSwgc3R5bGUuaHlwaGVuYXRpb25MaW1pdEJlZm9yZSgpLCBzdHls ZS5oeXBoZW5hdGlvbkxpbWl0QWZ0ZXIoKSwgbGFzdFNwYWNlLCBtX2N1cnJlbnQubV9wb3MsIG1f d2lkdGguY3VycmVudFdpZHRoKCkgLSBhZGRpdGlvbmFsVGVtcFdpZHRoLCBtX3dpZHRoLmF2YWls YWJsZVdpZHRoKCksIGlzRml4ZWRQaXRjaCwgbV9jb2xsYXBzZVdoaXRlU3BhY2UsIGxhc3RTcGFj ZVdvcmRTcGFjaW5nLCBtX2xpbmVCcmVhaywgbV9jdXJyZW50Lm1fbmV4dEJyZWFrYWJsZVBvc2l0 aW9uLCBtX2xpbmVCcmVha2VyLm1faHlwaGVuYXRlZCk7CisgICAgICAgICAgICB0cnlIeXBoZW5h dGluZyhyZW5kZXJUZXh0LCBmb250LCBzdHlsZS5sb2NhbGUoKSwgY29uc2VjdXRpdmVIeXBoZW5h dGVkTGluZXMsIG1fYmxvY2tTdHlsZS5oeXBoZW5hdGlvbkxpbWl0TGluZXMoKSwgc3R5bGUuaHlw aGVuYXRpb25MaW1pdEJlZm9yZSgpLCBzdHlsZS5oeXBoZW5hdGlvbkxpbWl0QWZ0ZXIoKSwgbGFz dFNwYWNlLCBtX2N1cnJlbnQubV9wb3MsIG1fd2lkdGguY3VycmVudFdpZHRoKCkgLSBhZGRpdGlv bmFsVGVtcFdpZHRoLCBtX3dpZHRoLmF2YWlsYWJsZVdpZHRoKCksIGlzRml4ZWRQaXRjaCwgbV9j b2xsYXBzZVdoaXRlU3BhY2UsIGxhc3RTcGFjZVdvcmRTcGFjaW5nLCBtX2xpbmVCcmVhaywgbV9j dXJyZW50Lm5leHRCcmVha2FibGVQb3NpdGlvbigpLCBtX2xpbmVCcmVha2VyLm1faHlwaGVuYXRl ZCk7CiAKICAgICAgICAgaWYgKCFoeXBoZW5hdGVkICYmIG1fbGluZUJyZWFrLnByZXZpb3VzSW5T YW1lTm9kZSgpID09IHNvZnRIeXBoZW4gJiYgc3R5bGUuaHlwaGVucygpICE9IEh5cGhlbnNOb25l KSB7CiAgICAgICAgICAgICBoeXBoZW5hdGVkID0gdHJ1ZTsK