22056 2008-11-03 14:47:19 -0800 Share FrameLoaderClient::transitionToCommittedForNewPage between Win/Gtk+/Qt 2009-01-30 17:57:54 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Gtk, Qt P2 Normal --- 1 zecke webkit-unassigned oldest_to_newest 97505 0 zecke 2008-11-03 14:47:19 -0800 Currently we need to copy and paste code from the windows port to get fixes, sometimes a port lags behind... Change it by sharing the implementation. 97507 1 24868 zecke 2008-11-03 14:50:45 -0800 Created attachment 24868 Define the Color::transparent in the cpp file to fix link errors Link fix required to use Color::transparent from within WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp. Some how my gcc only inlines that or such, any comment to find the real cause to resolve my link error would be welcome. 97508 2 24869 zecke 2008-11-03 14:51:58 -0800 Created attachment 24869 Move recursively setting a background color and toggling transparency to the FrameView Move the code from WebFrame to WebCore::FrameView to be able to use from the Gtk+ and the Qt build. 97509 3 24870 zecke 2008-11-03 14:54:10 -0800 Created attachment 24870 Share FrameLoaderClient::transitionToCommittedForNewPage between Win/Gtk+/Qt Create a FrameLoaderClient.cpp and provide a helper function to implement transitionToCommittedForNewPage in a cross port way. The mac port can not be switched to this implementation but this copy reduction is helping both the Qt and Gtk+ port. 98078 4 24868 darin 2008-11-09 10:15:35 -0800 Comment on attachment 24868 Define the Color::transparent in the cpp file to fix link errors This change isn't right. We do need to define these in the .cpp file; it was an error to have definitions in the header only. But the values should stay in the .h file. This is how C++ static const data members work. I'll land a corrected version. 98079 5 darin 2008-11-09 10:22:12 -0800 (In reply to comment #1) > Define the Color::transparent in the cpp file to fix link errors Landed in http://trac.webkit.org/changeset/38242 98903 6 24868 zecke 2008-11-15 16:17:06 -0800 Comment on attachment 24868 Define the Color::transparent in the cpp file to fix link errors Clearing review as Darin landed a patch which is using static const as of the various C++ FAQs. 98905 7 zecke 2008-11-15 16:18:33 -0800 The Share FrameLoaderClient::tra... patch has two build failures on Qt. One in qwebpage.cpp (calling a removed method) one in FrameLoaderClientQt.cpp (not declaring a variable name). I would fix it before landing the patch, the spirit/substance is still the same. 99022 8 24869 hausmann 2008-11-17 07:27:56 -0800 Comment on attachment 24869 Move recursively setting a background color and toggling transparency to the FrameView > +++ b/WebCore/page/FrameView.h > @@ -101,6 +101,7 @@ public: > > Color baseBackgroundColor() const; > void setBaseBackgroundColor(Color); > + void updateBackgroundRecursively(const Color&, bool); My feeling is that the second argument should have a name. But that's a minor detail. Otherwise the patch looks good. 99029 9 24870 hausmann 2008-11-17 07:53:42 -0800 Comment on attachment 24870 Share FrameLoaderClient::transitionToCommittedForNewPage between Win/Gtk+/Qt Nice cleanup! > + FrameView* frameView; > + if (isMainFrame) { > + frameView = new FrameView(frame, size); > + } else Minor coding style issue with the braces there. r+ and please fix the braces when landing :) 99150 10 ap 2008-11-18 04:59:44 -0800 I think it's a little sad that we now have code (even if a static function) in an interface class, which FrameLoaderClient is. 99159 11 24869 zecke 2008-11-18 08:06:29 -0800 Comment on attachment 24869 Move recursively setting a background color and toggling transparency to the FrameView Clear review, it got landed. 99160 12 24870 zecke 2008-11-18 08:06:47 -0800 Comment on attachment 24870 Share FrameLoaderClient::transitionToCommittedForNewPage between Win/Gtk+/Qt Clear review. 99161 13 25236 zecke 2008-11-18 08:08:46 -0800 Created attachment 25236 Kill FrameLoaderClient.cpp and move the code to Frame As suggested by Maciej, move the code to Frame. I picked the name createView. 107812 14 zecke 2009-01-30 17:57:54 -0800 Landed in r40435. 24868 2008-11-03 14:50:45 -0800 2008-11-15 16:17:06 -0800 Define the Color::transparent in the cpp file to fix link errors 0009-define-the-Color-constants-in-the-cpp-file-to-make-g.patch text/plain 2010 zecke RnJvbSAwYmM4YWExYzFjMjgwNDM1ODkxNGU1YzI1ZWVkZGU5MDY1OWY3NDdmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8emVja2VAc2Vs ZmlzaC5vcmc+CkRhdGU6IE1vbiwgMyBOb3YgMjAwOCAyMzoxMzo1NiArMDEwMApTdWJqZWN0OiBb UEFUQ0hdIGRlZmluZSB0aGUgQ29sb3IgY29uc3RhbnRzIGluIHRoZSBjcHAgZmlsZSB0byBtYWtl IGdjYyA0LjMuMiBoYXBweSB3aGVuIHVzaW5nIENvbG9yOjp0cmFuc3BhcmVudCBpbiBXZWJLaXQg Y29kZQoKICAgIFdpdGhvdXQgdGhpcyBjaGFuZ2UgSSBnZXQgbGluayBlcnJvciB3aGVuIHVzaW5n IGxpYndlYmtpdGd0ayBhbmQgdXNlCiAgICBDb2xvciBpbnNpZGUgdGhlIEd0ayBGcmFtZUxvYWRl ckNsaWVudC4KLS0tCiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNwcCB8ICAgIDcg KysrKysrKwogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5oICAgfCAgIDEyICsrKysr Ky0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuY3BwIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5jcHAKaW5kZXggM2ZmNTg5ZC4uOGNkNjE5NCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5jcHAKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5jcHAKQEAgLTM4LDYgKzM4LDEzIEBAIHVzaW5n IG5hbWVzcGFjZSBXVEY7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY29uc3QgUkdCQTMyIENv bG9yOjpibGFjayA9IDB4RkYwMDAwMDA7Citjb25zdCBSR0JBMzIgQ29sb3I6OndoaXRlID0gMHhG RkZGRkZGRjsKK2NvbnN0IFJHQkEzMiBDb2xvcjo6ZGFya0dyYXkgPSAweEZGODA4MDgwOworY29u c3QgUkdCQTMyIENvbG9yOjpncmF5ID0gMHhGRkEwQTBBMDsKK2NvbnN0IFJHQkEzMiBDb2xvcjo6 bGlnaHRHcmF5ID0gMHhGRkMwQzBDMDsKK2NvbnN0IFJHQkEzMiBDb2xvcjo6dHJhbnNwYXJlbnQg PSAweDAwMDAwMDAwOworCiBjb25zdCBSR0JBMzIgbGlnaHRlbmVkQmxhY2sgPSAweEZGNTQ1NDU0 OwogY29uc3QgUkdCQTMyIGRhcmtlbmVkV2hpdGUgPSAweEZGQUJBQkFCOwogCmRpZmYgLS1naXQg YS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmggYi9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0NvbG9yLmgKaW5kZXggZDA4ZmNlMC4uMjQ3MGQzOSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvQ29sb3IuaApAQCAtMTE5LDEyICsxMTksMTIgQEAgcHVibGljOgogCiAgICAgc3RhdGljIGJv b2wgcGFyc2VIZXhDb2xvcihjb25zdCBTdHJpbmcmIG5hbWUsIFJHQkEzMiYgcmdiKTsKIAotICAg IHN0YXRpYyBjb25zdCBSR0JBMzIgYmxhY2sgPSAweEZGMDAwMDAwOwotICAgIHN0YXRpYyBjb25z dCBSR0JBMzIgd2hpdGUgPSAweEZGRkZGRkZGOwotICAgIHN0YXRpYyBjb25zdCBSR0JBMzIgZGFy a0dyYXkgPSAweEZGODA4MDgwOwotICAgIHN0YXRpYyBjb25zdCBSR0JBMzIgZ3JheSA9IDB4RkZB MEEwQTA7Ci0gICAgc3RhdGljIGNvbnN0IFJHQkEzMiBsaWdodEdyYXkgPSAweEZGQzBDMEMwOwot ICAgIHN0YXRpYyBjb25zdCBSR0JBMzIgdHJhbnNwYXJlbnQgPSAweDAwMDAwMDAwOworICAgIHN0 YXRpYyBjb25zdCBSR0JBMzIgYmxhY2s7CisgICAgc3RhdGljIGNvbnN0IFJHQkEzMiB3aGl0ZTsK KyAgICBzdGF0aWMgY29uc3QgUkdCQTMyIGRhcmtHcmF5OworICAgIHN0YXRpYyBjb25zdCBSR0JB MzIgZ3JheTsKKyAgICBzdGF0aWMgY29uc3QgUkdCQTMyIGxpZ2h0R3JheTsKKyAgICBzdGF0aWMg Y29uc3QgUkdCQTMyIHRyYW5zcGFyZW50OwogCiBwcml2YXRlOgogICAgIFJHQkEzMiBtX2NvbG9y OwotLSAKMS41LjYuMwoK 24869 2008-11-03 14:51:58 -0800 2008-11-18 08:06:29 -0800 Move recursively setting a background color and toggling transparency to the FrameView 0010-Move-setting-the-background-color-and-transparency-t.patch text/plain 2782 zecke RnJvbSA1Y2ZkYzRlMmI5OGI4OWRhZTZiNDNhNzljNmI1NDY1MzAyNjhjMjdjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8emVja2VAc2Vs ZmlzaC5vcmc+CkRhdGU6IE1vbiwgMyBOb3YgMjAwOCAyMzoyNTowOCArMDEwMApTdWJqZWN0OiBb UEFUQ0hdIE1vdmUgc2V0dGluZyB0aGUgYmFja2dyb3VuZCBjb2xvciBhbmQgdHJhbnNwYXJlbmN5 IHRvIFdlYkNvcmUKCiAgICBBbGxvdyB0byBzaGFyZSBjb2RlIHRvIHNldCB0aGUgYmFja2dyb3Vu ZCBmcm9tIHRoZSBXaW5kb3dzIHBvcnQKICAgIFdlYkNvcmU6OkZyYW1lVmlldyB0byBhbGxvdyB0 aGUgUXQgYW5kIEd0aysgcmV1c2UgdGhhdCBjb2RlLgotLS0KIFdlYkNvcmUvcGFnZS9GcmFtZVZp ZXcuY3BwIHwgICAxMyArKysrKysrKysrKysrCiBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmggICB8 ICAgIDEgKwogV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAgICAgfCAgIDExICsrKystLS0tLS0tCiAz IGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmNwcAppbmRleCBiYjQxMTlhLi43ODM5YTQyIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMzUsNiArMzUs NyBAQAogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIKICNpbmNs dWRlICJGcmFtZUxvYWRlckNsaWVudC5oIgorI2luY2x1ZGUgIkZyYW1lVHJlZS5oIgogI2luY2x1 ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIkhUTUxEb2N1bWVudC5oIgogI2luY2x1 ZGUgIkhUTUxGcmFtZUVsZW1lbnQuaCIKQEAgLTg3MSw2ICs4NzIsMTggQEAgdm9pZCBGcmFtZVZp ZXc6OnNldEJhc2VCYWNrZ3JvdW5kQ29sb3IoQ29sb3IgYmMpCiAgICAgZC0+bV9iYXNlQmFja2dy b3VuZENvbG9yID0gYmM7CiB9CiAKK3ZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVCYWNrZ3JvdW5kUmVj dXJzaXZlbHkoY29uc3QgQ29sb3ImIGJhY2tncm91bmRDb2xvciwgYm9vbCB0cmFuc3BhcmVudCkK K3sKKyAgICBmb3IgKEZyYW1lKiBmcmFtZSA9IG1fZnJhbWUuZ2V0KCk7IGZyYW1lOyBmcmFtZSA9 IGZyYW1lLT50cmVlKCktPnRyYXZlcnNlTmV4dChtX2ZyYW1lLmdldCgpKSkgeworICAgICAgICBG cmFtZVZpZXcqIHZpZXcgPSBmcmFtZS0+dmlldygpOworICAgICAgICBpZiAoIXZpZXcpCisgICAg ICAgICAgICBjb250aW51ZTsKKworICAgICAgICB2aWV3LT5zZXRUcmFuc3BhcmVudCh0cmFuc3Bh cmVudCk7CisgICAgICAgIHZpZXctPnNldEJhc2VCYWNrZ3JvdW5kQ29sb3IoYmFja2dyb3VuZENv bG9yKTsKKyAgICB9Cit9CisKIGJvb2wgRnJhbWVWaWV3OjpzaG91bGRVcGRhdGVXaGlsZU9mZnNj cmVlbigpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGQtPm1fc2hvdWxkVXBkYXRlV2hpbGVPZmZzY3Jl ZW47CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmggYi9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmgKaW5kZXggODRhODI5Zi4uYTllYjdkNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9w YWdlL0ZyYW1lVmlldy5oCisrKyBiL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtMTAxLDYg KzEwMSw3IEBAIHB1YmxpYzoKIAogICAgIENvbG9yIGJhc2VCYWNrZ3JvdW5kQ29sb3IoKSBjb25z dDsKICAgICB2b2lkIHNldEJhc2VCYWNrZ3JvdW5kQ29sb3IoQ29sb3IpOworICAgIHZvaWQgdXBk YXRlQmFja2dyb3VuZFJlY3Vyc2l2ZWx5KGNvbnN0IENvbG9yJiwgYm9vbCk7CiAKICAgICBib29s IHNob3VsZFVwZGF0ZVdoaWxlT2Zmc2NyZWVuKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRTaG91bGRV cGRhdGVXaGlsZU9mZnNjcmVlbihib29sKTsKZGlmZiAtLWdpdCBhL1dlYktpdC93aW4vV2ViRnJh bWUuY3BwIGIvV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAKaW5kZXggNzAxZDFhYi4uMzIyNGExMCAx MDA2NDQKLS0tIGEvV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAKKysrIGIvV2ViS2l0L3dpbi9XZWJG cmFtZS5jcHAKQEAgLTIwMzYsMTMgKzIwMzYsMTAgQEAgdm9pZCBXZWJGcmFtZTo6dXBkYXRlQmFj a2dyb3VuZCgpCiB7CiAgICAgQ29sb3IgYmFja2dyb3VuZENvbG9yID0gd2ViVmlldygpLT50cmFu c3BhcmVudCgpID8gQ29sb3I6OnRyYW5zcGFyZW50IDogQ29sb3I6OndoaXRlOwogICAgIEZyYW1l KiBjb3JlRnJhbWUgPSBjb3JlKHRoaXMpOwotICAgIGZvciAoRnJhbWUqIGZyYW1lID0gY29yZUZy YW1lOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLT50cmF2ZXJzZU5leHQoY29yZUZyYW1l KSkgewotICAgICAgICBGcmFtZVZpZXcqIHZpZXcgPSBmcmFtZS0+dmlldygpOwotICAgICAgICBp ZiAoIXZpZXcpCi0gICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICB2aWV3LT5zZXRUcmFu c3BhcmVudCh3ZWJWaWV3KCktPnRyYW5zcGFyZW50KCkpOwotICAgICAgICB2aWV3LT5zZXRCYXNl QmFja2dyb3VuZENvbG9yKGJhY2tncm91bmRDb2xvcik7Ci0gICAgfQorICAgIGlmICghY29yZUZy YW1lIHx8ICFjb3JlRnJhbWUtPnZpZXcoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgY29yZUZy YW1lLT52aWV3KCktPnVwZGF0ZUJhY2tncm91bmRSZWN1cnNpdmVseShiYWNrZ3JvdW5kQ29sb3Is IHdlYlZpZXcoKS0+dHJhbnNwYXJlbnQoKSk7CiB9CiAKLS0gCjEuNS42LjMKCg== 24870 2008-11-03 14:54:10 -0800 2008-11-18 08:06:47 -0800 Share FrameLoaderClient::transitionToCommittedForNewPage between Win/Gtk+/Qt 0011-Attempt-to-share-transitionToCommittedForNewPage-of.patch text/plain 14736 zecke RnJvbSBkZDA5YjlkYjdlODg4MThkOWM3MzU0ZWI3MjMyODM4NTJkMmY4MGU4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8emVja2VAc2Vs ZmlzaC5vcmc+CkRhdGU6IE1vbiwgMyBOb3YgMjAwOCAyMzozMzo1NiArMDEwMApTdWJqZWN0OiBb UEFUQ0hdIEF0dGVtcHQgdG8gc2hhcmUgdHJhbnNpdGlvblRvQ29tbWl0dGVkRm9yTmV3UGFnZSBv ZiBGcmFtZUxvYWRlckNsaWVudCB3aXRoIHRoZSBkaWZmZXJlbnQgcG9ydHMKCiAgICBBZnRlciBI eWF0dCdzIHdvcmsgb24gV2lkZ2V0IGFuZCBTY3JvbGxWaWV3IHRoZXJlIGlzIGxpdHRsZSBkaWZm ZXJlbmNlCiAgICBiZXR3ZWVuIHRoZSBpbXBsZW1lbnRhdGlvbiBvZiBRdCwgR3RrKyBhbmQgV2lu LiBJbiBmYWN0IGFueSBraW5kIG9mCiAgICBkaWZmZXJlbmNlIGlzIG1vc3RseSBhIGJ1Zy4gQWxw IGhhcyBmaXhlZCB0d28gb2Ygc3VjaCBlcnJvcnMgZm9yIHRoZSBHdGsrCiAgICBwb3J0IGFuZCB0 aGUgUXQgcG9ydCBoYXMgYXQgbGVhc3Qgb25lIG9mIHRoZW0gbGVmdC4KCiAgICBUaGUgb25seSBk aWZmZXJlbmNlIGJldHdlZW4gdGhlIGltcGxlbWVudGF0aW9ucyBpcyBpbiBnZXR0aW5nIHRoZSB0 aGUKICAgIEludFNpemUgZm9yIHRoZSBuZXcgRnJhbWVWaWV3LCB0aGUgYmFja2dyb3VuZCBjb2xv ciB0byBiZSBhcHBsaWVkIGFuZAogICAgZXZlbnR1YWxseSBzb21lIHBvc3QgcHJvY2Vzc2luZy4K CiAgICBVbmlmeSB0aGUgaW1wbGVtZW50YXRpb25zIGJ5IHByb3ZpZGluZyBhIHN0YXRpYyBoZWxw ZXIgZnVuY3Rpb24gdGhhdAogICAgdGFrZXMgYSBGcmFtZSwgSW50U2l6ZSwgY29sb3IgYW5kIHRy YW5zcGFyZW5jeSBiaXQgYW5kIGNhbGxpbmcgaXQgZnJvbQogICAgdGhlIEd0ayssIHRoZSBRdCBh bmQgdGhlIFdpbmRvd3MgcG9ydC4KLS0tCiBXZWJDb3JlL0dOVW1ha2VmaWxlLmFtICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB8ICAgIDEgKwogV2ViQ29yZS9XZWJDb3JlLnBybyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAxICsKIFdlYkNvcmUvV2ViQ29yZS52Y3Byb2ov V2ViQ29yZS52Y3Byb2ogICAgICAgICAgICAgIHwgICAgNCArCiBXZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlckNsaWVudC5jcHAgICAgICAgICAgICAgICB8ICAgODMgKysrKysrKysrKysrKysrKysr KysKIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmggICAgICAgICAgICAgICAgIHwg ICAgNiArLQogV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5j cHAgfCAgIDQzICsrKy0tLS0tLS0KIFdlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCAgICAgICAg ICAgICAgICAgICAgICAgIHwgICAxMyAtLS0KIFdlYktpdC9xdC9BcGkvcXdlYmZyYW1lX3AuaCAg ICAgICAgICAgICAgICAgICAgICAgIHwgICAgMiAtCiBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRRdC5jcHAgICB8ICAgMjcgKy0tLS0tCiBXZWJLaXQvd2luL1dlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCB8ICAgNDEgKystLS0tLS0tLQogMTAg ZmlsZXMgY2hhbmdlZCwgMTE3IGluc2VydGlvbnMoKyksIDEwNCBkZWxldGlvbnMoLSkKIGNyZWF0 ZSBtb2RlIDEwMDY0NCBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5jcHAKCmRpZmYg LS1naXQgYS9XZWJDb3JlL0dOVW1ha2VmaWxlLmFtIGIvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQpp bmRleCBmMGQxNzJiLi5hNWYxM2VkIDEwMDY0NAotLS0gYS9XZWJDb3JlL0dOVW1ha2VmaWxlLmFt CisrKyBiL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0KQEAgLTEwMTYsNiArMTAxNiw3IEBAIHdlYmNv cmVfc291cmNlcyArPSBcCiAJV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIFwKIAlXZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5oIFwKIAlXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNs aWVudC5oIFwKKwlXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5jcHAgXAogCVdlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyVHlwZXMuaCBcCiAJV2ViQ29yZS9sb2FkZXIvSW1hZ2VEb2N1 bWVudC5jcHAgXAogCVdlYkNvcmUvbG9hZGVyL0ltYWdlRG9jdW1lbnQuaCBcCmRpZmYgLS1naXQg YS9XZWJDb3JlL1dlYkNvcmUucHJvIGIvV2ViQ29yZS9XZWJDb3JlLnBybwppbmRleCAwYWM2YTBj Li5mOTRiM2M4IDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNvcmUucHJvCisrKyBiL1dlYkNvcmUv V2ViQ29yZS5wcm8KQEAgLTc0MCw2ICs3NDAsNyBAQCBTT1VSQ0VTICs9IFwKICAgICBsb2FkZXIv RG9jdW1lbnRMb2FkZXIuY3BwIFwKICAgICBsb2FkZXIvRm9ybVN0YXRlLmNwcCBcCiAgICAgbG9h ZGVyL0ZyYW1lTG9hZGVyLmNwcCBcCisgICAgbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmNwcCBc CiAgICAgbG9hZGVyL0ZUUERpcmVjdG9yeURvY3VtZW50LmNwcCBcCiAgICAgbG9hZGVyL0ZUUERp cmVjdG9yeVBhcnNlci5jcHAgXAogICAgIGxvYWRlci9pY29uL0ljb25Mb2FkZXIuY3BwIFwKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2ogYi9XZWJDb3Jl L1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCmluZGV4IGY4ODkxMGUuLmVhMWYwMzUgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKKysrIGIvV2Vi Q29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagpAQCAtMjcyMCw2ICsyNzIwLDEwIEBA CiAJCQkJPg0KIAkJCTwvRmlsZT4NCiAJCQk8RmlsZQ0KKwkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGxv YWRlclxGcmFtZUxvYWRlckNsaWVudC5jcHAiDQorCQkJCT4NCisJCQk8L0ZpbGU+DQorCQkJPEZp bGUNCiAJCQkJUmVsYXRpdmVQYXRoPSIuLlxsb2FkZXJcRnJhbWVMb2FkZXJUeXBlcy5oIg0KIAkJ CQk+DQogCQkJPC9GaWxlPg0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy Q2xpZW50LmNwcCBiL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmNwcApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43OGQ2YWU2Ci0tLSAvZGV2L251bGwKKysrIGIv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBAIC0wLDAgKzEsODMgQEAKKy8q CisgKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcsIDIwMDggQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA4IEhvbGdlciBIYW5zIFBldGVyIEZyZXl0 aGVyCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKgorICog MS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUg Y29weXJpZ2h0CisgKiAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyLiAKKyAqIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5 IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0 aGUKKyAqICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQg d2l0aCB0aGUgZGlzdHJpYnV0aW9uLiAKKyAqIDMuICBOZWl0aGVyIHRoZSBuYW1lIG9mIEFwcGxl IENvbXB1dGVyLCBJbmMuICgiQXBwbGUiKSBub3IgdGhlIG5hbWVzIG9mCisgKiAgICAgaXRzIGNv bnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVy aXZlZAorICogICAgIGZyb20gdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdy aXR0ZW4gcGVybWlzc2lvbi4gCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBB UFBMRSBBTkQgSVRTIENPTlRSSUJVVE9SUyAiQVMgSVMiIEFORCBBTlkKKyAqIEVYUFJFU1MgT1Ig SU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElN UExJRUQKKyAqIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBB IFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUKKyAqIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxM IEFQUExFIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkKKyAqIERJUkVDVCwg SU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElB TCBEQU1BR0VTCisgKiAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5U IE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7CisgKiBMT1NTIE9GIFVTRSwgREFUQSwg T1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQK KyAqIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJ Q1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YKKyAqIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisg Ki8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUgIkZyYW1lTG9hZGVyQ2xpZW50Lmgi CisKKyNpbmNsdWRlICJDb2xvci5oIgorI2luY2x1ZGUgIkZyYW1lLmgiCisjaW5jbHVkZSAiRnJh bWVWaWV3LmgiCisjaW5jbHVkZSAiSFRNTEZyYW1lT3duZXJFbGVtZW50LmgiCisjaW5jbHVkZSAi UGFnZS5oIgorI2luY2x1ZGUgIlJlbmRlclBhcnQuaCIKKworbmFtZXNwYWNlIFdlYkNvcmUgewor CitGcmFtZUxvYWRlckNsaWVudDo6fkZyYW1lTG9hZGVyQ2xpZW50KCkKK3t9CisKK3ZvaWQgRnJh bWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UoRnJhbWUqIGZy YW1lLCBjb25zdCBJbnRTaXplJiBzaXplLCBjb25zdCBDb2xvciYgYmFja2dyb3VuZENvbG9yLCBi b29sIHRyYW5zcGFyZW50KQoreworICAgIEFTU0VSVChmcmFtZSk7CisKKyAgICBQYWdlKiBwYWdl ID0gZnJhbWUtPnBhZ2UoKTsKKyAgICBBU1NFUlQocGFnZSk7CisKKyAgICBib29sIGlzTWFpbkZy YW1lID0gZnJhbWUgPT0gcGFnZS0+bWFpbkZyYW1lKCk7CisKKyAgICBpZiAoaXNNYWluRnJhbWUg JiYgZnJhbWUtPnZpZXcoKSkKKyAgICAgICAgZnJhbWUtPnZpZXcoKS0+c2V0UGFyZW50VmlzaWJs ZShmYWxzZSk7CisKKyAgICBmcmFtZS0+c2V0VmlldygwKTsKKworICAgIEZyYW1lVmlldyogZnJh bWVWaWV3OworICAgIGlmIChpc01haW5GcmFtZSkgeworICAgICAgICBmcmFtZVZpZXcgPSBuZXcg RnJhbWVWaWV3KGZyYW1lLCBzaXplKTsKKyAgICB9IGVsc2UKKyAgICAgICAgZnJhbWVWaWV3ID0g bmV3IEZyYW1lVmlldyhmcmFtZSk7CisKKyAgICBmcmFtZS0+c2V0VmlldyhmcmFtZVZpZXcpOwor ICAgIC8vIEZyYW1lVmlld3MgYXJlIGNyZWF0ZWQgd2l0aCBhIHJlZiBjb3VudCBvZiAxLiBSZWxl YXNlIHRoaXMgcmVmIHNpbmNlIHdlJ3ZlIGFzc2lnbmVkIGl0IHRvIGZyYW1lLgorICAgIGZyYW1l Vmlldy0+ZGVyZWYoKTsKKworICAgIGlmICghYmFja2dyb3VuZENvbG9yLmlzVmFsaWQoKSkKKyAg ICAgICAgZnJhbWVWaWV3LT51cGRhdGVCYWNrZ3JvdW5kUmVjdXJzaXZlbHkoYmFja2dyb3VuZENv bG9yLCB0cmFuc3BhcmVudCk7CisKKyAgICBpZiAoaXNNYWluRnJhbWUpCisgICAgICAgIGZyYW1l Vmlldy0+c2V0UGFyZW50VmlzaWJsZSh0cnVlKTsKKworICAgIGlmIChmcmFtZS0+b3duZXJSZW5k ZXJlcigpKQorICAgICAgICBmcmFtZS0+b3duZXJSZW5kZXJlcigpLT5zZXRXaWRnZXQoZnJhbWVW aWV3KTsKKworICAgIGlmIChIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyID0gZnJhbWUtPm93 bmVyRWxlbWVudCgpKQorICAgICAgICBmcmFtZS0+dmlldygpLT5zZXRDYW5IYXZlU2Nyb2xsYmFy cyhvd25lci0+c2Nyb2xsaW5nTW9kZSgpICE9IFNjcm9sbGJhckFsd2F5c09mZik7Cit9CisKK30K KwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaCBiL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggZTU0NTRmZS4uNmQ3NDcxZCAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9XZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCkBAIC00NSw2ICs0NSw3IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAogICAgIGNsYXNzIEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOwogICAgIGNsYXNz IENhY2hlZFBhZ2U7CisgICAgY2xhc3MgQ29sb3I7CiAgICAgY2xhc3MgRG9jdW1lbnRMb2FkZXI7 CiAgICAgY2xhc3MgRWxlbWVudDsKICAgICBjbGFzcyBGb3JtU3RhdGU7CkBAIC03MCw3ICs3MSw3 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIGNsYXNzIEZyYW1lTG9hZGVyQ2xpZW50IHsK ICAgICBwdWJsaWM6Ci0gICAgICAgIHZpcnR1YWwgfkZyYW1lTG9hZGVyQ2xpZW50KCkgeyB9Cisg ICAgICAgIHZpcnR1YWwgfkZyYW1lTG9hZGVyQ2xpZW50KCk7CiAgICAgICAgIHZpcnR1YWwgdm9p ZCBmcmFtZUxvYWRlckRlc3Ryb3llZCgpID0gMDsKICAgICAgICAgCiAgICAgICAgIHZpcnR1YWwg Ym9vbCBoYXNXZWJWaWV3KCkgY29uc3QgPSAwOyAvLyBtYWlubHkgZm9yIGFzc2VydGlvbnMKQEAg LTIwNSw2ICsyMDYsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAjZW5kaWYKICAgICAgICAgdmly dHVhbCBOU0NhY2hlZFVSTFJlc3BvbnNlKiB3aWxsQ2FjaGVSZXNwb25zZShEb2N1bWVudExvYWRl ciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgTlNDYWNoZWRVUkxSZXNwb25zZSopIGNvbnN0 ID0gMDsKICNlbmRpZgorCisgICAgcHJvdGVjdGVkOgorICAgICAgICBzdGF0aWMgdm9pZCB0cmFu c2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKEZyYW1lKiwgY29uc3QgSW50U2l6ZSYsIGNvbnN0 IENvbG9yJiwgYm9vbCk7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0t Z2l0IGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAg Yi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcAppbmRl eCA5ZjE1NjI2Li4xNjE5OWI0IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcApAQCAtMjIsNiArMjIsNyBAQAogI2luY2x1ZGUgImNv bmZpZy5oIgogI2luY2x1ZGUgIkZyYW1lTG9hZGVyQ2xpZW50R3RrLmgiCiAKKyNpbmNsdWRlICJD b2xvci5oIgogI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2Fk ZXIuaCIKICNpbmNsdWRlICJGcmFtZVZpZXcuaCIKQEAgLTc1Myw0MiArNzU0LDIyIEBAIHZvaWQg RnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZyb21DYWNoZWRQYWdlKENh Y2hlZFBhZ2UqKQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0 ZWRGb3JOZXdQYWdlKCkKIHsKKyAgICBXZWJLaXRXZWJWaWV3KiBjb250YWluaW5nV2luZG93ID0g Z2V0Vmlld0Zyb21GcmFtZShtX2ZyYW1lKTsKKyAgICBJbnRTaXplIHNpemUgPSBJbnRTaXplKEdU S19XSURHRVQoY29udGFpbmluZ1dpbmRvdyktPmFsbG9jYXRpb24ud2lkdGgsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICBHVEtfV0lER0VUKGNvbnRhaW5pbmdXaW5kb3cpLT5hbGxvY2F0aW9u LmhlaWdodCk7CisgICAgYm9vbCB0cmFuc3BhcmVudCA9IHdlYmtpdF93ZWJfdmlld19nZXRfdHJh bnNwYXJlbnQoY29udGFpbmluZ1dpbmRvdyk7CisgICAgQ29sb3IgYmFja2dyb3VuZENvbG9yID0g dHJhbnNwYXJlbnQgPyBXZWJDb3JlOjpDb2xvcjo6dHJhbnNwYXJlbnQgOiBXZWJDb3JlOjpDb2xv cjo6d2hpdGU7CiAgICAgRnJhbWUqIGZyYW1lID0gY29yZShtX2ZyYW1lKTsKICAgICBBU1NFUlQo ZnJhbWUpOwogCi0gICAgUGFnZSogcGFnZSA9IGZyYW1lLT5wYWdlKCk7Ci0gICAgQVNTRVJUKHBh Z2UpOwotCi0gICAgV2ViS2l0V2ViVmlldyogY29udGFpbmluZ1dpbmRvdyA9IGdldFZpZXdGcm9t RnJhbWUobV9mcmFtZSk7Ci0gICAgYm9vbCBpc01haW5GcmFtZSA9IGZyYW1lID09IHBhZ2UtPm1h aW5GcmFtZSgpOwotCi0gICAgaWYgKGlzTWFpbkZyYW1lICYmIGZyYW1lLT52aWV3KCkpCi0gICAg ICAgIGZyYW1lLT52aWV3KCktPnNldFBhcmVudFZpc2libGUoZmFsc2UpOwotCi0gICAgZnJhbWUt PnNldFZpZXcoMCk7CisgICAgV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25U b0NvbW1pdHRlZEZvck5ld1BhZ2UoZnJhbWUsIHNpemUsIGJhY2tncm91bmRDb2xvciwgdHJhbnNw YXJlbnQpOwogCi0gICAgRnJhbWVWaWV3KiBmcmFtZVZpZXc7Ci0gICAgaWYgKGlzTWFpbkZyYW1l KSB7Ci0gICAgICAgIEludFNpemUgc2l6ZSA9IEludFNpemUoR1RLX1dJREdFVChjb250YWluaW5n V2luZG93KS0+YWxsb2NhdGlvbi53aWR0aCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBHVEtfV0lER0VUKGNvbnRhaW5pbmdXaW5kb3cpLT5hbGxvY2F0aW9uLmhlaWdodCk7Ci0gICAg ICAgIGZyYW1lVmlldyA9IG5ldyBGcmFtZVZpZXcoZnJhbWUsIHNpemUpOwotICAgICAgICBXZWJL aXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IFdFQktJVF9XRUJfVklFV19HRVRfUFJJVkFURShjb250 YWluaW5nV2luZG93KTsKLSAgICAgICAgZnJhbWVWaWV3LT5zZXRHdGtBZGp1c3RtZW50cyhwcml2 LT5ob3Jpem9udGFsQWRqdXN0bWVudCwgcHJpdi0+dmVydGljYWxBZGp1c3RtZW50KTsKLSAgICB9 IGVsc2UKLSAgICAgICAgZnJhbWVWaWV3ID0gbmV3IEZyYW1lVmlldyhmcmFtZSk7Ci0KLSAgICBm cmFtZS0+c2V0VmlldyhmcmFtZVZpZXcpOwotICAgIC8vIEZyYW1lVmlld3MgYXJlIGNyZWF0ZWQg d2l0aCBhIHJlZiBjb3VudCBvZiAxLiBSZWxlYXNlIHRoaXMgcmVmIHNpbmNlIHdlJ3ZlIGFzc2ln bmVkIGl0IHRvIGZyYW1lLgotICAgIGZyYW1lVmlldy0+ZGVyZWYoKTsKLQotICAgIGlmIChpc01h aW5GcmFtZSkKLSAgICAgICAgZnJhbWVWaWV3LT5zZXRQYXJlbnRWaXNpYmxlKHRydWUpOwotCi0g ICAgaWYgKGZyYW1lLT5vd25lclJlbmRlcmVyKCkpCi0gICAgICAgIGZyYW1lLT5vd25lclJlbmRl cmVyKCktPnNldFdpZGdldChmcmFtZVZpZXcpOwotCi0gICAgaWYgKCFmcmFtZS0+b3duZXJFbGVt ZW50KCkpCisgICAgLy8gV2UgbmVlZCB0byBkbyBmdXJ0aGVyIG1hbmlwdWxhdGlvbiBvbiB0aGUg RnJhbWVWaWV3IGlmIGl0IHdhcyB0aGUgbWFpbkZyYW1lCisgICAgaWYgKGZyYW1lICE9IGZyYW1l LT5wYWdlKCktPm1haW5GcmFtZSgpKQogICAgICAgICByZXR1cm47CisKKyAgICBXZWJLaXRXZWJW aWV3UHJpdmF0ZSogcHJpdiA9IFdFQktJVF9XRUJfVklFV19HRVRfUFJJVkFURShjb250YWluaW5n V2luZG93KTsKKyAgICBmcmFtZS0+dmlldygpLT5zZXRHdGtBZGp1c3RtZW50cyhwcml2LT5ob3Jp em9udGFsQWRqdXN0bWVudCwgcHJpdi0+dmVydGljYWxBZGp1c3RtZW50KTsKIH0KIAogfQpkaWZm IC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2Vi ZnJhbWUuY3BwCmluZGV4IDQ2ZGNmZTMuLmFhZTBkNmYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9B cGkvcXdlYmZyYW1lLmNwcAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKQEAgLTEx NiwxOSArMTE2LDYgQEAgV2ViQ29yZTo6U2Nyb2xsYmFyKiBRV2ViRnJhbWVQcml2YXRlOjp2ZXJ0 aWNhbFNjcm9sbEJhcigpIGNvbnN0CiAgICAgcmV0dXJuIGZyYW1lLT52aWV3KCktPnZlcnRpY2Fs U2Nyb2xsYmFyKCk7CiB9CiAKLXZvaWQgUVdlYkZyYW1lUHJpdmF0ZTo6dXBkYXRlQmFja2dyb3Vu ZCgpCi17Ci0gICAgV2ViQ29yZTo6RnJhbWVWaWV3ICp2aWV3ID0gZnJhbWUtPnZpZXcoKTsKLSAg ICBpZiAoIXZpZXcpCi0gICAgICAgIHJldHVybjsKLSAgICBRQnJ1c2ggYnJ1c2ggPSBwYWdlLT5w YWxldHRlKCkuYnJ1c2goUVBhbGV0dGU6OkJhY2tncm91bmQpOwotICAgIGlmIChicnVzaC5zdHls ZSgpID09IFF0OjpTb2xpZFBhdHRlcm4pIHsKLSAgICAgICAgdmlldy0+c2V0QmFzZUJhY2tncm91 bmRDb2xvcihicnVzaC5jb2xvcigpKTsKLSAgICAgICAgaWYgKCFicnVzaC5jb2xvcigpLmFscGhh KCkpCi0gICAgICAgICAgICB2aWV3LT5zZXRUcmFuc3BhcmVudCh0cnVlKTsKLSAgICB9Ci19Ci0K IC8qIQogICAgIFxjbGFzcyBRV2ViRnJhbWUKICAgICBcc2luY2UgNC40CmRpZmYgLS1naXQgYS9X ZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZV9wLmggYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZV9wLmgK aW5kZXggMmI0OTdlNi4uMTRmNjljZCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJh bWVfcC5oCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lX3AuaApAQCAtNzgsOCArNzgsNiBA QCBwdWJsaWM6CiAgICAgUXQ6OlNjcm9sbEJhclBvbGljeSBob3Jpem9udGFsU2Nyb2xsQmFyUG9s aWN5OwogICAgIFF0OjpTY3JvbGxCYXJQb2xpY3kgdmVydGljYWxTY3JvbGxCYXJQb2xpY3k7IAog Ci0gICAgdm9pZCB1cGRhdGVCYWNrZ3JvdW5kKCk7Ci0KICAgICBzdGF0aWMgV2ViQ29yZTo6RnJh bWUqIGNvcmUoUVdlYkZyYW1lKik7CiAgICAgc3RhdGljIFFXZWJGcmFtZSoga2l0KFdlYkNvcmU6 OkZyYW1lKik7CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxv YWRlckNsaWVudFF0LmNwcCBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNs aWVudFF0LmNwcAppbmRleCA5YzdiNGZmLi5iOTU1ZGFjIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQv V2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKKysrIGIvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCkBAIC0zLDYgKzMsNyBAQAogICog Q29weXJpZ2h0IChDKSAyMDA2IEFwcGxlIENvbXB1dGVyLCBJbmMuICBBbGwgcmlnaHRzIHJlc2Vy dmVkLgogICogQ29weXJpZ2h0IChDKSAyMDA4IE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMg c3Vic2lkaWFyeSgtaWVzKQogICogQ29weXJpZ2h0IChDKSAyMDA4IENvbGxhYm9yYSBMdGQuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3lwcmlnaHQgKEMpIDIwMDggSG9sZ2VyIEhhbnMgUGV0 ZXIgRnJleXRoZXIKICAqCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKQEAgLTIxMCwyOCAr MjExLDEwIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6dHJhbnNpdGlvblRvQ29tbWl0dGVk Rm9yTmV3UGFnZSgpCiAgICAgQVNTRVJUKG1fZnJhbWUpOwogICAgIEFTU0VSVChtX3dlYkZyYW1l KTsKIAotICAgIFBhZ2UqIHBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCk7Ci0gICAgQVNTRVJUKHBhZ2Up OwotCi0gICAgYm9vbCBpc01haW5GcmFtZSA9IG1fZnJhbWUgPT0gcGFnZS0+bWFpbkZyYW1lKCk7 Ci0KLSAgICBtX2ZyYW1lLT5zZXRWaWV3KDApOwotCi0gICAgRnJhbWVWaWV3KiBmcmFtZVZpZXc7 Ci0gICAgaWYgKGlzTWFpbkZyYW1lKQotICAgICAgICBmcmFtZVZpZXcgPSBuZXcgRnJhbWVWaWV3 KG1fZnJhbWUsIG1fd2ViRnJhbWUtPnBhZ2UoKS0+dmlld3BvcnRTaXplKCkpOwotICAgIGVsc2UK LSAgICAgICAgZnJhbWVWaWV3ID0gbmV3IEZyYW1lVmlldyhtX2ZyYW1lKTsKLQotICAgIG1fZnJh bWUtPnNldFZpZXcoZnJhbWVWaWV3KTsKLSAgICAvLyBGcmFtZVZpZXdzIGFyZSBjcmVhdGVkIHdp dGggYSByZWYgY291bnQgb2YgMS4gUmVsZWFzZSB0aGlzIHJlZiBzaW5jZSB3ZSd2ZSBhc3NpZ25l ZCBpdCB0byBmcmFtZS4KLSAgICBmcmFtZVZpZXctPmRlcmVmKCk7Ci0KLSAgICBpZiAobV93ZWJG cmFtZSAmJiBtX3dlYkZyYW1lLT5wYWdlKCkpCi0gICAgICAgIG1fd2ViRnJhbWUtPmQtPnVwZGF0 ZUJhY2tncm91bmQoKTsKLQotICAgIGlmIChtX2ZyYW1lLT5vd25lclJlbmRlcmVyKCkpCi0gICAg ICAgIG1fZnJhbWUtPm93bmVyUmVuZGVyZXIoKS0+c2V0V2lkZ2V0KGZyYW1lVmlldyk7CisgICAg UUJydXNoID0gbV93ZWJGcmFtZS0+cGFnZSgpLT5wYWxldHRlKCkuYnJ1c2goUVBhbGV0dGU6OkJh Y2tncm91bmQpOworICAgIFFDb2xvciBiYWNrZ3JvdW5kQ29sb3IgPSBicnVzaC5zdHlsZSgpID09 IFF0OjpTb2xpZFBhdHRlcm4gPyBicnVzaC5jb2xvcigpIDogUUNvbG9yKCk7CisgICAgV2ViQ29y ZTo6RnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UobV9m cmFtZSwgbV93ZWJGcmFtZS0+cGFnZSgpLT52aWV3cG9ydFNpemUoKSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiYWNrZ3Jv dW5kQ29sb3IsICFiYWNrZ3JvdW5kQ29sb3IuYWxwaGEoKSk7CiB9CiAKIApkaWZmIC0tZ2l0IGEv V2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9XZWJL aXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCAxN2Jl ZTQ3Li44YjIwNDhhIDEwMDY0NAotLS0gYS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtNDc4LDQyICs0NzgsMTMgQEAgdm9pZCBXZWJGcmFtZUxv YWRlckNsaWVudDo6c2F2ZVBsYXRmb3JtRGF0YVRvQ2FjaGVkUGFnZShDYWNoZWRQYWdlKiBjYWNo ZWRQYWdlKQogCiB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0 ZWRGb3JOZXdQYWdlKCkKIHsKLSAgICBGcmFtZSogZnJhbWUgPSBjb3JlKG1fd2ViRnJhbWUpOwot ICAgIEFTU0VSVChmcmFtZSk7Ci0KLSAgICBQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2UoKTsKLSAg ICBBU1NFUlQocGFnZSk7Ci0KLSAgICBib29sIGlzTWFpbkZyYW1lID0gZnJhbWUgPT0gcGFnZS0+ bWFpbkZyYW1lKCk7Ci0KLSAgICBpZiAoaXNNYWluRnJhbWUgJiYgZnJhbWUtPnZpZXcoKSkKLSAg ICAgICAgZnJhbWUtPnZpZXcoKS0+c2V0UGFyZW50VmlzaWJsZShmYWxzZSk7Ci0KLSAgICBmcmFt ZS0+c2V0VmlldygwKTsKLQotICAgIFdlYlZpZXcqIHdlYlZpZXcgPSBtX3dlYkZyYW1lLT53ZWJW aWV3KCk7Ci0KLSAgICBGcmFtZVZpZXcqIGZyYW1lVmlldzsKLSAgICBpZiAoaXNNYWluRnJhbWUp IHsKLSAgICAgICAgUkVDVCByZWN0OwotICAgICAgICB3ZWJWaWV3LT5mcmFtZVJlY3QoJnJlY3Qp OwotICAgICAgICBmcmFtZVZpZXcgPSBuZXcgRnJhbWVWaWV3KGZyYW1lLCBJbnRSZWN0KHJlY3Qp LnNpemUoKSk7Ci0gICAgfSBlbHNlCi0gICAgICAgIGZyYW1lVmlldyA9IG5ldyBGcmFtZVZpZXco ZnJhbWUpOwotCi0gICAgZnJhbWUtPnNldFZpZXcoZnJhbWVWaWV3KTsKLSAgICBmcmFtZVZpZXct PmRlcmVmKCk7IC8vIEZyYW1lVmlld3MgYXJlIGNyZWF0ZWQgd2l0aCBhIHJlZiBjb3VudCBvZiAx LiBSZWxlYXNlIHRoaXMgcmVmIHNpbmNlIHdlJ3ZlIGFzc2lnbmVkIGl0IHRvIGZyYW1lLgotCi0g ICAgbV93ZWJGcmFtZS0+dXBkYXRlQmFja2dyb3VuZCgpOwotCi0gICAgaWYgKGlzTWFpbkZyYW1l KQotICAgICAgICBmcmFtZVZpZXctPnNldFBhcmVudFZpc2libGUodHJ1ZSk7Ci0KLSAgICBpZiAo ZnJhbWUtPm93bmVyUmVuZGVyZXIoKSkKLSAgICAgICAgZnJhbWUtPm93bmVyUmVuZGVyZXIoKS0+ c2V0V2lkZ2V0KGZyYW1lVmlldyk7CisgICAgV2ViVmlldyogdmlldyA9IG1fd2ViRnJhbWUtPndl YlZpZXcoKTsKIAotICAgIGlmIChIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyID0gZnJhbWUt Pm93bmVyRWxlbWVudCgpKQotICAgICAgICBmcmFtZS0+dmlldygpLT5zZXRDYW5IYXZlU2Nyb2xs YmFycyhvd25lci0+c2Nyb2xsaW5nTW9kZSgpICE9IFNjcm9sbGJhckFsd2F5c09mZik7CisgICAg UkVDVCByZWN0OworICAgIHdlYlZpZXctPmZyYW1lUmVjdCgmcmVjdCk7CisgICAgYm9vbCB0cmFu c3BhcmVudCA9IHdlYlZpZXctPnRyYW5zcGFyZW50KCk7CisgICAgQ29sb3IgYmFja2dyb3VuZENv bG9yID0gdHJhbnNwYXJlbnQgPyBDb2xvcjo6dHJhbnNwYXJlbnQgOiBDb2xvcjo6d2hpdGU7Cisg ICAgV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5l d1BhZ2UoY29yZShtX3dlYkZyYW1lKSwgSW50UmVjdChyZWN0KS5zaXplKCksIGJhY2tncm91bmRD b2xvciwgdHJhbnNwYXJlbnQpOwogfQogCiBib29sIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjYW5D YWNoZVBhZ2UoKSBjb25zdAotLSAKMS41LjYuMwoK 25236 2008-11-18 08:08:46 -0800 2008-12-16 02:42:04 -0800 Kill FrameLoaderClient.cpp and move the code to Frame create-frame-createView.patch text/plain 13622 zecke Y29tbWl0IGE3NmQ1YmIyNTk3NTU0YjA3ODVkMTNkODZlYTgwMWExZTExZjhjNjYKQXV0aG9yOiBI b2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8emVja2VAc2VsZmlzaC5vcmc+CkRhdGU6ICAgVHVl IE5vdiAxOCAxNzowMDoyMCAyMDA4ICswMTAwCgogICAgS2lsbCBGcmFtZUxvYWRlckNsaWVudCBt b3ZlIHRoZSBjb2RlIG92ZXIgdG8gRnJhbWU6OmNyZWF0ZVZpZXcKICAgIAogICAgICAgIEZyYW1l TG9hZGVyQ2xpZW50IGlzIHN1cHBvc2VkIHRvIGJlIGEgaW50ZXJmYWNlLCBtb3ZlIHRoZQogICAg ICAgIHRvIGJlIHNoYXJlZCBjb2RlIHRvIEZyYW1lIHdoaWNoIGlzIGEgY29udHJvbGxlciBhbmQg aXMKICAgICAgICBhbGxvd2VkIHRvIGNyZWF0ZSBhIEZyYW1lVmlldy4KCmRpZmYgLS1naXQgYS9X ZWJDb3JlL0dOVW1ha2VmaWxlLmFtIGIvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQppbmRleCBkNGQ5 MGJiLi43NGZhNjdhIDEwMDY0NAotLS0gYS9XZWJDb3JlL0dOVW1ha2VmaWxlLmFtCisrKyBiL1dl YkNvcmUvR05VbWFrZWZpbGUuYW0KQEAgLTEwMTcsNyArMTAxNyw2IEBAIHdlYmNvcmVfc291cmNl cyArPSBcCiAJV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIFwKIAlXZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5oIFwKIAlXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oIFwK LQlXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5jcHAgXAogCVdlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyVHlwZXMuaCBcCiAJV2ViQ29yZS9sb2FkZXIvSW1hZ2VEb2N1bWVudC5jcHAg XAogCVdlYkNvcmUvbG9hZGVyL0ltYWdlRG9jdW1lbnQuaCBcCmRpZmYgLS1naXQgYS9XZWJDb3Jl L1dlYkNvcmUuYmFzZS5leHAgYi9XZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAKaW5kZXggN2YyMzYz OS4uNDQ2MmZkYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhwCisrKyBiL1dl YkNvcmUvV2ViQ29yZS5iYXNlLmV4cApAQCAtMzcyLDcgKzM3Miw2IEBAIF9fWk43V2ViQ29yZTE2 Y3JlYXRlRnVsbE1hcmt1cEVQS05TXzVSYW5nZUUKIF9fWk43V2ViQ29yZTE2ZW5jbG9zaW5nSW50 UmVjdEVSSzdfTlNSZWN0CiBfX1pON1dlYkNvcmUxNmlzRW5kT2ZQYXJhZ3JhcGhFUktOU18xNVZp c2libGVQb3NpdGlvbkUKIF9fWk43V2ViQ29yZTE3RE9NSW1wbGVtZW50YXRpb24xNGlzVGV4dE1J TUVUeXBlRVJLTlNfNlN0cmluZ0UKLV9fWk43V2ViQ29yZTE3RnJhbWVMb2FkZXJDbGllbnREMkV2 CiBfX1pON1dlYkNvcmUxN0dseXBoUGFnZVRyZWVOb2RlMTh0cmVlR2x5cGhQYWdlQ291bnRFdgog X19aTjdXZWJDb3JlMTdlcXVhbElnbm9yaW5nQ2FzZUVQTlNfMTBTdHJpbmdJbXBsRVMxXwogX19a TjdXZWJDb3JlMThQbGF0Zm9ybU1vdXNlRXZlbnRDMUVQN05TRXZlbnQKZGlmZiAtLWdpdCBhL1dl YkNvcmUvV2ViQ29yZS5wcm8gYi9XZWJDb3JlL1dlYkNvcmUucHJvCmluZGV4IDAxYWRjN2UuLjgz ZjNlYzEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvV2ViQ29yZS5wcm8KKysrIGIvV2ViQ29yZS9XZWJD b3JlLnBybwpAQCAtNzUyLDcgKzc1Miw2IEBAIFNPVVJDRVMgKz0gXAogICAgIGxvYWRlci9Eb2N1 bWVudExvYWRlci5jcHAgXAogICAgIGxvYWRlci9Gb3JtU3RhdGUuY3BwIFwKICAgICBsb2FkZXIv RnJhbWVMb2FkZXIuY3BwIFwKLSAgICBsb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuY3BwIFwKICAg ICBsb2FkZXIvRlRQRGlyZWN0b3J5RG9jdW1lbnQuY3BwIFwKICAgICBsb2FkZXIvRlRQRGlyZWN0 b3J5UGFyc2VyLmNwcCBcCiAgICAgbG9hZGVyL2ljb24vSWNvbkxvYWRlci5jcHAgXApkaWZmIC0t Z2l0IGEvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvaiBiL1dlYkNvcmUvV2Vi Q29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKaW5kZXggZDczYWYzOS4uZTI3MzkzOSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagorKysgYi9XZWJDb3Jl L1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCkBAIC0yNzIwLDEwICsyNzIwLDYgQEAKIAkJ CQk+DQogCQkJPC9GaWxlPg0KIAkJCTxGaWxlDQotCQkJCVJlbGF0aXZlUGF0aD0iLi5cbG9hZGVy XEZyYW1lTG9hZGVyQ2xpZW50LmNwcCINCi0JCQkJPg0KLQkJCTwvRmlsZT4NCi0JCQk8RmlsZQ0K IAkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGxvYWRlclxGcmFtZUxvYWRlclR5cGVzLmgiDQogCQkJCT4N CiAJCQk8L0ZpbGU+DQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2ogYi9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpp bmRleCA5MmE0MTk3Li5hNWFjYmY1IDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNvcmUueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvagpAQCAtNDE3MCw3ICs0MTcwLDYgQEAKIAkJRTE0Nzk5QjQwRUNERTlEODAwMjky QkYzIC8qIFdvcmtlck1lc3NhZ2luZ1Byb3h5LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEUxNDc5OUIzMEVDREU5RDgwMDI5MkJGMyAvKiBXb3JrZXJN ZXNzYWdpbmdQcm94eS5jcHAgKi87IH07CiAJCUUxN0E0QTFCMEQ5Nzk5MUQwMEZDMTBDNiAvKiBE T01TVkdBbHRHbHlwaEVsZW1lbnQuaCBpbiBDb3B5IEdlbmVyYXRlZCBIZWFkZXJzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDY1QUE2QkFDMEQ5NzRBMDAwMDA1NDFBRSAvKiBE T01TVkdBbHRHbHlwaEVsZW1lbnQuaCAqLzsgfTsKIAkJRTE3QTRBMUMwRDk3OTkxRDAwRkMxMEM2 IC8qIERPTVNWR0FsdEdseXBoRWxlbWVudEludGVybmFsLmggaW4gQ29weSBHZW5lcmF0ZWQgSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA2NUFBNkJBRTBEOTc0QTAw MDAwNTQxQUUgLyogRE9NU1ZHQWx0R2x5cGhFbGVtZW50SW50ZXJuYWwuaCAqLzsgfTsKLQkJRTE4 MjUwNEYwRUQyRjIwMjAwNDk5QThGIC8qIEZyYW1lTG9hZGVyQ2xpZW50LmNwcCBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEUxODI1MDRFMEVEMkYyMDIwMDQ5 OUE4RiAvKiBGcmFtZUxvYWRlckNsaWVudC5jcHAgKi87IH07CiAJCUUxQTMwMkJDMERFODM3MDMw MEM1MkYyQyAvKiBTdHJpbmdCdWlsZGVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSBFMUEzMDJCQjBERTgzNzAzMDBDNTJGMkMgLyogU3RyaW5nQnVpbGRl ci5oICovOyB9OwogCQlFMUEzMDJDMTBERTgzNzY5MDBDNTJGMkMgLyogU3RyaW5nQnVpbGRlci5j cHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBFMUEzMDJD MDBERTgzNzY5MDBDNTJGMkMgLyogU3RyaW5nQnVpbGRlci5jcHAgKi87IH07CiAJCUUxQTVGOTlC MEU3RUFBMjUwMEFGODVFQSAvKiBKU01lc3NhZ2VDaGFubmVsQ3VzdG9tLmNwcCBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEUxQTVGOTlBMEU3RUFBMjUwMEFG ODVFQSAvKiBKU01lc3NhZ2VDaGFubmVsQ3VzdG9tLmNwcCAqLzsgfTsKQEAgLTg4MTcsNyArODgx Niw2IEBACiAJCUUxMkVEQkU5MEIzMDhFMEIwMDI3MDRCNiAvKiBFdmVudFRhcmdldC5jcHAgKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBFdmVudFRhcmdldC5jcHA7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUUxNDc5OUE2MEVDREUzQTQwMDI5MkJGMyAvKiBXb3Jr ZXJNZXNzYWdpbmdQcm94eS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXb3Jr ZXJNZXNzYWdpbmdQcm94eS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlFMTQ3OTlC MzBFQ0RFOUQ4MDAyOTJCRjMgLyogV29ya2VyTWVzc2FnaW5nUHJveHkuY3BwICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV29ya2VyTWVzc2FnaW5nUHJveHkuY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwotCQlFMTgyNTA0RTBFRDJGMjAyMDA0OTlBOEYgLyogRnJh bWVMb2FkZXJDbGllbnQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g RnJhbWVMb2FkZXJDbGllbnQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlFMUEz MDJCQjBERTgzNzAzMDBDNTJGMkMgLyogU3RyaW5nQnVpbGRlci5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IHBhdGggPSBTdHJpbmdCdWlsZGVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCUUxQTMwMkMwMERFODM3NjkwMEM1MkYyQyAvKiBTdHJpbmdCdWlsZGVyLmNwcCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFN0cmluZ0J1aWxkZXIuY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlFMUE1Rjk5QTBFN0VBQTI1MDBBRjg1RUEgLyogSlNN ZXNzYWdlQ2hhbm5lbEN1c3RvbS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh dGggPSBKU01lc3NhZ2VDaGFubmVsQ3VzdG9tLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKQEAgLTEzMzA3LDcgKzEzMzA1LDYgQEAKIAkJCQk2NTZEMzcyMjBBREJBNURFMDBBNDU1NEQg LyogRm9ybVN0YXRlLmggKi8sCiAJCQkJOTMyRTE2MDgwQUY1NzgzNDAwMjVGNDA4IC8qIEZyYW1l TG9hZGVyLmNwcCAqLywKIAkJCQk2NTZEMzcyNDBBREJBNURFMDBBNDU1NEQgLyogRnJhbWVMb2Fk ZXIuaCAqLywKLQkJCQlFMTgyNTA0RTBFRDJGMjAyMDA0OTlBOEYgLyogRnJhbWVMb2FkZXJDbGll bnQuY3BwICovLAogCQkJCTY1NkQzNzI2MEFEQkE1REUwMEE0NTU0RCAvKiBGcmFtZUxvYWRlckNs aWVudC5oICovLAogCQkJCTkzQjc3QTM3MEFERDc5MjUwMEVBNEI4MSAvKiBGcmFtZUxvYWRlclR5 cGVzLmggKi8sCiAJCQkJNTFFNEFEQjIwQzQyQjRDRjAwNDJCQzU1IC8qIEZUUERpcmVjdG9yeURv Y3VtZW50LmNwcCAqLywKQEAgLTE4MjE1LDcgKzE4MjEyLDYgQEAKIAkJCQlFMTA4MjI0RjBFQzMx NTY3MDBFOTM5NTMgLyogV29ya2VyVGFzay5jcHAgaW4gU291cmNlcyAqLywKIAkJCQkwRkQ3MjM4 MzBFQzhCRDkzMDBDQTVERDcgLyogRmxvYXRRdWFkLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCUUx NDc5OUI0MEVDREU5RDgwMDI5MkJGMyAvKiBXb3JrZXJNZXNzYWdpbmdQcm94eS5jcHAgaW4gU291 cmNlcyAqLywKLQkJCQlFMTgyNTA0RjBFRDJGMjAyMDA0OTlBOEYgLyogRnJhbWVMb2FkZXJDbGll bnQuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0 cHJvY2Vzc2luZyA9IDA7CiAJCX07CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlckNsaWVudC5jcHAgYi9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5jcHAKZGVs ZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDI4NThlNzIuLjAwMDAwMDAKLS0tIGEvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuY3BwCisrKyAvZGV2L251bGwKQEAgLTEsODMgKzAs MCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNiwgMjAwNywgMjAwOCBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDggSG9sZ2VyIEhhbnMgUGV0 ZXIgRnJleXRoZXIKLSAqCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotICogYXJlIG1ldDoK LSAqCi0gKiAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRo ZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAyLiAgUmVkaXN0cmlidXRpb25zIGlu IGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgICBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIgaW4gdGhlCi0gKiAgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHBy b3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSAqIDMuICBOZWl0aGVyIHRoZSBuYW1lIG9m IEFwcGxlIENvbXB1dGVyLCBJbmMuICgiQXBwbGUiKSBub3IgdGhlIG5hbWVzIG9mCi0gKiAgICAg aXRzIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVj dHMgZGVyaXZlZAotICogICAgIGZyb20gdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHBy aW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVE IEJZIEFQUExFIEFORCBJVFMgQ09OVFJJQlVUT1JTICJBUyBJUyIgQU5EIEFOWQotICogRVhQUkVT UyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBU SEUgSU1QTElFRAotICogV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1Mg Rk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQotICogRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQg U0hBTEwgQVBQTEUgT1IgSVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWQotICogRElS RUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFV RU5USUFMIERBTUFHRVMKLSAqIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VS RU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsKLSAqIExPU1MgT0YgVVNFLCBE QVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VE IEFORAotICogT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1Qs IFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKLSAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBP VEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRgotICogVEhJUyBT T0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KLSAqLwotCi0jaW5jbHVkZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAiRnJhbWVMb2FkZXJDbGll bnQuaCIKLQotI2luY2x1ZGUgIkNvbG9yLmgiCi0jaW5jbHVkZSAiRnJhbWUuaCIKLSNpbmNsdWRl ICJGcmFtZVZpZXcuaCIKLSNpbmNsdWRlICJIVE1MRnJhbWVPd25lckVsZW1lbnQuaCIKLSNpbmNs dWRlICJQYWdlLmgiCi0jaW5jbHVkZSAiUmVuZGVyUGFydC5oIgotCi1uYW1lc3BhY2UgV2ViQ29y ZSB7Ci0KLUZyYW1lTG9hZGVyQ2xpZW50Ojp+RnJhbWVMb2FkZXJDbGllbnQoKQote30KLQotdm9p ZCBGcmFtZUxvYWRlckNsaWVudDo6dHJhbnNpdGlvblRvQ29tbWl0dGVkRm9yTmV3UGFnZShGcmFt ZSogZnJhbWUsIGNvbnN0IEludFNpemUmIHNpemUsIGNvbnN0IENvbG9yJiBiYWNrZ3JvdW5kQ29s b3IsIGJvb2wgdHJhbnNwYXJlbnQpCi17Ci0gICAgQVNTRVJUKGZyYW1lKTsKLQotICAgIFBhZ2Uq IHBhZ2UgPSBmcmFtZS0+cGFnZSgpOwotICAgIEFTU0VSVChwYWdlKTsKLQotICAgIGJvb2wgaXNN YWluRnJhbWUgPSBmcmFtZSA9PSBwYWdlLT5tYWluRnJhbWUoKTsKLQotICAgIGlmIChpc01haW5G cmFtZSAmJiBmcmFtZS0+dmlldygpKQotICAgICAgICBmcmFtZS0+dmlldygpLT5zZXRQYXJlbnRW aXNpYmxlKGZhbHNlKTsKLQotICAgIGZyYW1lLT5zZXRWaWV3KDApOwotCi0gICAgRnJhbWVWaWV3 KiBmcmFtZVZpZXc7Ci0gICAgaWYgKGlzTWFpbkZyYW1lKQotICAgICAgICBmcmFtZVZpZXcgPSBu ZXcgRnJhbWVWaWV3KGZyYW1lLCBzaXplKTsKLSAgICBlbHNlCi0gICAgICAgIGZyYW1lVmlldyA9 IG5ldyBGcmFtZVZpZXcoZnJhbWUpOwotCi0gICAgZnJhbWUtPnNldFZpZXcoZnJhbWVWaWV3KTsK LSAgICAvLyBGcmFtZVZpZXdzIGFyZSBjcmVhdGVkIHdpdGggYSByZWYgY291bnQgb2YgMS4gUmVs ZWFzZSB0aGlzIHJlZiBzaW5jZSB3ZSd2ZSBhc3NpZ25lZCBpdCB0byBmcmFtZS4KLSAgICBmcmFt ZVZpZXctPmRlcmVmKCk7Ci0KLSAgICBpZiAoIWJhY2tncm91bmRDb2xvci5pc1ZhbGlkKCkpCi0g ICAgICAgIGZyYW1lVmlldy0+dXBkYXRlQmFja2dyb3VuZFJlY3Vyc2l2ZWx5KGJhY2tncm91bmRD b2xvciwgdHJhbnNwYXJlbnQpOwotCi0gICAgaWYgKGlzTWFpbkZyYW1lKQotICAgICAgICBmcmFt ZVZpZXctPnNldFBhcmVudFZpc2libGUodHJ1ZSk7Ci0KLSAgICBpZiAoZnJhbWUtPm93bmVyUmVu ZGVyZXIoKSkKLSAgICAgICAgZnJhbWUtPm93bmVyUmVuZGVyZXIoKS0+c2V0V2lkZ2V0KGZyYW1l Vmlldyk7Ci0KLSAgICBpZiAoSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lciA9IGZyYW1lLT5v d25lckVsZW1lbnQoKSkKLSAgICAgICAgZnJhbWUtPnZpZXcoKS0+c2V0Q2FuSGF2ZVNjcm9sbGJh cnMob3duZXItPnNjcm9sbGluZ01vZGUoKSAhPSBTY3JvbGxiYXJBbHdheXNPZmYpOwotfQotCi19 Ci0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmggYi9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCmluZGV4IDZkNzQ3MWQuLmM5NjY1MTEgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaApAQCAtNzEsNyArNzEsNyBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKICAgICBjbGFzcyBGcmFtZUxvYWRlckNsaWVudCB7CiAgICAgcHVibGljOgot ICAgICAgICB2aXJ0dWFsIH5GcmFtZUxvYWRlckNsaWVudCgpOworICAgICAgICB2aXJ0dWFsIH5G cmFtZUxvYWRlckNsaWVudCgpIHt9CiAgICAgICAgIHZpcnR1YWwgdm9pZCBmcmFtZUxvYWRlckRl c3Ryb3llZCgpID0gMDsKICAgICAgICAgCiAgICAgICAgIHZpcnR1YWwgYm9vbCBoYXNXZWJWaWV3 KCkgY29uc3QgPSAwOyAvLyBtYWlubHkgZm9yIGFzc2VydGlvbnMKZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGFnZS9GcmFtZS5jcHAgYi9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCmluZGV4IDI1NzljOTIu LjVlYzgyZDUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKKysrIGIvV2ViQ29y ZS9wYWdlL0ZyYW1lLmNwcApAQCAtMTEzNiw2ICsxMTM2LDQwIEBAIHZvaWQgRnJhbWU6OnNldEV4 Y2x1ZGVGcm9tVGV4dFNlYXJjaChib29sIGV4Y2x1ZGUpCiAgICAgZC0+bV9leGNsdWRlRnJvbVRl eHRTZWFyY2ggPSBleGNsdWRlOwogfQogCit2b2lkIEZyYW1lOjpjcmVhdGVWaWV3KGNvbnN0IElu dFNpemUmIHNpemUsIGNvbnN0IENvbG9yJiBiYWNrZ3JvdW5kQ29sb3IsIGJvb2wgdHJhbnNwYXJl bnQpCit7CisgICAgQVNTRVJUKHBhZ2UoKSk7CisKKyAgICBib29sIGlzTWFpbkZyYW1lID0gdGhp cyA9PSBwYWdlKCktPm1haW5GcmFtZSgpOworCisgICAgaWYgKGlzTWFpbkZyYW1lICYmIHZpZXco KSkKKyAgICAgICAgdmlldygpLT5zZXRQYXJlbnRWaXNpYmxlKGZhbHNlKTsKKworICAgIHNldFZp ZXcoMCk7CisKKyAgICBGcmFtZVZpZXcqIGZyYW1lVmlldzsKKyAgICBpZiAoaXNNYWluRnJhbWUp CisgICAgICAgIGZyYW1lVmlldyA9IG5ldyBGcmFtZVZpZXcodGhpcywgc2l6ZSk7CisgICAgZWxz ZQorICAgICAgICBmcmFtZVZpZXcgPSBuZXcgRnJhbWVWaWV3KHRoaXMpOworCisgICAgc2V0Vmll dyhmcmFtZVZpZXcpOworICAgIC8vIEZyYW1lVmlld3MgYXJlIGNyZWF0ZWQgd2l0aCBhIHJlZiBj b3VudCBvZiAxLiBSZWxlYXNlIHRoaXMgcmVmIHNpbmNlIHdlJ3ZlIGFzc2lnbmVkIGl0IHRvIGZy YW1lLgorICAgIGZyYW1lVmlldy0+ZGVyZWYoKTsKKworICAgIGlmICghYmFja2dyb3VuZENvbG9y LmlzVmFsaWQoKSkKKyAgICAgICAgdmlldygpLT51cGRhdGVCYWNrZ3JvdW5kUmVjdXJzaXZlbHko YmFja2dyb3VuZENvbG9yLCB0cmFuc3BhcmVudCk7CisKKyAgICBpZiAoaXNNYWluRnJhbWUpCisg ICAgICAgIHZpZXcoKS0+c2V0UGFyZW50VmlzaWJsZSh0cnVlKTsKKworICAgIGlmIChvd25lclJl bmRlcmVyKCkpCisgICAgICAgIG93bmVyUmVuZGVyZXIoKS0+c2V0V2lkZ2V0KHZpZXcoKSk7CisK KyAgICBpZiAoSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lciA9IG93bmVyRWxlbWVudCgpKQor ICAgICAgICB2aWV3KCktPnNldENhbkhhdmVTY3JvbGxiYXJzKG93bmVyLT5zY3JvbGxpbmdNb2Rl KCkgIT0gU2Nyb2xsYmFyQWx3YXlzT2ZmKTsKK30KKwogLy8gcmV0dXJucyBGbG9hdFJlY3QgYmVj YXVzZSBnb2luZyB0aHJvdWdoIEludFJlY3Qgd291bGQgdHJ1bmNhdGUgYW55IGZsb2F0cwogRmxv YXRSZWN0IEZyYW1lOjpzZWxlY3Rpb25SZWN0KGJvb2wgY2xpcFRvVmlzaWJsZUNvbnRlbnQpIGNv bnN0CiB7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvRnJhbWUuaCBiL1dlYkNvcmUvcGFnZS9G cmFtZS5oCmluZGV4IDcxNDNkNWQuLmY0YWNhYTIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9G cmFtZS5oCisrKyBiL1dlYkNvcmUvcGFnZS9GcmFtZS5oCkBAIC0xMDAsNiArMTAwLDggQEAgcHVi bGljOgogICAgIGJvb2wgZXhjbHVkZUZyb21UZXh0U2VhcmNoKCkgY29uc3Q7CiAgICAgdm9pZCBz ZXRFeGNsdWRlRnJvbVRleHRTZWFyY2goYm9vbCk7CiAKKyAgICB2b2lkIGNyZWF0ZVZpZXcoY29u c3QgSW50U2l6ZSYsIGNvbnN0IENvbG9yJiwgYm9vbCB0cmFuc3BhcmVudCk7CisKICAgICBmcmll bmQgY2xhc3MgRnJhbWVQcml2YXRlOwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0 ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAgYi9XZWJLaXQvZ3RrL1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcAppbmRleCBhNTgyNjM3Li42MDdj YjMxIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50R3RrLmNwcAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50R3RrLmNwcApAQCAtNzYyLDcgKzc2Miw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OnRy YW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UoKQogICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUo bV9mcmFtZSk7CiAgICAgQVNTRVJUKGZyYW1lKTsKIAotICAgIFdlYkNvcmU6OkZyYW1lTG9hZGVy Q2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKGZyYW1lLCBzaXplLCBiYWNr Z3JvdW5kQ29sb3IsIHRyYW5zcGFyZW50KTsKKyAgICBmcmFtZS0+Y3JlYXRlVmlldyhzaXplLCBi YWNrZ3JvdW5kQ29sb3IsIHRyYW5zcGFyZW50KTsKIAogICAgIC8vIFdlIG5lZWQgdG8gZG8gZnVy dGhlciBtYW5pcHVsYXRpb24gb24gdGhlIEZyYW1lVmlldyBpZiBpdCB3YXMgdGhlIG1haW5GcmFt ZQogICAgIGlmIChmcmFtZSAhPSBmcmFtZS0+cGFnZSgpLT5tYWluRnJhbWUoKSkKZGlmZiAtLWdp dCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcCBiL1dl YktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAppbmRleCBkMDk1 YmQ4Li4wNDk4ODNiIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRRdC5jcHAKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9h ZGVyQ2xpZW50UXQuY3BwCkBAIC0yMTQsOCArMjE0LDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVu dFF0Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKCkKIAogICAgIFFCcnVzaCBicnVz aCA9IG1fd2ViRnJhbWUtPnBhZ2UoKS0+cGFsZXR0ZSgpLmJydXNoKFFQYWxldHRlOjpCYXNlKTsK ICAgICBRQ29sb3IgYmFja2dyb3VuZENvbG9yID0gYnJ1c2guc3R5bGUoKSA9PSBRdDo6U29saWRQ YXR0ZXJuID8gYnJ1c2guY29sb3IoKSA6IFFDb2xvcigpOwotICAgIFdlYkNvcmU6OkZyYW1lTG9h ZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKG1fZnJhbWUsIG1fd2Vi RnJhbWUtPnBhZ2UoKS0+dmlld3BvcnRTaXplKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmFja2dyb3VuZENvbG9yLCAh YmFja2dyb3VuZENvbG9yLmFscGhhKCkpOworICAgIG1fZnJhbWUtPmNyZWF0ZVZpZXcobV93ZWJG cmFtZS0+cGFnZSgpLT52aWV3cG9ydFNpemUoKSwgYmFja2dyb3VuZENvbG9yLCAhYmFja2dyb3Vu ZENvbG9yLmFscGhhKCkpOwogfQogCiAKZGlmZiAtLWdpdCBhL1dlYktpdC93aW4vV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9y dC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggN2Q0YjliMC4uOTAzNTk5MSAxMDA2NDQK LS0tIGEvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAK KysrIGIvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAK QEAgLTQ4NSw3ICs0ODUsOCBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9u VG9Db21taXR0ZWRGb3JOZXdQYWdlKCkKICAgICB2aWV3LT5mcmFtZVJlY3QoJnJlY3QpOwogICAg IGJvb2wgdHJhbnNwYXJlbnQgPSB2aWV3LT50cmFuc3BhcmVudCgpOwogICAgIENvbG9yIGJhY2tn cm91bmRDb2xvciA9IHRyYW5zcGFyZW50ID8gQ29sb3I6OnRyYW5zcGFyZW50IDogQ29sb3I6Ondo aXRlOwotICAgIFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0 ZWRGb3JOZXdQYWdlKGNvcmUobV93ZWJGcmFtZSksIEludFJlY3QocmVjdCkuc2l6ZSgpLCBiYWNr Z3JvdW5kQ29sb3IsIHRyYW5zcGFyZW50KTsKKworICAgIGNvcmUobV93ZWJGcmFtZSktPmNyZWF0 ZVZpZXcoSW50UmVjdChyZWN0KS5zaXplKCksIGJhY2tncm91bmRDb2xvciwgdHJhbnNwYXJlbnQp OwogfQogCiBib29sIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjYW5DYWNoZVBhZ2UoKSBjb25zdAo=