22553 2008-11-29 04:05:09 -0800 Remove unneeded GObject casts. 2008-12-01 09:26:32 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Trivial --- 1 xan.lopez webkit-unassigned oldest_to_newest 100696 0 xan.lopez 2008-11-29 04:05:09 -0800 g_object_get, g_object_set, g_signal_connect, etc. all take a gpointer argument, so there is no need to cast to GObject with the G_OBJECT macro. 100697 1 25594 xan.lopez 2008-11-29 04:13:00 -0800 Created attachment 25594 Remove unneeded GObject casts. 100748 2 25594 zecke 2008-11-29 19:44:12 -0800 Comment on attachment 25594 Remove unneeded GObject casts. > From 986ed09d38f02e5a51fd5b9834cafe06e7e272e1 Mon Sep 17 00:00:00 2001 > From: Xan Lopez <xan@gnome.org> > Date: Sat, 29 Nov 2008 14:09:59 +0200 > Subject: [PATCH] Remove unneeded GObject casts. > > --- > WebKit/gtk/ChangeLog | 28 ++++++++++++++++++++++ > WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp | 22 ++++++++-------- > WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp | 4 +- > WebKit/gtk/webkit/webkitwebframe.cpp | 6 ++-- > WebKit/gtk/webkit/webkitwebview.cpp | 4 +- > WebKit/gtk/webkit/webkitwebwindowfeatures.cpp | 10 ++++---- > 6 files changed, 51 insertions(+), 23 deletions(-) > > diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog > index 57a6479..62e35b6 100644 > --- a/WebKit/gtk/ChangeLog > +++ b/WebKit/gtk/ChangeLog > @@ -1,3 +1,31 @@ > +2008-11-29 Xan Lopez <xan@gnome.org> > + > + Reviewed by NOBODY (OOPS!). > + > + https://bugs.webkit.org/show_bug.cgi?id=22553 indention wrong? mixing tabs and spaces? besides that, you are right, g_object_set, g_object_ref, g_object_unref take a plain gpointer and there is no need to cast it. 100835 3 christian 2008-12-01 09:26:32 -0800 2008-12-01 Xan Lopez <xan@gnome.org> Reviewed by Holger Freyther. http://bugs.webkit.org/show_bug.cgi?id=22553 Remove unneeded GObject casts. Remove unneeded casts to GObject in functions that take a gpointer argument. 25594 2008-11-29 04:13:00 -0800 2008-11-29 19:44:12 -0800 Remove unneeded GObject casts. 0001-Remove-unneeded-GObject-casts.patch text/plain 11553 xan.lopez RnJvbSA5ODZlZDA5ZDM4ZjAyZTVhNTFmZDViOTgzNGNhZmUwNmU3ZTI3MmUxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhhbkBnbm9tZS5vcmc+CkRhdGU6IFNhdCwg MjkgTm92IDIwMDggMTQ6MDk6NTkgKzAyMDAKU3ViamVjdDogW1BBVENIXSBSZW1vdmUgdW5uZWVk ZWQgR09iamVjdCBjYXN0cy4KCi0tLQogV2ViS2l0L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICAyOCArKysrKysrKysrKysrKysrKysrKysrCiBXZWJLaXQvZ3Rr L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAgICAgfCAgIDIyICsrKysrKysrLS0t LS0tLS0KIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50R3RrLmNwcCB8 ICAgIDQgKy0KIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcCAgICAgICAgICAg ICB8ICAgIDYgKystLQogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAgICAgICAg ICAgICAgIHwgICAgNCArLQogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vid2luZG93ZmVhdHVy ZXMuY3BwICAgIHwgICAxMCArKysrLS0tLQogNiBmaWxlcyBjaGFuZ2VkLCA1MSBpbnNlcnRpb25z KCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBi L1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IDU3YTY0NzkuLjYyZTM1YjYgMTAwNjQ0Ci0tLSBh L1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMzEgQEAKKzIwMDgtMTEtMjkgIFhhbiBMb3BleiAgPHhhbkBnbm9tZS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKwlodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI1NTMKKworICAgICAgICBSZW1vdmUgdW5uZWVkZWQgY2FzdHMg dG8gR09iamVjdCBpbiBmdW5jdGlvbnMgdGhhdCB0YWtlIGEgZ3BvaW50ZXIKKyAgICAgICAgYXJn dW1lbnQuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwOgor ICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OnNldFdpbmRvd1JlY3QpOgorICAgICAgICAo V2ViS2l0OjpDaHJvbWVDbGllbnQ6OmNyZWF0ZVdpbmRvdyk6CisgICAgICAgIChXZWJLaXQ6OkNo cm9tZUNsaWVudDo6c2V0VG9vbGJhcnNWaXNpYmxlKToKKyAgICAgICAgKFdlYktpdDo6Q2hyb21l Q2xpZW50Ojp0b29sYmFyc1Zpc2libGUpOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6 OnNldFN0YXR1c2JhclZpc2libGUpOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OnN0 YXR1c2JhclZpc2libGUpOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OnNldFNjcm9s bGJhcnNWaXNpYmxlKToKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50OjpzY3JvbGxiYXJz VmlzaWJsZSk6CisgICAgICAgIChXZWJLaXQ6OkNocm9tZUNsaWVudDo6c2V0TWVudWJhclZpc2li bGUpOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6Om1lbnViYXJWaXNpYmxlKToKKyAg ICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50OjpzZXRUb29sVGlwKToKKyAgICAgICAgKiBXZWJD b3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpJbnNw ZWN0b3JDbGllbnQ6OmNyZWF0ZVBhZ2UpOgorICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJmcmFt ZS5jcHA6CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwOgorICAgICAgICAqIHdl YmtpdC93ZWJraXR3ZWJ3aW5kb3dmZWF0dXJlcy5jcHA6CisgICAgICAgIChfV2ViS2l0V2ViV2lu ZG93RmVhdHVyZXNQcml2YXRlOjp3ZWJraXRfd2ViX3dpbmRvd19mZWF0dXJlc19uZXdfZnJvbV9j b3JlX2ZlYXR1cmVzKToKKwogMjAwOC0xMS0yOCAgSG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRoZXIg IDx6ZWNrZUBzZWxmaXNoLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOaWtvbGFzIFppbW1l cm1hbm4uCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVu dEd0ay5jcHAgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAK aW5kZXggMzI4YzVkNy4uMDhjNGUxYSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9XZWJDb3JlU3Vw cG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwCisrKyBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQv Q2hyb21lQ2xpZW50R3RrLmNwcApAQCAtNzcsNyArNzcsNyBAQCB2b2lkIENocm9tZUNsaWVudDo6 c2V0V2luZG93UmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QpCiAgICAgSW50UmVjdCBpbnRyZWN0 ID0gSW50UmVjdChyZWN0KTsKICAgICBXZWJLaXRXZWJXaW5kb3dGZWF0dXJlcyogd2ViV2luZG93 RmVhdHVyZXMgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3dpbmRvd19mZWF0dXJlcyhtX3dlYlZpZXcp OwogCi0gICAgZ19vYmplY3Rfc2V0KEdfT0JKRUNUKHdlYldpbmRvd0ZlYXR1cmVzKSwKKyAgICBn X29iamVjdF9zZXQod2ViV2luZG93RmVhdHVyZXMsCiAgICAgICAgICAgICAgICAgICJ4IiwgaW50 cmVjdC54KCksCiAgICAgICAgICAgICAgICAgICJ5IiwgaW50cmVjdC55KCksCiAgICAgICAgICAg ICAgICAgICJ3aWR0aCIsIGludHJlY3Qud2lkdGgoKSwKQEAgLTEyMCw3ICsxMjAsNyBAQCBQYWdl KiBDaHJvbWVDbGllbnQ6OmNyZWF0ZVdpbmRvdyhGcmFtZSogZnJhbWUsIGNvbnN0IEZyYW1lTG9h ZFJlcXVlc3QmIGZyYW1lTG9hZAogCiAgICAgV2ViS2l0V2ViV2luZG93RmVhdHVyZXMqIHdlYldp bmRvd0ZlYXR1cmVzID0gd2Via2l0X3dlYl93aW5kb3dfZmVhdHVyZXNfbmV3X2Zyb21fY29yZV9m ZWF0dXJlcyhjb3JlRmVhdHVyZXMpOwogICAgIHdlYmtpdF93ZWJfdmlld19zZXRfd2luZG93X2Zl YXR1cmVzKHdlYlZpZXcsIHdlYldpbmRvd0ZlYXR1cmVzKTsKLSAgICBnX29iamVjdF91bnJlZihH X09CSkVDVCh3ZWJXaW5kb3dGZWF0dXJlcykpOworICAgIGdfb2JqZWN0X3VucmVmKHdlYldpbmRv d0ZlYXR1cmVzKTsKIAogICAgIGlmICghZnJhbWVMb2FkUmVxdWVzdC5pc0VtcHR5KCkpCiAgICAg ICAgIHdlYmtpdF93ZWJfdmlld19vcGVuKHdlYlZpZXcsIGZyYW1lTG9hZFJlcXVlc3QucmVzb3Vy Y2VSZXF1ZXN0KCkudXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CkBAIC0xNDgsNyArMTQ4 LDcgQEAgdm9pZCBDaHJvbWVDbGllbnQ6OnNldFRvb2xiYXJzVmlzaWJsZShib29sIHZpc2libGUp CiB7CiAgICAgV2ViS2l0V2ViV2luZG93RmVhdHVyZXMqIHdlYldpbmRvd0ZlYXR1cmVzID0gd2Vi a2l0X3dlYl92aWV3X2dldF93aW5kb3dfZmVhdHVyZXMobV93ZWJWaWV3KTsKIAotICAgIGdfb2Jq ZWN0X3NldChHX09CSkVDVCh3ZWJXaW5kb3dGZWF0dXJlcyksICJ0b29sYmFyLXZpc2libGUiLCB2 aXNpYmxlLCBOVUxMKTsKKyAgICBnX29iamVjdF9zZXQod2ViV2luZG93RmVhdHVyZXMsICJ0b29s YmFyLXZpc2libGUiLCB2aXNpYmxlLCBOVUxMKTsKIH0KIAogYm9vbCBDaHJvbWVDbGllbnQ6OnRv b2xiYXJzVmlzaWJsZSgpCkBAIC0xNTYsNyArMTU2LDcgQEAgYm9vbCBDaHJvbWVDbGllbnQ6OnRv b2xiYXJzVmlzaWJsZSgpCiAgICAgV2ViS2l0V2ViV2luZG93RmVhdHVyZXMqIHdlYldpbmRvd0Zl YXR1cmVzID0gd2Via2l0X3dlYl92aWV3X2dldF93aW5kb3dfZmVhdHVyZXMobV93ZWJWaWV3KTsK ICAgICBnYm9vbGVhbiB2aXNpYmxlOwogCi0gICAgZ19vYmplY3RfZ2V0KEdfT0JKRUNUKHdlYldp bmRvd0ZlYXR1cmVzKSwgInRvb2xiYXItdmlzaWJsZSIsICZ2aXNpYmxlLCBOVUxMKTsKKyAgICBn X29iamVjdF9nZXQod2ViV2luZG93RmVhdHVyZXMsICJ0b29sYmFyLXZpc2libGUiLCAmdmlzaWJs ZSwgTlVMTCk7CiAgICAgcmV0dXJuIHZpc2libGU7CiB9CiAKQEAgLTE2NCw3ICsxNjQsNyBAQCB2 b2lkIENocm9tZUNsaWVudDo6c2V0U3RhdHVzYmFyVmlzaWJsZShib29sIHZpc2libGUpCiB7CiAg ICAgV2ViS2l0V2ViV2luZG93RmVhdHVyZXMqIHdlYldpbmRvd0ZlYXR1cmVzID0gd2Via2l0X3dl Yl92aWV3X2dldF93aW5kb3dfZmVhdHVyZXMobV93ZWJWaWV3KTsKIAotICAgIGdfb2JqZWN0X3Nl dChHX09CSkVDVCh3ZWJXaW5kb3dGZWF0dXJlcyksICJzdGF0dXNiYXItdmlzaWJsZSIsIHZpc2li bGUsIE5VTEwpOworICAgIGdfb2JqZWN0X3NldCh3ZWJXaW5kb3dGZWF0dXJlcywgInN0YXR1c2Jh ci12aXNpYmxlIiwgdmlzaWJsZSwgTlVMTCk7CiB9CiAKIGJvb2wgQ2hyb21lQ2xpZW50OjpzdGF0 dXNiYXJWaXNpYmxlKCkKQEAgLTE3Miw3ICsxNzIsNyBAQCBib29sIENocm9tZUNsaWVudDo6c3Rh dHVzYmFyVmlzaWJsZSgpCiAgICAgV2ViS2l0V2ViV2luZG93RmVhdHVyZXMqIHdlYldpbmRvd0Zl YXR1cmVzID0gd2Via2l0X3dlYl92aWV3X2dldF93aW5kb3dfZmVhdHVyZXMobV93ZWJWaWV3KTsK ICAgICBnYm9vbGVhbiB2aXNpYmxlOwogCi0gICAgZ19vYmplY3RfZ2V0KEdfT0JKRUNUKHdlYldp bmRvd0ZlYXR1cmVzKSwgInN0YXR1c2Jhci12aXNpYmxlIiwgJnZpc2libGUsIE5VTEwpOworICAg IGdfb2JqZWN0X2dldCh3ZWJXaW5kb3dGZWF0dXJlcywgInN0YXR1c2Jhci12aXNpYmxlIiwgJnZp c2libGUsIE5VTEwpOwogICAgIHJldHVybiB2aXNpYmxlOwogfQogCkBAIC0xODAsMTQgKzE4MCwx NCBAQCB2b2lkIENocm9tZUNsaWVudDo6c2V0U2Nyb2xsYmFyc1Zpc2libGUoYm9vbCB2aXNpYmxl KQogewogICAgIFdlYktpdFdlYldpbmRvd0ZlYXR1cmVzKiB3ZWJXaW5kb3dGZWF0dXJlcyA9IHdl YmtpdF93ZWJfdmlld19nZXRfd2luZG93X2ZlYXR1cmVzKG1fd2ViVmlldyk7CiAKLSAgICBnX29i amVjdF9zZXQoR19PQkpFQ1Qod2ViV2luZG93RmVhdHVyZXMpLCAic2Nyb2xsYmFyLXZpc2libGUi LCB2aXNpYmxlLCBOVUxMKTsKKyAgICBnX29iamVjdF9zZXQod2ViV2luZG93RmVhdHVyZXMsICJz Y3JvbGxiYXItdmlzaWJsZSIsIHZpc2libGUsIE5VTEwpOwogfQogCiBib29sIENocm9tZUNsaWVu dDo6c2Nyb2xsYmFyc1Zpc2libGUoKSB7CiAgICAgV2ViS2l0V2ViV2luZG93RmVhdHVyZXMqIHdl YldpbmRvd0ZlYXR1cmVzID0gd2Via2l0X3dlYl92aWV3X2dldF93aW5kb3dfZmVhdHVyZXMobV93 ZWJWaWV3KTsKICAgICBnYm9vbGVhbiB2aXNpYmxlOwogCi0gICAgZ19vYmplY3RfZ2V0KEdfT0JK RUNUKHdlYldpbmRvd0ZlYXR1cmVzKSwgInNjcm9sbGJhci12aXNpYmxlIiwgJnZpc2libGUsIE5V TEwpOworICAgIGdfb2JqZWN0X2dldCh3ZWJXaW5kb3dGZWF0dXJlcywgInNjcm9sbGJhci12aXNp YmxlIiwgJnZpc2libGUsIE5VTEwpOwogICAgIHJldHVybiB2aXNpYmxlOwogfQogCkBAIC0xOTUs NyArMTk1LDcgQEAgdm9pZCBDaHJvbWVDbGllbnQ6OnNldE1lbnViYXJWaXNpYmxlKGJvb2wgdmlz aWJsZSkKIHsKICAgICBXZWJLaXRXZWJXaW5kb3dGZWF0dXJlcyogd2ViV2luZG93RmVhdHVyZXMg PSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3dpbmRvd19mZWF0dXJlcyhtX3dlYlZpZXcpOwogCi0gICAg Z19vYmplY3Rfc2V0KEdfT0JKRUNUKHdlYldpbmRvd0ZlYXR1cmVzKSwgIm1lbnViYXItdmlzaWJs ZSIsIHZpc2libGUsIE5VTEwpOworICAgIGdfb2JqZWN0X3NldCh3ZWJXaW5kb3dGZWF0dXJlcywg Im1lbnViYXItdmlzaWJsZSIsIHZpc2libGUsIE5VTEwpOwogfQogCiBib29sIENocm9tZUNsaWVu dDo6bWVudWJhclZpc2libGUoKQpAQCAtMjAzLDcgKzIwMyw3IEBAIGJvb2wgQ2hyb21lQ2xpZW50 OjptZW51YmFyVmlzaWJsZSgpCiAgICAgV2ViS2l0V2ViV2luZG93RmVhdHVyZXMqIHdlYldpbmRv d0ZlYXR1cmVzID0gd2Via2l0X3dlYl92aWV3X2dldF93aW5kb3dfZmVhdHVyZXMobV93ZWJWaWV3 KTsKICAgICBnYm9vbGVhbiB2aXNpYmxlOwogCi0gICAgZ19vYmplY3RfZ2V0KEdfT0JKRUNUKHdl YldpbmRvd0ZlYXR1cmVzKSwgIm1lbnViYXItdmlzaWJsZSIsICZ2aXNpYmxlLCBOVUxMKTsKKyAg ICBnX29iamVjdF9nZXQod2ViV2luZG93RmVhdHVyZXMsICJtZW51YmFyLXZpc2libGUiLCAmdmlz aWJsZSwgTlVMTCk7CiAgICAgcmV0dXJuIHZpc2libGU7CiB9CiAKQEAgLTM3Myw3ICszNzMsNyBA QCB2b2lkIENocm9tZUNsaWVudDo6c2V0VG9vbFRpcChjb25zdCBTdHJpbmcmIHRvb2xUaXApCiB7 CiAjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwxMiwwKQogICAgIGlmICh0b29sVGlwLmlzRW1wdHko KSkKLSAgICAgICAgZ19vYmplY3Rfc2V0KEdfT0JKRUNUKG1fd2ViVmlldyksICJoYXMtdG9vbHRp cCIsIEZBTFNFLCBOVUxMKTsKKyAgICAgICAgZ19vYmplY3Rfc2V0KG1fd2ViVmlldywgImhhcy10 b29sdGlwIiwgRkFMU0UsIE5VTEwpOwogICAgIGVsc2UKICAgICAgICAgZ3RrX3dpZGdldF9zZXRf dG9vbHRpcF90ZXh0KEdUS19XSURHRVQobV93ZWJWaWV3KSwgdG9vbFRpcC51dGY4KCkuZGF0YSgp KTsKICNlbHNlCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0luc3BlY3Rv ckNsaWVudEd0ay5jcHAgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVu dEd0ay5jcHAKaW5kZXggMjEwOTk1YS4uYmEzNzIxYSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9X ZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRHdGsuY3BwCisrKyBiL1dlYktpdC9ndGsvV2Vi Q29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50R3RrLmNwcApAQCAtNzcsNyArNzcsNyBAQCBQYWdl KiBJbnNwZWN0b3JDbGllbnQ6OmNyZWF0ZVBhZ2UoKQogICAgIC8vIGNsb3NlLXdpbmRvdyBhbmQg ZGVzdHJveSBzaWduYWxzIHN0aWxsIG5lZWQgdG8gYmUKICAgICAvLyBlbWl0dGVkLgogICAgIFdl YktpdFdlYkluc3BlY3Rvciogd2ViSW5zcGVjdG9yOwotICAgIGdfb2JqZWN0X2dldChHX09CSkVD VChtX2luc3BlY3RlZFdlYlZpZXcpLCAid2ViLWluc3BlY3RvciIsICZ3ZWJJbnNwZWN0b3IsIE5V TEwpOworICAgIGdfb2JqZWN0X2dldChtX2luc3BlY3RlZFdlYlZpZXcsICJ3ZWItaW5zcGVjdG9y IiwgJndlYkluc3BlY3RvciwgTlVMTCk7CiAgICAgbV93ZWJJbnNwZWN0b3IgPSB3ZWJJbnNwZWN0 b3I7CiAKICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUobV93ZWJJbnNwZWN0b3IsICJpbnNwZWN0 LXdlYi12aWV3IiwgbV9pbnNwZWN0ZWRXZWJWaWV3LCAmbV93ZWJWaWV3KTsKQEAgLTg5LDcgKzg5 LDcgQEAgUGFnZSogSW5zcGVjdG9yQ2xpZW50OjpjcmVhdGVQYWdlKCkKIAogICAgIHdlYmtpdF93 ZWJfaW5zcGVjdG9yX3NldF93ZWJfdmlldyhtX3dlYkluc3BlY3RvciwgbV93ZWJWaWV3KTsKIAot ICAgIGdfc2lnbmFsX2Nvbm5lY3QoR19PQkpFQ1QobV93ZWJWaWV3KSwgImRlc3Ryb3kiLAorICAg IGdfc2lnbmFsX2Nvbm5lY3QobV93ZWJWaWV3LCAiZGVzdHJveSIsCiAgICAgICAgICAgICAgICAg ICAgICBHX0NBTExCQUNLKG5vdGlmeVdlYlZpZXdEZXN0cm95ZWQpLCAoZ3BvaW50ZXIpdGhpcyk7 CiAKICAgICB3ZWJraXRfd2ViX3ZpZXdfb3BlbihtX3dlYlZpZXcsICJmaWxlOi8vIkRBVEFfRElS Ii93ZWJraXQtMS4wL3dlYmluc3BlY3Rvci9pbnNwZWN0b3IuaHRtbCIpOwpkaWZmIC0tZ2l0IGEv V2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuY3BwIGIvV2ViS2l0L2d0ay93ZWJraXQv d2Via2l0d2ViZnJhbWUuY3BwCmluZGV4IDZhNGM0ZDUuLjJlZjEyMjQgMTAwNjQ0Ci0tLSBhL1dl YktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXR3ZWJmcmFtZS5jcHAKQEAgLTU2MCw5ICs1NjAsOSBAQCB2b2lkIHdlYmtpdF93ZWJf ZnJhbWVfcHJpbnQoV2ViS2l0V2ViRnJhbWUqIGZyYW1lKQogICAgIFByaW50Q29udGV4dCBwcmlu dENvbnRleHQoY29yZUZyYW1lKTsKIAogICAgIEd0a1ByaW50T3BlcmF0aW9uKiBvcCA9IGd0a19w cmludF9vcGVyYXRpb25fbmV3KCk7Ci0gICAgZ19zaWduYWxfY29ubmVjdChHX09CSkVDVChvcCks ICJiZWdpbi1wcmludCIsIEdfQ0FMTEJBQ0soYmVnaW5fcHJpbnQpLCAmcHJpbnRDb250ZXh0KTsK LSAgICBnX3NpZ25hbF9jb25uZWN0KEdfT0JKRUNUKG9wKSwgImRyYXctcGFnZSIsIEdfQ0FMTEJB Q0soZHJhd19wYWdlKSwgJnByaW50Q29udGV4dCk7Ci0gICAgZ19zaWduYWxfY29ubmVjdChHX09C SkVDVChvcCksICJlbmQtcHJpbnQiLCBHX0NBTExCQUNLKGVuZF9wcmludCksICZwcmludENvbnRl eHQpOworICAgIGdfc2lnbmFsX2Nvbm5lY3Qob3AsICJiZWdpbi1wcmludCIsIEdfQ0FMTEJBQ0so YmVnaW5fcHJpbnQpLCAmcHJpbnRDb250ZXh0KTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KG9wLCAi ZHJhdy1wYWdlIiwgR19DQUxMQkFDSyhkcmF3X3BhZ2UpLCAmcHJpbnRDb250ZXh0KTsKKyAgICBn X3NpZ25hbF9jb25uZWN0KG9wLCAiZW5kLXByaW50IiwgR19DQUxMQkFDSyhlbmRfcHJpbnQpLCAm cHJpbnRDb250ZXh0KTsKICAgICBHRXJyb3IgKmVycm9yID0gTlVMTDsKICAgICBndGtfcHJpbnRf b3BlcmF0aW9uX3J1bihvcCwgR1RLX1BSSU5UX09QRVJBVElPTl9BQ1RJT05fUFJJTlRfRElBTE9H LCBHVEtfV0lORE9XKHRvcExldmVsKSwgJmVycm9yKTsKICAgICBnX29iamVjdF91bnJlZihvcCk7 CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcCBiL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IDAwNmYwMzcuLjcwZmRiMWMgMTAw NjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCisrKyBiL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC0xNDU0LDcgKzE0NTQsNyBAQCBzdGF0 aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfc2NyZWVuX2NoYW5nZWQoV2ViS2l0V2ViVmlldyogd2Vi VmlldywgR2RrU2NyZWVuKiBwcgogCiAgICAgZ3VpbnQgZGVmYXVsdEZvbnRTaXplLCBkZWZhdWx0 TW9ub3NwYWNlRm9udFNpemUsIG1pbmltdW1Gb250U2l6ZSwgbWluaW11bUxvZ2ljYWxGb250U2l6 ZTsKIAotICAgIGdfb2JqZWN0X2dldChHX09CSkVDVCh3ZWJTZXR0aW5ncyksCisgICAgZ19vYmpl Y3RfZ2V0KHdlYlNldHRpbmdzLAogICAgICAgICAgICAgICAgICAiZGVmYXVsdC1mb250LXNpemUi LCAmZGVmYXVsdEZvbnRTaXplLAogICAgICAgICAgICAgICAgICAiZGVmYXVsdC1tb25vc3BhY2Ut Zm9udC1zaXplIiwgJmRlZmF1bHRNb25vc3BhY2VGb250U2l6ZSwKICAgICAgICAgICAgICAgICAg Im1pbmltdW0tZm9udC1zaXplIiwgJm1pbmltdW1Gb250U2l6ZSwKQEAgLTE0NzYsNyArMTQ3Niw3 IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld191cGRhdGVfc2V0dGluZ3MoV2ViS2l0V2Vi Vmlldyogd2ViVmlldykKICAgICBnY2hhciogZGVmYXVsdEVuY29kaW5nLCAqY3Vyc2l2ZUZvbnRG YW1pbHksICpkZWZhdWx0Rm9udEZhbWlseSwgKmZhbnRhc3lGb250RmFtaWx5LCAqbW9ub3NwYWNl Rm9udEZhbWlseSwgKnNhbnNTZXJpZkZvbnRGYW1pbHksICpzZXJpZkZvbnRGYW1pbHksICp1c2Vy U3R5bGVzaGVldFVyaTsKICAgICBnYm9vbGVhbiBhdXRvTG9hZEltYWdlcywgYXV0b1Nocmlua0lt YWdlcywgcHJpbnRCYWNrZ3JvdW5kcywgZW5hYmxlU2NyaXB0cywgZW5hYmxlUGx1Z2lucywgZW5h YmxlRGV2ZWxvcGVyRXh0cmFzLCByZXNpemFibGVUZXh0QXJlYXM7CiAKLSAgICBnX29iamVjdF9n ZXQoR19PQkpFQ1Qod2ViU2V0dGluZ3MpLAorICAgIGdfb2JqZWN0X2dldCh3ZWJTZXR0aW5ncywK ICAgICAgICAgICAgICAgICAgImRlZmF1bHQtZW5jb2RpbmciLCAmZGVmYXVsdEVuY29kaW5nLAog ICAgICAgICAgICAgICAgICAiY3Vyc2l2ZS1mb250LWZhbWlseSIsICZjdXJzaXZlRm9udEZhbWls eSwKICAgICAgICAgICAgICAgICAgImRlZmF1bHQtZm9udC1mYW1pbHkiLCAmZGVmYXVsdEZvbnRG YW1pbHksCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ3aW5kb3dmZWF0 dXJlcy5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ3aW5kb3dmZWF0dXJlcy5jcHAK aW5kZXggNGE3YThjMS4uM2JiYmM2YyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Vi a2l0d2Vid2luZG93ZmVhdHVyZXMuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdl YndpbmRvd2ZlYXR1cmVzLmNwcApAQCAtMzUzLDE4ICszNTMsMTggQEAgV2ViS2l0V2ViV2luZG93 RmVhdHVyZXMqIHdlYmtpdF93ZWJfd2luZG93X2ZlYXR1cmVzX25ld19mcm9tX2NvcmVfZmVhdHVy ZXMoY29uc3QKICAgICBXZWJLaXRXZWJXaW5kb3dGZWF0dXJlcyAqd2ViV2luZG93RmVhdHVyZXMg PSB3ZWJraXRfd2ViX3dpbmRvd19mZWF0dXJlc19uZXcoKTsKIAogICAgIGlmKGZlYXR1cmVzLnhT ZXQpCi0gICAgICAgIGdfb2JqZWN0X3NldChHX09CSkVDVCh3ZWJXaW5kb3dGZWF0dXJlcyksICJ4 Iiwgc3RhdGljX2Nhc3Q8aW50PihmZWF0dXJlcy54KSwgTlVMTCk7CisgICAgICAgIGdfb2JqZWN0 X3NldCh3ZWJXaW5kb3dGZWF0dXJlcywgIngiLCBzdGF0aWNfY2FzdDxpbnQ+KGZlYXR1cmVzLngp LCBOVUxMKTsKIAogICAgIGlmKGZlYXR1cmVzLnlTZXQpCi0gICAgICAgIGdfb2JqZWN0X3NldChH X09CSkVDVCh3ZWJXaW5kb3dGZWF0dXJlcyksICJ5Iiwgc3RhdGljX2Nhc3Q8aW50PihmZWF0dXJl cy55KSwgTlVMTCk7CisgICAgICAgIGdfb2JqZWN0X3NldCh3ZWJXaW5kb3dGZWF0dXJlcywgInki LCBzdGF0aWNfY2FzdDxpbnQ+KGZlYXR1cmVzLnkpLCBOVUxMKTsKIAogICAgIGlmKGZlYXR1cmVz LndpZHRoU2V0KQotICAgICAgICBnX29iamVjdF9zZXQoR19PQkpFQ1Qod2ViV2luZG93RmVhdHVy ZXMpLCAid2lkdGgiLCBzdGF0aWNfY2FzdDxpbnQ+KGZlYXR1cmVzLndpZHRoKSwgTlVMTCk7Cisg ICAgICAgIGdfb2JqZWN0X3NldCh3ZWJXaW5kb3dGZWF0dXJlcywgIndpZHRoIiwgc3RhdGljX2Nh c3Q8aW50PihmZWF0dXJlcy53aWR0aCksIE5VTEwpOwogCiAgICAgaWYoZmVhdHVyZXMuaGVpZ2h0 U2V0KQotICAgICAgICBnX29iamVjdF9zZXQoR19PQkpFQ1Qod2ViV2luZG93RmVhdHVyZXMpLCAi aGVpZ2h0Iiwgc3RhdGljX2Nhc3Q8aW50PihmZWF0dXJlcy5oZWlnaHQpLCBOVUxMKTsKKyAgICAg ICAgZ19vYmplY3Rfc2V0KHdlYldpbmRvd0ZlYXR1cmVzLCAiaGVpZ2h0Iiwgc3RhdGljX2Nhc3Q8 aW50PihmZWF0dXJlcy5oZWlnaHQpLCBOVUxMKTsKIAotICAgIGdfb2JqZWN0X3NldChHX09CSkVD VCh3ZWJXaW5kb3dGZWF0dXJlcyksCisgICAgZ19vYmplY3Rfc2V0KHdlYldpbmRvd0ZlYXR1cmVz LAogICAgICAgICAgICAgICAgICAidG9vbGJhci12aXNpYmxlIiwgZmVhdHVyZXMudG9vbEJhclZp c2libGUsCiAgICAgICAgICAgICAgICAgICJzdGF0dXNiYXItdmlzaWJsZSIsIGZlYXR1cmVzLnN0 YXR1c0JhclZpc2libGUsCiAgICAgICAgICAgICAgICAgICJzY3JvbGxiYXItdmlzaWJsZSIsIGZl YXR1cmVzLnNjcm9sbGJhcnNWaXNpYmxlLAotLSAKMS42LjAuNAoK