89095 2012-06-14 06:42:26 -0700 [EFL][WK2] Add title support to Ewk_View 2012-06-15 05:17:17 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 61838 1 cdumez cdumez enmi.lee kenneth rakuco ryuan.choi webkit.review.bot oldest_to_newest 649126 0 cdumez 2012-06-14 06:42:26 -0700 We need to add support for title getting and title change notification to Ewk_View. This can then be used in MiniBrowser to set / update the window title. 649128 1 147575 cdumez 2012-06-14 06:50:00 -0700 Created attachment 147575 Patch 649607 2 ryuan.choi 2012-06-14 16:17:53 -0700 Looks good to me. 650001 3 cdumez 2012-06-15 01:10:03 -0700 I need this patch also for Ewk integration of Web Intents because it has the WKPageLoaderClient. I will need to define a callback for dispatchIntent() and emit a signal with the Ewk_Intent. 650003 4 enmi.lee 2012-06-15 01:12:35 -0700 > Source/WebKit2/UIProcess/API/efl/ewk_loader_client.cpp:29 > +#include "ewk_loader_client_private.h" I think "ewk_loader_client_private.h"'s proper location is #27 line. > Source/WebKit2/UIProcess/API/efl/ewk_loader_client.cpp:30 > +#include "ewk_view.h" I think "ewk_view.h" is not needed in this file. > Source/WebKit2/UIProcess/API/efl/ewk_loader_client.cpp:45 > +void ewk_loader_client_attach(WKPageRef pageRef, Evas_Object* ewkView) How about changing the function name to "ewk_view_loader_client_attach(Evas_Object* ewkView, WKPageRef pageRef)" and file name to "ewk_view_loader_client.cpp"? I think it it better to use "ewk_view" prefix because loader client will be set for ewk_view. > Source/WebKit2/UIProcess/API/efl/ewk_loader_client_private.h: 32 > +void ewk_loader_client_attach(WKPageRef pageRef, Evas_Object *o); Would you change "Evas_Object *o" to "Evas_Object* o"? This file has to follow WebKit style because it is private header. > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:549 > +evas_object_smart_callback_call(ewkView, "title,changed", (void*)title); Please use static_cast<void*>() instead of (void*). 650010 5 147575 cdumez 2012-06-15 01:26:14 -0700 Comment on attachment 147575 Patch Clear flags until I update the patch. Thanks for the feedback. 650012 6 cdumez 2012-06-15 01:31:36 -0700 (In reply to comment #4) > > Source/WebKit2/UIProcess/API/efl/ewk_loader_client.cpp:29 > > +#include "ewk_loader_client_private.h" > I think "ewk_loader_client_private.h"'s proper location is #27 line. What you're suggesting would be right if it was a public header (i.e. "ewk_loader_client.h"). However, I believe the current location is correct considering it is a private header. Also, if I move the line, the style check script starts complaining. 650060 7 enmi.lee 2012-06-15 03:26:21 -0700 (In reply to comment #6) > (In reply to comment #4) > > > Source/WebKit2/UIProcess/API/efl/ewk_loader_client.cpp:29 > > > +#include "ewk_loader_client_private.h" > > I think "ewk_loader_client_private.h"'s proper location is #27 line. > > What you're suggesting would be right if it was a public header (i.e. "ewk_loader_client.h"). However, I believe the current location is correct considering it is a private header. Also, if I move the line, the style check script starts complaining. Oh, I see. you are right :) 650061 8 147783 cdumez 2012-06-15 03:28:51 -0700 Created attachment 147783 Patch Take feedback into consideration. 650074 9 147783 cdumez 2012-06-15 04:00:51 -0700 Comment on attachment 147783 Patch Needs rebasing due to other patch that just landed. 650077 10 147791 cdumez 2012-06-15 04:03:49 -0700 Created attachment 147791 Patch for landing Rebasing on master. Could someone please cq+ ? 650090 11 147791 webkit.review.bot 2012-06-15 05:17:12 -0700 Comment on attachment 147791 Patch for landing Clearing flags on attachment: 147791 Committed r120442: <http://trac.webkit.org/changeset/120442> 650091 12 webkit.review.bot 2012-06-15 05:17:17 -0700 All reviewed patches have been landed. Closing bug. 147575 2012-06-14 06:50:00 -0700 2012-06-15 03:28:51 -0700 Patch 89095_view_title.patch text/plain 12000 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2MTE1MjkwLi43N2RmZjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTItMDYtMTQgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCB0aXRsZSBzdXBwb3J0IHRvIEV3a19WaWV3 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTA5NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIG1l dGhvZCB0byBnZXQgdGhlIHRpdGxlIG9mIHRoZSBtYWluIGZyYW1lIGluCisgICAgICAgIGFuIEV3 a19WaWV3LiBBICJ0aXRsZSxjaGFuZ2VkIiBzaWduYWwgaXMgbm93IGVtaXR0ZWQKKyAgICAgICAg b24gdGhlIHZpZXcgdG8gbm90aWZ5IGNsaWVudHMgdGhhdCB0aGUgbWFpbiBmcmFtZQorICAgICAg ICB0aXRsZSB3YXMgY2hhbmdlZC4KKworICAgICAgICAqIFBsYXRmb3JtRWZsLmNtYWtlOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19sb2FkZXJfY2xpZW50LmNwcDogQWRkZWQuCisg ICAgICAgIChkaWRSZWNlaXZlVGl0bGVGb3JGcmFtZSk6CisgICAgICAgIChld2tfbG9hZGVyX2Ns aWVudF9hdHRhY2gpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19sb2FkZXJfY2xp ZW50X3ByaXZhdGUuaDogQWRkZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXcuY3BwOgorICAgICAgICAoX0V3a19WaWV3X1ByaXZhdGVfRGF0YSk6CisgICAgICAgIChfZXdr X3ZpZXdfcHJpdl9kZWwpOgorICAgICAgICAoZXdrX3ZpZXdfYmFzZV9hZGQpOgorICAgICAgICAo ZXdrX3ZpZXdfdGl0bGVfZ2V0KToKKyAgICAgICAgKGV3a192aWV3X3RpdGxlX2NoYW5nZWQpOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3Lmg6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5oOgorCiAyMDEyLTA2LTE0ICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBBZGQgaW5w dXQgbWV0aG9kcyBzdWJtZW51IGl0ZW0gdG8gdGhlIGRlZmF1bHQgY29udGV4dCBtZW51IGZvciBl ZGl0YWJsZSBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUVmbC5j bWFrZSBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtRWZsLmNtYWtlCmluZGV4IDVlMDg4NWUuLjM4 NDAwNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtRWZsLmNtYWtlCisrKyBi L1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtRWZsLmNtYWtlCkBAIC0zMCw2ICszMCw3IEBAIExJU1Qo QVBQRU5EIFdlYktpdDJfU09VUkNFUwogCiAgICAgVUlQcm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVu dEltcGwuY3BwCiAgICAgVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCisgICAgVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX2xvYWRlcl9jbGllbnQuY3BwCiAgICAgVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuY3BwCiAKICAgICBVSVByb2Nlc3MvY2Fpcm8vQmFja2luZ1N0b3JlQ2Fpcm8u Y3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfbG9h ZGVyX2NsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfbG9h ZGVyX2NsaWVudC5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTEwNTg2 NwotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19sb2FkZXJfY2xpZW50LmNwcApAQCAtMCwwICsxLDUzIEBACisvKgorICogQ29weXJpZ2h0IChD KSAyMDEyIEludGVsIENvcnBvcmF0aW9uLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor ICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENP TlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJB TlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FS UkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgor ICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBP UiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNU LCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERB TUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICog U1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJ VFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBB TlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBM SUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAq IEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLwor CisjaW5jbHVkZSAiY29uZmlnLmgiCisKKyNpbmNsdWRlICJXS0ZyYW1lLmgiCisjaW5jbHVkZSAi ZXdrX2xvYWRlcl9jbGllbnRfcHJpdmF0ZS5oIgorI2luY2x1ZGUgImV3a192aWV3LmgiCisjaW5j bHVkZSAiZXdrX3ZpZXdfcHJpdmF0ZS5oIgorI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4K KwordXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKKworc3RhdGljIHZvaWQgZGlkUmVjZWl2ZVRpdGxl Rm9yRnJhbWUoV0tQYWdlUmVmLCBXS1N0cmluZ1JlZiB0aXRsZSwgV0tGcmFtZVJlZiBmcmFtZSwg V0tUeXBlUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQoreworICAgIGlmICghV0tGcmFtZUlz TWFpbkZyYW1lKGZyYW1lKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgRXZhc19PYmplY3QqIGV3 a1ZpZXcgPSBzdGF0aWNfY2FzdDxFdmFzX09iamVjdCo+KGNvbnN0X2Nhc3Q8dm9pZCo+KGNsaWVu dEluZm8pKTsKKyAgICBld2tfdmlld190aXRsZV9jaGFuZ2VkKGV3a1ZpZXcsIHRvSW1wbCh0aXRs ZSktPnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworfQorCit2b2lkIGV3a19sb2FkZXJfY2xpZW50 X2F0dGFjaChXS1BhZ2VSZWYgcGFnZVJlZiwgRXZhc19PYmplY3QqIGV3a1ZpZXcpCit7CisgICAg V0tQYWdlTG9hZGVyQ2xpZW50IGxvYWRDbGllbnQ7CisgICAgbWVtc2V0KCZsb2FkQ2xpZW50LCAw LCBzaXplb2YoV0tQYWdlTG9hZGVyQ2xpZW50KSk7CisgICAgbG9hZENsaWVudC52ZXJzaW9uID0g a1dLUGFnZUxvYWRlckNsaWVudEN1cnJlbnRWZXJzaW9uOworICAgIGxvYWRDbGllbnQuY2xpZW50 SW5mbyA9IGV3a1ZpZXc7CisgICAgbG9hZENsaWVudC5kaWRSZWNlaXZlVGl0bGVGb3JGcmFtZSA9 IGRpZFJlY2VpdmVUaXRsZUZvckZyYW1lOworICAgIFdLUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQo cGFnZVJlZiwgJmxvYWRDbGllbnQpOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX2xvYWRlcl9jbGllbnRfcHJpdmF0ZS5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2xvYWRlcl9jbGllbnRfcHJpdmF0ZS5oCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjI2YTg1NDcKLS0tIC9kZXYvbnVsbAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfbG9hZGVyX2NsaWVudF9wcml2YXRl LmgKQEAgLTAsMCArMSwzNCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMiBJbnRlbCBDb3Jw b3JhdGlvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQg dXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBt dXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3Ry aWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdo dAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0 ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRX QVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJ UycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hB TlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJ U0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9S UworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BF Q0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMg T1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUwor ICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JU IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBX QVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisg KiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2lmbmRlZiBld2tfbG9h ZGVyX2NsaWVudF9wcml2YXRlX2gKKyNkZWZpbmUgZXdrX2xvYWRlcl9jbGllbnRfcHJpdmF0ZV9o CisKKyNpbmNsdWRlIDxFdmFzLmg+CisjaW5jbHVkZSA8V2ViS2l0Mi9XS0Jhc2UuaD4KKwordm9p ZCBld2tfbG9hZGVyX2NsaWVudF9hdHRhY2goV0tQYWdlUmVmIHBhZ2VSZWYsIEV2YXNfT2JqZWN0 ICpvKTsKKworI2VuZGlmIC8vIGV3a19sb2FkZXJfY2xpZW50X3ByaXZhdGVfaApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IGRlMmFhODkuLjg2 ZTQ5M2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5j cHAKQEAgLTI5LDYgKzI5LDcgQEAKICNpbmNsdWRlICJXS1VSTC5oIgogI2luY2x1ZGUgImV3a19j b250ZXh0LmgiCiAjaW5jbHVkZSAiZXdrX2NvbnRleHRfcHJpdmF0ZS5oIgorI2luY2x1ZGUgImV3 a19sb2FkZXJfY2xpZW50X3ByaXZhdGUuaCIKICNpbmNsdWRlICJld2tfdmlld19wcml2YXRlLmgi CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogCkBAIC00MCw2ICs0MSw3IEBAIHN0YXRp YyBjb25zdCBjaGFyIEVXS19WSUVXX1RZUEVfU1RSW10gPSAiRVdLMl9WaWV3IjsKIHN0cnVjdCBf RXdrX1ZpZXdfUHJpdmF0ZV9EYXRhIHsKICAgICBPd25QdHI8UGFnZUNsaWVudEltcGw+IHBhZ2VD bGllbnQ7CiAgICAgY29uc3QgY2hhciogdXJpOworICAgIGNvbnN0IGNoYXIqIHRpdGxlOwogfTsK IAogI2RlZmluZSBFV0tfVklFV19UWVBFX0NIRUNLKGV3a1ZpZXcsIHJlc3VsdCkgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFwKQEAgLTI2Nyw2ICsyNjksNyBAQCBzdGF0aWMgdm9p ZCBfZXdrX3ZpZXdfcHJpdl9kZWwoRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKiBwcml2KQogCiAgICAg cHJpdi0+cGFnZUNsaWVudCA9IG51bGxwdHI7CiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJp di0+dXJpKTsKKyAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2LT50aXRsZSk7CiAgICAgZnJl ZShwcml2KTsKIH0KIApAQCAtNDg4LDYgKzQ5MSw3IEBAIEV2YXNfT2JqZWN0KiBld2tfdmlld19i YXNlX2FkZChFdmFzKiBjYW52YXMsIFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBXS1BhZ2VHcm91 CiAgICAgfQogCiAgICAgcHJpdi0+cGFnZUNsaWVudCA9IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGUo dG9JbXBsKGNvbnRleHRSZWYpLCB0b0ltcGwocGFnZUdyb3VwUmVmKSwgZXdrVmlldyk7CisgICAg ZXdrX2xvYWRlcl9jbGllbnRfYXR0YWNoKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQtPnBhZ2UoKSks IGV3a1ZpZXcpOwogCiAgICAgcmV0dXJuIGV3a1ZpZXc7CiB9CkBAIC01MjMsNiArNTI3LDI4IEBA IGNvbnN0IGNoYXIqIGV3a192aWV3X3VyaV9nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcp CiAgICAgcmV0dXJuIHByaXYtPnVyaTsKIH0KIAorY29uc3QgY2hhciogZXdrX3ZpZXdfdGl0bGVf Z2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQoreworICAgIEVXS19WSUVXX1NEX0dFVF9P Ul9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCAwKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9P Ul9SRVRVUk4oc21hcnREYXRhLCBwcml2LCAwKTsKKworICAgIENTdHJpbmcgdGl0bGUgPSBwcml2 LT5wYWdlQ2xpZW50LT5wYWdlKCktPnBhZ2VUaXRsZSgpLnV0ZjgoKTsKKyAgICBlaW5hX3N0cmlu Z3NoYXJlX3JlcGxhY2UoJnByaXYtPnRpdGxlLCB0aXRsZS5kYXRhKCkpOworCisgICAgcmV0dXJu IHByaXYtPnRpdGxlOworfQorCisvKioKKyAqIEBpbnRlcm5hbAorICogVGhlIHZpZXcgdGl0bGUg d2FzIGNoYW5nZWQgYnkgdGhlIGZyYW1lIGxvYWRlci4KKyAqCisgKiBFbWl0cyBzaWduYWw6ICJ0 aXRsZSxjaGFuZ2VkIiB3aXRoIHBvaW50ZXIgdG8gbmV3IHRpdGxlIHN0cmluZy4KKyAqLwordm9p ZCBld2tfdmlld190aXRsZV9jaGFuZ2VkKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBjaGFy KiB0aXRsZSkKK3sKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19jYWxsKGV3a1ZpZXcs ICJ0aXRsZSxjaGFuZ2VkIiwgKHZvaWQqKXRpdGxlKTsKK30KKwogdm9pZCBld2tfdmlld19kaXNw bGF5KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBJbnRSZWN0JiByZWN0KQogewogICAgIEVX S19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCmluZGV4IDFkYjRmNWUuLmQ4ODJmYmUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaApAQCAtMjIs NiArMjIsMTAgQEAKICAqIEBicmllZiAgIFdlYktpdCBtYWluIHNtYXJ0IG9iamVjdC4KICAqCiAg KiBUaGlzIG9iamVjdCBwcm92aWRlcyB2aWV3IHJlbGF0ZWQgQVBJcyBvZiBXZWJLaXQyIHRvIEVG TCBvYmplY3QuCisgKgorICogVGhlIGZvbGxvd2luZyBzaWduYWxzIChzZWUgZXZhc19vYmplY3Rf c21hcnRfY2FsbGJhY2tfYWRkKCkpIGFyZSBlbWl0dGVkOgorICoKKyAqIC0gInRpdGxlLGNoYW5n ZWQiLCBjb25zdCBjaGFyKjogdGl0bGUgb2YgdGhlIG1haW4gZnJhbWUgd2FzIGNoYW5nZWQuCiAg Ki8KIAogI2lmbmRlZiBld2tfdmlld19oCkBAIC0xNjQsNiArMTY4LDE4IEBAIEVBUEkgRWluYV9C b29sIGV3a192aWV3X3VyaV9zZXQoRXZhc19PYmplY3QgKm8sIGNvbnN0IGNoYXIgKnVyaSk7CiAg Ki8KIEVBUEkgY29uc3QgY2hhciAqZXdrX3ZpZXdfdXJpX2dldChjb25zdCBFdmFzX09iamVjdCAq byk7CiAKKy8qKgorICogR2V0cyB0aGUgY3VycmVudCB0aXRsZSBvZiB0aGUgbWFpbiBmcmFtZS4K KyAqCisgKiBJdCByZXR1cm5zIGFuIGludGVybmFsIHN0cmluZyBhbmQgc2hvdWxkIG5vdAorICog YmUgbW9kaWZpZWQuIFRoZSBzdHJpbmcgaXMgZ3VhcmFudGVlZCB0byBiZSBzdHJpbmdzaGFyZWQu CisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gZ2V0IGN1cnJlbnQgdGl0bGUKKyAqCisg KiBAcmV0dXJuIGN1cnJlbnQgdGl0bGUgb24gc3VjY2VzcyBvciBAYyAwIG9uIGZhaWx1cmUKKyAq LworRUFQSSBjb25zdCBjaGFyICpld2tfdmlld190aXRsZV9nZXQoY29uc3QgRXZhc19PYmplY3Qg Km8pOworCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5oCmluZGV4IDE5ZDBjODYu LjJiM2Y0NzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a192aWV3X3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfdmlld19wcml2YXRlLmgKQEAgLTMyLDYgKzMyLDcgQEAgY2xhc3MgSW50U2l6ZTsKIAogdm9p ZCBld2tfdmlld19kaXNwbGF5KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBXZWJDb3JlOjpJ bnRSZWN0JiByZWN0KTsKIHZvaWQgZXdrX3ZpZXdfaW1hZ2VfZGF0YV9zZXQoRXZhc19PYmplY3Qq IGV3a1ZpZXcsIHZvaWQqIGltYWdlRGF0YSwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2l6ZSk7 Cit2b2lkIGV3a192aWV3X3RpdGxlX2NoYW5nZWQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0 IGNoYXIqIHRpdGxlKTsKIAogRXZhc19PYmplY3QqIGV3a192aWV3X2Jhc2VfYWRkKEV2YXMqIGNh bnZhcywgV0tDb250ZXh0UmVmLCBXS1BhZ2VHcm91cFJlZik7CiAKZGlmZiAtLWdpdCBhL1Rvb2xz L0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxMTJkNTRjLi4yNWQyZDcyIDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTggQEAKKzIwMTItMDYtMTQgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGlu dGVsLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCB0aXRsZSBzdXBwb3J0IHRvIEV3a19W aWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTA5 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0 ZSB0aGUgTWluaUJyb3dzZXIgc28gaXQgbGlzdGVucyBmb3IgdGhlICJ0aXRsZSxjaGFuZ2UiCisg ICAgICAgIHNpZ25hbCBvbiB0aGUgdmlldyBhbmQga2VlcHMgdGhlIGJyb3dzZXIgd2luZG93IHRp dGxlCisgICAgICAgIHVwLXRvLWRhdGUuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9lZmwvbWFp bi5jOgorICAgICAgICAob25fdGl0bGVfY2hhbmdlZCk6CisgICAgICAgIChicm93c2VyQ3JlYXRl KToKKwogMjAxMi0wNi0xNCAgWm9sdGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9yZz4KIAog ICAgICAgICBbUXRdIFJlbW92ZSBVU0UoUVRfSU1BR0VfREVDT0RFUikgbWFjcm8sIHNpbmNlIHdl IGRvbid0IHVzZSBpdCBhbnltb3JlCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwv bWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwppbmRleCBjODVmZjJmLi40YTk5 Njk1IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCisrKyBiL1Rvb2xz L01pbmlCcm93c2VyL2VmbC9tYWluLmMKQEAgLTU2LDYgKzU2LDE1IEBAIHN0YXRpYyB2b2lkIG9u X2Vjb3JlX2V2YXNfcmVzaXplKEVjb3JlX0V2YXMgKmVlKQogICAgIGV2YXNfb2JqZWN0X3Jlc2l6 ZSh3ZWJ2aWV3LCB3LCBoKTsKIH0KIAorc3RhdGljIHZvaWQKK29uX3RpdGxlX2NoYW5nZWQodm9p ZCAqdXNlcl9kYXRhLCBFdmFzX09iamVjdCAqd2Vidmlldywgdm9pZCAqZXZlbnRfaW5mbykKK3sK KyAgICBNaW5pQnJvd3NlciAqYXBwID0gKE1pbmlCcm93c2VyICopdXNlcl9kYXRhOworICAgIGNv bnN0IGNoYXIgKnRpdGxlID0gKGNvbnN0IGNoYXIgKilldmVudF9pbmZvOworCisgICAgZWNvcmVf ZXZhc190aXRsZV9zZXQoYXBwLT5lZSwgdGl0bGUpOworfQorCiBzdGF0aWMgTWluaUJyb3dzZXIg KmJyb3dzZXJDcmVhdGUoY29uc3QgY2hhciAqdXJsKQogewogICAgIE1pbmlCcm93c2VyICphcHAg PSBtYWxsb2Moc2l6ZW9mKE1pbmlCcm93c2VyKSk7CkBAIC04MSw4ICs5MCwxMCBAQCBzdGF0aWMg TWluaUJyb3dzZXIgKmJyb3dzZXJDcmVhdGUoY29uc3QgY2hhciAqdXJsKQogICAgIC8qIENyZWF0 ZSB3ZWJ2aWV3ICovCiAgICAgYXBwLT5icm93c2VyID0gZXdrX3ZpZXdfYWRkKGFwcC0+ZXZhcyk7 CiAgICAgZXZhc19vYmplY3RfbmFtZV9zZXQoYXBwLT5icm93c2VyLCAiYnJvd3NlciIpOwotICAg IGV2YXNfb2JqZWN0X3NpemVfaGludF93ZWlnaHRfc2V0KGFwcC0+YnJvd3NlciwgRVZBU19ISU5U X0VYUEFORCwgRVZBU19ISU5UX0VYUEFORCk7CiAKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxs YmFja19hZGQoYXBwLT5icm93c2VyLCAidGl0bGUsY2hhbmdlZCIsIG9uX3RpdGxlX2NoYW5nZWQs IGFwcCk7CisKKyAgICBldmFzX29iamVjdF9zaXplX2hpbnRfd2VpZ2h0X3NldChhcHAtPmJyb3dz ZXIsIEVWQVNfSElOVF9FWFBBTkQsIEVWQVNfSElOVF9FWFBBTkQpOwogICAgIGV2YXNfb2JqZWN0 X3Jlc2l6ZShhcHAtPmJyb3dzZXIsIERFRkFVTFRfV0lEVEgsIERFRkFVTFRfSEVJR0hUKTsKICAg ICBldmFzX29iamVjdF9zaG93KGFwcC0+YnJvd3Nlcik7CiAgICAgZXZhc19vYmplY3RfZm9jdXNf c2V0KGFwcC0+YnJvd3NlciwgRUlOQV9UUlVFKTsK 147783 2012-06-15 03:28:51 -0700 2012-06-15 04:03:49 -0700 Patch 89095_view_title.patch text/plain 11942 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1OTQxNTAxLi4wMWI5MGMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzEg QEAKIDIwMTItMDYtMTUgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAorICAgICAgICBbRUZMXVtXSzJdIEFkZCB0aXRsZSBzdXBwb3J0IHRvIEV3a19WaWV3 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTA5NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIG1l dGhvZCB0byBnZXQgdGhlIHRpdGxlIG9mIHRoZSBtYWluIGZyYW1lIGluCisgICAgICAgIGFuIEV3 a19WaWV3LiBBICJ0aXRsZSxjaGFuZ2VkIiBzaWduYWwgaXMgbm93IGVtaXR0ZWQKKyAgICAgICAg b24gdGhlIHZpZXcgdG8gbm90aWZ5IGNsaWVudHMgdGhhdCB0aGUgbWFpbiBmcmFtZQorICAgICAg ICB0aXRsZSB3YXMgY2hhbmdlZC4KKworICAgICAgICAqIFBsYXRmb3JtRWZsLmNtYWtlOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKF9Fd2tfVmll d19Qcml2YXRlX0RhdGEpOgorICAgICAgICAoX2V3a192aWV3X3ByaXZfZGVsKToKKyAgICAgICAg KGV3a192aWV3X2Jhc2VfYWRkKToKKyAgICAgICAgKGV3a192aWV3X3RpdGxlX2dldCk6CisgICAg ICAgIChld2tfdmlld190aXRsZV9jaGFuZ2VkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2Vm bC9ld2tfdmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X2xvYWRl cl9jbGllbnQuY3BwOiBBZGRlZC4KKyAgICAgICAgKGRpZFJlY2VpdmVUaXRsZUZvckZyYW1lKToK KyAgICAgICAgKGV3a192aWV3X2xvYWRlcl9jbGllbnRfYXR0YWNoKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50X3ByaXZhdGUuaDogQWRkZWQuCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5oOgorCisyMDEyLTA2 LTE1ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKICAg ICAgICAgW0VGTF1bV0syXSBJbXBsZW1lbnQgcmVsb2FkIC8gc3RvcCBpbiBFd2tfVmlldwogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkxNjgKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UgYi9Tb3VyY2UvV2ViS2l0 Mi9QbGF0Zm9ybUVmbC5jbWFrZQppbmRleCA1ZTA4ODVlLi40NzJhODZhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUVmbC5jbWFrZQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0 Zm9ybUVmbC5jbWFrZQpAQCAtMzEsNiArMzEsNyBAQCBMSVNUKEFQUEVORCBXZWJLaXQyX1NPVVJD RVMKICAgICBVSVByb2Nlc3MvQVBJL2VmbC9QYWdlQ2xpZW50SW1wbC5jcHAKICAgICBVSVByb2Nl c3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAKICAgICBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll dy5jcHAKKyAgICBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50LmNwcAog CiAgICAgVUlQcm9jZXNzL2NhaXJvL0JhY2tpbmdTdG9yZUNhaXJvLmNwcAogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggNTY5NDdmMi4uM2Ji ZmJjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNw cApAQCAtMzAsNiArMzAsNyBAQAogI2luY2x1ZGUgIldLVVJMLmgiCiAjaW5jbHVkZSAiZXdrX2Nv bnRleHQuaCIKICNpbmNsdWRlICJld2tfY29udGV4dF9wcml2YXRlLmgiCisjaW5jbHVkZSAiZXdr X3ZpZXdfbG9hZGVyX2NsaWVudF9wcml2YXRlLmgiCiAjaW5jbHVkZSAiZXdrX3ZpZXdfcHJpdmF0 ZS5oIgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIApAQCAtNDEsNiArNDIsNyBAQCBz dGF0aWMgY29uc3QgY2hhciBFV0tfVklFV19UWVBFX1NUUltdID0gIkVXSzJfVmlldyI7CiBzdHJ1 Y3QgX0V3a19WaWV3X1ByaXZhdGVfRGF0YSB7CiAgICAgT3duUHRyPFBhZ2VDbGllbnRJbXBsPiBw YWdlQ2xpZW50OwogICAgIGNvbnN0IGNoYXIqIHVyaTsKKyAgICBjb25zdCBjaGFyKiB0aXRsZTsK IH07CiAKICNkZWZpbmUgRVdLX1ZJRVdfVFlQRV9DSEVDSyhld2tWaWV3LCByZXN1bHQpICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCkBAIC0yNjgsNiArMjcwLDcgQEAgc3RhdGlj IHZvaWQgX2V3a192aWV3X3ByaXZfZGVsKEV3a19WaWV3X1ByaXZhdGVfRGF0YSogcHJpdikKIAog ICAgIHByaXYtPnBhZ2VDbGllbnQgPSBudWxscHRyOwogICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVs KHByaXYtPnVyaSk7CisgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+dGl0bGUpOwogICAg IGZyZWUocHJpdik7CiB9CiAKQEAgLTQ4OSw2ICs0OTIsNyBAQCBFdmFzX09iamVjdCogZXdrX3Zp ZXdfYmFzZV9hZGQoRXZhcyogY2FudmFzLCBXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQYWdl R3JvdQogICAgIH0KIAogICAgIHByaXYtPnBhZ2VDbGllbnQgPSBQYWdlQ2xpZW50SW1wbDo6Y3Jl YXRlKHRvSW1wbChjb250ZXh0UmVmKSwgdG9JbXBsKHBhZ2VHcm91cFJlZiksIGV3a1ZpZXcpOwor ICAgIGV3a192aWV3X2xvYWRlcl9jbGllbnRfYXR0YWNoKHRvQVBJKHByaXYtPnBhZ2VDbGllbnQt PnBhZ2UoKSksIGV3a1ZpZXcpOwogCiAgICAgcmV0dXJuIGV3a1ZpZXc7CiB9CkBAIC01NDIsNiAr NTQ2LDI4IEBAIEVpbmFfQm9vbCBld2tfdmlld19zdG9wKEV2YXNfT2JqZWN0KiBld2tWaWV3KQog ICAgIHJldHVybiB0cnVlOwogfQogCitjb25zdCBjaGFyKiBld2tfdmlld190aXRsZV9nZXQoY29u c3QgRXZhc19PYmplY3QqIGV3a1ZpZXcpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVS Tihld2tWaWV3LCBzbWFydERhdGEsIDApOworICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVS TihzbWFydERhdGEsIHByaXYsIDApOworCisgICAgQ1N0cmluZyB0aXRsZSA9IHByaXYtPnBhZ2VD bGllbnQtPnBhZ2UoKS0+cGFnZVRpdGxlKCkudXRmOCgpOworICAgIGVpbmFfc3RyaW5nc2hhcmVf cmVwbGFjZSgmcHJpdi0+dGl0bGUsIHRpdGxlLmRhdGEoKSk7CisKKyAgICByZXR1cm4gcHJpdi0+ dGl0bGU7Cit9CisKKy8qKgorICogQGludGVybmFsCisgKiBUaGUgdmlldyB0aXRsZSB3YXMgY2hh bmdlZCBieSB0aGUgZnJhbWUgbG9hZGVyLgorICoKKyAqIEVtaXRzIHNpZ25hbDogInRpdGxlLGNo YW5nZWQiIHdpdGggcG9pbnRlciB0byBuZXcgdGl0bGUgc3RyaW5nLgorICovCit2b2lkIGV3a192 aWV3X3RpdGxlX2NoYW5nZWQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IGNoYXIqIHRpdGxl KQoreworICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwoZXdrVmlldywgInRpdGxl LGNoYW5nZWQiLCBjb25zdF9jYXN0PGNoYXIqPih0aXRsZSkpOworfQorCiB2b2lkIGV3a192aWV3 X2Rpc3BsYXkoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CiAg ICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKaW5kZXggYTI2OGEyNi4uYmRi YTAxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCkBA IC0yMyw2ICsyMywxMCBAQAogICogQGJyaWVmICAgV2ViS2l0IG1haW4gc21hcnQgb2JqZWN0Lgog ICoKICAqIFRoaXMgb2JqZWN0IHByb3ZpZGVzIHZpZXcgcmVsYXRlZCBBUElzIG9mIFdlYktpdDIg dG8gRUZMIG9iamVjdC4KKyAqCisgKiBUaGUgZm9sbG93aW5nIHNpZ25hbHMgKHNlZSBldmFzX29i amVjdF9zbWFydF9jYWxsYmFja19hZGQoKSkgYXJlIGVtaXR0ZWQ6CisgKgorICogLSAidGl0bGUs Y2hhbmdlZCIsIGNvbnN0IGNoYXIqOiB0aXRsZSBvZiB0aGUgbWFpbiBmcmFtZSB3YXMgY2hhbmdl ZC4KICAqLwogCiAjaWZuZGVmIGV3a192aWV3X2gKQEAgLTE4NSw2ICsxODksMTggQEAgRUFQSSBF aW5hX0Jvb2wgICAgZXdrX3ZpZXdfcmVsb2FkKEV2YXNfT2JqZWN0ICpvKTsKICAqLwogRUFQSSBF aW5hX0Jvb2wgICAgZXdrX3ZpZXdfc3RvcChFdmFzX09iamVjdCAqbyk7CiAKKy8qKgorICogR2V0 cyB0aGUgY3VycmVudCB0aXRsZSBvZiB0aGUgbWFpbiBmcmFtZS4KKyAqCisgKiBJdCByZXR1cm5z IGFuIGludGVybmFsIHN0cmluZyBhbmQgc2hvdWxkIG5vdAorICogYmUgbW9kaWZpZWQuIFRoZSBz dHJpbmcgaXMgZ3VhcmFudGVlZCB0byBiZSBzdHJpbmdzaGFyZWQuCisgKgorICogQHBhcmFtIG8g dmlldyBvYmplY3QgdG8gZ2V0IGN1cnJlbnQgdGl0bGUKKyAqCisgKiBAcmV0dXJuIGN1cnJlbnQg dGl0bGUgb24gc3VjY2VzcyBvciBAYyAwIG9uIGZhaWx1cmUKKyAqLworRUFQSSBjb25zdCBjaGFy ICpld2tfdmlld190aXRsZV9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOworCiAjaWZkZWYgX19j cGx1c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXdfbG9hZGVyX2NsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50LmNwcApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwLi5lOThlMTU0Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfbG9hZGVyX2NsaWVudC5jcHAKQEAgLTAs MCArMSw1MiBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMiBJbnRlbCBDb3Jwb3JhdGlvbi4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICog YXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFp biB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMg aW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAg bm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFp bWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHBy b3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBS T1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBB TkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1Qg TElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZ IEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQu IElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUg TElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhF TVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1Qg TElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklD RVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJS VVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdI RVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJ TkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9G IFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9T U0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorCisj aW5jbHVkZSAiV0tGcmFtZS5oIgorI2luY2x1ZGUgImV3a192aWV3X2xvYWRlcl9jbGllbnRfcHJp dmF0ZS5oIgorI2luY2x1ZGUgImV3a192aWV3X3ByaXZhdGUuaCIKKyNpbmNsdWRlIDx3dGYvdGV4 dC9DU3RyaW5nLmg+CisKK3VzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CisKK3N0YXRpYyB2b2lkIGRp ZFJlY2VpdmVUaXRsZUZvckZyYW1lKFdLUGFnZVJlZiwgV0tTdHJpbmdSZWYgdGl0bGUsIFdLRnJh bWVSZWYgZnJhbWUsIFdLVHlwZVJlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3sKKyAgICBp ZiAoIVdLRnJhbWVJc01haW5GcmFtZShmcmFtZSkpCisgICAgICAgIHJldHVybjsKKworICAgIEV2 YXNfT2JqZWN0KiBld2tWaWV3ID0gc3RhdGljX2Nhc3Q8RXZhc19PYmplY3QqPihjb25zdF9jYXN0 PHZvaWQqPihjbGllbnRJbmZvKSk7CisgICAgZXdrX3ZpZXdfdGl0bGVfY2hhbmdlZChld2tWaWV3 LCB0b0ltcGwodGl0bGUpLT5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKK30KKwordm9pZCBld2tf dmlld19sb2FkZXJfY2xpZW50X2F0dGFjaChXS1BhZ2VSZWYgcGFnZVJlZiwgRXZhc19PYmplY3Qq IGV3a1ZpZXcpCit7CisgICAgV0tQYWdlTG9hZGVyQ2xpZW50IGxvYWRDbGllbnQ7CisgICAgbWVt c2V0KCZsb2FkQ2xpZW50LCAwLCBzaXplb2YoV0tQYWdlTG9hZGVyQ2xpZW50KSk7CisgICAgbG9h ZENsaWVudC52ZXJzaW9uID0ga1dLUGFnZUxvYWRlckNsaWVudEN1cnJlbnRWZXJzaW9uOworICAg IGxvYWRDbGllbnQuY2xpZW50SW5mbyA9IGV3a1ZpZXc7CisgICAgbG9hZENsaWVudC5kaWRSZWNl aXZlVGl0bGVGb3JGcmFtZSA9IGRpZFJlY2VpdmVUaXRsZUZvckZyYW1lOworICAgIFdLUGFnZVNl dFBhZ2VMb2FkZXJDbGllbnQocGFnZVJlZiwgJmxvYWRDbGllbnQpOworfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfbG9hZGVyX2NsaWVudF9w cml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19sb2Fk ZXJfY2xpZW50X3ByaXZhdGUuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42 MTVjMDE5Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXdfbG9hZGVyX2NsaWVudF9wcml2YXRlLmgKQEAgLTAsMCArMSwzNCBAQAorLyoK KyAqIENvcHlyaWdodCAoQykgMjAxMiBJbnRlbCBDb3Jwb3JhdGlvbi4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEu IFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29w eXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxp c3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICog ICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhl IGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExF IElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAq IFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNI QUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkg RElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICog Q09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJP Q1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNF LCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVS IENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENP TlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBP UiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCisgKi8KKworI2lmbmRlZiBld2tfdmlld19sb2FkZXJfY2xpZW50X3ByaXZhdGVf aAorI2RlZmluZSBld2tfdmlld19sb2FkZXJfY2xpZW50X3ByaXZhdGVfaAorCisjaW5jbHVkZSA8 RXZhcy5oPgorI2luY2x1ZGUgPFdlYktpdDIvV0tCYXNlLmg+CisKK3ZvaWQgZXdrX3ZpZXdfbG9h ZGVyX2NsaWVudF9hdHRhY2goV0tQYWdlUmVmIHBhZ2VSZWYsIEV2YXNfT2JqZWN0KiBld2tWaWV3 KTsKKworI2VuZGlmIC8vIGV3a192aWV3X2xvYWRlcl9jbGllbnRfcHJpdmF0ZV9oCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmgKaW5k ZXggMTlkMGM4Ni4uMmIzZjQ3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL2V3a192aWV3X3ByaXZhdGUuaApAQCAtMzIsNiArMzIsNyBAQCBjbGFzcyBJbnRT aXplOwogCiB2b2lkIGV3a192aWV3X2Rpc3BsYXkoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0 IFdlYkNvcmU6OkludFJlY3QmIHJlY3QpOwogdm9pZCBld2tfdmlld19pbWFnZV9kYXRhX3NldChF dmFzX09iamVjdCogZXdrVmlldywgdm9pZCogaW1hZ2VEYXRhLCBjb25zdCBXZWJDb3JlOjpJbnRT aXplJiBzaXplKTsKK3ZvaWQgZXdrX3ZpZXdfdGl0bGVfY2hhbmdlZChFdmFzX09iamVjdCogZXdr VmlldywgY29uc3QgY2hhciogdGl0bGUpOwogCiBFdmFzX09iamVjdCogZXdrX3ZpZXdfYmFzZV9h ZGQoRXZhcyogY2FudmFzLCBXS0NvbnRleHRSZWYsIFdLUGFnZUdyb3VwUmVmKTsKIApkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDRkMjYxYTIuLjk0 MGM2ZjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cK QEAgLTEsNSArMSwyMCBAQAogMjAxMi0wNi0xNSAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9w aGUuZHVtZXpAaW50ZWwuY29tPgogCisgICAgICAgIFtFRkxdW1dLMl0gQWRkIHRpdGxlIHN1cHBv cnQgdG8gRXdrX1ZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTg5MDk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVXBkYXRlIHRoZSBNaW5pQnJvd3NlciBzbyBpdCBsaXN0ZW5zIGZvciB0aGUgInRpdGxl LGNoYW5nZSIKKyAgICAgICAgc2lnbmFsIG9uIHRoZSB2aWV3IGFuZCBrZWVwcyB0aGUgYnJvd3Nl ciB3aW5kb3cgdGl0bGUKKyAgICAgICAgdXAtdG8tZGF0ZS4KKworICAgICAgICAqIE1pbmlCcm93 c2VyL2VmbC9tYWluLmM6CisgICAgICAgIChvbl90aXRsZV9jaGFuZ2VkKToKKyAgICAgICAgKGJy b3dzZXJDcmVhdGUpOgorCisyMDEyLTA2LTE1ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3Bo ZS5kdW1lekBpbnRlbC5jb20+CisKICAgICAgICAgW0VGTF0gRUZMJ3MgTGF5b3V0VGVzdENvbnRy b2xsZXIgZG9lcyBub3Qgc3VwcG9ydCB0aXRsZVRleHREaXJlY3Rpb24KICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2NDc1CiAKZGlmZiAtLWdpdCBhL1Rv b2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5j CmluZGV4IDg4MGJmOGIuLmYwY2RlZDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2Vm bC9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwpAQCAtNzgsNiArNzgs MTUgQEAgb25fa2V5X2Rvd24odm9pZCAqZGF0YSwgRXZhcyAqZSwgRXZhc19PYmplY3QgKm9iaiwg dm9pZCAqZXZlbnRfaW5mbykKICAgICB9CiB9CiAKK3N0YXRpYyB2b2lkCitvbl90aXRsZV9jaGFu Z2VkKHZvaWQgKnVzZXJfZGF0YSwgRXZhc19PYmplY3QgKndlYnZpZXcsIHZvaWQgKmV2ZW50X2lu Zm8pCit7CisgICAgTWluaUJyb3dzZXIgKmFwcCA9IChNaW5pQnJvd3NlciAqKXVzZXJfZGF0YTsK KyAgICBjb25zdCBjaGFyICp0aXRsZSA9IChjb25zdCBjaGFyICopZXZlbnRfaW5mbzsKKworICAg IGVjb3JlX2V2YXNfdGl0bGVfc2V0KGFwcC0+ZWUsIHRpdGxlKTsKK30KKwogc3RhdGljIE1pbmlC cm93c2VyICpicm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCkKIHsKICAgICBNaW5pQnJvd3Nl ciAqYXBwID0gbWFsbG9jKHNpemVvZihNaW5pQnJvd3NlcikpOwpAQCAtMTA0LDYgKzExMyw4IEBA IHN0YXRpYyBNaW5pQnJvd3NlciAqYnJvd3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmwpCiAgICAg YXBwLT5icm93c2VyID0gZXdrX3ZpZXdfYWRkKGFwcC0+ZXZhcyk7CiAgICAgZXZhc19vYmplY3Rf bmFtZV9zZXQoYXBwLT5icm93c2VyLCAiYnJvd3NlciIpOwogCisgICAgZXZhc19vYmplY3Rfc21h cnRfY2FsbGJhY2tfYWRkKGFwcC0+YnJvd3NlciwgInRpdGxlLGNoYW5nZWQiLCBvbl90aXRsZV9j aGFuZ2VkLCBhcHApOworCiAgICAgZXZhc19vYmplY3RfZXZlbnRfY2FsbGJhY2tfYWRkKGFwcC0+ YnJvd3NlciwgRVZBU19DQUxMQkFDS19LRVlfRE9XTiwgb25fa2V5X2Rvd24sIGFwcCk7CiAKICAg ICBldmFzX29iamVjdF9zaXplX2hpbnRfd2VpZ2h0X3NldChhcHAtPmJyb3dzZXIsIEVWQVNfSElO VF9FWFBBTkQsIEVWQVNfSElOVF9FWFBBTkQpOwo= 147791 2012-06-15 04:03:49 -0700 2012-06-15 05:17:12 -0700 Patch for landing 89095_view_title.patch text/plain 11983 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiY2YwMDQ2Li5hNjVlMDY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzEg QEAKIDIwMTItMDYtMTUgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAorICAgICAgICBbRUZMXVtXSzJdIEFkZCB0aXRsZSBzdXBwb3J0IHRvIEV3a19WaWV3 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTA5NQor CisgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgorCisgICAg ICAgIEFkZCBhIG1ldGhvZCB0byBnZXQgdGhlIHRpdGxlIG9mIHRoZSBtYWluIGZyYW1lIGluCisg ICAgICAgIGFuIEV3a19WaWV3LiBBICJ0aXRsZSxjaGFuZ2VkIiBzaWduYWwgaXMgbm93IGVtaXR0 ZWQKKyAgICAgICAgb24gdGhlIHZpZXcgdG8gbm90aWZ5IGNsaWVudHMgdGhhdCB0aGUgbWFpbiBm cmFtZQorICAgICAgICB0aXRsZSB3YXMgY2hhbmdlZC4KKworICAgICAgICAqIFBsYXRmb3JtRWZs LmNtYWtlOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAg ICAgKF9Fd2tfVmlld19Qcml2YXRlX0RhdGEpOgorICAgICAgICAoX2V3a192aWV3X3ByaXZfZGVs KToKKyAgICAgICAgKGV3a192aWV3X2Jhc2VfYWRkKToKKyAgICAgICAgKGV3a192aWV3X3RpdGxl X2dldCk6CisgICAgICAgIChld2tfdmlld190aXRsZV9jaGFuZ2VkKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3 a192aWV3X2xvYWRlcl9jbGllbnQuY3BwOiBBZGRlZC4KKyAgICAgICAgKGRpZFJlY2VpdmVUaXRs ZUZvckZyYW1lKToKKyAgICAgICAgKGV3a192aWV3X2xvYWRlcl9jbGllbnRfYXR0YWNoKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50X3ByaXZhdGUu aDogQWRkZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5o OgorCisyMDEyLTA2LTE1ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRl bC5jb20+CisKICAgICAgICAgW1dLMl1bRUZMXSBJbXBsZW1lbnQgbmF2aWdhdGlvbiBiYWNrL2Zv cndhcmQgaW4gRXdrX1ZpZXcKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg5MTczCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtRWZs LmNtYWtlIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UKaW5kZXggNWUwODg1ZS4u NDcyYTg2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UKKysr IGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UKQEAgLTMxLDYgKzMxLDcgQEAgTElT VChBUFBFTkQgV2ViS2l0Ml9TT1VSQ0VTCiAgICAgVUlQcm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVu dEltcGwuY3BwCiAgICAgVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCiAgICAgVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCisgICAgVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXdfbG9hZGVyX2NsaWVudC5jcHAKIAogICAgIFVJUHJvY2Vzcy9jYWlyby9CYWNraW5nU3RvcmVD YWlyby5jcHAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcu Y3BwCmluZGV4IDY1YmE4ZTAuLjAxZmQ1ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJXS1VS TC5oIgogI2luY2x1ZGUgImV3a19jb250ZXh0LmgiCiAjaW5jbHVkZSAiZXdrX2NvbnRleHRfcHJp dmF0ZS5oIgorI2luY2x1ZGUgImV3a192aWV3X2xvYWRlcl9jbGllbnRfcHJpdmF0ZS5oIgogI2lu Y2x1ZGUgImV3a192aWV3X3ByaXZhdGUuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+ CiAKQEAgLTQxLDYgKzQyLDcgQEAgc3RhdGljIGNvbnN0IGNoYXIgRVdLX1ZJRVdfVFlQRV9TVFJb XSA9ICJFV0syX1ZpZXciOwogc3RydWN0IF9Fd2tfVmlld19Qcml2YXRlX0RhdGEgewogICAgIE93 blB0cjxQYWdlQ2xpZW50SW1wbD4gcGFnZUNsaWVudDsKICAgICBjb25zdCBjaGFyKiB1cmk7Cisg ICAgY29uc3QgY2hhciogdGl0bGU7CiB9OwogCiAjZGVmaW5lIEVXS19WSUVXX1RZUEVfQ0hFQ0so ZXdrVmlldywgcmVzdWx0KSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXApAQCAt MjY4LDYgKzI3MCw3IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19wcml2X2RlbChFd2tfVmlld19Q cml2YXRlX0RhdGEqIHByaXYpCiAKICAgICBwcml2LT5wYWdlQ2xpZW50ID0gbnVsbHB0cjsKICAg ICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2LT51cmkpOworICAgIGVpbmFfc3RyaW5nc2hhcmVf ZGVsKHByaXYtPnRpdGxlKTsKICAgICBmcmVlKHByaXYpOwogfQogCkBAIC00ODksNiArNDkyLDcg QEAgRXZhc19PYmplY3QqIGV3a192aWV3X2Jhc2VfYWRkKEV2YXMqIGNhbnZhcywgV0tDb250ZXh0 UmVmIGNvbnRleHRSZWYsIFdLUGFnZUdyb3UKICAgICB9CiAKICAgICBwcml2LT5wYWdlQ2xpZW50 ID0gUGFnZUNsaWVudEltcGw6OmNyZWF0ZSh0b0ltcGwoY29udGV4dFJlZiksIHRvSW1wbChwYWdl R3JvdXBSZWYpLCBld2tWaWV3KTsKKyAgICBld2tfdmlld19sb2FkZXJfY2xpZW50X2F0dGFjaCh0 b0FQSShwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCkpLCBld2tWaWV3KTsKIAogICAgIHJldHVybiBl d2tWaWV3OwogfQpAQCAtNTQyLDYgKzU0NiwyOCBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc3RvcChF dmFzX09iamVjdCogZXdrVmlldykKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorY29uc3QgY2hhciog ZXdrX3ZpZXdfdGl0bGVfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQoreworICAgIEVX S19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCAwKTsKKyAgICBFV0tf VklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCAwKTsKKworICAgIENTdHJp bmcgdGl0bGUgPSBwcml2LT5wYWdlQ2xpZW50LT5wYWdlKCktPnBhZ2VUaXRsZSgpLnV0ZjgoKTsK KyAgICBlaW5hX3N0cmluZ3NoYXJlX3JlcGxhY2UoJnByaXYtPnRpdGxlLCB0aXRsZS5kYXRhKCkp OworCisgICAgcmV0dXJuIHByaXYtPnRpdGxlOworfQorCisvKioKKyAqIEBpbnRlcm5hbAorICog VGhlIHZpZXcgdGl0bGUgd2FzIGNoYW5nZWQgYnkgdGhlIGZyYW1lIGxvYWRlci4KKyAqCisgKiBF bWl0cyBzaWduYWw6ICJ0aXRsZSxjaGFuZ2VkIiB3aXRoIHBvaW50ZXIgdG8gbmV3IHRpdGxlIHN0 cmluZy4KKyAqLwordm9pZCBld2tfdmlld190aXRsZV9jaGFuZ2VkKEV2YXNfT2JqZWN0KiBld2tW aWV3LCBjb25zdCBjaGFyKiB0aXRsZSkKK3sKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFj a19jYWxsKGV3a1ZpZXcsICJ0aXRsZSxjaGFuZ2VkIiwgY29uc3RfY2FzdDxjaGFyKj4odGl0bGUp KTsKK30KKwogdm9pZCBld2tfdmlld19kaXNwbGF5KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25z dCBJbnRSZWN0JiByZWN0KQogewogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmll dywgc21hcnREYXRhKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll dy5oCmluZGV4IDZhMmZiZmYuLmNiNWI2NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuaApAQCAtMjMsNiArMjMsMTAgQEAKICAqIEBicmllZiAgIFdlYktp dCBtYWluIHNtYXJ0IG9iamVjdC4KICAqCiAgKiBUaGlzIG9iamVjdCBwcm92aWRlcyB2aWV3IHJl bGF0ZWQgQVBJcyBvZiBXZWJLaXQyIHRvIEVGTCBvYmplY3QuCisgKgorICogVGhlIGZvbGxvd2lu ZyBzaWduYWxzIChzZWUgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKCkpIGFyZSBlbWl0 dGVkOgorICoKKyAqIC0gInRpdGxlLGNoYW5nZWQiLCBjb25zdCBjaGFyKjogdGl0bGUgb2YgdGhl IG1haW4gZnJhbWUgd2FzIGNoYW5nZWQuCiAgKi8KIAogI2lmbmRlZiBld2tfdmlld19oCkBAIC0y MjUsNiArMjI5LDE4IEBAIEVBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X2JhY2tfcG9zc2libGUo RXZhc19PYmplY3QgKm8pOwogICovCiBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19mb3J3YXJk X3Bvc3NpYmxlKEV2YXNfT2JqZWN0ICpvKTsKIAorLyoqCisgKiBHZXRzIHRoZSBjdXJyZW50IHRp dGxlIG9mIHRoZSBtYWluIGZyYW1lLgorICoKKyAqIEl0IHJldHVybnMgYW4gaW50ZXJuYWwgc3Ry aW5nIGFuZCBzaG91bGQgbm90CisgKiBiZSBtb2RpZmllZC4gVGhlIHN0cmluZyBpcyBndWFyYW50 ZWVkIHRvIGJlIHN0cmluZ3NoYXJlZC4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBn ZXQgY3VycmVudCB0aXRsZQorICoKKyAqIEByZXR1cm4gY3VycmVudCB0aXRsZSBvbiBzdWNjZXNz IG9yIEBjIDAgb24gZmFpbHVyZQorICovCitFQVBJIGNvbnN0IGNoYXIgKmV3a192aWV3X3RpdGxl X2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2Vu ZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll d19sb2FkZXJfY2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a192aWV3X2xvYWRlcl9jbGllbnQuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLmU5OGUxNTQKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50LmNwcApAQCAtMCwwICsxLDUyIEBACisvKgor ICogQ29weXJpZ2h0IChDKSAyMDEyIEludGVsIENvcnBvcmF0aW9uLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4g UmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5 cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBt dXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAg ICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUg ZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUg SU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBP UiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICog VEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9S IEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hB TEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBE SVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBD T05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9D VVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0Us IERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIg Q0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09O VFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9S IE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElT IFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNI IERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisKKyNpbmNsdWRlICJXS0ZyYW1l LmgiCisjaW5jbHVkZSAiZXdrX3ZpZXdfbG9hZGVyX2NsaWVudF9wcml2YXRlLmgiCisjaW5jbHVk ZSAiZXdrX3ZpZXdfcHJpdmF0ZS5oIgorI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KKwor dXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKKworc3RhdGljIHZvaWQgZGlkUmVjZWl2ZVRpdGxlRm9y RnJhbWUoV0tQYWdlUmVmLCBXS1N0cmluZ1JlZiB0aXRsZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tU eXBlUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQoreworICAgIGlmICghV0tGcmFtZUlzTWFp bkZyYW1lKGZyYW1lKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgRXZhc19PYmplY3QqIGV3a1Zp ZXcgPSBzdGF0aWNfY2FzdDxFdmFzX09iamVjdCo+KGNvbnN0X2Nhc3Q8dm9pZCo+KGNsaWVudElu Zm8pKTsKKyAgICBld2tfdmlld190aXRsZV9jaGFuZ2VkKGV3a1ZpZXcsIHRvSW1wbCh0aXRsZSkt PnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworfQorCit2b2lkIGV3a192aWV3X2xvYWRlcl9jbGll bnRfYXR0YWNoKFdLUGFnZVJlZiBwYWdlUmVmLCBFdmFzX09iamVjdCogZXdrVmlldykKK3sKKyAg ICBXS1BhZ2VMb2FkZXJDbGllbnQgbG9hZENsaWVudDsKKyAgICBtZW1zZXQoJmxvYWRDbGllbnQs IDAsIHNpemVvZihXS1BhZ2VMb2FkZXJDbGllbnQpKTsKKyAgICBsb2FkQ2xpZW50LnZlcnNpb24g PSBrV0tQYWdlTG9hZGVyQ2xpZW50Q3VycmVudFZlcnNpb247CisgICAgbG9hZENsaWVudC5jbGll bnRJbmZvID0gZXdrVmlldzsKKyAgICBsb2FkQ2xpZW50LmRpZFJlY2VpdmVUaXRsZUZvckZyYW1l ID0gZGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWU7CisgICAgV0tQYWdlU2V0UGFnZUxvYWRlckNsaWVu dChwYWdlUmVmLCAmbG9hZENsaWVudCk7Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50X3ByaXZhdGUuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X2xvYWRlcl9jbGllbnRfcHJpdmF0 ZS5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjYxNWMwMTkKLS0tIC9kZXYv bnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19sb2Fk ZXJfY2xpZW50X3ByaXZhdGUuaApAQCAtMCwwICsxLDM0IEBACisvKgorICogQ29weXJpZ2h0IChD KSAyMDEyIEludGVsIENvcnBvcmF0aW9uLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor ICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENP TlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJB TlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FS UkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgor ICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBP UiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNU LCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERB TUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICog U1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJ VFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBB TlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBM SUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAq IEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLwor CisjaWZuZGVmIGV3a192aWV3X2xvYWRlcl9jbGllbnRfcHJpdmF0ZV9oCisjZGVmaW5lIGV3a192 aWV3X2xvYWRlcl9jbGllbnRfcHJpdmF0ZV9oCisKKyNpbmNsdWRlIDxFdmFzLmg+CisjaW5jbHVk ZSA8V2ViS2l0Mi9XS0Jhc2UuaD4KKwordm9pZCBld2tfdmlld19sb2FkZXJfY2xpZW50X2F0dGFj aChXS1BhZ2VSZWYgcGFnZVJlZiwgRXZhc19PYmplY3QqIGV3a1ZpZXcpOworCisjZW5kaWYgLy8g ZXdrX3ZpZXdfbG9hZGVyX2NsaWVudF9wcml2YXRlX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X3ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X3ByaXZhdGUuaAppbmRleCAxOWQwYzg2Li4yYjNm NDc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll d19wcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXdfcHJpdmF0ZS5oCkBAIC0zMiw2ICszMiw3IEBAIGNsYXNzIEludFNpemU7CiAKIHZvaWQgZXdr X3ZpZXdfZGlzcGxheShFdmFzX09iamVjdCogZXdrVmlldywgY29uc3QgV2ViQ29yZTo6SW50UmVj dCYgcmVjdCk7CiB2b2lkIGV3a192aWV3X2ltYWdlX2RhdGFfc2V0KEV2YXNfT2JqZWN0KiBld2tW aWV3LCB2b2lkKiBpbWFnZURhdGEsIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNpemUpOwordm9p ZCBld2tfdmlld190aXRsZV9jaGFuZ2VkKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBjaGFy KiB0aXRsZSk7CiAKIEV2YXNfT2JqZWN0KiBld2tfdmlld19iYXNlX2FkZChFdmFzKiBjYW52YXMs IFdLQ29udGV4dFJlZiwgV0tQYWdlR3JvdXBSZWYpOwogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFu Z2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDViMDdjMi4uMWZmOGI5YSAxMDA2NDQKLS0t IGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBA CiAyMDEyLTA2LTE1ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5j b20+CiAKKyAgICAgICAgW0VGTF1bV0syXSBBZGQgdGl0bGUgc3VwcG9ydCB0byBFd2tfVmlldwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkwOTUKKwor ICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KKworICAgICAg ICBVcGRhdGUgdGhlIE1pbmlCcm93c2VyIHNvIGl0IGxpc3RlbnMgZm9yIHRoZSAidGl0bGUsY2hh bmdlIgorICAgICAgICBzaWduYWwgb24gdGhlIHZpZXcgYW5kIGtlZXBzIHRoZSBicm93c2VyIHdp bmRvdyB0aXRsZQorICAgICAgICB1cC10by1kYXRlLgorCisgICAgICAgICogTWluaUJyb3dzZXIv ZWZsL21haW4uYzoKKyAgICAgICAgKG9uX3RpdGxlX2NoYW5nZWQpOgorICAgICAgICAoYnJvd3Nl ckNyZWF0ZSk6CisKKzIwMTItMDYtMTUgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1 bWV6QGludGVsLmNvbT4KKwogICAgICAgICBbV0syXVtFRkxdIEltcGxlbWVudCBuYXZpZ2F0aW9u IGJhY2svZm9yd2FyZCBpbiBFd2tfVmlldwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODkxNzMKIApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIv ZWZsL21haW4uYyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKaW5kZXggYWM5ODE0Zi4u NzNjMjUzYiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYworKysgYi9U b29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCkBAIC04Niw2ICs4NiwxNSBAQCBvbl9rZXlfZG93 bih2b2lkICpkYXRhLCBFdmFzICplLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpldmVudF9pbmZv KQogICAgIH0KIH0KIAorc3RhdGljIHZvaWQKK29uX3RpdGxlX2NoYW5nZWQodm9pZCAqdXNlcl9k YXRhLCBFdmFzX09iamVjdCAqd2Vidmlldywgdm9pZCAqZXZlbnRfaW5mbykKK3sKKyAgICBNaW5p QnJvd3NlciAqYXBwID0gKE1pbmlCcm93c2VyICopdXNlcl9kYXRhOworICAgIGNvbnN0IGNoYXIg KnRpdGxlID0gKGNvbnN0IGNoYXIgKilldmVudF9pbmZvOworCisgICAgZWNvcmVfZXZhc190aXRs ZV9zZXQoYXBwLT5lZSwgdGl0bGUpOworfQorCiBzdGF0aWMgTWluaUJyb3dzZXIgKmJyb3dzZXJD cmVhdGUoY29uc3QgY2hhciAqdXJsKQogewogICAgIE1pbmlCcm93c2VyICphcHAgPSBtYWxsb2Mo c2l6ZW9mKE1pbmlCcm93c2VyKSk7CkBAIC0xMTIsNiArMTIxLDggQEAgc3RhdGljIE1pbmlCcm93 c2VyICpicm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCkKICAgICBhcHAtPmJyb3dzZXIgPSBl d2tfdmlld19hZGQoYXBwLT5ldmFzKTsKICAgICBldmFzX29iamVjdF9uYW1lX3NldChhcHAtPmJy b3dzZXIsICJicm93c2VyIik7CiAKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQo YXBwLT5icm93c2VyLCAidGl0bGUsY2hhbmdlZCIsIG9uX3RpdGxlX2NoYW5nZWQsIGFwcCk7CisK ICAgICBldmFzX29iamVjdF9ldmVudF9jYWxsYmFja19hZGQoYXBwLT5icm93c2VyLCBFVkFTX0NB TExCQUNLX0tFWV9ET1dOLCBvbl9rZXlfZG93biwgYXBwKTsKIAogICAgIGV2YXNfb2JqZWN0X3Np emVfaGludF93ZWlnaHRfc2V0KGFwcC0+YnJvd3NlciwgRVZBU19ISU5UX0VYUEFORCwgRVZBU19I SU5UX0VYUEFORCk7Cg==