108376 2013-01-30 14:01:38 -0800 [Gtk] drag and drop has black background without composition 2013-01-31 15:47:39 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 a.renevier a.renevier mrobinson webkit.review.bot oldest_to_newest 820515 0 a.renevier 2013-01-30 14:01:38 -0800 Hi, when dragging some text, a popup window with 0 opacity is created. It is then set as the drag icon with gtk_drag_set_icon_widget. While this gives a nice transparent result an a desktop with a compositor, it gives a black background when there is not compositor. So, if the text is black, it is not readable. And if the text is white, it's ugly anyway. May be we could use gtk_drag_set_icon_pixbuf as mozilla does (or gtk_drag_set_icon_surface when available to avoid a cairo/pixbuf conversion). This api decompose image into transparent/non transparent rectangles and use Xshape to make the transparent rectangles actually transparent even without a compositor. 820555 1 185571 a.renevier 2013-01-30 14:21:54 -0800 Created attachment 185571 patch proposal 820723 2 mrobinson 2013-01-30 15:49:51 -0800 If we are falling back, maybe we should just fall back all the way to a simple icon? Maybe you can show me what the fallback looks like. 820767 3 185612 a.renevier 2013-01-30 16:19:14 -0800 Created attachment 185612 updated patch: no need for a ManualTest 820809 4 185612 mrobinson 2013-01-30 16:48:20 -0800 Comment on attachment 185612 updated patch: no need for a ManualTest View in context: https://bugs.webkit.org/attachment.cgi?id=185612&action=review Looks great, just needs a teensy bit of cleaning up. > Source/WebCore/platform/gtk/DragIcon.cpp:56 > +#ifdef GTK_API_VERSION_2 > + , m_pixbuf(0) > +#endif This can be eliminated with a GRefPtr. See below. > Source/WebCore/platform/gtk/DragIcon.cpp:89 > +#ifdef GTK_API_VERSION_2 > + if (m_pixbuf) > + g_object_unref(m_pixbuf); > +#endif Instead of a raw pointer you could use a GRefPtr here. > Source/WebCore/platform/gtk/DragIcon.cpp:116 > +#ifdef GTK_API_VERSION_2 > + if (m_pixbuf) > + g_object_unref(m_pixbuf); > + m_pixbuf = cairoImageSurfaceToGdkPixbuf(image); > +#endif This would become: m_pixbuf = adoptGRef(cairoImageSurfaceToGdkPixbuf(image)); > Source/WebCore/platform/gtk/DragIcon.h:45 > + gboolean m_iscomposited; This should probably be: bool isComposited; 820907 5 185642 a.renevier 2013-01-30 18:10:00 -0800 Created attachment 185642 updated patch to address reviewer comments 821561 6 185642 mrobinson 2013-01-31 08:46:16 -0800 Comment on attachment 185642 updated patch to address reviewer comments Great! 822053 7 185642 webkit.review.bot 2013-01-31 15:47:36 -0800 Comment on attachment 185642 updated patch to address reviewer comments Clearing flags on attachment: 185642 Committed r141498: <http://trac.webkit.org/changeset/141498> 822054 8 webkit.review.bot 2013-01-31 15:47:39 -0800 All reviewed patches have been landed. Closing bug. 185571 2013-01-30 14:21:54 -0800 2013-01-30 16:19:12 -0800 patch proposal bug-108376-20130130141837.patch text/plain 6622 a.renevier U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMDAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWQ0ZDQxMzdkZWUzZjM5 OGE0OTJiZDk1MTgwY2NlZmNhM2RhZWExNy4uOWJlMDkyZjM0NjY2MTFhZmI3ZTdjMjM0Y2MxODUw MmVmMWFhYjE5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTAxLTMwICBBcm5h dWQgUmVuZXZpZXIgIDxhLnJlbmV2aWVyQHNpc2Euc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0d0 a10gZHJhZyBhbmQgZHJvcCBoYXMgYmxhY2sgYmFja2dyb3VuZCB3aXRob3V0IGNvbXBvc2l0aW9u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDgzNzYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgZ3Rr X2RyYWdfc2V0X2ljb25fc3VyZmFjZSAob3IgZ3RrX2RyYWdfc2V0X2ljb25fcGl4YnVmKSB3aGVu IHRoZQorICAgICAgICBzY3JlZW4gaXMgbm90IGNvbXBvc2l0ZWQuIFRoYXQgd2F5LCBkcmFnIHdp bmRvdyB3aWxsIGJlIGRlY29tcG9zaXRlZAorICAgICAgICBhbmQgcmVuZGVyZWQgdHJhbnNwYXJl bnQgd2l0aCBYc2hhcGUuCisKKyAgICAgICAgVG8gZGV0ZXJtaW5lIHdoaWNoIHBhcnRzIG9mIHRo ZSB3aW5kb3cgbXVzdCBiZSB0cmFuc3BhcmVudCwgZ3RrIGNoZWNrcworICAgICAgICBpZiBhIHBp eGVsIGlzIG1vcmUgdGhhbiA1MCUgb3BhcXVlLiBXaXRoIGRpc3NvbHZlRHJhZ0ltYWdlVG9GcmFj dGlvbiwKKyAgICAgICAgYWxsIHBpeGVscyBhcmUgbWFkZSAyNSUgdHJhbnNwYXJlbnQuIFdpdGgg YW50aWFsaWFzaW5nLCBvcGFjaXR5IGdvZXMKKyAgICAgICAgYmVsb3cgdGhlIHRocmVzaG9sZCBm b3Igc29tZSBwaXhlbHMsIHdoaWNoIG1ha2VzIHRoZSByZXN1bHRpbmcgaW1hZ2UKKyAgICAgICAg bWVzc3kuIFNvLCB3ZSBuZWVkIHRvIHNraXAgZGlzc29sdmVEcmFnSW1hZ2VUb0ZyYWN0aW9uIHdo ZW4gd2UgdXNlCisgICAgICAgIGd0a19kcmFnX3NldF9pY29uX3N1cmZhY2UuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ndGsvRHJhZ0ljb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0ljb246 OkRyYWdJY29uKToKKyAgICAgICAgKFdlYkNvcmU6OkRyYWdJY29uOjp+RHJhZ0ljb24pOgorICAg ICAgICAoV2ViQ29yZTo6RHJhZ0ljb246OnNldEltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkRy YWdJY29uOjp1c2VGb3JEcmFnKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvRHJhZ0ljb24uaDoK KyAgICAgICAgKERyYWdJY29uKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvRHJhZ0ltYWdlR3Rr LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmRpc3NvbHZlRHJhZ0ltYWdlVG9GcmFjdGlvbik6CisK IDIwMTItMTItMjAgIEFybmF1ZCBSZW5ldmllciAgPGEucmVuZXZpZXJAc2lzYS5zYW1zdW5nLmNv bT4KIAogICAgICAgICBbR1RLXSBBZGQgc3VwcG9ydCBmb3IgY29sb3IgaW5wdXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EcmFnSWNvbi5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvRHJhZ0ljb24uY3BwCmluZGV4IGU2MmRmNDIyNTUwZDkzZmI1NWY5 ZDcwOTMwYWMyOGZjMTA3OGI4YTMuLjVkZDMzYjVmNGJiOWM0MTk0NmI5OTdhMGJhZDY1Yjk3N2Q4 OGY0N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EcmFnSWNvbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0RyYWdJY29uLmNwcApAQCAtMjUs NiArMjUsNyBAQAogCiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiRHJhZ0ljb24uaCIK KyNpbmNsdWRlICJHZGtDYWlyb1V0aWxpdGllcy5oIgogCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgog CkBAIC00OCw4ICs0OSwxNiBAQCBzdGF0aWMgZ2Jvb2xlYW4gZHJhZ0ljb25XaW5kb3dEcmF3RXZl bnRDYWxsYmFjayhHdGtXaWRnZXQqLCBjYWlyb190KiBjb250ZXh0LCBEcgogI2VuZGlmIC8vIEdU S19BUElfVkVSU0lPTl8yCiAKIERyYWdJY29uOjpEcmFnSWNvbigpCi0gICAgOiBtX3dpbmRvdyhn dGtfd2luZG93X25ldyhHVEtfV0lORE9XX1BPUFVQKSkKKyAgICA6IG1faXNjb21wb3NpdGVkKGdk a19zY3JlZW5faXNfY29tcG9zaXRlZChnZGtfc2NyZWVuX2dldF9kZWZhdWx0KCkpKQorICAgICwg bV93aW5kb3coMCkKKyNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgorICAgICwgbV9waXhidWYoMCkK KyNlbmRpZgogeworICAgIGlmICghbV9pc2NvbXBvc2l0ZWQpCisgICAgICAgIHJldHVybjsKKwor ICAgIG1fd2luZG93ID0gZ3RrX3dpbmRvd19uZXcoR1RLX1dJTkRPV19QT1BVUCk7CiAjaWZkZWYg R1RLX0FQSV9WRVJTSU9OXzIKICAgICBnX3NpZ25hbF9jb25uZWN0KG1fd2luZG93LCAiZXhwb3Nl LWV2ZW50IiwgR19DQUxMQkFDSyhkcmFnSWNvbldpbmRvd0RyYXdFdmVudENhbGxiYWNrKSwgdGhp cyk7CiAjZWxzZQpAQCAtNzIsNyArODEsMTIgQEAgRHJhZ0ljb246OkRyYWdJY29uKCkKIAogRHJh Z0ljb246On5EcmFnSWNvbigpCiB7Ci0gICAgZ3RrX3dpZGdldF9kZXN0cm95KG1fd2luZG93KTsK KyAgICBpZiAobV93aW5kb3cpCisgICAgICAgIGd0a193aWRnZXRfZGVzdHJveShtX3dpbmRvdyk7 CisjaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKKyAgICBpZiAobV9waXhidWYpCisgICAgICAgIGdf b2JqZWN0X3VucmVmKG1fcGl4YnVmKTsKKyNlbmRpZgogfQogCiB2b2lkIERyYWdJY29uOjpkcmF3 KGNhaXJvX3QqIGNvbnRleHQpCkBAIC05MCw3ICsxMDQsMTYgQEAgdm9pZCBEcmFnSWNvbjo6c2V0 SW1hZ2UoY2Fpcm9fc3VyZmFjZV90KiBpbWFnZSkKICAgICBBU1NFUlQoaW1hZ2UpOwogICAgIG1f aW1hZ2UgPSBpbWFnZTsKICAgICBtX2ltYWdlU2l6ZSA9IEludFNpemUoY2Fpcm9faW1hZ2Vfc3Vy ZmFjZV9nZXRfd2lkdGgoaW1hZ2UpLCBjYWlyb19pbWFnZV9zdXJmYWNlX2dldF9oZWlnaHQoaW1h Z2UpKTsKLSAgICBndGtfd2luZG93X3Jlc2l6ZShHVEtfV0lORE9XKG1fd2luZG93KSwgbV9pbWFn ZVNpemUud2lkdGgoKSwgbV9pbWFnZVNpemUuaGVpZ2h0KCkpOworICAgIGlmIChtX2lzY29tcG9z aXRlZCkgeworICAgICAgICBndGtfd2luZG93X3Jlc2l6ZShHVEtfV0lORE9XKG1fd2luZG93KSwg bV9pbWFnZVNpemUud2lkdGgoKSwgbV9pbWFnZVNpemUuaGVpZ2h0KCkpOworICAgICAgICByZXR1 cm47CisgICAgfQorCisjaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKKyAgICBpZiAobV9waXhidWYp CisgICAgICAgIGdfb2JqZWN0X3VucmVmKG1fcGl4YnVmKTsKKyAgICBtX3BpeGJ1ZiA9IGNhaXJv SW1hZ2VTdXJmYWNlVG9HZGtQaXhidWYoaW1hZ2UpOworI2VuZGlmCiB9CiAKIHZvaWQgRHJhZ0lj b246OnVzZUZvckRyYWcoR2RrRHJhZ0NvbnRleHQqIGNvbnRleHQpCkBAIC0xMDIsNyArMTI1LDE1 IEBAIHZvaWQgRHJhZ0ljb246OnVzZUZvckRyYWcoR2RrRHJhZ0NvbnRleHQqIGNvbnRleHQpCiAK IHZvaWQgRHJhZ0ljb246OnVzZUZvckRyYWcoR2RrRHJhZ0NvbnRleHQqIGNvbnRleHQsIGNvbnN0 IEludFBvaW50JiBob3RzcG90KQogewotICAgIGd0a19kcmFnX3NldF9pY29uX3dpZGdldChjb250 ZXh0LCBtX3dpbmRvdywgaG90c3BvdC54KCksIGhvdHNwb3QueSgpKTsKKyAgICBpZiAobV9pc2Nv bXBvc2l0ZWQpIHsKKyAgICAgICAgZ3RrX2RyYWdfc2V0X2ljb25fd2lkZ2V0KGNvbnRleHQsIG1f d2luZG93LCBob3RzcG90LngoKSwgaG90c3BvdC55KCkpOworICAgICAgICByZXR1cm47CisgICAg fQorI2lmZGVmIEdUS19BUElfVkVSU0lPTl8yCisgICAgZ3RrX2RyYWdfc2V0X2ljb25fcGl4YnVm KGNvbnRleHQsIG1fcGl4YnVmLCBob3RzcG90LngoKSwgaG90c3BvdC55KCkpOworI2Vsc2UKKyAg ICBndGtfZHJhZ19zZXRfaWNvbl9zdXJmYWNlKGNvbnRleHQsIG1faW1hZ2UuZ2V0KCkpOworI2Vu ZGlmCiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2d0ay9EcmFnSWNvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L0RyYWdJY29uLmgKaW5kZXggOTFlZTU5ZmFkMTUzYmNkODZmYzE1ZGE4Y2YwYjI2ZjZjZGFmZjQ4 Yi4uM2Q1ZTMyNDJhNzcxZmU0YzYwNmY4YTRlYmY4MTEzOTFiODM0ZWRkNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0RyYWdJY29uLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3RrL0RyYWdJY29uLmgKQEAgLTQyLDkgKzQyLDEzIEBAIHB1YmxpYzoKICAg ICB2b2lkIHVzZUZvckRyYWcoR2RrRHJhZ0NvbnRleHQqLCBjb25zdCBJbnRQb2ludCYgaG90c3Bv dCk7CiAKIHByaXZhdGU6CisgICAgZ2Jvb2xlYW4gbV9pc2NvbXBvc2l0ZWQ7CiAgICAgR3RrV2lk Z2V0KiBtX3dpbmRvdzsKICAgICBSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBtX2ltYWdlOwogICAg IEludFNpemUgbV9pbWFnZVNpemU7CisjaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKKyAgICBHZGtQ aXhidWYqIG1fcGl4YnVmOworI2VuZGlmCiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvRHJhZ0ltYWdlR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2d0ay9EcmFnSW1hZ2VHdGsuY3BwCmluZGV4IDAxOThkZWMyOGRjNTk5NDg5MmNjOTg4ZjIw MzlmNDExYzk4OTczODguLjNiN2M0YzE0MmUxY2VmMzlkMjRmM2JlZTlmMzRjYjJlYWQyYmQ3ZTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EcmFnSW1hZ2VHdGsuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EcmFnSW1hZ2VHdGsuY3BwCkBAIC0y Myw2ICsyMyw3IEBACiAjaW5jbHVkZSAiSW1hZ2UuaCIKICNpbmNsdWRlICJSZWZQdHJDYWlyby5o IgogI2luY2x1ZGUgPGNhaXJvLmg+CisjaW5jbHVkZSA8Z2RrL2dkay5oPgogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKQEAgLTY2LDYgKzY3LDkgQEAgRHJhZ0ltYWdlUmVmIGRpc3NvbHZlRHJhZ0lt YWdlVG9GcmFjdGlvbihEcmFnSW1hZ2VSZWYgaW1hZ2UsIGZsb2F0IGZyYWN0aW9uKQogICAgIGlm ICghaW1hZ2UpCiAgICAgICAgIHJldHVybiAwOwogCisgICAgaWYgKCFnZGtfc2NyZWVuX2lzX2Nv bXBvc2l0ZWQoZ2RrX3NjcmVlbl9nZXRfZGVmYXVsdCgpKSkKKyAgICAgICAgcmV0dXJuIGltYWdl OworCiAgICAgUmVmUHRyPGNhaXJvX3Q+IGNvbnRleHQgPSBhZG9wdFJlZihjYWlyb19jcmVhdGUo aW1hZ2UpKTsKICAgICBjYWlyb19zZXRfb3BlcmF0b3IoY29udGV4dC5nZXQoKSwgQ0FJUk9fT1BF UkFUT1JfREVTVF9JTik7CiAgICAgY2Fpcm9fc2V0X3NvdXJjZV9yZ2JhKGNvbnRleHQuZ2V0KCks IDAsIDAsIDAsIGZyYWN0aW9uKTsKZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwpp bmRleCA2N2NhOGFiM2E0YTI5NTkxZDk0YjAyOTJkOWU0Mjc3OTg0MDZjMWIyLi5hMDY3YWZmYmUy ODBjOWY4Y2M5ZTQ4YzBiZmJkOTI4YzEzYTQ1NzcxIDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysr IGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTMtMDEtMzAgIEFybmF1ZCBSZW5ldmll ciAgPGEucmVuZXZpZXJAc2lzYS5zYW1zdW5nLmNvbT4KKworICAgICAgICBbR3RrXSBkcmFnIGFu ZCBkcm9wIGhhcyBibGFjayBiYWNrZ3JvdW5kIHdpdGhvdXQgY29tcG9zaXRpb24KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODM3NgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTWFudWFsVGVzdHMvZHJh Zy10ZXh0Lmh0bWw6IEFkZGVkLgorCiAyMDEyLTEyLTIwICBBcm5hdWQgUmVuZXZpZXIgIDxhLnJl bmV2aWVyQHNpc2Euc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIHN1cHBvcnQgZm9y IGNvbG9yIGlucHV0CmRpZmYgLS1naXQgYS9NYW51YWxUZXN0cy9kcmFnLXRleHQuaHRtbCBiL01h bnVhbFRlc3RzL2RyYWctdGV4dC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjE1MGIwZTIyNmViNDdiNjNhMWFk N2JjYWE2ZTA3ZDAyZmI5YjkyZmQKLS0tIC9kZXYvbnVsbAorKysgYi9NYW51YWxUZXN0cy9kcmFn LXRleHQuaHRtbApAQCAtMCwwICsxLDcgQEAKKzwhRE9DVFlQRSBIVE1MPgorPGh0bWw+Cis8dGl0 bGU+ZHJhZyB0ZXN0PC90aXRsZT4KKzxib2R5PgorICAgIDxwIHN0eWxlPSJiYWNrZ3JvdW5kLWNv bG9yOiB3aGl0ZTsgY29sb3I6IGJsYWNrIj5EcmFnIHRoaXMgdGV4dCwgaXQgc2hvdWxkIGJlIHJl YWRhYmxlIHdoaWxlIGRyYWdnaW5nLjwvcD4KKyAgICA8cCBzdHlsZT0iYmFja2dyb3VuZC1jb2xv cjogYmxhY2s7IGNvbG9yOiB3aGl0ZSI+VGhpcyB0ZXh0IHNob3VsZCBhbHNvIHN0YXkgcmVhZGFi bGUsIGF0IGxlYXN0IHdoaWxlIGRyYWdnZWQgb3ZlciB0aGUgYmxhY2sgYmFja2dyb3VuZC48L3A+ Cis8L2JvZHk+Cg== 185612 2013-01-30 16:19:14 -0800 2013-01-30 18:09:58 -0800 updated patch: no need for a ManualTest bug-108376-20130130161556.patch text/plain 5493 a.renevier U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMDAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWQ0ZDQxMzdkZWUzZjM5 OGE0OTJiZDk1MTgwY2NlZmNhM2RhZWExNy4uOWJlMDkyZjM0NjY2MTFhZmI3ZTdjMjM0Y2MxODUw MmVmMWFhYjE5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTAxLTMwICBBcm5h dWQgUmVuZXZpZXIgIDxhLnJlbmV2aWVyQHNpc2Euc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0d0 a10gZHJhZyBhbmQgZHJvcCBoYXMgYmxhY2sgYmFja2dyb3VuZCB3aXRob3V0IGNvbXBvc2l0aW9u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDgzNzYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgZ3Rr X2RyYWdfc2V0X2ljb25fc3VyZmFjZSAob3IgZ3RrX2RyYWdfc2V0X2ljb25fcGl4YnVmKSB3aGVu IHRoZQorICAgICAgICBzY3JlZW4gaXMgbm90IGNvbXBvc2l0ZWQuIFRoYXQgd2F5LCBkcmFnIHdp bmRvdyB3aWxsIGJlIGRlY29tcG9zaXRlZAorICAgICAgICBhbmQgcmVuZGVyZWQgdHJhbnNwYXJl bnQgd2l0aCBYc2hhcGUuCisKKyAgICAgICAgVG8gZGV0ZXJtaW5lIHdoaWNoIHBhcnRzIG9mIHRo ZSB3aW5kb3cgbXVzdCBiZSB0cmFuc3BhcmVudCwgZ3RrIGNoZWNrcworICAgICAgICBpZiBhIHBp eGVsIGlzIG1vcmUgdGhhbiA1MCUgb3BhcXVlLiBXaXRoIGRpc3NvbHZlRHJhZ0ltYWdlVG9GcmFj dGlvbiwKKyAgICAgICAgYWxsIHBpeGVscyBhcmUgbWFkZSAyNSUgdHJhbnNwYXJlbnQuIFdpdGgg YW50aWFsaWFzaW5nLCBvcGFjaXR5IGdvZXMKKyAgICAgICAgYmVsb3cgdGhlIHRocmVzaG9sZCBm b3Igc29tZSBwaXhlbHMsIHdoaWNoIG1ha2VzIHRoZSByZXN1bHRpbmcgaW1hZ2UKKyAgICAgICAg bWVzc3kuIFNvLCB3ZSBuZWVkIHRvIHNraXAgZGlzc29sdmVEcmFnSW1hZ2VUb0ZyYWN0aW9uIHdo ZW4gd2UgdXNlCisgICAgICAgIGd0a19kcmFnX3NldF9pY29uX3N1cmZhY2UuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ndGsvRHJhZ0ljb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0ljb246 OkRyYWdJY29uKToKKyAgICAgICAgKFdlYkNvcmU6OkRyYWdJY29uOjp+RHJhZ0ljb24pOgorICAg ICAgICAoV2ViQ29yZTo6RHJhZ0ljb246OnNldEltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkRy YWdJY29uOjp1c2VGb3JEcmFnKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvRHJhZ0ljb24uaDoK KyAgICAgICAgKERyYWdJY29uKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvRHJhZ0ltYWdlR3Rr LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmRpc3NvbHZlRHJhZ0ltYWdlVG9GcmFjdGlvbik6CisK IDIwMTItMTItMjAgIEFybmF1ZCBSZW5ldmllciAgPGEucmVuZXZpZXJAc2lzYS5zYW1zdW5nLmNv bT4KIAogICAgICAgICBbR1RLXSBBZGQgc3VwcG9ydCBmb3IgY29sb3IgaW5wdXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EcmFnSWNvbi5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvRHJhZ0ljb24uY3BwCmluZGV4IGU2MmRmNDIyNTUwZDkzZmI1NWY5 ZDcwOTMwYWMyOGZjMTA3OGI4YTMuLjVkZDMzYjVmNGJiOWM0MTk0NmI5OTdhMGJhZDY1Yjk3N2Q4 OGY0N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EcmFnSWNvbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0RyYWdJY29uLmNwcApAQCAtMjUs NiArMjUsNyBAQAogCiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiRHJhZ0ljb24uaCIK KyNpbmNsdWRlICJHZGtDYWlyb1V0aWxpdGllcy5oIgogCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgog CkBAIC00OCw4ICs0OSwxNiBAQCBzdGF0aWMgZ2Jvb2xlYW4gZHJhZ0ljb25XaW5kb3dEcmF3RXZl bnRDYWxsYmFjayhHdGtXaWRnZXQqLCBjYWlyb190KiBjb250ZXh0LCBEcgogI2VuZGlmIC8vIEdU S19BUElfVkVSU0lPTl8yCiAKIERyYWdJY29uOjpEcmFnSWNvbigpCi0gICAgOiBtX3dpbmRvdyhn dGtfd2luZG93X25ldyhHVEtfV0lORE9XX1BPUFVQKSkKKyAgICA6IG1faXNjb21wb3NpdGVkKGdk a19zY3JlZW5faXNfY29tcG9zaXRlZChnZGtfc2NyZWVuX2dldF9kZWZhdWx0KCkpKQorICAgICwg bV93aW5kb3coMCkKKyNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgorICAgICwgbV9waXhidWYoMCkK KyNlbmRpZgogeworICAgIGlmICghbV9pc2NvbXBvc2l0ZWQpCisgICAgICAgIHJldHVybjsKKwor ICAgIG1fd2luZG93ID0gZ3RrX3dpbmRvd19uZXcoR1RLX1dJTkRPV19QT1BVUCk7CiAjaWZkZWYg R1RLX0FQSV9WRVJTSU9OXzIKICAgICBnX3NpZ25hbF9jb25uZWN0KG1fd2luZG93LCAiZXhwb3Nl LWV2ZW50IiwgR19DQUxMQkFDSyhkcmFnSWNvbldpbmRvd0RyYXdFdmVudENhbGxiYWNrKSwgdGhp cyk7CiAjZWxzZQpAQCAtNzIsNyArODEsMTIgQEAgRHJhZ0ljb246OkRyYWdJY29uKCkKIAogRHJh Z0ljb246On5EcmFnSWNvbigpCiB7Ci0gICAgZ3RrX3dpZGdldF9kZXN0cm95KG1fd2luZG93KTsK KyAgICBpZiAobV93aW5kb3cpCisgICAgICAgIGd0a193aWRnZXRfZGVzdHJveShtX3dpbmRvdyk7 CisjaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKKyAgICBpZiAobV9waXhidWYpCisgICAgICAgIGdf b2JqZWN0X3VucmVmKG1fcGl4YnVmKTsKKyNlbmRpZgogfQogCiB2b2lkIERyYWdJY29uOjpkcmF3 KGNhaXJvX3QqIGNvbnRleHQpCkBAIC05MCw3ICsxMDQsMTYgQEAgdm9pZCBEcmFnSWNvbjo6c2V0 SW1hZ2UoY2Fpcm9fc3VyZmFjZV90KiBpbWFnZSkKICAgICBBU1NFUlQoaW1hZ2UpOwogICAgIG1f aW1hZ2UgPSBpbWFnZTsKICAgICBtX2ltYWdlU2l6ZSA9IEludFNpemUoY2Fpcm9faW1hZ2Vfc3Vy ZmFjZV9nZXRfd2lkdGgoaW1hZ2UpLCBjYWlyb19pbWFnZV9zdXJmYWNlX2dldF9oZWlnaHQoaW1h Z2UpKTsKLSAgICBndGtfd2luZG93X3Jlc2l6ZShHVEtfV0lORE9XKG1fd2luZG93KSwgbV9pbWFn ZVNpemUud2lkdGgoKSwgbV9pbWFnZVNpemUuaGVpZ2h0KCkpOworICAgIGlmIChtX2lzY29tcG9z aXRlZCkgeworICAgICAgICBndGtfd2luZG93X3Jlc2l6ZShHVEtfV0lORE9XKG1fd2luZG93KSwg bV9pbWFnZVNpemUud2lkdGgoKSwgbV9pbWFnZVNpemUuaGVpZ2h0KCkpOworICAgICAgICByZXR1 cm47CisgICAgfQorCisjaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKKyAgICBpZiAobV9waXhidWYp CisgICAgICAgIGdfb2JqZWN0X3VucmVmKG1fcGl4YnVmKTsKKyAgICBtX3BpeGJ1ZiA9IGNhaXJv SW1hZ2VTdXJmYWNlVG9HZGtQaXhidWYoaW1hZ2UpOworI2VuZGlmCiB9CiAKIHZvaWQgRHJhZ0lj b246OnVzZUZvckRyYWcoR2RrRHJhZ0NvbnRleHQqIGNvbnRleHQpCkBAIC0xMDIsNyArMTI1LDE1 IEBAIHZvaWQgRHJhZ0ljb246OnVzZUZvckRyYWcoR2RrRHJhZ0NvbnRleHQqIGNvbnRleHQpCiAK IHZvaWQgRHJhZ0ljb246OnVzZUZvckRyYWcoR2RrRHJhZ0NvbnRleHQqIGNvbnRleHQsIGNvbnN0 IEludFBvaW50JiBob3RzcG90KQogewotICAgIGd0a19kcmFnX3NldF9pY29uX3dpZGdldChjb250 ZXh0LCBtX3dpbmRvdywgaG90c3BvdC54KCksIGhvdHNwb3QueSgpKTsKKyAgICBpZiAobV9pc2Nv bXBvc2l0ZWQpIHsKKyAgICAgICAgZ3RrX2RyYWdfc2V0X2ljb25fd2lkZ2V0KGNvbnRleHQsIG1f d2luZG93LCBob3RzcG90LngoKSwgaG90c3BvdC55KCkpOworICAgICAgICByZXR1cm47CisgICAg fQorI2lmZGVmIEdUS19BUElfVkVSU0lPTl8yCisgICAgZ3RrX2RyYWdfc2V0X2ljb25fcGl4YnVm KGNvbnRleHQsIG1fcGl4YnVmLCBob3RzcG90LngoKSwgaG90c3BvdC55KCkpOworI2Vsc2UKKyAg ICBndGtfZHJhZ19zZXRfaWNvbl9zdXJmYWNlKGNvbnRleHQsIG1faW1hZ2UuZ2V0KCkpOworI2Vu ZGlmCiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2d0ay9EcmFnSWNvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L0RyYWdJY29uLmgKaW5kZXggOTFlZTU5ZmFkMTUzYmNkODZmYzE1ZGE4Y2YwYjI2ZjZjZGFmZjQ4 Yi4uM2Q1ZTMyNDJhNzcxZmU0YzYwNmY4YTRlYmY4MTEzOTFiODM0ZWRkNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0RyYWdJY29uLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3RrL0RyYWdJY29uLmgKQEAgLTQyLDkgKzQyLDEzIEBAIHB1YmxpYzoKICAg ICB2b2lkIHVzZUZvckRyYWcoR2RrRHJhZ0NvbnRleHQqLCBjb25zdCBJbnRQb2ludCYgaG90c3Bv dCk7CiAKIHByaXZhdGU6CisgICAgZ2Jvb2xlYW4gbV9pc2NvbXBvc2l0ZWQ7CiAgICAgR3RrV2lk Z2V0KiBtX3dpbmRvdzsKICAgICBSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBtX2ltYWdlOwogICAg IEludFNpemUgbV9pbWFnZVNpemU7CisjaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKKyAgICBHZGtQ aXhidWYqIG1fcGl4YnVmOworI2VuZGlmCiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvRHJhZ0ltYWdlR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2d0ay9EcmFnSW1hZ2VHdGsuY3BwCmluZGV4IDAxOThkZWMyOGRjNTk5NDg5MmNjOTg4ZjIw MzlmNDExYzk4OTczODguLjNiN2M0YzE0MmUxY2VmMzlkMjRmM2JlZTlmMzRjYjJlYWQyYmQ3ZTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EcmFnSW1hZ2VHdGsuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EcmFnSW1hZ2VHdGsuY3BwCkBAIC0y Myw2ICsyMyw3IEBACiAjaW5jbHVkZSAiSW1hZ2UuaCIKICNpbmNsdWRlICJSZWZQdHJDYWlyby5o IgogI2luY2x1ZGUgPGNhaXJvLmg+CisjaW5jbHVkZSA8Z2RrL2dkay5oPgogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKQEAgLTY2LDYgKzY3LDkgQEAgRHJhZ0ltYWdlUmVmIGRpc3NvbHZlRHJhZ0lt YWdlVG9GcmFjdGlvbihEcmFnSW1hZ2VSZWYgaW1hZ2UsIGZsb2F0IGZyYWN0aW9uKQogICAgIGlm ICghaW1hZ2UpCiAgICAgICAgIHJldHVybiAwOwogCisgICAgaWYgKCFnZGtfc2NyZWVuX2lzX2Nv bXBvc2l0ZWQoZ2RrX3NjcmVlbl9nZXRfZGVmYXVsdCgpKSkKKyAgICAgICAgcmV0dXJuIGltYWdl OworCiAgICAgUmVmUHRyPGNhaXJvX3Q+IGNvbnRleHQgPSBhZG9wdFJlZihjYWlyb19jcmVhdGUo aW1hZ2UpKTsKICAgICBjYWlyb19zZXRfb3BlcmF0b3IoY29udGV4dC5nZXQoKSwgQ0FJUk9fT1BF UkFUT1JfREVTVF9JTik7CiAgICAgY2Fpcm9fc2V0X3NvdXJjZV9yZ2JhKGNvbnRleHQuZ2V0KCks IDAsIDAsIDAsIGZyYWN0aW9uKTsK 185642 2013-01-30 18:10:00 -0800 2013-01-31 15:47:36 -0800 updated patch to address reviewer comments bug-108376-20130130180642.patch text/plain 5435 a.renevier U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMDAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWQ0ZDQxMzdkZWUzZjM5 OGE0OTJiZDk1MTgwY2NlZmNhM2RhZWExNy4uOWJlMDkyZjM0NjY2MTFhZmI3ZTdjMjM0Y2MxODUw MmVmMWFhYjE5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTAxLTMwICBBcm5h dWQgUmVuZXZpZXIgIDxhLnJlbmV2aWVyQHNpc2Euc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0d0 a10gZHJhZyBhbmQgZHJvcCBoYXMgYmxhY2sgYmFja2dyb3VuZCB3aXRob3V0IGNvbXBvc2l0aW9u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDgzNzYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgZ3Rr X2RyYWdfc2V0X2ljb25fc3VyZmFjZSAob3IgZ3RrX2RyYWdfc2V0X2ljb25fcGl4YnVmKSB3aGVu IHRoZQorICAgICAgICBzY3JlZW4gaXMgbm90IGNvbXBvc2l0ZWQuIFRoYXQgd2F5LCBkcmFnIHdp bmRvdyB3aWxsIGJlIGRlY29tcG9zaXRlZAorICAgICAgICBhbmQgcmVuZGVyZWQgdHJhbnNwYXJl bnQgd2l0aCBYc2hhcGUuCisKKyAgICAgICAgVG8gZGV0ZXJtaW5lIHdoaWNoIHBhcnRzIG9mIHRo ZSB3aW5kb3cgbXVzdCBiZSB0cmFuc3BhcmVudCwgZ3RrIGNoZWNrcworICAgICAgICBpZiBhIHBp eGVsIGlzIG1vcmUgdGhhbiA1MCUgb3BhcXVlLiBXaXRoIGRpc3NvbHZlRHJhZ0ltYWdlVG9GcmFj dGlvbiwKKyAgICAgICAgYWxsIHBpeGVscyBhcmUgbWFkZSAyNSUgdHJhbnNwYXJlbnQuIFdpdGgg YW50aWFsaWFzaW5nLCBvcGFjaXR5IGdvZXMKKyAgICAgICAgYmVsb3cgdGhlIHRocmVzaG9sZCBm b3Igc29tZSBwaXhlbHMsIHdoaWNoIG1ha2VzIHRoZSByZXN1bHRpbmcgaW1hZ2UKKyAgICAgICAg bWVzc3kuIFNvLCB3ZSBuZWVkIHRvIHNraXAgZGlzc29sdmVEcmFnSW1hZ2VUb0ZyYWN0aW9uIHdo ZW4gd2UgdXNlCisgICAgICAgIGd0a19kcmFnX3NldF9pY29uX3N1cmZhY2UuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ndGsvRHJhZ0ljb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0ljb246 OkRyYWdJY29uKToKKyAgICAgICAgKFdlYkNvcmU6OkRyYWdJY29uOjp+RHJhZ0ljb24pOgorICAg ICAgICAoV2ViQ29yZTo6RHJhZ0ljb246OnNldEltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkRy YWdJY29uOjp1c2VGb3JEcmFnKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvRHJhZ0ljb24uaDoK KyAgICAgICAgKERyYWdJY29uKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvRHJhZ0ltYWdlR3Rr LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmRpc3NvbHZlRHJhZ0ltYWdlVG9GcmFjdGlvbik6CisK IDIwMTItMTItMjAgIEFybmF1ZCBSZW5ldmllciAgPGEucmVuZXZpZXJAc2lzYS5zYW1zdW5nLmNv bT4KIAogICAgICAgICBbR1RLXSBBZGQgc3VwcG9ydCBmb3IgY29sb3IgaW5wdXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EcmFnSWNvbi5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvRHJhZ0ljb24uY3BwCmluZGV4IGU2MmRmNDIyNTUwZDkzZmI1NWY5 ZDcwOTMwYWMyOGZjMTA3OGI4YTMuLmQ4MTg3NzFjODI5OWQwMTE1NDk1ZWZjY2M1MDExMmFjZDg0 ZWQ3NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EcmFnSWNvbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0RyYWdJY29uLmNwcApAQCAtMjUs NiArMjUsNyBAQAogCiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiRHJhZ0ljb24uaCIK KyNpbmNsdWRlICJHZGtDYWlyb1V0aWxpdGllcy5oIgogCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgog CkBAIC00OCw4ICs0OSwxMyBAQCBzdGF0aWMgZ2Jvb2xlYW4gZHJhZ0ljb25XaW5kb3dEcmF3RXZl bnRDYWxsYmFjayhHdGtXaWRnZXQqLCBjYWlyb190KiBjb250ZXh0LCBEcgogI2VuZGlmIC8vIEdU S19BUElfVkVSU0lPTl8yCiAKIERyYWdJY29uOjpEcmFnSWNvbigpCi0gICAgOiBtX3dpbmRvdyhn dGtfd2luZG93X25ldyhHVEtfV0lORE9XX1BPUFVQKSkKKyAgICA6IGlzQ29tcG9zaXRlZChnZGtf c2NyZWVuX2lzX2NvbXBvc2l0ZWQoZ2RrX3NjcmVlbl9nZXRfZGVmYXVsdCgpKSkKKyAgICAsIG1f d2luZG93KDApCiB7CisgICAgaWYgKCFpc0NvbXBvc2l0ZWQpCisgICAgICAgIHJldHVybjsKKwor ICAgIG1fd2luZG93ID0gZ3RrX3dpbmRvd19uZXcoR1RLX1dJTkRPV19QT1BVUCk7CiAjaWZkZWYg R1RLX0FQSV9WRVJTSU9OXzIKICAgICBnX3NpZ25hbF9jb25uZWN0KG1fd2luZG93LCAiZXhwb3Nl LWV2ZW50IiwgR19DQUxMQkFDSyhkcmFnSWNvbldpbmRvd0RyYXdFdmVudENhbGxiYWNrKSwgdGhp cyk7CiAjZWxzZQpAQCAtNzIsNyArNzgsOCBAQCBEcmFnSWNvbjo6RHJhZ0ljb24oKQogCiBEcmFn SWNvbjo6fkRyYWdJY29uKCkKIHsKLSAgICBndGtfd2lkZ2V0X2Rlc3Ryb3kobV93aW5kb3cpOwor ICAgIGlmIChtX3dpbmRvdykKKyAgICAgICAgZ3RrX3dpZGdldF9kZXN0cm95KG1fd2luZG93KTsK IH0KIAogdm9pZCBEcmFnSWNvbjo6ZHJhdyhjYWlyb190KiBjb250ZXh0KQpAQCAtOTAsNyArOTcs MTQgQEAgdm9pZCBEcmFnSWNvbjo6c2V0SW1hZ2UoY2Fpcm9fc3VyZmFjZV90KiBpbWFnZSkKICAg ICBBU1NFUlQoaW1hZ2UpOwogICAgIG1faW1hZ2UgPSBpbWFnZTsKICAgICBtX2ltYWdlU2l6ZSA9 IEludFNpemUoY2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRfd2lkdGgoaW1hZ2UpLCBjYWlyb19pbWFn ZV9zdXJmYWNlX2dldF9oZWlnaHQoaW1hZ2UpKTsKLSAgICBndGtfd2luZG93X3Jlc2l6ZShHVEtf V0lORE9XKG1fd2luZG93KSwgbV9pbWFnZVNpemUud2lkdGgoKSwgbV9pbWFnZVNpemUuaGVpZ2h0 KCkpOworICAgIGlmIChpc0NvbXBvc2l0ZWQpIHsKKyAgICAgICAgZ3RrX3dpbmRvd19yZXNpemUo R1RLX1dJTkRPVyhtX3dpbmRvdyksIG1faW1hZ2VTaXplLndpZHRoKCksIG1faW1hZ2VTaXplLmhl aWdodCgpKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworI2lmZGVmIEdUS19BUElfVkVSU0lP Tl8yCisgICAgbV9waXhidWYgPSBhZG9wdEdSZWYoY2Fpcm9JbWFnZVN1cmZhY2VUb0dka1BpeGJ1 ZihpbWFnZSkpOworI2VuZGlmCiB9CiAKIHZvaWQgRHJhZ0ljb246OnVzZUZvckRyYWcoR2RrRHJh Z0NvbnRleHQqIGNvbnRleHQpCkBAIC0xMDIsNyArMTE2LDE1IEBAIHZvaWQgRHJhZ0ljb246OnVz ZUZvckRyYWcoR2RrRHJhZ0NvbnRleHQqIGNvbnRleHQpCiAKIHZvaWQgRHJhZ0ljb246OnVzZUZv ckRyYWcoR2RrRHJhZ0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFBvaW50JiBob3RzcG90KQog ewotICAgIGd0a19kcmFnX3NldF9pY29uX3dpZGdldChjb250ZXh0LCBtX3dpbmRvdywgaG90c3Bv dC54KCksIGhvdHNwb3QueSgpKTsKKyAgICBpZiAoaXNDb21wb3NpdGVkKSB7CisgICAgICAgIGd0 a19kcmFnX3NldF9pY29uX3dpZGdldChjb250ZXh0LCBtX3dpbmRvdywgaG90c3BvdC54KCksIGhv dHNwb3QueSgpKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyNpZmRlZiBHVEtfQVBJX1ZFUlNJ T05fMgorICAgIGd0a19kcmFnX3NldF9pY29uX3BpeGJ1Zihjb250ZXh0LCBtX3BpeGJ1Zi5nZXQo KSwgaG90c3BvdC54KCksIGhvdHNwb3QueSgpKTsKKyNlbHNlCisgICAgZ3RrX2RyYWdfc2V0X2lj b25fc3VyZmFjZShjb250ZXh0LCBtX2ltYWdlLmdldCgpKTsKKyNlbmRpZgogfQogCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv RHJhZ0ljb24uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EcmFnSWNvbi5oCmluZGV4 IDkxZWU1OWZhZDE1M2JjZDg2ZmMxNWRhOGNmMGIyNmY2Y2RhZmY0OGIuLmZiZTQzNWRjYmRhMjBl MmVkZDdiZmMyNmY3YjBmZjA5YTI4Yjg4NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9EcmFnSWNvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9E cmFnSWNvbi5oCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpbmNsdWRlICJJbnRQb2ludC5oIgogI2lu Y2x1ZGUgPFJlZlB0ckNhaXJvLmg+CisjaW5jbHVkZSA8d3RmL2dvYmplY3QvR1JlZlB0ci5oPgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTQyLDkgKzQzLDEzIEBAIHB1YmxpYzoKICAgICB2 b2lkIHVzZUZvckRyYWcoR2RrRHJhZ0NvbnRleHQqLCBjb25zdCBJbnRQb2ludCYgaG90c3BvdCk7 CiAKIHByaXZhdGU6CisgICAgYm9vbCBpc0NvbXBvc2l0ZWQ7CiAgICAgR3RrV2lkZ2V0KiBtX3dp bmRvdzsKICAgICBSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBtX2ltYWdlOwogICAgIEludFNpemUg bV9pbWFnZVNpemU7CisjaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKKyAgICBHUmVmUHRyPEdka1Bp eGJ1Zj4gbV9waXhidWY7CisjZW5kaWYKIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2d0ay9EcmFnSW1hZ2VHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL0RyYWdJbWFnZUd0ay5jcHAKaW5kZXggMDE5OGRlYzI4ZGM1OTk0ODkyY2M5ODhmMjAz OWY0MTFjOTg5NzM4OC4uM2I3YzRjMTQyZTFjZWYzOWQyNGYzYmVlOWYzNGNiMmVhZDJiZDdlOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0RyYWdJbWFnZUd0ay5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0RyYWdJbWFnZUd0ay5jcHAKQEAgLTIz LDYgKzIzLDcgQEAKICNpbmNsdWRlICJJbWFnZS5oIgogI2luY2x1ZGUgIlJlZlB0ckNhaXJvLmgi CiAjaW5jbHVkZSA8Y2Fpcm8uaD4KKyNpbmNsdWRlIDxnZGsvZ2RrLmg+CiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIApAQCAtNjYsNiArNjcsOSBAQCBEcmFnSW1hZ2VSZWYgZGlzc29sdmVEcmFnSW1h Z2VUb0ZyYWN0aW9uKERyYWdJbWFnZVJlZiBpbWFnZSwgZmxvYXQgZnJhY3Rpb24pCiAgICAgaWYg KCFpbWFnZSkKICAgICAgICAgcmV0dXJuIDA7CiAKKyAgICBpZiAoIWdka19zY3JlZW5faXNfY29t cG9zaXRlZChnZGtfc2NyZWVuX2dldF9kZWZhdWx0KCkpKQorICAgICAgICByZXR1cm4gaW1hZ2U7 CisKICAgICBSZWZQdHI8Y2Fpcm9fdD4gY29udGV4dCA9IGFkb3B0UmVmKGNhaXJvX2NyZWF0ZShp bWFnZSkpOwogICAgIGNhaXJvX3NldF9vcGVyYXRvcihjb250ZXh0LmdldCgpLCBDQUlST19PUEVS QVRPUl9ERVNUX0lOKTsKICAgICBjYWlyb19zZXRfc291cmNlX3JnYmEoY29udGV4dC5nZXQoKSwg MCwgMCwgMCwgZnJhY3Rpb24pOwo=