137361 2014-10-02 14:28:15 -0700 [GTK] Fix build when DRAG_SUPPORT is disabled 2014-10-05 04:28:35 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ltilve ltilve berto cgarcia commit-queue gustavo mrobinson oldest_to_newest 1038982 0 ltilve 2014-10-02 14:28:15 -0700 It is necessary to flag out some code to fix the build if DRAG_SUPPORT is disabled. 1038987 1 239140 ltilve 2014-10-02 14:42:16 -0700 Created attachment 239140 Patch 1038988 2 commit-queue 2014-10-02 14:44:27 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1039137 3 239140 cgarcia 2014-10-02 23:46:36 -0700 Comment on attachment 239140 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=239140&action=review Thanks for the patch. I have a few comments. > Source/WebCore/platform/gtk/GtkDragAndDropHelper.cpp:89 > +#if ENABLE(DRAG_SUPPORT) > DragData dragData(context->dataObject.get(), position, > convertWidgetPointToScreenPoint(m_widget, position), > DragOperationNone); > context->exitedCallback(m_widget, dragData, context->dropHappened); > +#endif I think the entire class GtkDragAndDropHelper should be only compiled when drag support is enabled > Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp:234 > +#if ENABLE(DRAG_SUPPORT) > dragData = DragData(platformData.release().leakRef(), clientPosition, globalPosition, static_cast<DragOperation>(sourceOperationMask), > static_cast<DragApplicationFlags>(flags)); > +#endif DragData is only used by messages defined inside a drag_support #ifdef, so we should only define encode/decode for DragData when drag_support is enabled > Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp:276 > void PageClientImpl::startDrag(const WebCore::DragData& dragData, PassRefPtr<ShareableBitmap> dragImage) > { > +#if ENABLE(DRAG_SUPPORT) > webkitWebViewBaseStartDrag(WEBKIT_WEB_VIEW_BASE(m_viewWidget), dragData, dragImage); > +#endif > } PageClientImpl::startDrag() is only called by WebPageProxy::startDrag(), which is the handler of an IPC message defined only when drag support is enabled, see: #if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT) StartDrag(WebCore::DragData dragData, WebKit::ShareableBitmap::Handle dragImage) #endif So, we should add the guard to PageClient.h to only define startDrag when drag support is enabled. 1039585 4 239297 ltilve 2014-10-05 01:11:24 -0700 Created attachment 239297 Patch 1039586 5 ltilve 2014-10-05 01:16:13 -0700 (In reply to comment #3) > (From update of attachment 239140 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=239140&action=review Thanks for the review, I've fixed the commented issues. 1039588 6 239297 cgarcia 2014-10-05 01:21:50 -0700 Comment on attachment 239297 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=239297&action=review > Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h:47 > template<> struct ArgumentCoder<WebCore::DragData> { > +#if ENABLE(DRAG_SUPPORT) > static void encode(ArgumentEncoder&, const WebCore::DragData&); > static bool decode(ArgumentDecoder&, WebCore::DragData&); > +#endif > }; Why are the ifdefs inside the struct instead of the whole struct definition inside the #ifdef block? 1039590 7 239298 ltilve 2014-10-05 01:57:25 -0700 Created attachment 239298 Patch 1039591 8 239298 commit-queue 2014-10-05 04:28:31 -0700 Comment on attachment 239298 Patch Clearing flags on attachment: 239298 Committed r174328: <http://trac.webkit.org/changeset/174328> 1039592 9 commit-queue 2014-10-05 04:28:35 -0700 All reviewed patches have been landed. Closing bug. 239140 2014-10-02 14:42:16 -0700 2014-10-05 01:11:15 -0700 Patch bug-137361-20141002234216.patch text/plain 3807 ltilve U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0MjMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzcyYjQwNzI2MmU4NDVm ZGRlOTUzNjI4YTE1ZjE5MzY3NTQwMjQ2NS4uNWI2MTBiYjlhZGExNTZlMDlkODE0OTMyZjEzMDUx YTFiMDEyNzM3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTEwLTAyICBMb3Jl bnpvIFRpbHZlICA8bHRpbHZlQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gRml4IGJ1aWxk IHdoZW4gRFJBR19TVVBQT1JUIGlzIGRpc2FibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzczNjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGbGFnIG91dCB1bmJ1aWxkYWJsZSBjb2RlIHdpdGhvdXQg RFJBR19TVVBQT1JULgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0d0a0RyYWdBbmREcm9wSGVs cGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okd0a0RyYWdBbmREcm9wSGVscGVyOjpoYW5kbGVE cmFnTGVhdmVMYXRlcik6CisKIDIwMTQtMTAtMDIgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRv bkBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBQYWdlT3ZlcmxheVtDb250cm9sbGVyXSB0byBX ZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTY3YTdlOTQ0ZGFkZmQzYzU1NjU1ZWRjYjA1OWI1ZmUxYTJi ZGRlOC4uNWI2NDdhOWE0MzEzNzQ3YjA4YWFlNjZhOTI5MWI5NWY4YWM3Y2IwMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTEwLTAyICBMb3JlbnpvIFRpbHZlICA8bHRpbHZlQGln YWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gRml4IGJ1aWxkIHdoZW4gRFJBR19TVVBQT1JUIGlz IGRpc2FibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzczNjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBGbGFnIG91dCB1bmJ1aWxkYWJsZSBjb2RlIHdpdGhvdXQgZHJhZyBzdXBwb3J0LgorCisgICAg ICAgICogU2hhcmVkL2d0ay9Bcmd1bWVudENvZGVyc0d0ay5jcHA6CisgICAgICAgIChJUEM6OkFy Z3VtZW50Q29kZXI8RHJhZ0RhdGE+OjpkZWNvZGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Z3RrL1BhZ2VDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6 OnN0YXJ0RHJhZyk6CisKIDIwMTQtMTAtMDIgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBh cHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBQYWdlT3ZlcmxheVtDb250cm9sbGVyXSB0byBXZWJD b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrRHJhZ0FuZERy b3BIZWxwZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a0RyYWdBbmREcm9w SGVscGVyLmNwcAppbmRleCBjOGViOGQxNzBmM2U3MDMxYzIwZDE5MTRhMGI1N2MyMTg4NTYxZTRm Li45YzFlMzdiMzE3MDEwZjU5ZjczMDM1MGE5MGEwMDZkYmMwNWJmZGNmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrRHJhZ0FuZERyb3BIZWxwZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtEcmFnQW5kRHJvcEhlbHBlci5jcHAKQEAg LTgxLDEwICs4MSwxMiBAQCB2b2lkIEd0a0RyYWdBbmREcm9wSGVscGVyOjpoYW5kbGVEcmFnTGVh dmVMYXRlcihEcm9wcGluZ0NvbnRleHQqIGNvbnRleHQpCiAgICAgICAgIHJldHVybjsKIAogICAg IGNvbnN0IEludFBvaW50JiBwb3NpdGlvbiA9IGNvbnRleHQtPmxhc3RNb3Rpb25Qb3NpdGlvbjsK KyNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogICAgIERyYWdEYXRhIGRyYWdEYXRhKGNvbnRleHQt PmRhdGFPYmplY3QuZ2V0KCksIHBvc2l0aW9uLAogICAgICAgICAgICAgICAgICAgICAgIGNvbnZl cnRXaWRnZXRQb2ludFRvU2NyZWVuUG9pbnQobV93aWRnZXQsIHBvc2l0aW9uKSwKICAgICAgICAg ICAgICAgICAgICAgICBEcmFnT3BlcmF0aW9uTm9uZSk7CiAgICAgY29udGV4dC0+ZXhpdGVkQ2Fs bGJhY2sobV93aWRnZXQsIGRyYWdEYXRhLCBjb250ZXh0LT5kcm9wSGFwcGVuZWQpOworI2VuZGlm CiAKICAgICBtX2Ryb3BwaW5nQ29udGV4dHMucmVtb3ZlKGl0ZXJhdG9yKTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvQXJndW1lbnRDb2RlcnNHdGsuY3BwIGIvU291 cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9Bcmd1bWVudENvZGVyc0d0ay5jcHAKaW5kZXggNDJjM2Fj MTQ3MjVmOWQwNTgwOWZjYTUwMjg4Yzk2OGNhOTM3NzczMi4uY2Y2MzM0NGQ5NzRmZWUyMDM2ZTdi MDU0MmYyYTk1ZDVjODE5OGU2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL2d0 ay9Bcmd1bWVudENvZGVyc0d0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9B cmd1bWVudENvZGVyc0d0ay5jcHAKQEAgLTIyOCw4ICsyMjgsMTAgQEAgYm9vbCBBcmd1bWVudENv ZGVyPERyYWdEYXRhPjo6ZGVjb2RlKEFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgRHJhZ0RhdGEm IGRyYWdEYXQKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKKyNpZiBFTkFCTEUo RFJBR19TVVBQT1JUKQogICAgIGRyYWdEYXRhID0gRHJhZ0RhdGEocGxhdGZvcm1EYXRhLnJlbGVh c2UoKS5sZWFrUmVmKCksIGNsaWVudFBvc2l0aW9uLCBnbG9iYWxQb3NpdGlvbiwgc3RhdGljX2Nh c3Q8RHJhZ09wZXJhdGlvbj4oc291cmNlT3BlcmF0aW9uTWFzayksCiAgICAgICAgICAgICAgICAg ICAgICAgICBzdGF0aWNfY2FzdDxEcmFnQXBwbGljYXRpb25GbGFncz4oZmxhZ3MpKTsKKyNlbmRp ZgogCiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAKaW5kZXggMzg5YmQyYjhiZWI1ZDg0ZmViNzZj NzQ0MGNhYjAzNDJmZGNmNzcyZC4uZjZkYTIxYzg3NjBkZTkxMzZlMGQzNGVmOTFiOWU5NTVlM2Fi Yjc3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNs aWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VD bGllbnRJbXBsLmNwcApAQCAtMjcwLDcgKzI3MCw5IEBAIHZvaWQgUGFnZUNsaWVudEltcGw6OnVw ZGF0ZVRleHRJbnB1dFN0YXRlKCkKIAogdm9pZCBQYWdlQ2xpZW50SW1wbDo6c3RhcnREcmFnKGNv bnN0IFdlYkNvcmU6OkRyYWdEYXRhJiBkcmFnRGF0YSwgUGFzc1JlZlB0cjxTaGFyZWFibGVCaXRt YXA+IGRyYWdJbWFnZSkKIHsKKyNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogICAgIHdlYmtpdFdl YlZpZXdCYXNlU3RhcnREcmFnKFdFQktJVF9XRUJfVklFV19CQVNFKG1fdmlld1dpZGdldCksIGRy YWdEYXRhLCBkcmFnSW1hZ2UpOworI2VuZGlmCiB9CiAKIHZvaWQgUGFnZUNsaWVudEltcGw6Omhh bmRsZURvd25sb2FkUmVxdWVzdChEb3dubG9hZFByb3h5KiBkb3dubG9hZCkK 239297 2014-10-05 01:11:24 -0700 2014-10-05 01:57:18 -0700 Patch bug-137361-20141005101124.patch text/plain 7849 ltilve U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0MzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDFhZjU1NDNiNDEyMDNk ZWFkMDZjYmIxODU5MTEwYmEzZWM5MGUwMS4uN2UxNjNjOTEwOTBmYTFkNTVmMDE4NzkyMGM4YjQ2 OWNjYTM3ODE5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTEwLTA0ICBMb3Jl bnpvIFRpbHZlICA8bHRpbHZlQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gRml4IGJ1aWxk IHdoZW4gRFJBR19TVVBQT1JUIGlzIGRpc2FibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzczNjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGbGFnIG91dCB1bmJ1aWxkYWJsZSBjb2RlIHdpdGhvdXQg RFJBR19TVVBQT1JULgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0d0a0RyYWdBbmREcm9wSGVs cGVyLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvR3RrRHJhZ0FuZERyb3BIZWxwZXIuaDoK KwogMjAxNC0xMC0wNCAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rvbi5lZHU+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogdGltZWxpbmVzIHNob3VsZCBub3QgY291bnQgdGltZSBl bGFwc2VkIHdoaWxlIHBhdXNlZCBpbiB0aGUgZGVidWdnZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjYTg3OWJj MDczZWE3OTlmNTA5ZWY2MzBmMjgzNWQ1MGU2OTBlZWI0Li42NTgzYjJjNjdkYmUyMmUyYTEzMjYz Nzc1NWUzY2VmZGI3OWU4NzdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTQtMTAt MDQgIExvcmVuem8gVGlsdmUgIDxsdGlsdmVAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBG aXggYnVpbGQgd2hlbiBEUkFHX1NVUFBPUlQgaXMgZGlzYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzM2MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZsYWcgb3V0IHVuYnVpbGRhYmxlIGNvZGUg d2l0aG91dCBEUkFHX1NVUFBPUlQuCisKKyAgICAgICAgKiBTaGFyZWQvZ3RrL0FyZ3VtZW50Q29k ZXJzR3RrLmNwcDoKKyAgICAgICAgKiBTaGFyZWQvZ3RrL0FyZ3VtZW50Q29kZXJzR3RrLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmg6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwOgorICAgICAgICAod2Via2l0V2ViVmlld0Jh c2VDb25zdHJ1Y3RlZCk6CisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VDbGllbnQuaDoKKwogMjAx NC0xMC0wNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZC4gQWRkIG1pc3NpbmcgaW5zcGVjdG9yIGZpbGVzIHRvIGNvbXBpbGF0 aW9uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a0RyYWdBbmRE cm9wSGVscGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtEcmFnQW5kRHJv cEhlbHBlci5jcHAKaW5kZXggYzhlYjhkMTcwZjNlNzAzMWMyMGQxOTE0YTBiNTdjMjE4ODU2MWU0 Zi4uYTQzNTY5YTIwY2VmYTNjNzY5ZDkxNWI5ZTQ5MDQzMGM2MTEyNGQxYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a0RyYWdBbmREcm9wSGVscGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrRHJhZ0FuZERyb3BIZWxwZXIuY3BwCkBA IC0xOSw2ICsxOSw4IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiR3RrRHJhZ0Fu ZERyb3BIZWxwZXIuaCIKIAorI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCisKICNpbmNsdWRlICJD bGlwYm9hcmRVdGlsaXRpZXNHdGsuaCIKICNpbmNsdWRlICJEcmFnRGF0YS5oIgogI2luY2x1ZGUg Ikd0a1V0aWxpdGllcy5oIgpAQCAtMTY2LDMgKzE2OCw1IEBAIHZvaWQgR3RrRHJhZ0FuZERyb3BI ZWxwZXI6OnN0YXJ0ZWREcmFnKEdka0RyYWdDb250ZXh0KiBjb250ZXh0LCBEYXRhT2JqZWN0R3Rr KiBkCiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKKworI2VuZGlmIC8vIEVOQUJMRShEUkFH X1NVUFBPUlQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrRHJh Z0FuZERyb3BIZWxwZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtEcmFnQW5k RHJvcEhlbHBlci5oCmluZGV4IGE4YzZmMjdkMTcyMWVhNjJkMDhlNjczNmFlMTk2ODNiZmJlZmUx Y2MuLjg4MzlkZDM0ZDZjMWUxOTgwOWFjZmVjMDNlMjM4ZDlkZDA4NjI5ZDggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtEcmFnQW5kRHJvcEhlbHBlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtEcmFnQW5kRHJvcEhlbHBlci5oCkBAIC0x OSw2ICsxOSw4IEBACiAjaWZuZGVmIEd0a0RyYWdBbmREcm9wSGVscGVyX2gKICNkZWZpbmUgR3Rr RHJhZ0FuZERyb3BIZWxwZXJfaAogCisjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKKwogI2luY2x1 ZGUgIkRhdGFPYmplY3RHdGsuaCIKICNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgogI2luY2x1 ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgpAQCAtNTcsNCArNTksNiBAQCBwcml2YXRlOgogCiB9CiAK KyNlbmRpZiAvLyBFTkFCTEUoRFJBR19TVVBQT1JUKQorCiAjZW5kaWYgLy8gRGF0YU9iamVjdEd0 a19oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ3RrL0FyZ3VtZW50Q29kZXJz R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvQXJndW1lbnRDb2RlcnNHdGsuY3Bw CmluZGV4IDQyYzNhYzE0NzI1ZjlkMDU4MDlmY2E1MDI4OGM5NjhjYTkzNzc3MzIuLmVmMWNiMWFj YzIyZDNhNTg2MGJlNjM3YTdjMGU2YjNjMDVjNjU1Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9ndGsvQXJndW1lbnRDb2RlcnNHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9ndGsvQXJndW1lbnRDb2RlcnNHdGsuY3BwCkBAIC0xODcsNiArMTg3LDcgQEAgc3Rh dGljIGJvb2wgZGVjb2RlRGF0YU9iamVjdChBcmd1bWVudERlY29kZXImIGRlY29kZXIsIFJlZlB0 cjxEYXRhT2JqZWN0R3RrPiYgZGEKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorI2lmIEVOQUJMRShE UkFHX1NVUFBPUlQpCiB2b2lkIEFyZ3VtZW50Q29kZXI8RHJhZ0RhdGE+OjplbmNvZGUoQXJndW1l bnRFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBEcmFnRGF0YSYgZHJhZ0RhdGEpCiB7CiAgICAgZW5j b2RlciA8PCBkcmFnRGF0YS5jbGllbnRQb3NpdGlvbigpOwpAQCAtMjMzLDYgKzIzNCw3IEBAIGJv b2wgQXJndW1lbnRDb2RlcjxEcmFnRGF0YT46OmRlY29kZShBcmd1bWVudERlY29kZXImIGRlY29k ZXIsIERyYWdEYXRhJiBkcmFnRGF0CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KKyNlbmRpZiAvLyBF TkFCTEUoRFJBR19TVVBQT1JUKQogCiBzdGF0aWMgdm9pZCBlbmNvZGVHS2V5RmlsZShBcmd1bWVu dEVuY29kZXImIGVuY29kZXIsIEdLZXlGaWxlKiBrZXlGaWxlKQogewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9Bcmd1bWVudENvZGVyc0d0ay5oIGIvU291cmNlL1dlYktp dDIvU2hhcmVkL2d0ay9Bcmd1bWVudENvZGVyc0d0ay5oCmluZGV4IGVjYjIxYWEyZGQ2YTI1N2Uy MmYzZWVjNDhhZjY3MDFiNzI1YjY0MjYuLjkyOTJiMmYwMjUzZmQ5NTdmMjJhMjMxM2IxYjkxYTBj M2U2NWUyZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvQXJndW1lbnRD b2RlcnNHdGsuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ3RrL0FyZ3VtZW50Q29kZXJz R3RrLmgKQEAgLTQwLDggKzQwLDEwIEBAIGNsYXNzIERyYWdEYXRhOwogbmFtZXNwYWNlIElQQyB7 CiAKIHRlbXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6RHJhZ0RhdGE+IHsK KyNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogICAgIHN0YXRpYyB2b2lkIGVuY29kZShBcmd1bWVu dEVuY29kZXImLCBjb25zdCBXZWJDb3JlOjpEcmFnRGF0YSYpOwogICAgIHN0YXRpYyBib29sIGRl Y29kZShBcmd1bWVudERlY29kZXImLCBXZWJDb3JlOjpEcmFnRGF0YSYpOworI2VuZGlmCiB9Owog CiB2b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXImLCBHdGtQcmludFNldHRpbmdzKik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAK aW5kZXggMzg5YmQyYjhiZWI1ZDg0ZmViNzZjNzQ0MGNhYjAzNDJmZGNmNzcyZC4uMzZmZmRkZGRh MmI2NDEzYjg3ODZmYzA3MjEzODI5MGQwMjY3Y2RmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcApAQCAtMjY4LDEwICsyNjgs MTIgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6dXBkYXRlVGV4dElucHV0U3RhdGUoKQogICAgIHdl YmtpdFdlYlZpZXdCYXNlVXBkYXRlVGV4dElucHV0U3RhdGUoV0VCS0lUX1dFQl9WSUVXX0JBU0Uo bV92aWV3V2lkZ2V0KSk7CiB9CiAKKyNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogdm9pZCBQYWdl Q2xpZW50SW1wbDo6c3RhcnREcmFnKGNvbnN0IFdlYkNvcmU6OkRyYWdEYXRhJiBkcmFnRGF0YSwg UGFzc1JlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGRyYWdJbWFnZSkKIHsKICAgICB3ZWJraXRXZWJW aWV3QmFzZVN0YXJ0RHJhZyhXRUJLSVRfV0VCX1ZJRVdfQkFTRShtX3ZpZXdXaWRnZXQpLCBkcmFn RGF0YSwgZHJhZ0ltYWdlKTsKIH0KKyNlbmRpZgogCiB2b2lkIFBhZ2VDbGllbnRJbXBsOjpoYW5k bGVEb3dubG9hZFJlcXVlc3QoRG93bmxvYWRQcm94eSogZG93bmxvYWQpCiB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuaAppbmRleCBkZTUy Yjc4N2RkNWM0YzgwMDRiNjM0NDY2MzBkZjJjMTdjMDRhYWQzLi4wNmM2ZmMzYWM4YTNjMGI3YTUy MTZmNDY3YTllMGZiYmM4YjQ3OTMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmgKQEAgLTk2LDcgKzk2LDkgQEAgcHJpdmF0ZToKICAg ICB2aXJ0dWFsIHZvaWQgc2V0RmluZEluZGljYXRvcihQYXNzUmVmUHRyPEZpbmRJbmRpY2F0b3I+ LCBib29sIGZhZGVPdXQsIGJvb2wgYW5pbWF0ZSkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lk IGdldEVkaXRvckNvbW1hbmRzRm9yS2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVu dCYsIGNvbnN0IEF0b21pY1N0cmluZyYsIFZlY3RvcjxXVEY6OlN0cmluZz4mKSBvdmVycmlkZTsK ICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlVGV4dElucHV0U3RhdGUoKSBvdmVycmlkZTsKKyNpZiBF TkFCTEUoRFJBR19TVVBQT1JUKQogICAgIHZpcnR1YWwgdm9pZCBzdGFydERyYWcoY29uc3QgV2Vi Q29yZTo6RHJhZ0RhdGEmLCBQYXNzUmVmUHRyPFNoYXJlYWJsZUJpdG1hcD4gZHJhZ0ltYWdlKSBv dmVycmlkZTsKKyNlbmRpZgogCiAgICAgdmlydHVhbCB2b2lkIGVudGVyQWNjZWxlcmF0ZWRDb21w b3NpdGluZ01vZGUoY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYpIG92ZXJyaWRlOwogICAgIHZpcnR1 YWwgdm9pZCBleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSBvdmVycmlkZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNl LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNl LmNwcAppbmRleCBjOTI4YThjYjFhMGU5OTAyNDZkODQxYjc2NjZlZjFjODVlZWFiMDNmLi40MDQ2 YzBhMjc2ODJmNzlhMGI4NzdhMDBjNjUwOWZlYTA2Y2YwYjI4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCkBAIC0x MDEsNyArMTAxLDkgQEAgc3RydWN0IF9XZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUgewogICAgIEd0 a0NsaWNrQ291bnRlciBjbGlja0NvdW50ZXI7CiAgICAgQ1N0cmluZyB0b29sdGlwVGV4dDsKICAg ICBJbnRSZWN0IHRvb2x0aXBBcmVhOworI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAgICAgR3Rr RHJhZ0FuZERyb3BIZWxwZXIgZHJhZ0FuZERyb3BIZWxwZXI7CisjZW5kaWYKICAgICBEcmFnSWNv biBkcmFnSWNvbjsKICNpZiAhR1RLX0NIRUNLX1ZFUlNJT04oMywgMTMsIDQpCiAgICAgSW50U2l6 ZSByZXNpemVyU2l6ZTsKQEAgLTQyMyw3ICs0MjUsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJW aWV3QmFzZUNvbnN0cnVjdGVkKEdPYmplY3QqIG9iamVjdCkKIAogICAgIFdlYktpdFdlYlZpZXdC YXNlUHJpdmF0ZSogcHJpdiA9IFdFQktJVF9XRUJfVklFV19CQVNFKG9iamVjdCktPnByaXY7CiAg ICAgcHJpdi0+cGFnZUNsaWVudCA9IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGUodmlld1dpZGdldCk7 CisjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKICAgICBwcml2LT5kcmFnQW5kRHJvcEhlbHBlci5z ZXRXaWRnZXQodmlld1dpZGdldCk7CisjZW5kaWYKIAogI2lmIFVTRShURVhUVVJFX01BUFBFUl9H TCkgJiYgUExBVEZPUk0oWDExKQogICAgIEdka0Rpc3BsYXkqIGRpc3BsYXkgPSBnZGtfZGlzcGxh eV9tYW5hZ2VyX2dldF9kZWZhdWx0X2Rpc3BsYXkoZ2RrX2Rpc3BsYXlfbWFuYWdlcl9nZXQoKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAppbmRleCAzNjg0NjA5MzRhOThiNGI2 MGZlNDYxMjMwZDcyYzY0ZTdiOTQzZDkxLi4wNjkxZTVlMmUzMTdhZDExMzk4M2MzOTZkNTFjOGQ1 MzE0MGEyZjQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVu dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKQEAgLTE1OCw3 ICsxNTgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZUNvbnRlbnRTaXpl KGNvbnN0IFdlYkNvcmU6OkludFNpemUmKSA9IDA7CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKEdU SykKKyNpZiBQTEFURk9STShHVEspICYmIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAgICAgdmlydHVh bCB2b2lkIHN0YXJ0RHJhZyhjb25zdCBXZWJDb3JlOjpEcmFnRGF0YSYsIFBhc3NSZWZQdHI8U2hh cmVhYmxlQml0bWFwPiBkcmFnSW1hZ2UpID0gMDsKICNlbmRpZgogCg== 239298 2014-10-05 01:57:25 -0700 2014-10-05 04:28:31 -0700 Patch bug-137361-20141005105726.patch text/plain 7912 ltilve U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0MzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDFhZjU1NDNiNDEyMDNk ZWFkMDZjYmIxODU5MTEwYmEzZWM5MGUwMS4uN2UxNjNjOTEwOTBmYTFkNTVmMDE4NzkyMGM4YjQ2 OWNjYTM3ODE5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTEwLTA0ICBMb3Jl bnpvIFRpbHZlICA8bHRpbHZlQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gRml4IGJ1aWxk IHdoZW4gRFJBR19TVVBQT1JUIGlzIGRpc2FibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzczNjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGbGFnIG91dCB1bmJ1aWxkYWJsZSBjb2RlIHdpdGhvdXQg RFJBR19TVVBQT1JULgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0d0a0RyYWdBbmREcm9wSGVs cGVyLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvR3RrRHJhZ0FuZERyb3BIZWxwZXIuaDoK KwogMjAxNC0xMC0wNCAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rvbi5lZHU+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogdGltZWxpbmVzIHNob3VsZCBub3QgY291bnQgdGltZSBl bGFwc2VkIHdoaWxlIHBhdXNlZCBpbiB0aGUgZGVidWdnZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjYTg3OWJj MDczZWE3OTlmNTA5ZWY2MzBmMjgzNWQ1MGU2OTBlZWI0Li42NTgzYjJjNjdkYmUyMmUyYTEzMjYz Nzc1NWUzY2VmZGI3OWU4NzdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTQtMTAt MDQgIExvcmVuem8gVGlsdmUgIDxsdGlsdmVAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBG aXggYnVpbGQgd2hlbiBEUkFHX1NVUFBPUlQgaXMgZGlzYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzM2MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZsYWcgb3V0IHVuYnVpbGRhYmxlIGNvZGUg d2l0aG91dCBEUkFHX1NVUFBPUlQuCisKKyAgICAgICAgKiBTaGFyZWQvZ3RrL0FyZ3VtZW50Q29k ZXJzR3RrLmNwcDoKKyAgICAgICAgKiBTaGFyZWQvZ3RrL0FyZ3VtZW50Q29kZXJzR3RrLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmg6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwOgorICAgICAgICAod2Via2l0V2ViVmlld0Jh c2VDb25zdHJ1Y3RlZCk6CisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VDbGllbnQuaDoKKwogMjAx NC0xMC0wNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZC4gQWRkIG1pc3NpbmcgaW5zcGVjdG9yIGZpbGVzIHRvIGNvbXBpbGF0 aW9uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a0RyYWdBbmRE cm9wSGVscGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtEcmFnQW5kRHJv cEhlbHBlci5jcHAKaW5kZXggYzhlYjhkMTcwZjNlNzAzMWMyMGQxOTE0YTBiNTdjMjE4ODU2MWU0 Zi4uYTQzNTY5YTIwY2VmYTNjNzY5ZDkxNWI5ZTQ5MDQzMGM2MTEyNGQxYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a0RyYWdBbmREcm9wSGVscGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrRHJhZ0FuZERyb3BIZWxwZXIuY3BwCkBA IC0xOSw2ICsxOSw4IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiR3RrRHJhZ0Fu ZERyb3BIZWxwZXIuaCIKIAorI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCisKICNpbmNsdWRlICJD bGlwYm9hcmRVdGlsaXRpZXNHdGsuaCIKICNpbmNsdWRlICJEcmFnRGF0YS5oIgogI2luY2x1ZGUg Ikd0a1V0aWxpdGllcy5oIgpAQCAtMTY2LDMgKzE2OCw1IEBAIHZvaWQgR3RrRHJhZ0FuZERyb3BI ZWxwZXI6OnN0YXJ0ZWREcmFnKEdka0RyYWdDb250ZXh0KiBjb250ZXh0LCBEYXRhT2JqZWN0R3Rr KiBkCiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKKworI2VuZGlmIC8vIEVOQUJMRShEUkFH X1NVUFBPUlQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrRHJh Z0FuZERyb3BIZWxwZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtEcmFnQW5k RHJvcEhlbHBlci5oCmluZGV4IGE4YzZmMjdkMTcyMWVhNjJkMDhlNjczNmFlMTk2ODNiZmJlZmUx Y2MuLjg4MzlkZDM0ZDZjMWUxOTgwOWFjZmVjMDNlMjM4ZDlkZDA4NjI5ZDggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtEcmFnQW5kRHJvcEhlbHBlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtEcmFnQW5kRHJvcEhlbHBlci5oCkBAIC0x OSw2ICsxOSw4IEBACiAjaWZuZGVmIEd0a0RyYWdBbmREcm9wSGVscGVyX2gKICNkZWZpbmUgR3Rr RHJhZ0FuZERyb3BIZWxwZXJfaAogCisjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKKwogI2luY2x1 ZGUgIkRhdGFPYmplY3RHdGsuaCIKICNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgogI2luY2x1 ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgpAQCAtNTcsNCArNTksNiBAQCBwcml2YXRlOgogCiB9CiAK KyNlbmRpZiAvLyBFTkFCTEUoRFJBR19TVVBQT1JUKQorCiAjZW5kaWYgLy8gRGF0YU9iamVjdEd0 a19oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ3RrL0FyZ3VtZW50Q29kZXJz R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvQXJndW1lbnRDb2RlcnNHdGsuY3Bw CmluZGV4IDQyYzNhYzE0NzI1ZjlkMDU4MDlmY2E1MDI4OGM5NjhjYTkzNzc3MzIuLmVmMWNiMWFj YzIyZDNhNTg2MGJlNjM3YTdjMGU2YjNjMDVjNjU1Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9ndGsvQXJndW1lbnRDb2RlcnNHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9ndGsvQXJndW1lbnRDb2RlcnNHdGsuY3BwCkBAIC0xODcsNiArMTg3LDcgQEAgc3Rh dGljIGJvb2wgZGVjb2RlRGF0YU9iamVjdChBcmd1bWVudERlY29kZXImIGRlY29kZXIsIFJlZlB0 cjxEYXRhT2JqZWN0R3RrPiYgZGEKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorI2lmIEVOQUJMRShE UkFHX1NVUFBPUlQpCiB2b2lkIEFyZ3VtZW50Q29kZXI8RHJhZ0RhdGE+OjplbmNvZGUoQXJndW1l bnRFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBEcmFnRGF0YSYgZHJhZ0RhdGEpCiB7CiAgICAgZW5j b2RlciA8PCBkcmFnRGF0YS5jbGllbnRQb3NpdGlvbigpOwpAQCAtMjMzLDYgKzIzNCw3IEBAIGJv b2wgQXJndW1lbnRDb2RlcjxEcmFnRGF0YT46OmRlY29kZShBcmd1bWVudERlY29kZXImIGRlY29k ZXIsIERyYWdEYXRhJiBkcmFnRGF0CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KKyNlbmRpZiAvLyBF TkFCTEUoRFJBR19TVVBQT1JUKQogCiBzdGF0aWMgdm9pZCBlbmNvZGVHS2V5RmlsZShBcmd1bWVu dEVuY29kZXImIGVuY29kZXIsIEdLZXlGaWxlKiBrZXlGaWxlKQogewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9Bcmd1bWVudENvZGVyc0d0ay5oIGIvU291cmNlL1dlYktp dDIvU2hhcmVkL2d0ay9Bcmd1bWVudENvZGVyc0d0ay5oCmluZGV4IGVjYjIxYWEyZGQ2YTI1N2Uy MmYzZWVjNDhhZjY3MDFiNzI1YjY0MjYuLjRhYTU1ZGU3NDAxMTI0YjE2YjViMmE0YjgyODJkMGQx M2U3MjdkODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvQXJndW1lbnRD b2RlcnNHdGsuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ3RrL0FyZ3VtZW50Q29kZXJz R3RrLmgKQEAgLTM5LDEwICszOSwxMiBAQCBjbGFzcyBEcmFnRGF0YTsKIAogbmFtZXNwYWNlIElQ QyB7CiAKKyNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogdGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1l bnRDb2RlcjxXZWJDb3JlOjpEcmFnRGF0YT4gewogICAgIHN0YXRpYyB2b2lkIGVuY29kZShBcmd1 bWVudEVuY29kZXImLCBjb25zdCBXZWJDb3JlOjpEcmFnRGF0YSYpOwogICAgIHN0YXRpYyBib29s IGRlY29kZShBcmd1bWVudERlY29kZXImLCBXZWJDb3JlOjpEcmFnRGF0YSYpOwogfTsKKyNlbmRp ZgogCiB2b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXImLCBHdGtQcmludFNldHRpbmdzKik7CiBi b29sIGRlY29kZShBcmd1bWVudERlY29kZXImLCBHUmVmUHRyPEd0a1ByaW50U2V0dGluZ3M+Jik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50 SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1w bC5jcHAKaW5kZXggMzg5YmQyYjhiZWI1ZDg0ZmViNzZjNzQ0MGNhYjAzNDJmZGNmNzcyZC4uMzZm ZmRkZGRhMmI2NDEzYjg3ODZmYzA3MjEzODI5MGQwMjY3Y2RmOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcApAQCAtMjY4LDEw ICsyNjgsMTIgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6dXBkYXRlVGV4dElucHV0U3RhdGUoKQog ICAgIHdlYmtpdFdlYlZpZXdCYXNlVXBkYXRlVGV4dElucHV0U3RhdGUoV0VCS0lUX1dFQl9WSUVX X0JBU0UobV92aWV3V2lkZ2V0KSk7CiB9CiAKKyNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogdm9p ZCBQYWdlQ2xpZW50SW1wbDo6c3RhcnREcmFnKGNvbnN0IFdlYkNvcmU6OkRyYWdEYXRhJiBkcmFn RGF0YSwgUGFzc1JlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGRyYWdJbWFnZSkKIHsKICAgICB3ZWJr aXRXZWJWaWV3QmFzZVN0YXJ0RHJhZyhXRUJLSVRfV0VCX1ZJRVdfQkFTRShtX3ZpZXdXaWRnZXQp LCBkcmFnRGF0YSwgZHJhZ0ltYWdlKTsKIH0KKyNlbmRpZgogCiB2b2lkIFBhZ2VDbGllbnRJbXBs OjpoYW5kbGVEb3dubG9hZFJlcXVlc3QoRG93bmxvYWRQcm94eSogZG93bmxvYWQpCiB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuaAppbmRl eCBkZTUyYjc4N2RkNWM0YzgwMDRiNjM0NDY2MzBkZjJjMTdjMDRhYWQzLi4wNmM2ZmMzYWM4YTNj MGI3YTUyMTZmNDY3YTllMGZiYmM4YjQ3OTMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmgKQEAgLTk2LDcgKzk2LDkgQEAgcHJpdmF0 ZToKICAgICB2aXJ0dWFsIHZvaWQgc2V0RmluZEluZGljYXRvcihQYXNzUmVmUHRyPEZpbmRJbmRp Y2F0b3I+LCBib29sIGZhZGVPdXQsIGJvb2wgYW5pbWF0ZSkgb3ZlcnJpZGU7CiAgICAgdmlydHVh bCB2b2lkIGdldEVkaXRvckNvbW1hbmRzRm9yS2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9h cmRFdmVudCYsIGNvbnN0IEF0b21pY1N0cmluZyYsIFZlY3RvcjxXVEY6OlN0cmluZz4mKSBvdmVy cmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlVGV4dElucHV0U3RhdGUoKSBvdmVycmlkZTsK KyNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogICAgIHZpcnR1YWwgdm9pZCBzdGFydERyYWcoY29u c3QgV2ViQ29yZTo6RHJhZ0RhdGEmLCBQYXNzUmVmUHRyPFNoYXJlYWJsZUJpdG1hcD4gZHJhZ0lt YWdlKSBvdmVycmlkZTsKKyNlbmRpZgogCiAgICAgdmlydHVhbCB2b2lkIGVudGVyQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ01vZGUoY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYpIG92ZXJyaWRlOwogICAg IHZpcnR1YWwgdm9pZCBleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSBvdmVycmlkZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXdCYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXdCYXNlLmNwcAppbmRleCBjOTI4YThjYjFhMGU5OTAyNDZkODQxYjc2NjZlZjFjODVlZWFiMDNm Li40MDQ2YzBhMjc2ODJmNzlhMGI4NzdhMDBjNjUwOWZlYTA2Y2YwYjI4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3Bw CkBAIC0xMDEsNyArMTAxLDkgQEAgc3RydWN0IF9XZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUgewog ICAgIEd0a0NsaWNrQ291bnRlciBjbGlja0NvdW50ZXI7CiAgICAgQ1N0cmluZyB0b29sdGlwVGV4 dDsKICAgICBJbnRSZWN0IHRvb2x0aXBBcmVhOworI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAg ICAgR3RrRHJhZ0FuZERyb3BIZWxwZXIgZHJhZ0FuZERyb3BIZWxwZXI7CisjZW5kaWYKICAgICBE cmFnSWNvbiBkcmFnSWNvbjsKICNpZiAhR1RLX0NIRUNLX1ZFUlNJT04oMywgMTMsIDQpCiAgICAg SW50U2l6ZSByZXNpemVyU2l6ZTsKQEAgLTQyMyw3ICs0MjUsOSBAQCBzdGF0aWMgdm9pZCB3ZWJr aXRXZWJWaWV3QmFzZUNvbnN0cnVjdGVkKEdPYmplY3QqIG9iamVjdCkKIAogICAgIFdlYktpdFdl YlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IFdFQktJVF9XRUJfVklFV19CQVNFKG9iamVjdCktPnBy aXY7CiAgICAgcHJpdi0+cGFnZUNsaWVudCA9IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGUodmlld1dp ZGdldCk7CisjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKICAgICBwcml2LT5kcmFnQW5kRHJvcEhl bHBlci5zZXRXaWRnZXQodmlld1dpZGdldCk7CisjZW5kaWYKIAogI2lmIFVTRShURVhUVVJFX01B UFBFUl9HTCkgJiYgUExBVEZPUk0oWDExKQogICAgIEdka0Rpc3BsYXkqIGRpc3BsYXkgPSBnZGtf ZGlzcGxheV9tYW5hZ2VyX2dldF9kZWZhdWx0X2Rpc3BsYXkoZ2RrX2Rpc3BsYXlfbWFuYWdlcl9n ZXQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAppbmRleCAzNjg0NjA5MzRh OThiNGI2MGZlNDYxMjMwZDcyYzY0ZTdiOTQzZDkxLi4wNjkxZTVlMmUzMTdhZDExMzk4M2MzOTZk NTFjOGQ1MzE0MGEyZjQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFn ZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKQEAg LTE1OCw3ICsxNTgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZUNvbnRl bnRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKSA9IDA7CiAjZW5kaWYKIAotI2lmIFBMQVRG T1JNKEdUSykKKyNpZiBQTEFURk9STShHVEspICYmIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAgICAg dmlydHVhbCB2b2lkIHN0YXJ0RHJhZyhjb25zdCBXZWJDb3JlOjpEcmFnRGF0YSYsIFBhc3NSZWZQ dHI8U2hhcmVhYmxlQml0bWFwPiBkcmFnSW1hZ2UpID0gMDsKICNlbmRpZgogCg==