73753 2011-12-03 13:02:23 -0800 Move shouldLayoutFixedElementsRelativeToFrame to Page.cpp 2012-01-25 19:21:31 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED DUPLICATE 76459 P2 Normal --- 1 fsamuel fsamuel dglazkov gustavo.noronha gustavo simon.fraser webkit.review.bot xan.lopez oldest_to_newest 514566 0 fsamuel 2011-12-03 13:02:23 -0800 Move shouldLayoutFixedElementsRelativeToFrame to Page.cpp 514567 1 117772 fsamuel 2011-12-03 13:04:32 -0800 Created attachment 117772 Patch 514568 2 fsamuel 2011-12-03 13:07:20 -0800 I don't know if this is better in Page or as a Setting? I've put it in Page until someone can give me a good reason to make this a Setting 514579 3 117772 gustavo.noronha 2011-12-03 13:56:51 -0800 Comment on attachment 117772 Patch Attachment 117772 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/10734347 514587 4 117772 darin 2011-12-03 15:18:39 -0800 Comment on attachment 117772 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=117772&action=review > Source/WebCore/page/FrameView.cpp:1397 > + bool shouldLayoutFixedElementsRelativeToFrame = frame()->page() ? frame()->page()->shouldLayoutFixedElementsRelativeToFrame(): false; && might be more readable here than ? : > Source/WebCore/page/Page.cpp:687 > + if (m_mainFrame && m_mainFrame->document()->renderer()) > + m_mainFrame->document()->renderer()->setNeedsLayout(true); Don’t we have to do this for subframes too? 514603 5 117772 webkit.review.bot 2011-12-03 17:54:06 -0800 Comment on attachment 117772 Patch Attachment 117772 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10732339 New failing tests: svg/custom/linking-uri-01-b.svg 514607 6 117772 fsamuel 2011-12-03 19:43:27 -0800 Comment on attachment 117772 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=117772&action=review >> Source/WebCore/page/FrameView.cpp:1397 >> + bool shouldLayoutFixedElementsRelativeToFrame = frame()->page() ? frame()->page()->shouldLayoutFixedElementsRelativeToFrame(): false; > > && might be more readable here than ? : Sure, I'll do this in a patch refresh. >> Source/WebCore/page/Page.cpp:687 >> + m_mainFrame->document()->renderer()->setNeedsLayout(true); > > Don’t we have to do this for subframes too? This setting has no impact on subframes or at least should have no impact on subframes (There might be a bug here that I need to test for) because frameScaleFactor == 1 for subframes. I have to confirm this isn't broken in a layout test. 525518 7 117772 eric 2011-12-21 13:30:08 -0800 Comment on attachment 117772 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=117772&action=review Seems reasonable to me, but loks like the EWS bots strongly disagree. Please upload a new patch which passes EWS. :) > Source/WebCore/ChangeLog:10 > + of frame because it's a no-op on subframes. This is a page-level property. To > + reduce confusion and to save a few bytes, it has been moved to Page. Bytes don't really matter on FrameView. :) 542847 8 fsamuel 2012-01-25 19:21:31 -0800 *** This bug has been marked as a duplicate of bug 76459 *** 117772 2011-12-03 13:04:32 -0800 2011-12-21 13:30:08 -0800 Patch bug-73753-20111203160431.patch text/plain 10969 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxOTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjVmYmM0OGRjYmViOTUy MDNhOTVkMDIyNTRjM2YxMzlmMjNmNTEyNy4uMzI2YjAxZjFiNTkyNTA2ZTcyNDliMDFkMzMxNmY5 NTBhZDNhNjQzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDExLTEyLTAzICBGYWR5 IFNhbXVlbCAgPGZzYW11ZWxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE1vdmUgc2hvdWxkTGF5 b3V0Rml4ZWRFbGVtZW50c1JlbGF0aXZlVG9GcmFtZSB0byBQYWdlLmNwcAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM3NTMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIEl0IGRvZXNuJ3QgbWFr ZSBzZW5zZSB0byBtYWtlIHNob3VsZExheW91dEZpeGVkRWxlbWVudHNSZWxhdGl2ZVRvRnJhbWUg YSBwcm9wZXJ0eQorICAgICAgICBvZiBmcmFtZSBiZWNhdXNlIGl0J3MgYSBuby1vcCBvbiBzdWJm cmFtZXMuIFRoaXMgaXMgYSBwYWdlLWxldmVsIHByb3BlcnR5LiBUbworICAgICAgICByZWR1Y2Ug Y29uZnVzaW9uIGFuZCB0byBzYXZlIGEgZmV3IGJ5dGVzLCBpdCBoYXMgYmVlbiBtb3ZlZCB0byBQ YWdlLgorCisgICAgICAKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZVZpZXc6OnJlc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6 c2Nyb2xsWEZvckZpeGVkUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojpz Y3JvbGxZRm9yRml4ZWRQb3NpdGlvbik6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuaDoKKyAg ICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6UGFnZSk6Cisg ICAgICAgIChXZWJDb3JlOjpQYWdlOjpzZXRTaG91bGRMYXlvdXRGaXhlZEVsZW1lbnRzUmVsYXRp dmVUb0ZyYW1lKToKKyAgICAgICAgKiBwYWdlL1BhZ2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlBh Z2U6OnNob3VsZExheW91dEZpeGVkRWxlbWVudHNSZWxhdGl2ZVRvRnJhbWUpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpz aG91bGRMYXlvdXRGaXhlZEVsZW1lbnRSZWxhdGl2ZVRvRnJhbWUpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQm94Ojpjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JQb3NpdGlvbmVkKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29udGFpbmluZ0Jsb2NrTG9naWNhbEhlaWdo dEZvclBvc2l0aW9uZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKyAgICAg ICAgKiB0ZXN0aW5nL0ludGVybmFscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6 OnNldFNob3VsZExheW91dEZpeGVkRWxlbWVudHNSZWxhdGl2ZVRvRnJhbWUpOgorCiAyMDExLTEy LTAzICBBbmRyZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KIAogICAgICAgICBTaHJpbmsg Q1NTVmFsdWVMaXN0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDY5MTNlOGVhMDY1 ZjIwYzk4OTM5ZDEyMGRlZTRjODljNjg0ZDhjNjIuLjUwNGJhODM3N2FkMjllNjljMTg4ODNhNGQy NjVmZjE1NzA4MzRmNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTIxNyw3ICsy MTcsNiBAQCB2b2lkIEZyYW1lVmlldzo6cmVzZXQoKQogICAgIG1fY2Fubm90QmxpdFRvV2luZG93 ID0gZmFsc2U7CiAgICAgbV9pc092ZXJsYXBwZWQgPSBmYWxzZTsKICAgICBtX2NvbnRlbnRJc09w YXF1ZSA9IGZhbHNlOwotICAgIG1fc2hvdWxkTGF5b3V0Rml4ZWRFbGVtZW50c1JlbGF0aXZlVG9G cmFtZSA9IGZhbHNlOwogICAgIG1fYm9yZGVyWCA9IDMwOwogICAgIG1fYm9yZGVyWSA9IDMwOwog ICAgIG1fbGF5b3V0VGltZXIuc3RvcCgpOwpAQCAtMTM5NSw3ICsxMzk0LDggQEAgaW50IEZyYW1l Vmlldzo6c2Nyb2xsWEZvckZpeGVkUG9zaXRpb24oKSBjb25zdAogICAgIC8vIFdoZW4gdGhlIHBh Z2UgaXMgc2NhbGVkLCB0aGUgc2NhbGVkICJ2aWV3cG9ydCIgd2l0aCByZXNwZWN0IHRvIHdoaWNo IGZpeGVkIG9iamVjdCBhcmUgcG9zaXRpb25lZAogICAgIC8vIGRvZXNuJ3QgbW92ZSBhcyBmYXN0 IGFzIHRoZSBjb250ZW50IHZpZXcsIHNvIHRoYXQgd2hlbiB0aGUgY29udGVudCBpcyBzY3JvbGxl ZCBhbGwgdGhlIHdheSB0byB0aGUKICAgICAvLyBlbmQsIHRoZSBib3R0b20gb2YgdGhlIHNjYWxl ZCAidmlld3BvcnQiIHRvdWNoZXMgdGhlIGJvdHRvbSBvZiB0aGUgcmVhbCB2aWV3cG9ydC4KLSAg ICBmbG9hdCBkcmFnRmFjdG9yID0gc2hvdWxkTGF5b3V0Rml4ZWRFbGVtZW50c1JlbGF0aXZlVG9G cmFtZSgpID8gMSA6IChjb250ZW50c1dpZHRoKCkgLSB2aXNpYmxlQ29udGVudFdpZHRoICogZnJh bWVTY2FsZUZhY3RvcikgLyBtYXhYOworICAgIGJvb2wgc2hvdWxkTGF5b3V0Rml4ZWRFbGVtZW50 c1JlbGF0aXZlVG9GcmFtZSA9IGZyYW1lKCktPnBhZ2UoKSA/IGZyYW1lKCktPnBhZ2UoKS0+c2hv dWxkTGF5b3V0Rml4ZWRFbGVtZW50c1JlbGF0aXZlVG9GcmFtZSgpOiBmYWxzZTsKKyAgICBmbG9h dCBkcmFnRmFjdG9yID0gc2hvdWxkTGF5b3V0Rml4ZWRFbGVtZW50c1JlbGF0aXZlVG9GcmFtZSA/ IDEgOiAoY29udGVudHNXaWR0aCgpIC0gdmlzaWJsZUNvbnRlbnRXaWR0aCAqIGZyYW1lU2NhbGVG YWN0b3IpIC8gbWF4WDsKIAogICAgIHJldHVybiB4ICogZHJhZ0ZhY3RvciAvIGZyYW1lU2NhbGVG YWN0b3I7CiB9CkBAIC0xNDI2LDcgKzE0MjYsOCBAQCBpbnQgRnJhbWVWaWV3OjpzY3JvbGxZRm9y Rml4ZWRQb3NpdGlvbigpIGNvbnN0CiAgICAgICAgIHJldHVybiB5OwogCiAgICAgZmxvYXQgZnJh bWVTY2FsZUZhY3RvciA9IG1fZnJhbWUtPmZyYW1lU2NhbGVGYWN0b3IoKTsKLSAgICBmbG9hdCBk cmFnRmFjdG9yID0gc2hvdWxkTGF5b3V0Rml4ZWRFbGVtZW50c1JlbGF0aXZlVG9GcmFtZSgpID8g MSA6IChjb250ZW50c0hlaWdodCgpIC0gdmlzaWJsZUNvbnRlbnRIZWlnaHQgKiBmcmFtZVNjYWxl RmFjdG9yKSAvIG1heFk7CisgICAgYm9vbCBzaG91bGRMYXlvdXRGaXhlZEVsZW1lbnRzUmVsYXRp dmVUb0ZyYW1lID0gZnJhbWUoKS0+cGFnZSgpID8gZnJhbWUoKS0+cGFnZSgpLT5zaG91bGRMYXlv dXRGaXhlZEVsZW1lbnRzUmVsYXRpdmVUb0ZyYW1lKCk6IGZhbHNlOworICAgIGZsb2F0IGRyYWdG YWN0b3IgPSBzaG91bGRMYXlvdXRGaXhlZEVsZW1lbnRzUmVsYXRpdmVUb0ZyYW1lID8gMSA6IChj b250ZW50c0hlaWdodCgpIC0gdmlzaWJsZUNvbnRlbnRIZWlnaHQgKiBmcmFtZVNjYWxlRmFjdG9y KSAvIG1heFk7CiAgICAgcmV0dXJuIHkgKiBkcmFnRmFjdG9yIC8gZnJhbWVTY2FsZUZhY3RvcjsK IH0KIApAQCAtMTQzNSwxOCArMTQzNiw2IEBAIEludFNpemUgRnJhbWVWaWV3OjpzY3JvbGxPZmZz ZXRGb3JGaXhlZFBvc2l0aW9uKCkgY29uc3QKICAgICByZXR1cm4gSW50U2l6ZShzY3JvbGxYRm9y Rml4ZWRQb3NpdGlvbigpLCBzY3JvbGxZRm9yRml4ZWRQb3NpdGlvbigpKTsKIH0KIAotdm9pZCBG cmFtZVZpZXc6OnNldFNob3VsZExheW91dEZpeGVkRWxlbWVudHNSZWxhdGl2ZVRvRnJhbWUoYm9v bCBzaG91bGRMYXlvdXRGaXhlZEVsZW1lbnRzUmVsYXRpdmVUb0ZyYW1lKQotewotICAgIGlmIChz aG91bGRMYXlvdXRGaXhlZEVsZW1lbnRzUmVsYXRpdmVUb0ZyYW1lID09IG1fc2hvdWxkTGF5b3V0 Rml4ZWRFbGVtZW50c1JlbGF0aXZlVG9GcmFtZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV9z aG91bGRMYXlvdXRGaXhlZEVsZW1lbnRzUmVsYXRpdmVUb0ZyYW1lID0gc2hvdWxkTGF5b3V0Rml4 ZWRFbGVtZW50c1JlbGF0aXZlVG9GcmFtZTsKLQotICAgIGlmICghaGFzRml4ZWRPYmplY3RzKCkp Ci0gICAgICAgIHJldHVybjsKLQotICAgIHNldE5lZWRzTGF5b3V0KCk7Ci19CiBJbnRQb2ludCBG cmFtZVZpZXc6OmN1cnJlbnRNb3VzZVBvc2l0aW9uKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9m cmFtZSA/IG1fZnJhbWUtPmV2ZW50SGFuZGxlcigpLT5jdXJyZW50TW91c2VQb3NpdGlvbigpIDog SW50UG9pbnQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmluZGV4IGRjZDZkMzM0YTU2Yjg3NmZh Y2Q1OTQzYzIwZjI5MTkxODU0OTQxY2MuLjM2YTE2NjA5Njc1ODI2YTg2ZmYwOWNlMWRkNTIyMmY5 NjM5YzhiMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtMTk2LDkgKzE5Niw2IEBAIHB1 YmxpYzoKICAgICBpbnQgc2Nyb2xsWUZvckZpeGVkUG9zaXRpb24oKSBjb25zdDsKICAgICBJbnRT aXplIHNjcm9sbE9mZnNldEZvckZpeGVkUG9zaXRpb24oKSBjb25zdDsKIAotICAgIGJvb2wgc2hv dWxkTGF5b3V0Rml4ZWRFbGVtZW50c1JlbGF0aXZlVG9GcmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1f c2hvdWxkTGF5b3V0Rml4ZWRFbGVtZW50c1JlbGF0aXZlVG9GcmFtZTsgfQotICAgIHZvaWQgc2V0 U2hvdWxkTGF5b3V0Rml4ZWRFbGVtZW50c1JlbGF0aXZlVG9GcmFtZShib29sKTsKLQogICAgIHZv aWQgYmVnaW5EZWZlcnJlZFJlcGFpbnRzKCk7CiAgICAgdm9pZCBlbmREZWZlcnJlZFJlcGFpbnRz KCk7CiAgICAgdm9pZCBjaGVja1N0b3BEZWxheWluZ0RlZmVycmVkUmVwYWludHMoKTsKQEAgLTQx NCw3ICs0MTEsNiBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9jYW5ub3RCbGl0VG9XaW5kb3c7CiAg ICAgYm9vbCBtX2lzT3ZlcmxhcHBlZDsKICAgICBib29sIG1fY29udGVudElzT3BhcXVlOwotICAg IGJvb2wgbV9zaG91bGRMYXlvdXRGaXhlZEVsZW1lbnRzUmVsYXRpdmVUb0ZyYW1lOwogICAgIHVu c2lnbmVkIG1fc2xvd1JlcGFpbnRPYmplY3RDb3VudDsKICAgICB1bnNpZ25lZCBtX2ZpeGVkT2Jq ZWN0Q291bnQ7CiAgICAgaW50IG1fYm9yZGVyWDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCmluZGV4IDc3MjAw ZmUyMjc0YzgzMjhlNTcwZTcwM2Y4NWViMDEzNTcyZDIwYjYuLjRiNzJjMTNiNjIxOGU3YTI1ZThj MzJjOGJlYTY0ZThjNDExZWJlZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFn ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApAQCAtMTYzLDYgKzE2Myw3 IEBAIFBhZ2U6OlBhZ2UoUGFnZUNsaWVudHMmIHBhZ2VDbGllbnRzKQogICAgICwgbV9tZWRpYVZv bHVtZSgxKQogICAgICwgbV9wYWdlU2NhbGVGYWN0b3IoMSkKICAgICAsIG1fZGV2aWNlU2NhbGVG YWN0b3IoMSkKKyAgICAsIG1fc2hvdWxkTGF5b3V0Rml4ZWRFbGVtZW50c1JlbGF0aXZlVG9GcmFt ZShmYWxzZSkKICAgICAsIG1famF2YVNjcmlwdFVSTHNBcmVBbGxvd2VkKHRydWUpCiAgICAgLCBt X2RpZExvYWRVc2VyU3R5bGVTaGVldChmYWxzZSkKICAgICAsIG1fdXNlclN0eWxlU2hlZXRNb2Rp ZmljYXRpb25UaW1lKDApCkBAIC02NzUsNiArNjc2LDE3IEBAIHZvaWQgUGFnZTo6c2V0RGV2aWNl U2NhbGVGYWN0b3IoZmxvYXQgc2NhbGVGYWN0b3IpCiAgICAgYmFja0ZvcndhcmQoKS0+bWFya1Bh Z2VzRm9yRnVsbFN0eWxlUmVjYWxjKCk7CiB9CiAKK3ZvaWQgUGFnZTo6c2V0U2hvdWxkTGF5b3V0 Rml4ZWRFbGVtZW50c1JlbGF0aXZlVG9GcmFtZShib29sIHNob3VsZExheW91dEZpeGVkRWxlbWVu dHNSZWxhdGl2ZVRvRnJhbWUpCit7CisgICAgaWYgKHNob3VsZExheW91dEZpeGVkRWxlbWVudHNS ZWxhdGl2ZVRvRnJhbWUgPT0gbV9zaG91bGRMYXlvdXRGaXhlZEVsZW1lbnRzUmVsYXRpdmVUb0Zy YW1lKQorICAgICAgICByZXR1cm47CisKKyAgICBtX3Nob3VsZExheW91dEZpeGVkRWxlbWVudHNS ZWxhdGl2ZVRvRnJhbWUgPSBzaG91bGRMYXlvdXRGaXhlZEVsZW1lbnRzUmVsYXRpdmVUb0ZyYW1l OworCisgICAgaWYgKG1fbWFpbkZyYW1lICYmIG1fbWFpbkZyYW1lLT5kb2N1bWVudCgpLT5yZW5k ZXJlcigpKQorICAgICAgICBtX21haW5GcmFtZS0+ZG9jdW1lbnQoKS0+cmVuZGVyZXIoKS0+c2V0 TmVlZHNMYXlvdXQodHJ1ZSk7Cit9CisKIHZvaWQgUGFnZTo6c2V0UGFnaW5hdGlvbihjb25zdCBQ YWdpbmF0aW9uJiBwYWdpbmF0aW9uKQogewogICAgIGlmIChtX3BhZ2luYXRpb24gPT0gcGFnaW5h dGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oIGIvU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlLmgKaW5kZXggNDk4MDFiNTVmOTA1OTdmMWIwZjYxOWM2ZmJiN2I2MzNh YmY2MWE1Zi4uY2QzNzQxNzRkNzJhMzM3MGU3Mjc0ZmQ5NDkzODU4YjU1MDE2NzQzZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlLmgKQEAgLTI1Niw2ICsyNTYsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAg IGZsb2F0IGRldmljZVNjYWxlRmFjdG9yKCkgY29uc3QgeyByZXR1cm4gbV9kZXZpY2VTY2FsZUZh Y3RvcjsgfQogICAgICAgICB2b2lkIHNldERldmljZVNjYWxlRmFjdG9yKGZsb2F0KTsKIAorICAg ICAgICBib29sIHNob3VsZExheW91dEZpeGVkRWxlbWVudHNSZWxhdGl2ZVRvRnJhbWUoKSBjb25z dCB7IHJldHVybiBtX3Nob3VsZExheW91dEZpeGVkRWxlbWVudHNSZWxhdGl2ZVRvRnJhbWU7IH0K KyAgICAgICAgdm9pZCBzZXRTaG91bGRMYXlvdXRGaXhlZEVsZW1lbnRzUmVsYXRpdmVUb0ZyYW1l KGJvb2wpOworCiAgICAgICAgIHN0cnVjdCBQYWdpbmF0aW9uIHsKICAgICAgICAgICAgIGVudW0g TW9kZSB7IFVucGFnaW5hdGVkLCBIb3Jpem9udGFsbHlQYWdpbmF0ZWQsIFZlcnRpY2FsbHlQYWdp bmF0ZWQgfTsKIApAQCAtNDE1LDYgKzQxOCw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgZmxvYXQgbV9wYWdlU2NhbGVGYWN0b3I7CiAgICAgICAgIGZsb2F0IG1fZGV2aWNlU2NhbGVG YWN0b3I7CiAKKyAgICAgICAgYm9vbCBtX3Nob3VsZExheW91dEZpeGVkRWxlbWVudHNSZWxhdGl2 ZVRvRnJhbWU7CisKICAgICAgICAgUGFnaW5hdGlvbiBtX3BhZ2luYXRpb247CiAKICAgICAgICAg Ym9vbCBtX2phdmFTY3JpcHRVUkxzQXJlQWxsb3dlZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveC5jcHAKaW5kZXggYjljMjVkNmE0NjEyMjgxZTBhOGU0ZWNjODYzMjc1MzdjZmFhMzYw OS4uZmI4Y2I4YWE2MThhYmM0OGNlNzUwNjQ1OTBkNDU2ZWJlNTg3MjE0NiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTYzMSw5ICs2MzEsOSBAQCBMYXlvdXRSZWN0 IFJlbmRlckJveDo6cmVmbGVjdGVkUmVjdChjb25zdCBMYXlvdXRSZWN0JiByKSBjb25zdAogICAg IHJldHVybiByZXN1bHQ7CiB9CiAKLWJvb2wgUmVuZGVyQm94OjpzaG91bGRMYXlvdXRGaXhlZEVs ZW1lbnRSZWxhdGl2ZVRvRnJhbWUoRnJhbWUqIGZyYW1lLCBGcmFtZVZpZXcqIGZyYW1lVmlldykg Y29uc3QKK2Jvb2wgUmVuZGVyQm94OjpzaG91bGRMYXlvdXRGaXhlZEVsZW1lbnRSZWxhdGl2ZVRv RnJhbWUoRnJhbWUqIGZyYW1lKSBjb25zdAogewotICAgIHJldHVybiBzdHlsZSgpICYmIHN0eWxl KCktPnBvc2l0aW9uKCkgPT0gRml4ZWRQb3NpdGlvbiAmJiBjb250YWluZXIoKS0+aXNSZW5kZXJW aWV3KCkgJiYgZnJhbWUgJiYgZnJhbWVWaWV3ICYmIGZyYW1lVmlldy0+c2hvdWxkTGF5b3V0Rml4 ZWRFbGVtZW50c1JlbGF0aXZlVG9GcmFtZSgpOworICAgIHJldHVybiBzdHlsZSgpICYmIHN0eWxl KCktPnBvc2l0aW9uKCkgPT0gRml4ZWRQb3NpdGlvbiAmJiBjb250YWluZXIoKS0+aXNSZW5kZXJW aWV3KCkgJiYgZnJhbWUgJiYgZnJhbWUtPnBhZ2UoKSAmJiBmcmFtZS0+cGFnZSgpLT5zaG91bGRM YXlvdXRGaXhlZEVsZW1lbnRzUmVsYXRpdmVUb0ZyYW1lKCk7CiB9CiAKIGJvb2wgUmVuZGVyQm94 OjppbmNsdWRlVmVydGljYWxTY3JvbGxiYXJTaXplKCkgY29uc3QKQEAgLTIzMjUsNyArMjMyNSw3 IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JQ b3NpdGlvbmVkKGNvbnN0IFJlbmRlckJveE1vCiAgICAgLy8gQ29udGFpbmVyIGZvciBwb3NpdGlv bjpmaXhlZCBpcyB0aGUgZnJhbWUuCiAgICAgRnJhbWUqIGZyYW1lID0gdmlldygpID8gdmlldygp LT5mcmFtZSgpOiAwOwogICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gdmlldygpID8gdmlldygp LT5mcmFtZVZpZXcoKSA6IDA7Ci0gICAgaWYgKHNob3VsZExheW91dEZpeGVkRWxlbWVudFJlbGF0 aXZlVG9GcmFtZShmcmFtZSwgZnJhbWVWaWV3KSkKKyAgICBpZiAoc2hvdWxkTGF5b3V0Rml4ZWRF bGVtZW50UmVsYXRpdmVUb0ZyYW1lKGZyYW1lKSkKICAgICAgICAgcmV0dXJuICh2aWV3KCktPmlz SG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBmcmFtZVZpZXctPnZpc2libGVXaWR0aCgpIDogZnJh bWVWaWV3LT52aXNpYmxlSGVpZ2h0KCkpIC8gZnJhbWUtPmZyYW1lU2NhbGVGYWN0b3IoKTsKIAog ICAgIGlmIChjaGVja0ZvclBlcnBlbmRpY3VsYXJXcml0aW5nTW9kZSAmJiBjb250YWluaW5nQmxv Y2stPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgIT0gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo KSkKQEAgLTIzODIsNyArMjM4Miw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb250YWluaW5n QmxvY2tMb2dpY2FsSGVpZ2h0Rm9yUG9zaXRpb25lZChjb25zdCBSZW5kZXJCb3hNCiB7CiAgICAg RnJhbWUqIGZyYW1lID0gdmlldygpID8gdmlldygpLT5mcmFtZSgpOiAwOwogICAgIEZyYW1lVmll dyogZnJhbWVWaWV3ID0gdmlldygpID8gdmlldygpLT5mcmFtZVZpZXcoKSA6IDA7Ci0gICAgaWYg KHNob3VsZExheW91dEZpeGVkRWxlbWVudFJlbGF0aXZlVG9GcmFtZShmcmFtZSwgZnJhbWVWaWV3 KSkKKyAgICBpZiAoc2hvdWxkTGF5b3V0Rml4ZWRFbGVtZW50UmVsYXRpdmVUb0ZyYW1lKGZyYW1l KSkKICAgICAgICAgcmV0dXJuICh2aWV3KCktPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBm cmFtZVZpZXctPnZpc2libGVIZWlnaHQoKSA6IGZyYW1lVmlldy0+dmlzaWJsZVdpZHRoKCkpIC8g ZnJhbWUtPmZyYW1lU2NhbGVGYWN0b3IoKTsKIAogICAgIGlmIChjaGVja0ZvclBlcnBlbmRpY3Vs YXJXcml0aW5nTW9kZSAmJiBjb250YWluaW5nQmxvY2stPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2Rl KCkgIT0gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guaAppbmRleCBlNGVlZjY1ZGU5YzA5ZDZkNTE4NTk4NTA0NTI2ZWY2Y2U4NDY2NjUyLi5h MzM3OGIzMDRiOTUyNDc2MGNkOTMyYzk1OWJhYWZkYWI1NWM5ODhhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveC5oCkBAIC00NjIsNyArNDYyLDcgQEAgcHJvdGVjdGVkOgogICAgIHZv aWQgcGFpbnRSb290Qm94RmlsbExheWVycyhjb25zdCBQYWludEluZm8mKTsKIAogcHJpdmF0ZToK LSAgICBib29sIHNob3VsZExheW91dEZpeGVkRWxlbWVudFJlbGF0aXZlVG9GcmFtZShGcmFtZSos IEZyYW1lVmlldyopIGNvbnN0OworICAgIGJvb2wgc2hvdWxkTGF5b3V0Rml4ZWRFbGVtZW50UmVs YXRpdmVUb0ZyYW1lKEZyYW1lKikgY29uc3Q7CiAKICAgICBib29sIGluY2x1ZGVWZXJ0aWNhbFNj cm9sbGJhclNpemUoKSBjb25zdDsKICAgICBib29sIGluY2x1ZGVIb3Jpem9udGFsU2Nyb2xsYmFy U2l6ZSgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5h bHMuY3BwIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCmluZGV4IDlmNTEz NmZmZDE2MmYwNTk0OGRmMWIyNzE3NGMwYWU1ZWMyOGI2OTYuLmM1ZDNjMGMzNTQzNjg2ZjIyMWY4 MzNkOTdjNzAyZjk5ODQ3NzM4ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3Rpbmcv SW50ZXJuYWxzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAK QEAgLTU4NCw4ICs1ODQsNyBAQCB2b2lkIEludGVybmFsczo6c2V0U2hvdWxkTGF5b3V0Rml4ZWRF bGVtZW50c1JlbGF0aXZlVG9GcmFtZShEb2N1bWVudCogZG9jdW1lbnQsCiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKLSAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IGRvY3VtZW50LT52aWV3KCk7 Ci0gICAgZnJhbWVWaWV3LT5zZXRTaG91bGRMYXlvdXRGaXhlZEVsZW1lbnRzUmVsYXRpdmVUb0Zy YW1lKGVuYWJsZWQpOworICAgIGRvY3VtZW50LT5wYWdlKCktPnNldFNob3VsZExheW91dEZpeGVk RWxlbWVudHNSZWxhdGl2ZVRvRnJhbWUoZW5hYmxlZCk7CiB9CiAKIHZvaWQgSW50ZXJuYWxzOjpz ZXRVbmlmaWVkVGV4dENoZWNraW5nRW5hYmxlZChEb2N1bWVudCogZG9jdW1lbnQsIGJvb2wgZW5h YmxlZCwgRXhjZXB0aW9uQ29kZSYgZWMpCg==