51885 2011-01-04 10:57:21 -0800 [GTK] Fix gtk2 compilation for master 2011-01-10 11:31:15 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 alex webkit-unassigned mrobinson xan.lopez oldest_to_newest 329086 0 alex 2011-01-04 10:57:21 -0800 Some functions have been deprecated and we need some cleaning, namely: - gdk_drawable_get_size - gtk_dialog_set_has_separator 329101 1 77912 alex 2011-01-04 11:23:09 -0800 Created attachment 77912 Proposed patch 329107 2 77912 xan.lopez 2011-01-04 11:41:45 -0800 Comment on attachment 77912 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=77912&action=review > Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp:43 > + gdk_pixmap_get_size(GDK_DRAWABLE(pixmap), &width, &height); This is confusing, I think you should make the macro do nothing in newer versions. But then the code will be a mess to understand... ugh :/(the fact that it still compiles tells me the GTK+ guys dropped the ball by now). > WebKit/gtk/webkit/webkitsoupauthdialog.c:230 > + g_object_set(dialog, "has-separator", FALSE, NULL); Let's just remove the separator? It's not like we have to have one or anything :) 329507 3 alex 2011-01-05 04:37:38 -0800 (In reply to comment #2) > (From update of attachment 77912 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=77912&action=review > > > Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp:43 > > + gdk_pixmap_get_size(GDK_DRAWABLE(pixmap), &width, &height); > > This is confusing, I think you should make the macro do nothing in newer versions. But then the code will be a mess to understand... ugh :/(the fact that it still compiles tells me the GTK+ guys dropped the ball by now). > Yep, I can add that or even try to remove the gtk2 code and use other way to get the size. > > WebKit/gtk/webkit/webkitsoupauthdialog.c:230 > > + g_object_set(dialog, "has-separator", FALSE, NULL); > > Let's just remove the separator? It's not like we have to have one or anything :) Actually we are removing it with the code, but yeah, I do not think anything depends on not having it. 329637 4 alex 2011-01-05 10:22:43 -0800 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 77912 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=77912&action=review > > > > > Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp:43 > > > + gdk_pixmap_get_size(GDK_DRAWABLE(pixmap), &width, &height); > > > > This is confusing, I think you should make the macro do nothing in newer versions. But then the code will be a mess to understand... ugh :/(the fact that it still compiles tells me the GTK+ guys dropped the ball by now). > > > > Yep, I can add that or even try to remove the gtk2 code and use other way to get the size. > I've checked we do not need this, we did not even need GDK_DRAWABLE macro in the first place because: ... typedef struct _GdkDrawable GdkDrawable; ... typedef struct _GdkDrawable GdkPixmap; ... 329639 5 78014 alex 2011-01-05 10:23:40 -0800 Created attachment 78014 Proposed patch 331685 6 78014 xan.lopez 2011-01-10 10:36:06 -0800 Comment on attachment 78014 Proposed patch Looks good. 331757 7 alex 2011-01-10 11:31:15 -0800 Landed http://trac.webkit.org/changeset/75397 77912 2011-01-04 11:23:09 -0800 2011-01-05 10:23:40 -0800 Proposed patch fix_gtk2.patch text/plain 5493 alex ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5MDA5 NmIwLi5hMTFjNzg3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDEtMDQgIEFsZWphbmRybyBHLiBDYXN0cm8g IDxhbGV4QGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW0dUS10gRml4IGd0azIgY29tcGlsYXRpb24gZm9yIG1hc3RlcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTE4ODUKKworICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL2d0ay9QaXhlbER1bXBTdXBwb3J0R3RrLmNwcDoKKyAgICAgICAg KGNyZWF0ZUJpdG1hcENvbnRleHRGcm9tV2ViVmlldyk6IFJlcGxhY2VkIHRoZSBvbGQKKyAgICAg ICAgZ2RrX2RyYXdhYmxlX2dldF9zaXplIHdpdGggZ2RrX3BpeG1hcF9nZXRfc2l6ZS4KKwogMjAx MS0wMS0wMyAgWWkgU2hlbiAgPHlpLjQuc2hlbkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9Q aXhlbER1bXBTdXBwb3J0R3RrLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9QaXhlbER1 bXBTdXBwb3J0R3RrLmNwcAppbmRleCA0MDczNDAzLi43ZjZlMjU4IDEwMDY0NAotLS0gYS9Ub29s cy9EdW1wUmVuZGVyVHJlZS9ndGsvUGl4ZWxEdW1wU3VwcG9ydEd0ay5jcHAKKysrIGIvVG9vbHMv RHVtcFJlbmRlclRyZWUvZ3RrL1BpeGVsRHVtcFN1cHBvcnRHdGsuY3BwCkBAIC0zMCw2ICszMCw3 IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAKICNpbmNsdWRlICJEdW1wUmVuZGVyVHJlZS5oIgor I2luY2x1ZGUgIkd0a1ZlcnNpb25pbmcuaCIKICNpbmNsdWRlICJQaXhlbER1bXBTdXBwb3J0Q2Fp cm8uaCIKICNpbmNsdWRlIDx3ZWJraXQvd2Via2l0Lmg+CiAKQEAgLTM5LDcgKzQwLDcgQEAgUGFz c1JlZlB0cjxCaXRtYXBDb250ZXh0PiBjcmVhdGVCaXRtYXBDb250ZXh0RnJvbVdlYlZpZXcoYm9v bCwgYm9vbCwgYm9vbCwgYm9vbCkKICAgICBnaW50IHdpZHRoLCBoZWlnaHQ7CiAjaWZkZWYgR1RL X0FQSV9WRVJTSU9OXzIKICAgICBHZGtQaXhtYXAqIHBpeG1hcCA9IGd0a193aWRnZXRfZ2V0X3Nu YXBzaG90KEdUS19XSURHRVQodmlldyksIDApOwotICAgIGdka19kcmF3YWJsZV9nZXRfc2l6ZShH REtfRFJBV0FCTEUocGl4bWFwKSwgJndpZHRoLCAmaGVpZ2h0KTsKKyAgICBnZGtfcGl4bWFwX2dl dF9zaXplKEdES19EUkFXQUJMRShwaXhtYXApLCAmd2lkdGgsICZoZWlnaHQpOwogI2Vsc2UKICAg ICB3aWR0aCA9IGd0a193aWRnZXRfZ2V0X2FsbG9jYXRlZF93aWR0aChHVEtfV0lER0VUKHZpZXcp KTsKICAgICBoZWlnaHQgPSBndGtfd2lkZ2V0X2dldF9hbGxvY2F0ZWRfaGVpZ2h0KEdUS19XSURH RVQodmlldykpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCAzMDBhNTNmLi4wMTQzZTVlIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDExLTAxLTA0ICBB bGVqYW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEZpeCBndGsyIGNvbXBpbGF0aW9u IGZvciBtYXN0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTUxODg1CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oOiBSZXBs YWNlZCB0aGUgMi4yNC4wIGNoZWNrIHdpdGgKKyAgICAgICAgMi4yMy4wIHRvIGF2b2lkIHVzaW5n IHRoZSBvbGQgc3ltYm9scyBpbiB0aGUgMi4yMyByZWxlYXNlcy4gQWRkZWQKKyAgICAgICAgc3Vw cG9ydCBmb3IgZ2RrX3BpeG1hcF9nZXRfc2l6ZSBiZWZvcmUgdGhlIDIuMjMuNC4KKyAgICAgICAg KiBwbGF0Zm9ybS9ndGsvV2lkZ2V0UmVuZGVyaW5nQ29udGV4dEd0azIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6V2lkZ2V0UmVuZGVyaW5nQ29udGV4dDo6V2lkZ2V0UmVuZGVyaW5nQ29udGV4dCk6 CisgICAgICAgIFJlcGxhY2VkIHRoZSBvbGQgZ2RrX2RyYXdhYmxlX2dldF9zaXplIHdpdGggZ2Rr X3BpeG1hcF9nZXRfc2l6ZS4KKwogMjAxMS0wMS0wNCAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2 aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjc0 OTYwLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oIGIv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oCmluZGV4IDExZDFmOGEuLjdlOWZj ZDEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaAorKysg Yi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgKQEAgLTM3LDEyICszNywxNCBA QCBHZGtQaXhidWYqIGdka19waXhidWZfZ2V0X2Zyb21fc3VyZmFjZShjYWlyb19zdXJmYWNlX3Qq IHN1cmZhY2UsIGludCBzcmNYLCBpbnQgcwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KTsKICNlbmRpZgogCi0jaWYgIUdUS19DSEVD S19WRVJTSU9OKDIsIDI0LCAwKQorI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigyLCAyMywgNCkKKyNk ZWZpbmUgZ2RrX3BpeG1hcF9nZXRfc2l6ZSBnZGtfZHJhd2FibGVfZ2V0X3NpemUKKyNlbmRpZiAv LyBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAyMywgNCkKKworI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigy LCAyMywgMCkKICNkZWZpbmUgZ2RrX3dpbmRvd19nZXRfZGlzcGxheSh3aW5kb3cpIGdka19kcmF3 YWJsZV9nZXRfZGlzcGxheSh3aW5kb3cpCi0jaWZkZWYgR0RLX0RJU0FCTEVfREVQUkVDQVRFRAog I2RlZmluZSBnZGtfd2luZG93X2dldF92aXN1YWwgZ2RrX2RyYXdhYmxlX2dldF92aXN1YWwKLSNl bmRpZgotI2VuZGlmIC8vIEdUS19DSEVDS19WRVJTSU9OKDIsIDI0LCAwKQorI2VuZGlmIC8vIEdU S19DSEVDS19WRVJTSU9OKDIsIDIzLCAwKQogCiAjaWYgIUdUS19DSEVDS19WRVJTSU9OKDIsIDIx LCAyKQogI2RlZmluZSBnZGtfdmlzdWFsX2dldF9kZXB0aCh2aXN1YWwpICh2aXN1YWwpLT5kZXB0 aApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvV2lkZ2V0UmVuZGVyaW5nQ29udGV4 dEd0azIuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvV2lkZ2V0UmVuZGVyaW5nQ29udGV4dEd0 azIuY3BwCmluZGV4IGU4NWM1NzAuLjZkMWJlMzEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL1dpZGdldFJlbmRlcmluZ0NvbnRleHRHdGsyLmNwcAorKysgYi9XZWJDb3JlL3BsYXRm b3JtL2d0ay9XaWRnZXRSZW5kZXJpbmdDb250ZXh0R3RrMi5jcHAKQEAgLTMyLDYgKzMyLDcgQEAK ICNpbmNsdWRlICJXaWRnZXRSZW5kZXJpbmdDb250ZXh0LmgiCiAKICNpbmNsdWRlICJHcmFwaGlj c0NvbnRleHQuaCIKKyNpbmNsdWRlICJHdGtWZXJzaW9uaW5nLmgiCiAjaW5jbHVkZSAiUmVmUHRy Q2Fpcm8uaCIKICNpbmNsdWRlICJSZW5kZXJUaGVtZUd0ay5oIgogI2luY2x1ZGUgIlRpbWVyLmgi CkBAIC0xMDcsNyArMTA4LDcgQEAgV2lkZ2V0UmVuZGVyaW5nQ29udGV4dDo6V2lkZ2V0UmVuZGVy aW5nQ29udGV4dChHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwKICAgICBpbnQgc2Ny YXRjaFdpZHRoID0gMDsKICAgICBpbnQgc2NyYXRjaEhlaWdodCA9IDA7CiAgICAgaWYgKGdTY3Jh dGNoQnVmZmVyKQotICAgICAgICBnZGtfZHJhd2FibGVfZ2V0X3NpemUoZ1NjcmF0Y2hCdWZmZXIs ICZzY3JhdGNoV2lkdGgsICZzY3JhdGNoSGVpZ2h0KTsKKyAgICAgICAgZ2RrX3BpeG1hcF9nZXRf c2l6ZShnU2NyYXRjaEJ1ZmZlciwgJnNjcmF0Y2hXaWR0aCwgJnNjcmF0Y2hIZWlnaHQpOwogCiAg ICAgLy8gV2UgZG8gbm90IG5lZWQgdG8gcmVjcmVhdGUgdGhlIGJ1ZmZlciBpZiB0aGUgY3VycmVu dCBidWZmZXIgaXMgbGFyZ2UgZW5vdWdoLgogICAgIGlmICghZ1NjcmF0Y2hCdWZmZXIgfHwgc2Ny YXRjaFdpZHRoIDwgd2lkdGggfHwgc2NyYXRjaEhlaWdodCA8IGhlaWdodCkgewpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCBlOTQz YzZlLi42MDRmYzAzIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJL aXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDExLTAxLTA0ICBBbGVqYW5kcm8g Ry4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEZpeCBndGsyIGNvbXBpbGF0aW9uIGZvciBtYXN0 ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxODg1 CisKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0c291cGF1dGhkaWFsb2cuYzoKKyAgICAgICAgKHNo b3dfYXV0aF9kaWFsb2cpOiBBdm9pZGVkIHRoZSBndGtfZGlhbG9nX3NldF9oYXNfc2VwYXJhdG9y IEFQSQorICAgICAgICB0byByZW1vdmUgYSB3YXJuaW5nLgorCiAyMDExLTAxLTAzICBHdXN0YXZv IE5vcm9uaGEgU2lsdmEgIDxndXN0YXZvLm5vcm9uaGFAY29sbGFib3JhLmNvLnVrPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsv d2Via2l0L3dlYmtpdHNvdXBhdXRoZGlhbG9nLmMgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRz b3VwYXV0aGRpYWxvZy5jCmluZGV4IDJlZWZjYzUuLjU5NGNkMjQgMTAwNjQ0Ci0tLSBhL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHNvdXBhdXRoZGlhbG9nLmMKKysrIGIvV2ViS2l0L2d0ay93ZWJr aXQvd2Via2l0c291cGF1dGhkaWFsb2cuYwpAQCAtMjI3LDcgKzIyNyw3IEBAIHN0YXRpYyB2b2lk IHNob3dfYXV0aF9kaWFsb2coV2ViS2l0QXV0aERhdGEqIGF1dGhEYXRhLCBjb25zdCBjaGFyKiBs b2dpbiwgY29uc3QKIAogICAgIC8qIFNldCB0aGUgZGlhbG9nIHVwIHdpdGggSElHIHByb3BlcnRp ZXMgKi8KICNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgotICAgIGd0a19kaWFsb2dfc2V0X2hhc19z ZXBhcmF0b3IoZGlhbG9nLCBGQUxTRSk7CisgICAgZ19vYmplY3Rfc2V0KGRpYWxvZywgImhhcy1z ZXBhcmF0b3IiLCBGQUxTRSwgTlVMTCk7CiAjZW5kaWYKICAgICBndGtfY29udGFpbmVyX3NldF9i b3JkZXJfd2lkdGgoR1RLX0NPTlRBSU5FUihkaWFsb2cpLCA1KTsKICAgICBndGtfYm94X3NldF9z cGFjaW5nKEdUS19CT1goZ3RrX2RpYWxvZ19nZXRfY29udGVudF9hcmVhKGRpYWxvZykpLCAyKTsg LyogMiAqIDUgKyAyID0gMTIgKi8K 78014 2011-01-05 10:23:40 -0800 2011-01-10 10:36:06 -0800 Proposed patch fix_gtk2.patch text/plain 5563 alex ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxYTUw YmQ4Li5kNjg5ZDM1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDEtMDQgIEFsZWphbmRybyBHLiBDYXN0cm8g IDxhbGV4QGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW0dUS10gRml4IGd0azIgY29tcGlsYXRpb24gZm9yIG1hc3RlcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTE4ODUKKworICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL2d0ay9QaXhlbER1bXBTdXBwb3J0R3RrLmNwcDoKKyAgICAgICAg KGNyZWF0ZUJpdG1hcENvbnRleHRGcm9tV2ViVmlldyk6IFJlcGxhY2VkIHRoZSBvbGQKKyAgICAg ICAgZ2RrX2RyYXdhYmxlX2dldF9zaXplIHdpdGggZ2RrX3BpeG1hcF9nZXRfc2l6ZS4KKwogMjAx MS0wMS0wNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZC4gQWRkaW5nIG15c2VsZiB0byB0aGUgbGlzdCBvZiBjb21taXR0ZXJz LgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL1BpeGVsRHVtcFN1cHBvcnRH dGsuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL1BpeGVsRHVtcFN1cHBvcnRHdGsuY3Bw CmluZGV4IDQwNzM0MDMuLjMyYmM2MDAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2d0ay9QaXhlbER1bXBTdXBwb3J0R3RrLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9n dGsvUGl4ZWxEdW1wU3VwcG9ydEd0ay5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJj b25maWcuaCIKIAogI2luY2x1ZGUgIkR1bXBSZW5kZXJUcmVlLmgiCisjaW5jbHVkZSAiR3RrVmVy c2lvbmluZy5oIgogI2luY2x1ZGUgIlBpeGVsRHVtcFN1cHBvcnRDYWlyby5oIgogI2luY2x1ZGUg PHdlYmtpdC93ZWJraXQuaD4KIApAQCAtMzksNyArNDAsNyBAQCBQYXNzUmVmUHRyPEJpdG1hcENv bnRleHQ+IGNyZWF0ZUJpdG1hcENvbnRleHRGcm9tV2ViVmlldyhib29sLCBib29sLCBib29sLCBi b29sKQogICAgIGdpbnQgd2lkdGgsIGhlaWdodDsKICNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgog ICAgIEdka1BpeG1hcCogcGl4bWFwID0gZ3RrX3dpZGdldF9nZXRfc25hcHNob3QoR1RLX1dJREdF VCh2aWV3KSwgMCk7Ci0gICAgZ2RrX2RyYXdhYmxlX2dldF9zaXplKEdES19EUkFXQUJMRShwaXht YXApLCAmd2lkdGgsICZoZWlnaHQpOworICAgIGdka19waXhtYXBfZ2V0X3NpemUocGl4bWFwLCAm d2lkdGgsICZoZWlnaHQpOwogI2Vsc2UKICAgICB3aWR0aCA9IGd0a193aWRnZXRfZ2V0X2FsbG9j YXRlZF93aWR0aChHVEtfV0lER0VUKHZpZXcpKTsKICAgICBoZWlnaHQgPSBndGtfd2lkZ2V0X2dl dF9hbGxvY2F0ZWRfaGVpZ2h0KEdUS19XSURHRVQodmlldykpOwpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwMzNkODI5Li4yMDg5YTZiIDEw MDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE3IEBACisyMDExLTAxLTA0ICBBbGVqYW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2Fs aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtHVEtdIEZpeCBndGsyIGNvbXBpbGF0aW9uIGZvciBtYXN0ZXIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxODg1CisKKyAgICAgICAgKiBwbGF0Zm9y bS9ndGsvR3RrVmVyc2lvbmluZy5oOiBSZXBsYWNlZCB0aGUgMi4yNC4wIGNoZWNrIHdpdGgKKyAg ICAgICAgMi4yMy4wIHRvIGF2b2lkIHVzaW5nIHRoZSBvbGQgc3ltYm9scyBpbiB0aGUgMi4yMyBy ZWxlYXNlcy4gQWRkZWQKKyAgICAgICAgc3VwcG9ydCBmb3IgZ2RrX3BpeG1hcF9nZXRfc2l6ZSBi ZWZvcmUgdGhlIDIuMjMuNC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvV2lkZ2V0UmVuZGVyaW5n Q29udGV4dEd0azIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2lkZ2V0UmVuZGVyaW5nQ29udGV4 dDo6V2lkZ2V0UmVuZGVyaW5nQ29udGV4dCk6CisgICAgICAgIFJlcGxhY2VkIHRoZSBvbGQgZ2Rr X2RyYXdhYmxlX2dldF9zaXplIHdpdGggZ2RrX3BpeG1hcF9nZXRfc2l6ZS4KKwogMjAxMS0wMS0w NCAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQuIEdUSyBidWlsZCBmaXguCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9H dGtWZXJzaW9uaW5nLmggYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgKaW5k ZXggMTFkMWY4YS4uN2U5ZmNkMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3Rr VmVyc2lvbmluZy5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaApA QCAtMzcsMTIgKzM3LDE0IEBAIEdka1BpeGJ1ZiogZ2RrX3BpeGJ1Zl9nZXRfZnJvbV9zdXJmYWNl KGNhaXJvX3N1cmZhY2VfdCogc3VyZmFjZSwgaW50IHNyY1gsIGludCBzCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgd2lkdGgsIGludCBoZWlnaHQpOwogI2VuZGlm CiAKLSNpZiAhR1RLX0NIRUNLX1ZFUlNJT04oMiwgMjQsIDApCisjaWYgIUdUS19DSEVDS19WRVJT SU9OKDIsIDIzLCA0KQorI2RlZmluZSBnZGtfcGl4bWFwX2dldF9zaXplIGdka19kcmF3YWJsZV9n ZXRfc2l6ZQorI2VuZGlmIC8vIEdUS19DSEVDS19WRVJTSU9OKDIsIDIzLCA0KQorCisjaWYgIUdU S19DSEVDS19WRVJTSU9OKDIsIDIzLCAwKQogI2RlZmluZSBnZGtfd2luZG93X2dldF9kaXNwbGF5 KHdpbmRvdykgZ2RrX2RyYXdhYmxlX2dldF9kaXNwbGF5KHdpbmRvdykKLSNpZmRlZiBHREtfRElT QUJMRV9ERVBSRUNBVEVECiAjZGVmaW5lIGdka193aW5kb3dfZ2V0X3Zpc3VhbCBnZGtfZHJhd2Fi bGVfZ2V0X3Zpc3VhbAotI2VuZGlmCi0jZW5kaWYgLy8gR1RLX0NIRUNLX1ZFUlNJT04oMiwgMjQs IDApCisjZW5kaWYgLy8gR1RLX0NIRUNLX1ZFUlNJT04oMiwgMjMsIDApCiAKICNpZiAhR1RLX0NI RUNLX1ZFUlNJT04oMiwgMjEsIDIpCiAjZGVmaW5lIGdka192aXN1YWxfZ2V0X2RlcHRoKHZpc3Vh bCkgKHZpc3VhbCktPmRlcHRoCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9XaWRn ZXRSZW5kZXJpbmdDb250ZXh0R3RrMi5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9XaWRnZXRS ZW5kZXJpbmdDb250ZXh0R3RrMi5jcHAKaW5kZXggZTg1YzU3MC4uNmQxYmUzMSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvV2lkZ2V0UmVuZGVyaW5nQ29udGV4dEd0azIuY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1dpZGdldFJlbmRlcmluZ0NvbnRleHRHdGsyLmNwcApA QCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgIldpZGdldFJlbmRlcmluZ0NvbnRleHQuaCIKIAog I2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgorI2luY2x1ZGUgIkd0a1ZlcnNpb25pbmcuaCIK ICNpbmNsdWRlICJSZWZQdHJDYWlyby5oIgogI2luY2x1ZGUgIlJlbmRlclRoZW1lR3RrLmgiCiAj aW5jbHVkZSAiVGltZXIuaCIKQEAgLTEwNyw3ICsxMDgsNyBAQCBXaWRnZXRSZW5kZXJpbmdDb250 ZXh0OjpXaWRnZXRSZW5kZXJpbmdDb250ZXh0KEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250 ZXh0LAogICAgIGludCBzY3JhdGNoV2lkdGggPSAwOwogICAgIGludCBzY3JhdGNoSGVpZ2h0ID0g MDsKICAgICBpZiAoZ1NjcmF0Y2hCdWZmZXIpCi0gICAgICAgIGdka19kcmF3YWJsZV9nZXRfc2l6 ZShnU2NyYXRjaEJ1ZmZlciwgJnNjcmF0Y2hXaWR0aCwgJnNjcmF0Y2hIZWlnaHQpOworICAgICAg ICBnZGtfcGl4bWFwX2dldF9zaXplKGdTY3JhdGNoQnVmZmVyLCAmc2NyYXRjaFdpZHRoLCAmc2Ny YXRjaEhlaWdodCk7CiAKICAgICAvLyBXZSBkbyBub3QgbmVlZCB0byByZWNyZWF0ZSB0aGUgYnVm ZmVyIGlmIHRoZSBjdXJyZW50IGJ1ZmZlciBpcyBsYXJnZSBlbm91Z2guCiAgICAgaWYgKCFnU2Ny YXRjaEJ1ZmZlciB8fCBzY3JhdGNoV2lkdGggPCB3aWR0aCB8fCBzY3JhdGNoSGVpZ2h0IDwgaGVp Z2h0KSB7CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktpdC9ndGsvQ2hh bmdlTG9nCmluZGV4IDQyYmQ2OTguLjE5MmQzYWUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvQ2hh bmdlTG9nCisrKyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEt MDEtMDQgIEFsZWphbmRybyBHLiBDYXN0cm8gIDxhbGV4QGlnYWxpYS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gRml4IGd0azIgY29t cGlsYXRpb24gZm9yIG1hc3RlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTE4ODUKKworICAgICAgICAqIHdlYmtpdC93ZWJraXRzb3VwYXV0aGRpYWxv Zy5jOgorICAgICAgICAoc2hvd19hdXRoX2RpYWxvZyk6IFJlbW92ZWQgdGhlIGNhbGwgdG8KKyAg ICAgICAgZ3RrX2RpYWxvZ19zZXRfaGFzX3NlcGFyYXRvciBBUEkgdG8gcmVtb3ZlIGEgd2Fybmlu Zy4KKwogMjAxMS0wMS0wNCAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXRzb3VwYXV0aGRpYWxvZy5jIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 c291cGF1dGhkaWFsb2cuYwppbmRleCAyZWVmY2M1Li5jNDA3ZTZhIDEwMDY0NAotLS0gYS9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXRzb3VwYXV0aGRpYWxvZy5jCisrKyBiL1dlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdHNvdXBhdXRoZGlhbG9nLmMKQEAgLTIyNiw5ICsyMjYsNiBAQCBzdGF0aWMgdm9p ZCBzaG93X2F1dGhfZGlhbG9nKFdlYktpdEF1dGhEYXRhKiBhdXRoRGF0YSwgY29uc3QgY2hhciog bG9naW4sIGNvbnN0CiAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMKTsKIAogICAgIC8q IFNldCB0aGUgZGlhbG9nIHVwIHdpdGggSElHIHByb3BlcnRpZXMgKi8KLSNpZmRlZiBHVEtfQVBJ X1ZFUlNJT05fMgotICAgIGd0a19kaWFsb2dfc2V0X2hhc19zZXBhcmF0b3IoZGlhbG9nLCBGQUxT RSk7Ci0jZW5kaWYKICAgICBndGtfY29udGFpbmVyX3NldF9ib3JkZXJfd2lkdGgoR1RLX0NPTlRB SU5FUihkaWFsb2cpLCA1KTsKICAgICBndGtfYm94X3NldF9zcGFjaW5nKEdUS19CT1goZ3RrX2Rp YWxvZ19nZXRfY29udGVudF9hcmVhKGRpYWxvZykpLCAyKTsgLyogMiAqIDUgKyAyID0gMTIgKi8K ICAgICBndGtfY29udGFpbmVyX3NldF9ib3JkZXJfd2lkdGgoR1RLX0NPTlRBSU5FUihndGtfZGlh bG9nX2dldF9hY3Rpb25fYXJlYShkaWFsb2cpKSwgNSk7Cg==