127362 2014-01-21 12:11:18 -0800 Clean up PLATFORM(IOS) code related to the custom fixed position layout rect 2014-01-21 12:21:56 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 970364 0 simon.fraser 2014-01-21 12:11:18 -0800 Clean up PLATFORM(IOS) code related to the custom fixed position layout rect 970367 1 221774 simon.fraser 2014-01-21 12:13:13 -0800 Created attachment 221774 Patch 970370 2 221774 hyatt 2014-01-21 12:17:13 -0800 Comment on attachment 221774 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221774&action=review r=me > Source/WebCore/ChangeLog:8 > + Various platform customize the rect used to layout position:fixed elements, Typo, should be "platforms" 970372 3 simon.fraser 2014-01-21 12:21:56 -0800 https://trac.webkit.org/r162462 221774 2014-01-21 12:13:13 -0800 2014-01-21 12:17:12 -0800 Patch bug-127362-20140121121312.patch text/plain 11114 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmJkMWYzNDFkOTc5ZTAy NTkxOWU1MmQ4ODkxNjZmMjZlYjQxMmQ0ZC4uYjM0ZTM5MDU4OTkzMjllYWRiZjE0ZTdiMTZhYmRh YmJiYTFmYWU3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTAxLTIxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIFBM QVRGT1JNKElPUykgY29kZSByZWxhdGVkIHRvIHRoZSBjdXN0b20gZml4ZWQgcG9zaXRpb24gbGF5 b3V0IHJlY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyNzM2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFZhcmlvdXMgcGxhdGZvcm0gY3VzdG9taXplIHRoZSByZWN0IHVzZWQgdG8gbGF5b3V0IHBvc2l0 aW9uOmZpeGVkIGVsZW1lbnRzLAorICAgICAgICBhbmQgZWFjaCBtb2RpZmllZCBSZW5kZXJCb3g6 OmF2YWlsYWJsZUxvZ2ljYWxIZWlnaHQvV2lkdGhVc2luZygpIGluIGRpZmZlcmVudAorICAgICAg ICB3YXlzLgorICAgICAgICAKKyAgICAgICAgQ2xlYW4gdGhpcyB1cCBieSBhZGRpbmcgUmVuZGVy Vmlldzo6Y2xpZW50TG9naWNhbFdpZHRoL0hlaWdodEZvckZpeGVkUG9zaXRpb24oKSwKKyAgICAg ICAgYW5kIG1vdmluZyB0aGUgcGxhdGZvcm0gaGFja3MgaW50byBpdC4KKworICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjphdmFp bGFibGVMb2dpY2FsSGVpZ2h0VXNpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpj b250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JQb3NpdGlvbmVkKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckJveDo6Y29udGFpbmluZ0Jsb2NrTG9naWNhbEhlaWdodEZvclBvc2l0aW9uZWQp OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclZpZXc6OmNsaWVudExvZ2ljYWxXaWR0aEZvckZpeGVkUG9zaXRpb24pOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6Y2xpZW50TG9naWNhbEhlaWdodEZvckZpeGVkUG9zaXRp b24pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3Lmg6CisKIDIwMTQtMDEtMjAgIEVy aWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgQWxsb3cgTWVk aWFTZXNzaW9uTWFuYWdlciB0byByZXN0cmljdCAncHJlbG9hZCcgYmVoYXZpb3IKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggM2NjMDVjNTYwZDY3MjFmNTczODE4MjVi Y2ZjNDdjM2RkODZiYjE5My4uMTdjMDMyYmRmNDhkZWRkNDExZTY3MmViNmRjNzUzYmFkMzM3YzE3 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTI5NTIsMzMgKzI5 NTIsNiBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6YXZhaWxhYmxlTG9naWNhbEhlaWdodChBdmFp bGFibGVMb2dpY2FsSGVpZ2h0VHlwZSBoZWlnaHRUeQogICAgIHJldHVybiBjb25zdHJhaW5Mb2dp Y2FsSGVpZ2h0QnlNaW5NYXgoYXZhaWxhYmxlTG9naWNhbEhlaWdodFVzaW5nKHN0eWxlKCkubG9n aWNhbEhlaWdodCgpLCBoZWlnaHRUeXBlKSk7CiB9CiAKLSNpZiBQTEFURk9STShJT1MpCi1zdGF0 aWMgaW5saW5lIGludCBjdXN0b21Db250YWluaW5nQmxvY2tXaWR0aChjb25zdCBSZW5kZXJWaWV3 JiB2aWV3LCBjb25zdCBSZW5kZXJCb3gmIGNvbnRhaW5pbmdCbG9ja0JveCkKLXsKLSAgICByZXR1 cm4gdmlldy5mcmFtZVZpZXcoKS5jdXN0b21GaXhlZFBvc2l0aW9uTGF5b3V0UmVjdCgpLndpZHRo KCkgLSBjb250YWluaW5nQmxvY2tCb3guYm9yZGVyTGVmdCgpIC0gY29udGFpbmluZ0Jsb2NrQm94 LmJvcmRlclJpZ2h0KCkgLSBjb250YWluaW5nQmxvY2tCb3gudmVydGljYWxTY3JvbGxiYXJXaWR0 aCgpOwotfQotCi1zdGF0aWMgaW5saW5lIGludCBjdXN0b21Db250YWluaW5nQmxvY2tIZWlnaHQo Y29uc3QgUmVuZGVyVmlldyYgdmlldywgY29uc3QgUmVuZGVyQm94JiBjb250YWluaW5nQmxvY2tC b3gpCi17Ci0gICAgcmV0dXJuIHZpZXcuZnJhbWVWaWV3KCkuY3VzdG9tRml4ZWRQb3NpdGlvbkxh eW91dFJlY3QoKS5oZWlnaHQoKSAtIGNvbnRhaW5pbmdCbG9ja0JveC5ib3JkZXJUb3AoKSAtIGNv bnRhaW5pbmdCbG9ja0JveC5ib3JkZXJCb3R0b20oKSAtIGNvbnRhaW5pbmdCbG9ja0JveC5ob3Jp em9udGFsU2Nyb2xsYmFySGVpZ2h0KCk7Ci19Ci0KLXN0YXRpYyBpbnQgY3VzdG9tQ29udGFpbmlu Z0Jsb2NrTG9naWNhbFdpZHRoKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgUmVuZGVy VmlldyYgdmlldywgY29uc3QgUmVuZGVyQm94JiBjb250YWluaW5nQmxvY2tCb3gpCi17Ci0gICAg cmV0dXJuIHN0eWxlLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBjdXN0b21Db250YWluaW5n QmxvY2tXaWR0aCh2aWV3LCBjb250YWluaW5nQmxvY2tCb3gpIDogY3VzdG9tQ29udGFpbmluZ0Js b2NrSGVpZ2h0KHZpZXcsIGNvbnRhaW5pbmdCbG9ja0JveCk7Ci19Ci0KLXN0YXRpYyBpbnQgY3Vz dG9tQ29udGFpbmluZ0Jsb2NrTG9naWNhbEhlaWdodChjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUs IGNvbnN0IFJlbmRlclZpZXcmIHZpZXcsIGNvbnN0IFJlbmRlckJveCYgY29udGFpbmluZ0Jsb2Nr Qm94KQotewotICAgIHJldHVybiBzdHlsZS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gY3Vz dG9tQ29udGFpbmluZ0Jsb2NrSGVpZ2h0KHZpZXcsIGNvbnRhaW5pbmdCbG9ja0JveCkgOiBjdXN0 b21Db250YWluaW5nQmxvY2tXaWR0aCh2aWV3LCBjb250YWluaW5nQmxvY2tCb3gpOwotfQotCi1z dGF0aWMgaW5saW5lIGludCBjdXN0b21Db250YWluaW5nQmxvY2tBdmFpbGFibGVMb2dpY2FsSGVp Z2h0KGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgUmVuZGVyVmlldyYgdmlldykKLXsK LSAgICByZXR1cm4gc3R5bGUuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHZpZXcuZnJhbWVW aWV3KCkuY3VzdG9tRml4ZWRQb3NpdGlvbkxheW91dFJlY3QoKS5oZWlnaHQoKSA6IHZpZXcuZnJh bWVWaWV3KCkuY3VzdG9tRml4ZWRQb3NpdGlvbkxheW91dFJlY3QoKS53aWR0aCgpOwotfQotI2Vu ZGlmCi0KIExheW91dFVuaXQgUmVuZGVyQm94OjphdmFpbGFibGVMb2dpY2FsSGVpZ2h0VXNpbmco Y29uc3QgTGVuZ3RoJiBoLCBBdmFpbGFibGVMb2dpY2FsSGVpZ2h0VHlwZSBoZWlnaHRUeXBlKSBj b25zdAogewogICAgIC8vIFdlIG5lZWQgdG8gc3RvcCBoZXJlLCBzaW5jZSB3ZSBkb24ndCB3YW50 IHRvIGluY3JlYXNlIHRoZSBoZWlnaHQgb2YgdGhlIHRhYmxlCkBAIC0yOTkxLDIxICsyOTY0LDkg QEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmF2YWlsYWJsZUxvZ2ljYWxIZWlnaHRVc2luZyhjb25z dCBMZW5ndGgmIGgsIEF2YWlsYWJsZUxvZ2kKICAgICB9CiAKICAgICBpZiAoaC5pc1BlcmNlbnQo KSAmJiBpc091dE9mRmxvd1Bvc2l0aW9uZWQoKSAmJiAhaXNSZW5kZXJGbG93VGhyZWFkKCkpIHsK LSNpZiBQTEFURk9STShJT1MpCi0gICAgICAgIFJlbmRlckJsb2NrKiBjb250YWluaW5nQmxvY2sg PSB0aGlzLT5jb250YWluaW5nQmxvY2soKTsKLSAgICAgICAgLy8gSWYgd2UncmUgZml4ZWQsIGFu ZCBvdXIgY29udGFpbmVyIGlzIHRoZSBSZW5kZXJWaWV3LCB1c2UgdGhlIGN1c3RvbSBmaXhlZCBw b3NpdGlvbiByZWN0IGZvciBzaXppbmcuCi0gICAgICAgIGlmIChjb250YWluaW5nQmxvY2stPmlz UmVuZGVyVmlldygpKSB7Ci0gICAgICAgICAgICBSZW5kZXJWaWV3JiB2aWV3ID0gdG9SZW5kZXJW aWV3KCpjb250YWluaW5nQmxvY2spOwotICAgICAgICAgICAgaWYgKHZpZXcuaGFzQ3VzdG9tRml4 ZWRQb3NpdGlvbigqdGhpcykpCi0gICAgICAgICAgICAgICAgcmV0dXJuIGFkanVzdENvbnRlbnRC b3hMb2dpY2FsSGVpZ2h0Rm9yQm94U2l6aW5nKHZhbHVlRm9yTGVuZ3RoKGgsIGN1c3RvbUNvbnRh aW5pbmdCbG9ja0F2YWlsYWJsZUxvZ2ljYWxIZWlnaHQoY29udGFpbmluZ0Jsb2NrLT5zdHlsZSgp LCB2aWV3KSkpOwotICAgICAgICB9Ci0KLSAgICAgICAgcmV0dXJuIGFkanVzdENvbnRlbnRCb3hM b2dpY2FsSGVpZ2h0Rm9yQm94U2l6aW5nKHZhbHVlRm9yTGVuZ3RoKGgsIGNvbnRhaW5pbmdCbG9j ay0+YXZhaWxhYmxlTG9naWNhbEhlaWdodChoZWlnaHRUeXBlKSkpOwotI2Vsc2UKICAgICAgICAg Ly8gRklYTUU6IFRoaXMgaXMgd3JvbmcgaWYgdGhlIGNvbnRhaW5pbmdCbG9jayBoYXMgYSBwZXJw ZW5kaWN1bGFyIHdyaXRpbmcgbW9kZS4KICAgICAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVIZWln aHQgPSBjb250YWluaW5nQmxvY2tMb2dpY2FsSGVpZ2h0Rm9yUG9zaXRpb25lZChjb250YWluaW5n QmxvY2soKSk7CiAgICAgICAgIHJldHVybiBhZGp1c3RDb250ZW50Qm94TG9naWNhbEhlaWdodEZv ckJveFNpemluZyh2YWx1ZUZvckxlbmd0aChoLCBhdmFpbGFibGVIZWlnaHQpKTsKLSNlbmRpZgog ICAgIH0KIAogICAgIExheW91dFVuaXQgaGVpZ2h0SW5jbHVkaW5nU2Nyb2xsYmFyID0gY29tcHV0 ZUNvbnRlbnRBbmRTY3JvbGxiYXJMb2dpY2FsSGVpZ2h0VXNpbmcoaCk7CkBAIC0zMDYwLDI3ICsz MDIxLDIxIEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlQW5kU2V0QmxvY2tEaXJlY3Rpb25NYXJn aW5zKGNvbnN0IFJlbmRlckJsb2NrKiBjb250YWluaW5nCiAKIExheW91dFVuaXQgUmVuZGVyQm94 Ojpjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JQb3NpdGlvbmVkKGNvbnN0IFJlbmRlckJv eE1vZGVsT2JqZWN0KiBjb250YWluaW5nQmxvY2ssIFJlbmRlclJlZ2lvbiogcmVnaW9uLCBib29s IGNoZWNrRm9yUGVycGVuZGljdWxhcldyaXRpbmdNb2RlKSBjb25zdAogewotICAgIC8vIENvbnRh aW5lciBmb3IgcG9zaXRpb246Zml4ZWQgaXMgdGhlIGZyYW1lLgotICAgIGNvbnN0IEZyYW1lVmll dyYgZnJhbWVWaWV3ID0gdmlldygpLmZyYW1lVmlldygpOwotICAgIGlmIChmaXhlZEVsZW1lbnRM YXlzT3V0UmVsYXRpdmVUb0ZyYW1lKGZyYW1lVmlldykpCi0gICAgICAgIHJldHVybiAodmlldygp LmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBmcmFtZVZpZXcudmlzaWJsZVdpZHRoKCkgOiBm cmFtZVZpZXcudmlzaWJsZUhlaWdodCgpKSAvIGZyYW1lVmlldy5mcmFtZSgpLmZyYW1lU2NhbGVG YWN0b3IoKTsKLQogICAgIGlmIChjaGVja0ZvclBlcnBlbmRpY3VsYXJXcml0aW5nTW9kZSAmJiBj b250YWluaW5nQmxvY2stPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgIT0gaXNIb3Jpem9udGFs V3JpdGluZ01vZGUoKSkKICAgICAgICAgcmV0dXJuIGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxIZWln aHRGb3JQb3NpdGlvbmVkKGNvbnRhaW5pbmdCbG9jaywgZmFsc2UpOwogCiAgICAgaWYgKGNvbnRh aW5pbmdCbG9jay0+aXNCb3goKSkgeworICAgICAgICBib29sIGlzRml4ZWRQb3NpdGlvbiA9IHN0 eWxlKCkucG9zaXRpb24oKSA9PSBGaXhlZFBvc2l0aW9uOworCiAgICAgICAgIFJlbmRlckZsb3dU aHJlYWQqIGZsb3dUaHJlYWQgPSBmbG93VGhyZWFkQ29udGFpbmluZ0Jsb2NrKCk7CiAgICAgICAg IGlmICghZmxvd1RocmVhZCkgewotI2lmIFBMQVRGT1JNKElPUykKLSAgICAgICAgICAgIGlmICh2 aWV3KCkuaGFzQ3VzdG9tRml4ZWRQb3NpdGlvbigqdGhpcykpIHsKLSAgICAgICAgICAgICAgICBj b25zdCBSZW5kZXJCb3gmIGNvbnRhaW5pbmdCbG9ja0JveCA9IHRvUmVuZGVyQm94KCpjb250YWlu aW5nQmxvY2spOwotICAgICAgICAgICAgICAgIHJldHVybiBjdXN0b21Db250YWluaW5nQmxvY2tM b2dpY2FsV2lkdGgoY29udGFpbmluZ0Jsb2NrQm94LnN0eWxlKCksIHZpZXcoKSwgY29udGFpbmlu Z0Jsb2NrQm94KTsKLSAgICAgICAgICAgIH0KLSNlbmRpZgorICAgICAgICAgICAgaWYgKGlzRml4 ZWRQb3NpdGlvbiAmJiBjb250YWluaW5nQmxvY2stPmlzUmVuZGVyVmlldygpKQorICAgICAgICAg ICAgICAgIHJldHVybiB0b1JlbmRlclZpZXcoY29udGFpbmluZ0Jsb2NrKS0+Y2xpZW50TG9naWNh bFdpZHRoRm9yRml4ZWRQb3NpdGlvbigpOworCiAgICAgICAgICAgICByZXR1cm4gdG9SZW5kZXJC b3goY29udGFpbmluZ0Jsb2NrKS0+Y2xpZW50TG9naWNhbFdpZHRoKCk7CiAgICAgICAgIH0KIAot ICAgICAgICBpZiAoY29udGFpbmluZ0Jsb2NrLT5pc1JlbmRlck5hbWVkRmxvd1RocmVhZCgpICYm IHN0eWxlKCkucG9zaXRpb24oKSA9PSBGaXhlZFBvc2l0aW9uKQorICAgICAgICBpZiAoaXNGaXhl ZFBvc2l0aW9uICYmIGNvbnRhaW5pbmdCbG9jay0+aXNSZW5kZXJOYW1lZEZsb3dUaHJlYWQoKSkK ICAgICAgICAgICAgIHJldHVybiBjb250YWluaW5nQmxvY2stPnZpZXcoKS5jbGllbnRMb2dpY2Fs V2lkdGgoKTsKIAogICAgICAgICBjb25zdCBSZW5kZXJCbG9jayogY2IgPSB0b1JlbmRlckJsb2Nr KGNvbnRhaW5pbmdCbG9jayk7CkBAIC0zMTI2LDIzICszMDgxLDIwIEBAIExheW91dFVuaXQgUmVu ZGVyQm94Ojpjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JQb3NpdGlvbmVkKGNvbnN0IFJl bmRlckJveE1vCiAKIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb250YWluaW5nQmxvY2tMb2dpY2Fs SGVpZ2h0Rm9yUG9zaXRpb25lZChjb25zdCBSZW5kZXJCb3hNb2RlbE9iamVjdCogY29udGFpbmlu Z0Jsb2NrLCBib29sIGNoZWNrRm9yUGVycGVuZGljdWxhcldyaXRpbmdNb2RlKSBjb25zdAogewot ICAgIGNvbnN0IEZyYW1lVmlldyYgZnJhbWVWaWV3ID0gdmlldygpLmZyYW1lVmlldygpOwotICAg IGlmIChmaXhlZEVsZW1lbnRMYXlzT3V0UmVsYXRpdmVUb0ZyYW1lKGZyYW1lVmlldykpCi0gICAg ICAgIHJldHVybiAodmlldygpLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBmcmFtZVZpZXcu dmlzaWJsZUhlaWdodCgpIDogZnJhbWVWaWV3LnZpc2libGVXaWR0aCgpKSAvIGZyYW1lVmlldy5m cmFtZSgpLmZyYW1lU2NhbGVGYWN0b3IoKTsKLQogICAgIGlmIChjaGVja0ZvclBlcnBlbmRpY3Vs YXJXcml0aW5nTW9kZSAmJiBjb250YWluaW5nQmxvY2stPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2Rl KCkgIT0gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkKICAgICAgICAgcmV0dXJuIGNvbnRhaW5p bmdCbG9ja0xvZ2ljYWxXaWR0aEZvclBvc2l0aW9uZWQoY29udGFpbmluZ0Jsb2NrLCAwLCBmYWxz ZSk7CiAKICAgICBpZiAoY29udGFpbmluZ0Jsb2NrLT5pc0JveCgpKSB7Ci0jaWYgUExBVEZPUk0o SU9TKQotICAgICAgICBpZiAodmlldygpLmhhc0N1c3RvbUZpeGVkUG9zaXRpb24oKnRoaXMpKQot ICAgICAgICAgICAgcmV0dXJuIGN1c3RvbUNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxIZWlnaHQoc3R5 bGUoKSwgdmlldygpLCB0b1JlbmRlckJveCgqY29udGFpbmluZ0Jsb2NrKSk7Ci0jZW5kaWYKKyAg ICAgICAgYm9vbCBpc0ZpeGVkUG9zaXRpb24gPSBzdHlsZSgpLnBvc2l0aW9uKCkgPT0gRml4ZWRQ b3NpdGlvbjsKKworICAgICAgICBpZiAoaXNGaXhlZFBvc2l0aW9uICYmIGNvbnRhaW5pbmdCbG9j ay0+aXNSZW5kZXJWaWV3KCkpCisgICAgICAgICAgICByZXR1cm4gdG9SZW5kZXJWaWV3KGNvbnRh aW5pbmdCbG9jayktPmNsaWVudExvZ2ljYWxIZWlnaHRGb3JGaXhlZFBvc2l0aW9uKCk7CisKICAg ICAgICAgY29uc3QgUmVuZGVyQmxvY2sqIGNiID0gdG9SZW5kZXJCbG9jayhjb250YWluaW5nQmxv Y2spOwogICAgICAgICBMYXlvdXRVbml0IHJlc3VsdCA9IGNiLT5jbGllbnRMb2dpY2FsSGVpZ2h0 KCk7CiAgICAgICAgIFJlbmRlckZsb3dUaHJlYWQqIGZsb3dUaHJlYWQgPSBmbG93VGhyZWFkQ29u dGFpbmluZ0Jsb2NrKCk7CiAgICAgICAgIGlmIChmbG93VGhyZWFkICYmIGNvbnRhaW5pbmdCbG9j ay0+aXNSZW5kZXJGbG93VGhyZWFkKCkgJiYgZmxvd1RocmVhZC0+aXNIb3Jpem9udGFsV3JpdGlu Z01vZGUoKSA9PSBjb250YWluaW5nQmxvY2stPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsK LSAgICAgICAgICAgIGlmIChjb250YWluaW5nQmxvY2stPmlzUmVuZGVyTmFtZWRGbG93VGhyZWFk KCkgJiYgc3R5bGUoKS5wb3NpdGlvbigpID09IEZpeGVkUG9zaXRpb24pCisgICAgICAgICAgICBp ZiAoY29udGFpbmluZ0Jsb2NrLT5pc1JlbmRlck5hbWVkRmxvd1RocmVhZCgpICYmIGlzRml4ZWRQ b3NpdGlvbikKICAgICAgICAgICAgICAgICByZXR1cm4gY29udGFpbmluZ0Jsb2NrLT52aWV3KCku Y2xpZW50TG9naWNhbEhlaWdodCgpOwogICAgICAgICAgICAgcmV0dXJuIHRvUmVuZGVyRmxvd1Ro cmVhZChjb250YWluaW5nQmxvY2spLT5jb250ZW50TG9naWNhbEhlaWdodE9mRmlyc3RSZWdpb24o KTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCmluZGV4 IDFkZTQ5ZmRkYTIxZDk4MDNjYmM4OTMwNGY4NWI4YTMyY2Q2Zjk0YjAuLjRhNGIzNWNlMWFjOTM5 ZmQ2ZTc1ZGY4Mzg1YjE5MWEwNDJiNjA1YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVmlldy5jcHAKQEAgLTM2Niw2ICszNjYsMzQgQEAgTGF5b3V0VW5pdCBSZW5kZXJWaWV3Ojpw YWdlT3JWaWV3TG9naWNhbEhlaWdodCgpIGNvbnN0CiAgICAgcmV0dXJuIHZpZXdMb2dpY2FsSGVp Z2h0KCk7CiB9CiAKK0xheW91dFVuaXQgUmVuZGVyVmlldzo6Y2xpZW50TG9naWNhbFdpZHRoRm9y Rml4ZWRQb3NpdGlvbigpIGNvbnN0Cit7CisgICAgLy8gRklYTUU6IElmIHRoZSBGcmFtZVZpZXcn cyBmaXhlZFZpc2libGVDb250ZW50UmVjdCgpIGlzIG5vdCBlbXB0eSwgcGVyaGFwcyBpdCBzaG91 bGQgYmUgY29uc3VsdGVkIGhlcmUgdG9vPworICAgIGlmIChmcmFtZVZpZXcoKS5maXhlZEVsZW1l bnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lKCkpCisgICAgICAgIHJldHVybiAoaXNIb3Jpem9udGFs V3JpdGluZ01vZGUoKSA/IGZyYW1lVmlldygpLnZpc2libGVXaWR0aCgpIDogZnJhbWVWaWV3KCku dmlzaWJsZUhlaWdodCgpKSAvIGZyYW1lVmlldygpLmZyYW1lKCkuZnJhbWVTY2FsZUZhY3Rvcigp OworCisjaWYgUExBVEZPUk0oSU9TKQorICAgIGlmIChmcmFtZVZpZXcoKS51c2VDdXN0b21GaXhl ZFBvc2l0aW9uTGF5b3V0UmVjdCgpKQorICAgICAgICByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGlu Z01vZGUoKSA/IGZyYW1lVmlldygpLmN1c3RvbUZpeGVkUG9zaXRpb25MYXlvdXRSZWN0KCkud2lk dGgoKSA6IGZyYW1lVmlldygpLmN1c3RvbUZpeGVkUG9zaXRpb25MYXlvdXRSZWN0KCkuaGVpZ2h0 KCk7CisjZW5kaWYKKworICAgIHJldHVybiBjbGllbnRMb2dpY2FsV2lkdGgoKTsKK30KKworTGF5 b3V0VW5pdCBSZW5kZXJWaWV3OjpjbGllbnRMb2dpY2FsSGVpZ2h0Rm9yRml4ZWRQb3NpdGlvbigp IGNvbnN0Cit7CisgICAgLy8gRklYTUU6IElmIHRoZSBGcmFtZVZpZXcncyBmaXhlZFZpc2libGVD b250ZW50UmVjdCgpIGlzIG5vdCBlbXB0eSwgcGVyaGFwcyBpdCBzaG91bGQgYmUgY29uc3VsdGVk IGhlcmUgdG9vPworICAgIGlmIChmcmFtZVZpZXcoKS5maXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRp dmVUb0ZyYW1lKCkpCisgICAgICAgIHJldHVybiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/ IGZyYW1lVmlldygpLnZpc2libGVIZWlnaHQoKSA6IGZyYW1lVmlldygpLnZpc2libGVXaWR0aCgp KSAvIGZyYW1lVmlldygpLmZyYW1lKCkuZnJhbWVTY2FsZUZhY3RvcigpOworCisjaWYgUExBVEZP Uk0oSU9TKQorICAgIGlmIChmcmFtZVZpZXcoKS51c2VDdXN0b21GaXhlZFBvc2l0aW9uTGF5b3V0 UmVjdCgpKQorICAgICAgICByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGZyYW1l VmlldygpLmN1c3RvbUZpeGVkUG9zaXRpb25MYXlvdXRSZWN0KCkuaGVpZ2h0KCkgOiBmcmFtZVZp ZXcoKS5jdXN0b21GaXhlZFBvc2l0aW9uTGF5b3V0UmVjdCgpLndpZHRoKCk7CisjZW5kaWYKKwor ICAgIHJldHVybiBjbGllbnRMb2dpY2FsSGVpZ2h0KCk7Cit9CisKICNpZiBQTEFURk9STShJT1Mp CiBzdGF0aWMgaW5saW5lIExheW91dFNpemUgZml4ZWRQb3NpdGlvbk9mZnNldChjb25zdCBGcmFt ZVZpZXcmIGZyYW1lVmlldykKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCmlu ZGV4IGYxM2E2YTJhNzZhOWU3OGE2NDY1ZTE0YzJlMzdlMzFhNjE4OWU2YzEuLmM3NTVjMTJlZDk5 Yzg0ZWM5NTEzNGJiZTE4YWMwNDI5ZTg0MzJmNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclZpZXcuaApAQCAtNjgsNiArNjgsOSBAQCBwdWJsaWM6CiAgICAgaW50IHZpZXdMb2dpY2Fs V2lkdGgoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkg PyB2aWV3V2lkdGgoKSA6IHZpZXdIZWlnaHQoKTsgfQogICAgIGludCB2aWV3TG9naWNhbEhlaWdo dCgpIGNvbnN0OwogCisgICAgTGF5b3V0VW5pdCBjbGllbnRMb2dpY2FsV2lkdGhGb3JGaXhlZFBv c2l0aW9uKCkgY29uc3Q7CisgICAgTGF5b3V0VW5pdCBjbGllbnRMb2dpY2FsSGVpZ2h0Rm9yRml4 ZWRQb3NpdGlvbigpIGNvbnN0OworCiAgICAgZmxvYXQgem9vbUZhY3RvcigpIGNvbnN0OwogCiAg ICAgRnJhbWVWaWV3JiBmcmFtZVZpZXcoKSBjb25zdCB7IHJldHVybiBtX2ZyYW1lVmlldzsgfQo=