144407 2015-04-29 13:37:59 -0700 Avoid containingBlock() calls when no writing mode flipping is needed 2015-04-30 11:38:26 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1090141 0 hyatt 2015-04-29 13:37:59 -0700 Avoid containingBlock() calls when no writing mode flipping is needed 1090143 1 251983 hyatt 2015-04-29 13:40:44 -0700 Created attachment 251983 Patch 1090144 2 251984 hyatt 2015-04-29 13:42:13 -0700 Created attachment 251984 Patch 1090512 3 hyatt 2015-04-30 11:38:26 -0700 Fixed in r183636. 251983 2015-04-29 13:40:44 -0700 2015-04-29 13:42:13 -0700 Patch patch.txt text/plain 8070 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MzU3MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE1LTA0LTI5ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBBdm9pZCBjb250YWluaW5nQmxvY2so KSBjYWxscyB3aGVuIG5vIHdyaXRpbmcgbW9kZSBmbGlwcGluZyBpcyBuZWVkZWQuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ0MDcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBib29sIHRvIFJl bmRlclZpZXcgdGhhdCBpbmRpY2F0ZXMgd2hldGhlciBvciBub3QgYW55IGZsaXBwZWQgYmxvY2tz IGhhdmUgYmVlbgorICAgICAgICBhZGRlZCB0byB0aGUgdmlldy4gT25jZSB0YWludGVkLCB0aGUg dmlldyBqdXN0IHN0YXlzIGRpcnR5IGZvcmV2ZXIuIElmIG5vIGZsaXBwZWQKKyAgICAgICAgYmxv Y2tzIGFyZSBldmVyIHNlZSwgd2UgY2FuIHRoZW4gb3B0aW1pemUgYXdheSB0aGUgcGxhY2VzIHdo ZXJlIHdlIHdlcmUgY2FsbGluZworICAgICAgICBjb250YWluaW5nQmxvY2soKSBmb3IgdGhlIHNv bGUgcHVycG9zZSBvZiBkb2luZyBmbGlwRm9yV3JpdGluZ01vZGUgY2FsbHMgdGhhdCBlbmRlZAor ICAgICAgICB1cCBkb2luZyBub3RoaW5nLgorCisgICAgICAgIFRoZSBtb3RpdmF0aW9uIGZvciB0 aGlzIHBhdGNoIGlzIHRvIGltcHJvdmUgbGF5ZXIgcG9zaXRpb24gdXBkYXRpbmcsIHdoaWNoIG1h a2VzIG1hbnkKKyAgICAgICAgY2FsbHMgdG8gdG9wTGVmdExvY2F0aW9uT2Zmc2V0KCksIG9uZSBv ZiB0aGUgZnVuY3Rpb25zIHRoYXQgY2FuIGJlIG9wdGltaXplZCBieSB0aGlzCisgICAgICAgIGNo YW5nZS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94OjpsYXlvdXRPdmVyZmxvd1JlY3RGb3JQcm9wYWdhdGlvbik6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckJveE1vZGVsT2JqZWN0Ojp1cGRhdGVGcm9tU3R5bGUpOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6 Y2FsY3VsYXRlQ2xpcFJlY3RzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGluZUJveExp c3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGluZUJveExpc3Q6OnJhbmdlSW50ZXJz ZWN0c1JlY3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclZpZXc6OlJlbmRlclZpZXcpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJWaWV3Lmg6CisKIDIwMTUtMDQtMjkgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxODM1NTMgYW5k IHIxODM1NjEuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkocmV2 aXNpb24gMTgzNDAwKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTQ4MTEsNiArNDgxMSw5IEBAIHZvaWQgUmVuZGVyQm94OjpmbGlw Rm9yV3JpdGluZ01vZGUoRmxvYXQKIAogTGF5b3V0UG9pbnQgUmVuZGVyQm94Ojp0b3BMZWZ0TG9j YXRpb24oKSBjb25zdAogeworICAgIGlmICghdmlldygpLmhhc0ZsaXBwZWRCbG9ja0Rlc2NlbmRh bnRzKCkpCisgICAgICAgIHJldHVybiBsb2NhdGlvbigpOworICAgIAogICAgIFJlbmRlckJsb2Nr KiBjb250YWluZXJCbG9jayA9IGNvbnRhaW5pbmdCbG9jaygpOwogICAgIGlmICghY29udGFpbmVy QmxvY2sgfHwgY29udGFpbmVyQmxvY2sgPT0gdGhpcykKICAgICAgICAgcmV0dXJuIGxvY2F0aW9u KCk7CkBAIC00ODE5LDYgKzQ4MjIsOSBAQCBMYXlvdXRQb2ludCBSZW5kZXJCb3g6OnRvcExlZnRM b2NhdGlvbigpCiAKIExheW91dFNpemUgUmVuZGVyQm94Ojp0b3BMZWZ0TG9jYXRpb25PZmZzZXQo KSBjb25zdAogeworICAgIGlmICghdmlldygpLmhhc0ZsaXBwZWRCbG9ja0Rlc2NlbmRhbnRzKCkp CisgICAgICAgIHJldHVybiBMYXlvdXRTaXplKG1fZnJhbWVSZWN0LngoKSwgbV9mcmFtZVJlY3Qu eSgpKTsKKwogICAgIFJlbmRlckJsb2NrKiBjb250YWluZXJCbG9jayA9IGNvbnRhaW5pbmdCbG9j aygpOwogICAgIGlmICghY29udGFpbmVyQmxvY2sgfHwgY29udGFpbmVyQmxvY2sgPT0gdGhpcykK ICAgICAgICAgcmV0dXJuIGxvY2F0aW9uT2Zmc2V0KCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAJKHJldmlzaW9uIDE4MzQw MCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTIxOSw2ICsyMTksOCBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2Jq ZWN0Ojp1cGRhdGVGcm9tU3R5CiAgICAgc2V0SW5saW5lKHN0eWxlVG9Vc2UuaXNEaXNwbGF5SW5s aW5lVHlwZSgpKTsKICAgICBzZXRQb3NpdGlvblN0YXRlKHN0eWxlVG9Vc2UucG9zaXRpb24oKSk7 CiAgICAgc2V0SG9yaXpvbnRhbFdyaXRpbmdNb2RlKHN0eWxlVG9Vc2UuaXNIb3Jpem9udGFsV3Jp dGluZ01vZGUoKSk7CisgICAgaWYgKHN0eWxlVG9Vc2UuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01v ZGUoKSkKKyAgICAgICAgdmlldygpLnNldEhhc0ZsaXBwZWRCbG9ja0Rlc2NlbmRhbnRzKHRydWUp OwogfQogCiBzdGF0aWMgTGF5b3V0U2l6ZSBhY2N1bXVsYXRlSW5GbG93UG9zaXRpb25PZmZzZXRz KGNvbnN0IFJlbmRlck9iamVjdCogY2hpbGQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHAJKHJldmlzaW9uIDE4MzQwMCkKKysrIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4MTQsMTEgKzU4MTQs MTMgQEAgTGF5b3V0UmVjdCBSZW5kZXJMYXllcjo6bG9jYWxCb3VuZGluZ0JveAogTGF5b3V0UmVj dCBSZW5kZXJMYXllcjo6Ym91bmRpbmdCb3goY29uc3QgUmVuZGVyTGF5ZXIqIGFuY2VzdG9yTGF5 ZXIsIGNvbnN0IExheW91dFNpemUmIG9mZnNldEZyb21Sb290LCBDYWxjdWxhdGVMYXllckJvdW5k c0ZsYWdzIGZsYWdzKSBjb25zdAogeyAgICAKICAgICBMYXlvdXRSZWN0IHJlc3VsdCA9IGxvY2Fs Qm91bmRpbmdCb3goZmxhZ3MpOwotICAgIGlmIChyZW5kZXJlcigpLmlzQm94KCkpCi0gICAgICAg IHJlbmRlckJveCgpLT5mbGlwRm9yV3JpdGluZ01vZGUocmVzdWx0KTsKLSAgICBlbHNlCi0gICAg ICAgIHJlbmRlcmVyKCkuY29udGFpbmluZ0Jsb2NrKCktPmZsaXBGb3JXcml0aW5nTW9kZShyZXN1 bHQpOwotICAgIAorICAgIGlmIChyZW5kZXJlcigpLnZpZXcoKS5oYXNGbGlwcGVkQmxvY2tEZXNj ZW5kYW50cygpKSB7CisgICAgICAgIGlmIChyZW5kZXJlcigpLmlzQm94KCkpCisgICAgICAgICAg ICByZW5kZXJCb3goKS0+ZmxpcEZvcldyaXRpbmdNb2RlKHJlc3VsdCk7CisgICAgICAgIGVsc2UK KyAgICAgICAgICAgIHJlbmRlcmVyKCkuY29udGFpbmluZ0Jsb2NrKCktPmZsaXBGb3JXcml0aW5n TW9kZShyZXN1bHQpOworICAgIH0KKwogICAgIFBhZ2luYXRpb25JbmNsdXNpb25Nb2RlIGluY2x1 c2lvbk1vZGUgPSBFeGNsdWRlQ29tcG9zaXRlZFBhZ2luYXRlZExheWVyczsKICAgICBpZiAoZmxh Z3MgJiBVc2VGcmFnbWVudEJveGVzSW5jbHVkaW5nQ29tcG9zaXRpbmcpCiAgICAgICAgIGluY2x1 c2lvbk1vZGUgPSBJbmNsdWRlQ29tcG9zaXRlZFBhZ2luYXRlZExheWVyczsKQEAgLTU4OTQsMTAg KzU4OTYsMTIgQEAgTGF5b3V0UmVjdCBSZW5kZXJMYXllcjo6Y2FsY3VsYXRlTGF5ZXJCbwogCiAg ICAgTGF5b3V0UmVjdCBib3VuZGluZ0JveFJlY3QgPSBsb2NhbEJvdW5kaW5nQm94KGZsYWdzKTsK IAotICAgIGlmIChpczxSZW5kZXJCb3g+KHJlbmRlcmVyKCkpKQotICAgICAgICBkb3duY2FzdDxS ZW5kZXJCb3g+KHJlbmRlcmVyKCkpLmZsaXBGb3JXcml0aW5nTW9kZShib3VuZGluZ0JveFJlY3Qp OwotICAgIGVsc2UKLSAgICAgICAgcmVuZGVyZXIoKS5jb250YWluaW5nQmxvY2soKS0+ZmxpcEZv cldyaXRpbmdNb2RlKGJvdW5kaW5nQm94UmVjdCk7CisgICAgaWYgKHJlbmRlcmVyKCkudmlldygp Lmhhc0ZsaXBwZWRCbG9ja0Rlc2NlbmRhbnRzKCkpIHsKKyAgICAgICAgaWYgKGlzPFJlbmRlckJv eD4ocmVuZGVyZXIoKSkpCisgICAgICAgICAgICBkb3duY2FzdDxSZW5kZXJCb3g+KHJlbmRlcmVy KCkpLmZsaXBGb3JXcml0aW5nTW9kZShib3VuZGluZ0JveFJlY3QpOworICAgICAgICBlbHNlCisg ICAgICAgICAgICByZW5kZXJlcigpLmNvbnRhaW5pbmdCbG9jaygpLT5mbGlwRm9yV3JpdGluZ01v ZGUoYm91bmRpbmdCb3hSZWN0KTsKKyAgICB9CiAKICAgICBpZiAocmVuZGVyZXIoKS5pc1Jvb3Qo KSkgewogICAgICAgICAvLyBJZiB0aGUgcm9vdCBsYXllciBiZWNvbWVzIGNvbXBvc2l0ZWQgKGUu Zy4gYmVjYXVzZSBzb21lIGRlc2NlbmRhbnQgd2l0aCBuZWdhdGl2ZSB6LWluZGV4IGlzIGNvbXBv c2l0ZWQpLApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpbmVCb3hMaXN0 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGluZUJv eExpc3QuY3BwCShyZXZpc2lvbiAxODM0MDApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGluZUJveExpc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTIsMTMgKzE1MiwxOCBA QCB2b2lkIFJlbmRlckxpbmVCb3hMaXN0OjpkaXJ0eUxpbmVCb3hlcygpCiAvLyBGSVhNRTogVGhp cyBzaG91bGQgdGFrZSBhIFJlbmRlckJveE1vZGVsT2JqZWN0Ji4KIGJvb2wgUmVuZGVyTGluZUJv eExpc3Q6OnJhbmdlSW50ZXJzZWN0c1JlY3QoUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlbmRlcmVy LCBMYXlvdXRVbml0IGxvZ2ljYWxUb3AsIExheW91dFVuaXQgbG9naWNhbEJvdHRvbSwgY29uc3Qg TGF5b3V0UmVjdCYgcmVjdCwgY29uc3QgTGF5b3V0UG9pbnQmIG9mZnNldCkgY29uc3QKIHsKLSAg ICBSZW5kZXJCb3gqIGJsb2NrOwotICAgIGlmIChpczxSZW5kZXJCb3g+KCpyZW5kZXJlcikpCi0g ICAgICAgIGJsb2NrID0gZG93bmNhc3Q8UmVuZGVyQm94PihyZW5kZXJlcik7Ci0gICAgZWxzZQot ICAgICAgICBibG9jayA9IHJlbmRlcmVyLT5jb250YWluaW5nQmxvY2soKTsKLSAgICBMYXlvdXRV bml0IHBoeXNpY2FsU3RhcnQgPSBibG9jay0+ZmxpcEZvcldyaXRpbmdNb2RlKGxvZ2ljYWxUb3Ap OwotICAgIExheW91dFVuaXQgcGh5c2ljYWxFbmQgPSBibG9jay0+ZmxpcEZvcldyaXRpbmdNb2Rl KGxvZ2ljYWxCb3R0b20pOworICAgIExheW91dFVuaXQgcGh5c2ljYWxTdGFydCA9IGxvZ2ljYWxU b3A7CisgICAgTGF5b3V0VW5pdCBwaHlzaWNhbEVuZCA9IGxvZ2ljYWxCb3R0b207CisgICAgaWYg KHJlbmRlcmVyLT52aWV3KCkuaGFzRmxpcHBlZEJsb2NrRGVzY2VuZGFudHMoKSkgeworICAgICAg ICBSZW5kZXJCb3gqIGJsb2NrOworICAgICAgICBpZiAoaXM8UmVuZGVyQm94PigqcmVuZGVyZXIp KQorICAgICAgICAgICAgYmxvY2sgPSBkb3duY2FzdDxSZW5kZXJCb3g+KHJlbmRlcmVyKTsKKyAg ICAgICAgZWxzZQorICAgICAgICAgICAgYmxvY2sgPSByZW5kZXJlci0+Y29udGFpbmluZ0Jsb2Nr KCk7CisgICAgICAgIHBoeXNpY2FsU3RhcnQgPSBibG9jay0+ZmxpcEZvcldyaXRpbmdNb2RlKGxv Z2ljYWxUb3ApOworICAgICAgICBwaHlzaWNhbEVuZCA9IGJsb2NrLT5mbGlwRm9yV3JpdGluZ01v ZGUobG9naWNhbEJvdHRvbSk7CisgICAgfQorCiAgICAgTGF5b3V0VW5pdCBwaHlzaWNhbEV4dGVu dCA9IGFic29sdXRlVmFsdWUocGh5c2ljYWxFbmQgLSBwaHlzaWNhbFN0YXJ0KTsKICAgICBwaHlz aWNhbFN0YXJ0ID0gc3RkOjptaW4ocGh5c2ljYWxTdGFydCwgcGh5c2ljYWxFbmQpOwogICAgIApJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAkocmV2aXNpb24gMTgz NDAwKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xMTEsNiArMTExLDcgQEAgUmVuZGVyVmlldzo6UmVuZGVyVmlldyhEb2N1bWVu dCYgZG9jdW1lbgogICAgICwgbV9yZW5kZXJDb3VudGVyQ291bnQoMCkKICAgICAsIG1fc2VsZWN0 aW9uV2FzQ2FyZXQoZmFsc2UpCiAgICAgLCBtX2hhc1NvZnR3YXJlRmlsdGVycyhmYWxzZSkKKyAg ICAsIG1faGFzRmxpcHBlZEJsb2NrRGVzY2VuZGFudHMoZmFsc2UpCiAjaWYgRU5BQkxFKFNFUlZJ Q0VfQ09OVFJPTFMpCiAgICAgLCBtX3NlbGVjdGlvblJlY3RHYXRoZXJlcigqdGhpcykKICNlbmRp ZgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCShyZXZpc2lvbiAxODM0 MDApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCSh3b3JraW5nIGNv cHkpCkBAIC0xMDIsNiArMTAyLDkgQEAgcHVibGljOgogCiAgICAgTGF5b3V0UmVjdCB2aWV3UmVj dCgpIGNvbnN0OwogCisgICAgYm9vbCBoYXNGbGlwcGVkQmxvY2tEZXNjZW5kYW50cygpIGNvbnN0 IHsgcmV0dXJuIG1faGFzRmxpcHBlZEJsb2NrRGVzY2VuZGFudHM7IH0KKyAgICB2b2lkIHNldEhh c0ZsaXBwZWRCbG9ja0Rlc2NlbmRhbnRzKGJvb2wgYikgeyBtX2hhc0ZsaXBwZWRCbG9ja0Rlc2Nl bmRhbnRzID0gYjsgfQorCiAgICAgLy8gbGF5b3V0RGVsdGEgaXMgdXNlZCB0cmFuc2llbnRseSBk dXJpbmcgbGF5b3V0IHRvIHN0b3JlIGhvdyBmYXIgYW4gb2JqZWN0IGhhcyBtb3ZlZCBmcm9tIGl0 cwogICAgIC8vIGxhc3QgbGF5b3V0IGxvY2F0aW9uLCBpbiBvcmRlciB0byByZXBhaW50IGNvcnJl Y3RseS4KICAgICAvLyBJZiB3ZSdyZSBkb2luZyBhIGZ1bGwgcmVwYWludCBtX2xheW91dFN0YXRl IHdpbGwgYmUgMCwgYnV0IGluIHRoYXQgY2FzZSBsYXlvdXREZWx0YSBkb2Vzbid0IG1hdHRlci4K QEAgLTM1Niw2ICszNTksNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBtX3NlbGVjdGlvbldhc0Nh cmV0OwogICAgIGJvb2wgbV9oYXNTb2Z0d2FyZUZpbHRlcnM7CisgICAgYm9vbCBtX2hhc0ZsaXBw ZWRCbG9ja0Rlc2NlbmRhbnRzOwogCiAgICAgSGFzaFNldDxSZW5kZXJFbGVtZW50Kj4gbV9yZW5k ZXJlcnNXaXRoUGF1c2VkSW1hZ2VBbmltYXRpb247CiAK 251984 2015-04-29 13:42:13 -0700 2015-04-29 13:46:52 -0700 Patch patch.txt text/plain 7946 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MzU3MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE1LTA0LTI5ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBBdm9pZCBjb250YWluaW5nQmxvY2so KSBjYWxscyB3aGVuIG5vIHdyaXRpbmcgbW9kZSBmbGlwcGluZyBpcyBuZWVkZWQuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ0MDcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBib29sIHRvIFJl bmRlclZpZXcgdGhhdCBpbmRpY2F0ZXMgd2hldGhlciBvciBub3QgYW55IGZsaXBwZWQgYmxvY2tz IGhhdmUgYmVlbgorICAgICAgICBhZGRlZCB0byB0aGUgdmlldy4gT25jZSB0YWludGVkLCB0aGUg dmlldyBqdXN0IHN0YXlzIGRpcnR5IGZvcmV2ZXIuIElmIG5vIGZsaXBwZWQKKyAgICAgICAgYmxv Y2tzIGFyZSBldmVyIHNlZW4sIHdlIGNhbiB0aGVuIG9wdGltaXplIGF3YXkgY2FsbHMgdG8gY29u dGFpbmluZ0Jsb2NrKCkuCisKKyAgICAgICAgVGhlIG1vdGl2YXRpb24gZm9yIHRoaXMgcGF0Y2gg aXMgdG8gaW1wcm92ZSBsYXllciBwb3NpdGlvbiB1cGRhdGluZywgd2hpY2ggbWFrZXMgbWFueQor ICAgICAgICBjYWxscyB0byB0b3BMZWZ0TG9jYXRpb25PZmZzZXQoKSwgb25lIG9mIHRoZSBmdW5j dGlvbnMgdGhhdCBjYW4gYmUgb3B0aW1pemVkIGJ5IHRoaXMKKyAgICAgICAgY2hhbmdlLgorCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OmxheW91dE92ZXJmbG93UmVjdEZvclByb3BhZ2F0aW9uKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Qm94TW9kZWxPYmplY3Q6OnVwZGF0ZUZyb21TdHlsZSk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjYWxjdWxhdGVD bGlwUmVjdHMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMaW5lQm94TGlzdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaW5lQm94TGlzdDo6cmFuZ2VJbnRlcnNlY3RzUmVjdCk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVmlldzo6UmVuZGVyVmlldyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcu aDoKKwogMjAxNS0wNC0yOSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE4MzU1MyBhbmQgcjE4MzU2MS4K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCShyZXZpc2lvbiAxODM0 MDApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDgxMSw2ICs0ODExLDkgQEAgdm9pZCBSZW5kZXJCb3g6OmZsaXBGb3JXcml0aW5n TW9kZShGbG9hdAogCiBMYXlvdXRQb2ludCBSZW5kZXJCb3g6OnRvcExlZnRMb2NhdGlvbigpIGNv bnN0CiB7CisgICAgaWYgKCF2aWV3KCkuaGFzRmxpcHBlZEJsb2NrRGVzY2VuZGFudHMoKSkKKyAg ICAgICAgcmV0dXJuIGxvY2F0aW9uKCk7CisgICAgCiAgICAgUmVuZGVyQmxvY2sqIGNvbnRhaW5l ckJsb2NrID0gY29udGFpbmluZ0Jsb2NrKCk7CiAgICAgaWYgKCFjb250YWluZXJCbG9jayB8fCBj b250YWluZXJCbG9jayA9PSB0aGlzKQogICAgICAgICByZXR1cm4gbG9jYXRpb24oKTsKQEAgLTQ4 MTksNiArNDgyMiw5IEBAIExheW91dFBvaW50IFJlbmRlckJveDo6dG9wTGVmdExvY2F0aW9uKCkK IAogTGF5b3V0U2l6ZSBSZW5kZXJCb3g6OnRvcExlZnRMb2NhdGlvbk9mZnNldCgpIGNvbnN0CiB7 CisgICAgaWYgKCF2aWV3KCkuaGFzRmxpcHBlZEJsb2NrRGVzY2VuZGFudHMoKSkKKyAgICAgICAg cmV0dXJuIExheW91dFNpemUobV9mcmFtZVJlY3QueCgpLCBtX2ZyYW1lUmVjdC55KCkpOworCiAg ICAgUmVuZGVyQmxvY2sqIGNvbnRhaW5lckJsb2NrID0gY29udGFpbmluZ0Jsb2NrKCk7CiAgICAg aWYgKCFjb250YWluZXJCbG9jayB8fCBjb250YWluZXJCbG9jayA9PSB0aGlzKQogICAgICAgICBy ZXR1cm4gbG9jYXRpb25PZmZzZXQoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAkocmV2aXNpb24gMTgzNDAwKQorKysgU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjE5LDYgKzIxOSw4IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnVwZGF0 ZUZyb21TdHkKICAgICBzZXRJbmxpbmUoc3R5bGVUb1VzZS5pc0Rpc3BsYXlJbmxpbmVUeXBlKCkp OwogICAgIHNldFBvc2l0aW9uU3RhdGUoc3R5bGVUb1VzZS5wb3NpdGlvbigpKTsKICAgICBzZXRI b3Jpem9udGFsV3JpdGluZ01vZGUoc3R5bGVUb1VzZS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgp KTsKKyAgICBpZiAoc3R5bGVUb1VzZS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKQorICAg ICAgICB2aWV3KCkuc2V0SGFzRmxpcHBlZEJsb2NrRGVzY2VuZGFudHModHJ1ZSk7CiB9CiAKIHN0 YXRpYyBMYXlvdXRTaXplIGFjY3VtdWxhdGVJbkZsb3dQb3NpdGlvbk9mZnNldHMoY29uc3QgUmVu ZGVyT2JqZWN0KiBjaGlsZCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcAkocmV2aXNpb24gMTgzNDAwKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTgxNCwxMSArNTgxNCwxMyBAQCBMYXlv dXRSZWN0IFJlbmRlckxheWVyOjpsb2NhbEJvdW5kaW5nQm94CiBMYXlvdXRSZWN0IFJlbmRlckxh eWVyOjpib3VuZGluZ0JveChjb25zdCBSZW5kZXJMYXllciogYW5jZXN0b3JMYXllciwgY29uc3Qg TGF5b3V0U2l6ZSYgb2Zmc2V0RnJvbVJvb3QsIENhbGN1bGF0ZUxheWVyQm91bmRzRmxhZ3MgZmxh Z3MpIGNvbnN0CiB7ICAgIAogICAgIExheW91dFJlY3QgcmVzdWx0ID0gbG9jYWxCb3VuZGluZ0Jv eChmbGFncyk7Ci0gICAgaWYgKHJlbmRlcmVyKCkuaXNCb3goKSkKLSAgICAgICAgcmVuZGVyQm94 KCktPmZsaXBGb3JXcml0aW5nTW9kZShyZXN1bHQpOwotICAgIGVsc2UKLSAgICAgICAgcmVuZGVy ZXIoKS5jb250YWluaW5nQmxvY2soKS0+ZmxpcEZvcldyaXRpbmdNb2RlKHJlc3VsdCk7Ci0gICAg CisgICAgaWYgKHJlbmRlcmVyKCkudmlldygpLmhhc0ZsaXBwZWRCbG9ja0Rlc2NlbmRhbnRzKCkp IHsKKyAgICAgICAgaWYgKHJlbmRlcmVyKCkuaXNCb3goKSkKKyAgICAgICAgICAgIHJlbmRlckJv eCgpLT5mbGlwRm9yV3JpdGluZ01vZGUocmVzdWx0KTsKKyAgICAgICAgZWxzZQorICAgICAgICAg ICAgcmVuZGVyZXIoKS5jb250YWluaW5nQmxvY2soKS0+ZmxpcEZvcldyaXRpbmdNb2RlKHJlc3Vs dCk7CisgICAgfQorCiAgICAgUGFnaW5hdGlvbkluY2x1c2lvbk1vZGUgaW5jbHVzaW9uTW9kZSA9 IEV4Y2x1ZGVDb21wb3NpdGVkUGFnaW5hdGVkTGF5ZXJzOwogICAgIGlmIChmbGFncyAmIFVzZUZy YWdtZW50Qm94ZXNJbmNsdWRpbmdDb21wb3NpdGluZykKICAgICAgICAgaW5jbHVzaW9uTW9kZSA9 IEluY2x1ZGVDb21wb3NpdGVkUGFnaW5hdGVkTGF5ZXJzOwpAQCAtNTg5NCwxMCArNTg5NiwxMiBA QCBMYXlvdXRSZWN0IFJlbmRlckxheWVyOjpjYWxjdWxhdGVMYXllckJvCiAKICAgICBMYXlvdXRS ZWN0IGJvdW5kaW5nQm94UmVjdCA9IGxvY2FsQm91bmRpbmdCb3goZmxhZ3MpOwogCi0gICAgaWYg KGlzPFJlbmRlckJveD4ocmVuZGVyZXIoKSkpCi0gICAgICAgIGRvd25jYXN0PFJlbmRlckJveD4o cmVuZGVyZXIoKSkuZmxpcEZvcldyaXRpbmdNb2RlKGJvdW5kaW5nQm94UmVjdCk7Ci0gICAgZWxz ZQotICAgICAgICByZW5kZXJlcigpLmNvbnRhaW5pbmdCbG9jaygpLT5mbGlwRm9yV3JpdGluZ01v ZGUoYm91bmRpbmdCb3hSZWN0KTsKKyAgICBpZiAocmVuZGVyZXIoKS52aWV3KCkuaGFzRmxpcHBl ZEJsb2NrRGVzY2VuZGFudHMoKSkgeworICAgICAgICBpZiAoaXM8UmVuZGVyQm94PihyZW5kZXJl cigpKSkKKyAgICAgICAgICAgIGRvd25jYXN0PFJlbmRlckJveD4ocmVuZGVyZXIoKSkuZmxpcEZv cldyaXRpbmdNb2RlKGJvdW5kaW5nQm94UmVjdCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg IHJlbmRlcmVyKCkuY29udGFpbmluZ0Jsb2NrKCktPmZsaXBGb3JXcml0aW5nTW9kZShib3VuZGlu Z0JveFJlY3QpOworICAgIH0KIAogICAgIGlmIChyZW5kZXJlcigpLmlzUm9vdCgpKSB7CiAgICAg ICAgIC8vIElmIHRoZSByb290IGxheWVyIGJlY29tZXMgY29tcG9zaXRlZCAoZS5nLiBiZWNhdXNl IHNvbWUgZGVzY2VuZGFudCB3aXRoIG5lZ2F0aXZlIHotaW5kZXggaXMgY29tcG9zaXRlZCksCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGluZUJveExpc3QuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaW5lQm94TGlzdC5jcHAJ KHJldmlzaW9uIDE4MzQwMCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaW5l Qm94TGlzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1MiwxMyArMTUyLDE4IEBAIHZvaWQgUmVu ZGVyTGluZUJveExpc3Q6OmRpcnR5TGluZUJveGVzKCkKIC8vIEZJWE1FOiBUaGlzIHNob3VsZCB0 YWtlIGEgUmVuZGVyQm94TW9kZWxPYmplY3QmLgogYm9vbCBSZW5kZXJMaW5lQm94TGlzdDo6cmFu Z2VJbnRlcnNlY3RzUmVjdChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVuZGVyZXIsIExheW91dFVu aXQgbG9naWNhbFRvcCwgTGF5b3V0VW5pdCBsb2dpY2FsQm90dG9tLCBjb25zdCBMYXlvdXRSZWN0 JiByZWN0LCBjb25zdCBMYXlvdXRQb2ludCYgb2Zmc2V0KSBjb25zdAogewotICAgIFJlbmRlckJv eCogYmxvY2s7Ci0gICAgaWYgKGlzPFJlbmRlckJveD4oKnJlbmRlcmVyKSkKLSAgICAgICAgYmxv Y2sgPSBkb3duY2FzdDxSZW5kZXJCb3g+KHJlbmRlcmVyKTsKLSAgICBlbHNlCi0gICAgICAgIGJs b2NrID0gcmVuZGVyZXItPmNvbnRhaW5pbmdCbG9jaygpOwotICAgIExheW91dFVuaXQgcGh5c2lj YWxTdGFydCA9IGJsb2NrLT5mbGlwRm9yV3JpdGluZ01vZGUobG9naWNhbFRvcCk7Ci0gICAgTGF5 b3V0VW5pdCBwaHlzaWNhbEVuZCA9IGJsb2NrLT5mbGlwRm9yV3JpdGluZ01vZGUobG9naWNhbEJv dHRvbSk7CisgICAgTGF5b3V0VW5pdCBwaHlzaWNhbFN0YXJ0ID0gbG9naWNhbFRvcDsKKyAgICBM YXlvdXRVbml0IHBoeXNpY2FsRW5kID0gbG9naWNhbEJvdHRvbTsKKyAgICBpZiAocmVuZGVyZXIt PnZpZXcoKS5oYXNGbGlwcGVkQmxvY2tEZXNjZW5kYW50cygpKSB7CisgICAgICAgIFJlbmRlckJv eCogYmxvY2s7CisgICAgICAgIGlmIChpczxSZW5kZXJCb3g+KCpyZW5kZXJlcikpCisgICAgICAg ICAgICBibG9jayA9IGRvd25jYXN0PFJlbmRlckJveD4ocmVuZGVyZXIpOworICAgICAgICBlbHNl CisgICAgICAgICAgICBibG9jayA9IHJlbmRlcmVyLT5jb250YWluaW5nQmxvY2soKTsKKyAgICAg ICAgcGh5c2ljYWxTdGFydCA9IGJsb2NrLT5mbGlwRm9yV3JpdGluZ01vZGUobG9naWNhbFRvcCk7 CisgICAgICAgIHBoeXNpY2FsRW5kID0gYmxvY2stPmZsaXBGb3JXcml0aW5nTW9kZShsb2dpY2Fs Qm90dG9tKTsKKyAgICB9CisKICAgICBMYXlvdXRVbml0IHBoeXNpY2FsRXh0ZW50ID0gYWJzb2x1 dGVWYWx1ZShwaHlzaWNhbEVuZCAtIHBoeXNpY2FsU3RhcnQpOwogICAgIHBoeXNpY2FsU3RhcnQg PSBzdGQ6Om1pbihwaHlzaWNhbFN0YXJ0LCBwaHlzaWNhbEVuZCk7CiAgICAgCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCShyZXZpc2lvbiAxODM0MDApCisrKyBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTExMSw2ICsxMTEsNyBAQCBSZW5kZXJWaWV3OjpSZW5kZXJWaWV3KERvY3VtZW50JiBkb2N1bWVu CiAgICAgLCBtX3JlbmRlckNvdW50ZXJDb3VudCgwKQogICAgICwgbV9zZWxlY3Rpb25XYXNDYXJl dChmYWxzZSkKICAgICAsIG1faGFzU29mdHdhcmVGaWx0ZXJzKGZhbHNlKQorICAgICwgbV9oYXNG bGlwcGVkQmxvY2tEZXNjZW5kYW50cyhmYWxzZSkKICNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9M UykKICAgICAsIG1fc2VsZWN0aW9uUmVjdEdhdGhlcmVyKCp0aGlzKQogI2VuZGlmCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgJKHJldmlzaW9uIDE4MzQwMCkKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTEw Miw2ICsxMDIsOSBAQCBwdWJsaWM6CiAKICAgICBMYXlvdXRSZWN0IHZpZXdSZWN0KCkgY29uc3Q7 CiAKKyAgICBib29sIGhhc0ZsaXBwZWRCbG9ja0Rlc2NlbmRhbnRzKCkgY29uc3QgeyByZXR1cm4g bV9oYXNGbGlwcGVkQmxvY2tEZXNjZW5kYW50czsgfQorICAgIHZvaWQgc2V0SGFzRmxpcHBlZEJs b2NrRGVzY2VuZGFudHMoYm9vbCBiKSB7IG1faGFzRmxpcHBlZEJsb2NrRGVzY2VuZGFudHMgPSBi OyB9CisKICAgICAvLyBsYXlvdXREZWx0YSBpcyB1c2VkIHRyYW5zaWVudGx5IGR1cmluZyBsYXlv dXQgdG8gc3RvcmUgaG93IGZhciBhbiBvYmplY3QgaGFzIG1vdmVkIGZyb20gaXRzCiAgICAgLy8g bGFzdCBsYXlvdXQgbG9jYXRpb24sIGluIG9yZGVyIHRvIHJlcGFpbnQgY29ycmVjdGx5LgogICAg IC8vIElmIHdlJ3JlIGRvaW5nIGEgZnVsbCByZXBhaW50IG1fbGF5b3V0U3RhdGUgd2lsbCBiZSAw LCBidXQgaW4gdGhhdCBjYXNlIGxheW91dERlbHRhIGRvZXNuJ3QgbWF0dGVyLgpAQCAtMzU2LDYg KzM1OSw3IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1fc2VsZWN0aW9uV2FzQ2FyZXQ7CiAgICAg Ym9vbCBtX2hhc1NvZnR3YXJlRmlsdGVyczsKKyAgICBib29sIG1faGFzRmxpcHBlZEJsb2NrRGVz Y2VuZGFudHM7CiAKICAgICBIYXNoU2V0PFJlbmRlckVsZW1lbnQqPiBtX3JlbmRlcmVyc1dpdGhQ YXVzZWRJbWFnZUFuaW1hdGlvbjsKIAo=