108729 2013-02-01 17:24:06 -0800 Allow TiledCoreAnimationDrawingArea overlay layers to become tiled 2013-02-04 11:28:10 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca sam simon.fraser oldest_to_newest 823453 0 thorton 2013-02-01 17:24:06 -0800 In some cases, we need the view-sized layer that TiledCoreAnimationDrawingArea uses for the page overlay to become tiled (if the view is huge). So we should do that, and make sure the relevant TileCache has the view's exposed rect so it can make the right set of tiles. <rdar://problem/13047546> 823466 1 186197 thorton 2013-02-01 17:42:27 -0800 Created attachment 186197 patch 824593 2 186197 andersca 2013-02-04 11:17:04 -0800 Comment on attachment 186197 patch View in context: https://bugs.webkit.org/attachment.cgi?id=186197&action=review > Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:347 > + if (m_pageOverlayLayer) > + if (TiledBacking* tiledBacking = m_pageOverlayLayer->tiledBacking()) > + tiledBacking->setExposedRect(exposedRect); Outer if statement should have braces. > Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:356 > + if (m_pageOverlayLayer) > + if (TiledBacking* tiledBacking = m_pageOverlayLayer->tiledBacking()) > + tiledBacking->setClipsToExposedRect(!isScrollable); Outer if statement should have braces. 824602 3 thorton 2013-02-04 11:28:10 -0800 http://trac.webkit.org/changeset/141789 186197 2013-02-01 17:42:27 -0800 2013-02-04 11:17:03 -0800 patch tiled.diff text/plain 9056 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3YTkzN2I5Li43ZTBlMWFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTMtMDItMDEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgQWxsb3cgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEgb3ZlcmxheSBsYXll cnMgdG8gYmVjb21lIHRpbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDg3MjkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEzMDQ3NTQ2PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzTGF5ZXJDQTo6Zmx1c2hDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSk6IFRoZSAi Zm9yIHRoaXMgbGF5ZXIgb25seSIgdmFyaWFudAorICAgICAgICBvZiBmbHVzaENvbXBvc2l0aW5n U3RhdGUgd2Fzbid0IGluZm9ybWluZyBpdHMgY2xpZW50IHRoYXQgaXQgY29tbWl0dGVkIGNoYW5n ZXMgZm9yIHRoZSBsYXllci4KKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6c3dh cEZyb21PclRvVGlsZWRMYXllcik6IFdlIG5vdyBleHBsaWNpdGx5IHdhbnQgdG8gYmUgYWJsZSB0 byBoYXZlIGEKKyAgICAgICAgR3JhcGhpY3NMYXllckNBIHN3aXRjaCBpbnRvIG9yIG91dCBvZiB0 aWxpbmcgd2hpbGUgYmVpbmcgdW5wYXJlbnRlZCAod2UnbGwgZ2V0IGEgY2xpZW50IGNhbGxiYWNr IGFuZAorICAgICAgICBzd2FwIG91dCBpdHMgcGFyZW50IG91cnNlbHZlcykuCisKIDIwMTMtMDIt MDEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgU21hcnQgbGlu ayBjYW4gZXJyb25lb3VzbHkgbW92ZSBjYXJldCBhZnRlciBhbiBVUkwgd2hlbiB0eXBpbmcgaW1t ZWRpYXRlbHkgYmVmb3JlIGl0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcAppbmRleCBjMzc2Y2YxLi4xOGQzNjRiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xh eWVyQ0EuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBo aWNzTGF5ZXJDQS5jcHAKQEAgLTg5Niw5ICs4OTYsMTQgQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6 OmZsdXNoQ29tcG9zaXRpbmdTdGF0ZShjb25zdCBGbG9hdFJlY3QmIGNsaXBSZWN0KQogdm9pZCBH cmFwaGljc0xheWVyQ0E6OmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKQog ewogICAgIGZsb2F0IHBhZ2VTY2FsZUZhY3RvcjsKKyAgICBib29sIGhhZENoYW5nZXMgPSBtX3Vu Y29tbWl0dGVkQ2hhbmdlczsKKwogICAgIEZsb2F0UG9pbnQgb2Zmc2V0ID0gY29tcHV0ZVBvc2l0 aW9uUmVsYXRpdmVUb0Jhc2UocGFnZVNjYWxlRmFjdG9yKTsKICAgICBjb21taXRMYXllckNoYW5n ZXNCZWZvcmVTdWJsYXllcnMocGFnZVNjYWxlRmFjdG9yLCBvZmZzZXQsIG1fdmlzaWJsZVJlY3Qp OwogICAgIGNvbW1pdExheWVyQ2hhbmdlc0FmdGVyU3VibGF5ZXJzKCk7CisKKyAgICBpZiAoaGFk Q2hhbmdlcyAmJiBjbGllbnQoKSkKKyAgICAgICAgY2xpZW50KCktPmRpZENvbW1pdENoYW5nZXNG b3JMYXllcih0aGlzKTsKIH0KIAogVGlsZWRCYWNraW5nKiBHcmFwaGljc0xheWVyQ0E6OnRpbGVk QmFja2luZygpIGNvbnN0CkBAIC0yNjQ3LDkgKzI2NTIsOSBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJD QTo6c3dhcEZyb21PclRvVGlsZWRMYXllcihib29sIHVzZVRpbGVkTGF5ZXIpCiAgICAgICAgIG1f bGF5ZXItPmFwcGVuZFN1YmxheWVyKG1fdmlzaWJsZVRpbGVXYXNoTGF5ZXIuZ2V0KCkpOwogI2Vu ZGlmCiAKLSAgICAvLyBGSVhNRTogU2tpcCB0aGlzIHN0ZXAgaWYgd2UgZG9uJ3QgaGF2ZSBhIHN1 cGVybGF5ZXIuIFRoaXMgaXMgcHJvYmxhYmx5IGEgYmVuaWduCi0gICAgLy8gY2FzZSB0aGF0IGhh cHBlbnMgd2hpbGUgcmVzdHJ1Y3R1cmluZyB0aGUgbGF5ZXIgdHJlZS4KLSAgICBBU1NFUlQob2xk TGF5ZXItPnN1cGVybGF5ZXIoKSk7CisgICAgLy8gU2tpcCB0aGlzIHN0ZXAgaWYgd2UgZG9uJ3Qg aGF2ZSBhIHN1cGVybGF5ZXIuIFRoaXMgaXMgcHJvYmFibHkgYSBiZW5pZ24KKyAgICAvLyBjYXNl IHRoYXQgaGFwcGVucyB3aGlsZSByZXN0cnVjdHVyaW5nIHRoZSBsYXllciB0cmVlLCBhbmQgYWxz byBvY2N1cnMgd2l0aAorICAgIC8vIFdlYktpdDIgcGFnZSBvdmVybGF5cywgd2hpY2ggY2FuIGJl Y29tZSB0aWxlZCBidXQgYXJlIG91dC1vZi10cmVlLgogICAgIGlmIChvbGRMYXllci0+c3VwZXJs YXllcigpKQogICAgICAgICBvbGRMYXllci0+c3VwZXJsYXllcigpLT5yZXBsYWNlU3VibGF5ZXIo b2xkTGF5ZXIuZ2V0KCksIG1fbGF5ZXIuZ2V0KCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDRkYjUzYi4u YjQwZGUwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAyLTAxICBUaW0gSG9y dG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEFsbG93IFRpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhIG92ZXJsYXkgbGF5ZXJzIHRvIGJlY29tZSB0aWxlZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4NzI5CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8xMzA0NzU0Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWEuaDoKKyAgICAgICAgKFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhKTogQWRkIGRpZENvbW1pdENoYW5nZXNGb3JMYXllciBhbmQgc3RvcmFnZSBmb3IgdGhl CisgICAgICAgIGN1cnJlbnQgUGxhdGZvcm1MYXllciBjb3JyZXNwb25kaW5nIHRvIG1fcGFnZU92 ZXJsYXlMYXllci4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFu aW1hdGlvbkRyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYTo6Zmx1c2hMYXllcnMpOiBVcGRhdGUgdGhlIFRpbGVDYWNoZSdzIHZpc2li bGUgcmVjdC4KKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6 OnNldEV4cG9zZWRSZWN0KTogRm9yd2FyZCBleHBvc2VkIHJlY3QgY2hhbmdlcyB0byB0aGUgcGFn ZSBvdmVybGF5IGxheWVyLCBpZiBpdCdzIHRpbGVkLgorICAgICAgICAoV2ViS2l0OjpUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYTo6bWFpbkZyYW1lU2Nyb2xsYWJpbGl0eUNoYW5nZWQpOiBG b3J3YXJkIHNjcm9sbGFiaWxpdHkgY2hhbmdlcyB0byB0aGUgcGFnZSBvdmVybGF5IGxheWVyLCBp ZiBpdCdzIHRpbGVkLgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5n QXJlYTo6Y3JlYXRlUGFnZU92ZXJsYXlMYXllcik6IEFsbG93IHRoZSBwYWdlIG92ZXJsYXkgbGF5 ZXIgdG8gYmVjb21lIHRpbGVkLiBVcGRhdGUgaXRzIGV4cG9zZWQgcmVjdCBhbmQgd2hldGhlciBv ciBub3QgaXQgcmVzcGVjdHMgdGhlIGV4cG9zZWQgcmVjdCBpZiBpdCdzIHRpbGVkIHVwb24gY3Jl YXRpb24uCisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpk aWRDb21taXRDaGFuZ2VzRm9yTGF5ZXIpOiBJZiBhIEdyYXBoaWNzTGF5ZXIncyBwbGF0Zm9ybSBs YXllciBjaGFuZ2VzIChiZWNhdXNlIGl0IHN3aXRjaGVkIHRvIG9yIGZyb20gYSB0aWxlZCBsYXll ciksIHJlcGFyZW50IGl0LiBJZiBpdCdzIHN3aXRjaGluZyB0byBhIHRpbGVkIGxheWVyLCB1cGRh dGUgdGhlIGV4cG9zZWQgcmVjdCBhbmQgd2hldGhlciBvciBub3QgaXQgc2hvdWxkIHJlc3BlY3Qg dGhlIGV4cG9zZWQgcmVjdC4KKwogMjAxMy0wMi0wMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxj Z2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRhcHQgV29ya1F1ZXVlR3RrIHRv IHRoZSBsYXRlc3QgY2hhbmdlcyBpbiBXZWJLaXQyIGFmdGVyIHIxNDE0OTcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9u RHJhd2luZ0FyZWEuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaAppbmRleCBmMzkxY2MxLi5hYzljNTAzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFu aW1hdGlvbkRyYXdpbmdBcmVhLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCkBAIC04MSw2ICs4MSw3IEBA IHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIG5vdGlmeUZsdXNoUmVxdWlyZWQoY29uc3QgV2Vi Q29yZTo6R3JhcGhpY3NMYXllciopIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBwYWludENv bnRlbnRzKGNvbnN0IFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqLCBXZWJDb3JlOjpHcmFwaGljc0Nv bnRleHQmLCBXZWJDb3JlOjpHcmFwaGljc0xheWVyUGFpbnRpbmdQaGFzZSwgY29uc3QgV2ViQ29y ZTo6SW50UmVjdCYgY2xpcFJlY3QpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgZmxvYXQgZGV2aWNl U2NhbGVGYWN0b3IoKSBjb25zdCBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkQ29tbWl0 Q2hhbmdlc0ZvckxheWVyKGNvbnN0IFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqKSBjb25zdCBPVkVS UklERTsKIAogICAgIC8vIFdlYkNvcmU6OkxheWVyRmx1c2hTY2hlZHVsZXJDbGllbnQKICAgICB2 aXJ0dWFsIGJvb2wgZmx1c2hMYXllcnMoKSBPVkVSUklERTsKQEAgLTExMyw2ICsxMTQsNyBAQCBw cml2YXRlOgogICAgIFJldGFpblB0cjxDQUxheWVyPiBtX2RlYnVnSW5mb0xheWVyOwogCiAgICAg T3duUHRyPFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI+IG1fcGFnZU92ZXJsYXlMYXllcjsKKyAgICBt dXRhYmxlIFJldGFpblB0cjxDQUxheWVyPiBtX3BhZ2VPdmVybGF5UGxhdGZvcm1MYXllcjsKIAog ICAgIGJvb2wgbV9pc1BhaW50aW5nU3VzcGVuZGVkOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh Lm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYS5tbQppbmRleCA1MDc4ODQzLi4zYWRiNmRkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMv VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KQEAgLTI5Nyw2ICsyOTcsOCBAQCBib29s IFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpmbHVzaExheWVycygpCiAKICAgICBpZiAo bV9wYWdlT3ZlcmxheUxheWVyKSB7CiAgICAgICAgIG1fcGFnZU92ZXJsYXlMYXllci0+c2V0TmVl ZHNEaXNwbGF5KCk7CisgICAgICAgIGlmIChUaWxlZEJhY2tpbmcqIG92ZXJsYXlUaWxlZEJhY2tp bmcgPSBtX3BhZ2VPdmVybGF5TGF5ZXItPnRpbGVkQmFja2luZygpKQorICAgICAgICAgICAgb3Zl cmxheVRpbGVkQmFja2luZy0+c2V0VmlzaWJsZVJlY3QoZW5jbG9zaW5nSW50UmVjdChtX3Jvb3RM YXllci5nZXQoKS5mcmFtZSkpOwogICAgICAgICBtX3BhZ2VPdmVybGF5TGF5ZXItPmZsdXNoQ29t cG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKTsKICAgICB9CiAKQEAgLTMzOSwxMSArMzQx LDE5IEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNldEV4cG9zZWRSZWN0 KGNvbnN0IEludFJlY3QmIGV4cG9zZWRSZWN0KQogICAgIG1fZXhwb3NlZFJlY3QgPSBleHBvc2Vk UmVjdDsKIAogICAgIG1haW5GcmFtZVRpbGVkQmFja2luZygpLT5zZXRFeHBvc2VkUmVjdChleHBv c2VkUmVjdCk7CisKKyAgICBpZiAobV9wYWdlT3ZlcmxheUxheWVyKQorICAgICAgICBpZiAoVGls ZWRCYWNraW5nKiB0aWxlZEJhY2tpbmcgPSBtX3BhZ2VPdmVybGF5TGF5ZXItPnRpbGVkQmFja2lu ZygpKQorICAgICAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRFeHBvc2VkUmVjdChleHBvc2VkUmVj dCk7CiB9CiAKIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6Om1haW5GcmFtZVNj cm9sbGFiaWxpdHlDaGFuZ2VkKGJvb2wgaXNTY3JvbGxhYmxlKQogewogICAgIG1haW5GcmFtZVRp bGVkQmFja2luZygpLT5zZXRDbGlwc1RvRXhwb3NlZFJlY3QoIWlzU2Nyb2xsYWJsZSk7CisKKyAg ICBpZiAobV9wYWdlT3ZlcmxheUxheWVyKQorICAgICAgICBpZiAoVGlsZWRCYWNraW5nKiB0aWxl ZEJhY2tpbmcgPSBtX3BhZ2VPdmVybGF5TGF5ZXItPnRpbGVkQmFja2luZygpKQorICAgICAgICAg ICAgdGlsZWRCYWNraW5nLT5zZXRDbGlwc1RvRXhwb3NlZFJlY3QoIWlzU2Nyb2xsYWJsZSk7CiB9 CiAKIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZUdlb21ldHJ5KGNv bnN0IEludFNpemUmIHZpZXdTaXplKQpAQCAtNDcxLDEzICs0ODEsMTcgQEAgdm9pZCBUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYTo6Y3JlYXRlUGFnZU92ZXJsYXlMYXllcigpCiAgICAgbV9w YWdlT3ZlcmxheUxheWVyLT5zZXROYW1lKCJwYWdlIG92ZXJsYXkgY29udGVudCIpOwogI2VuZGlm CiAKLSAgICAvLyBXZSBkb24ndCBldmVyIHdhbnQgdGhlIG92ZXJsYXkgbGF5ZXIgdG8gYmVjb21l IHRpbGVkIGJlY2F1c2UgdGhhdCB3aWxsIGxvb2sgYmFkLCBhbmQKLSAgICAvLyB3ZSBhbHNvIG5l dmVyIGV4cGVjdCB0aGUgdW5kZXJseWluZyBDQUxheWVyIHRvIGNoYW5nZS4KLSAgICBzdGF0aWNf Y2FzdDxHcmFwaGljc0xheWVyQ0EqPihtX3BhZ2VPdmVybGF5TGF5ZXIuZ2V0KCkpLT5zZXRBbGxv d1RpbGVkTGF5ZXIoZmFsc2UpOwogICAgIG1fcGFnZU92ZXJsYXlMYXllci0+c2V0QWNjZWxlcmF0 ZXNEcmF3aW5nKHRydWUpOwogICAgIG1fcGFnZU92ZXJsYXlMYXllci0+c2V0RHJhd3NDb250ZW50 KHRydWUpOwogICAgIG1fcGFnZU92ZXJsYXlMYXllci0+c2V0U2l6ZShtX3dlYlBhZ2UtPnNpemUo KSk7CiAKKyAgICBtX3BhZ2VPdmVybGF5UGxhdGZvcm1MYXllciA9IG1fcGFnZU92ZXJsYXlMYXll ci0+cGxhdGZvcm1MYXllcigpOworCisgICAgaWYgKFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5n ID0gbV9wYWdlT3ZlcmxheUxheWVyLT50aWxlZEJhY2tpbmcoKSkgeworICAgICAgICB0aWxlZEJh Y2tpbmctPnNldEV4cG9zZWRSZWN0KG1fZXhwb3NlZFJlY3QpOworICAgICAgICB0aWxlZEJhY2tp bmctPnNldENsaXBzVG9FeHBvc2VkUmVjdCghbV93ZWJQYWdlLT5tYWluRnJhbWVJc1Njcm9sbGFi bGUoKSk7CisgICAgfQorCiAgICAgW0NBVHJhbnNhY3Rpb24gYmVnaW5dOwogICAgIFtDQVRyYW5z YWN0aW9uIHNldERpc2FibGVBY3Rpb25zOllFU107CiAKQEAgLTUwMCw2ICs1MTQsMzIgQEAgdm9p ZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6ZGVzdHJveVBhZ2VPdmVybGF5TGF5ZXIo KQogICAgIG1fcGFnZU92ZXJsYXlMYXllciA9IG51bGxwdHI7CiB9CiAKK3ZvaWQgVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWE6OmRpZENvbW1pdENoYW5nZXNGb3JMYXllcihjb25zdCBHcmFw aGljc0xheWVyKiBsYXllcikgY29uc3QKK3sKKyAgICBpZiAobGF5ZXIgIT0gbV9wYWdlT3Zlcmxh eUxheWVyLmdldCgpKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAobV9wYWdlT3ZlcmxheVBs YXRmb3JtTGF5ZXIuZ2V0KCkgPT0gbGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgW0NBVHJhbnNhY3Rpb24gYmVnaW5dOworICAgIFtDQVRyYW5zYWN0aW9uIHNl dERpc2FibGVBY3Rpb25zOllFU107CisgICAgCisgICAgaWYgKG1fcGFnZU92ZXJsYXlQbGF0Zm9y bUxheWVyKQorICAgICAgICBbbV9wYWdlT3ZlcmxheVBsYXRmb3JtTGF5ZXIuZ2V0KCkgcmVtb3Zl RnJvbVN1cGVybGF5ZXJdOworCisgICAgW21fcm9vdExheWVyLmdldCgpIGFkZFN1YmxheWVyOm1f cGFnZU92ZXJsYXlMYXllci0+cGxhdGZvcm1MYXllcigpXTsKKyAgICAKKyAgICBbQ0FUcmFuc2Fj dGlvbiBjb21taXRdOworCisgICAgaWYgKFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5nID0gbV9w YWdlT3ZlcmxheUxheWVyLT50aWxlZEJhY2tpbmcoKSkgeworICAgICAgICB0aWxlZEJhY2tpbmct PnNldEV4cG9zZWRSZWN0KG1fZXhwb3NlZFJlY3QpOworICAgICAgICB0aWxlZEJhY2tpbmctPnNl dENsaXBzVG9FeHBvc2VkUmVjdCghbV93ZWJQYWdlLT5tYWluRnJhbWVJc1Njcm9sbGFibGUoKSk7 CisgICAgfQorCisgICAgbV9wYWdlT3ZlcmxheVBsYXRmb3JtTGF5ZXIgPSBtX3BhZ2VPdmVybGF5 TGF5ZXItPnBsYXRmb3JtTGF5ZXIoKTsKK30KKwogVGlsZWRCYWNraW5nKiBUaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYTo6bWFpbkZyYW1lVGlsZWRCYWNraW5nKCkgY29uc3QKIHsKICAgICBG cmFtZSogZnJhbWUgPSBtX3dlYlBhZ2UtPmNvcmVQYWdlKCktPm1haW5GcmFtZSgpOwo=