96165 2012-09-07 17:11:48 -0700 WebKit Git fails to build with --with-acceleration-backend=clutter 2012-09-12 15:35:49 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 siraj webkit-unassigned gustavo mrobinson webkit.review.bot oldest_to_newest 715154 0 siraj 2012-09-07 17:11:48 -0700 Due to the Changes merged from https://bugs.webkit.org/show_bug.cgi?id=90085 --with-acceleration-backend=clutter doesn't build anymore 718655 1 163679 siraj 2012-09-12 13:15:09 -0700 Created attachment 163679 Build fix for webkit clutter AC backend 718664 2 163679 mrobinson 2012-09-12 13:29:42 -0700 Comment on attachment 163679 Build fix for webkit clutter AC backend View in context: https://bugs.webkit.org/attachment.cgi?id=163679&action=review > Source/WebCore/GNUmakefile.list.am:5954 > +if USE_TEXTURE_MAPPER_GL > +webcoregtk_sources += \ > + Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp \ > + Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h > +endif What's the compiler message when you try to compile these with the Clutter backend? 718683 3 163684 siraj 2012-09-12 13:51:01 -0700 Created attachment 163684 Error Log Error Log when RedirectedXCompositeWindow gets compiled with clutter backend 718709 4 mrobinson 2012-09-12 14:15:13 -0700 (In reply to comment #3) > Created an attachment (id=163684) [details] > Error Log > > Error Log when RedirectedXCompositeWindow gets compiled with clutter backend It seems that RedirectedXCompositeWindow.cpp/h needs to be protected by USE(GLX) just like Source/WebCore/platform/graphics/glx/GLContextGLX.cpp/h. I think that's a better approach than conditional inclusion on the sources list. 718752 5 163703 siraj 2012-09-12 14:48:26 -0700 Created attachment 163703 Updated patch with USE(GLX) ok :), I removed the conditional inclusion from the source list and added USE(GLX) to protect the file 718760 6 163703 mrobinson 2012-09-12 14:52:09 -0700 Comment on attachment 163703 Updated patch with USE(GLX) Thank you! 718812 7 163703 webkit.review.bot 2012-09-12 15:35:46 -0700 Comment on attachment 163703 Updated patch with USE(GLX) Clearing flags on attachment: 163703 Committed r128372: <http://trac.webkit.org/changeset/128372> 718813 8 webkit.review.bot 2012-09-12 15:35:49 -0700 All reviewed patches have been landed. Closing bug. 163679 2012-09-12 13:15:09 -0700 2012-09-12 14:48:26 -0700 Build fix for webkit clutter AC backend 0001-Source-WebCore-GTK-Avoid-including-RedirectedXCompos.patch text/plain 9635 siraj RnJvbSAyY2FmMTBiZTVjOTUwYWNlNTM2NDRjNGYyNzViNDQ4YWZjYmIxYmQwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTaXJhaiBSYXppY2sgPHNpcmFqLnJhemlja0Bjb2xsYWJvcmEu Y28udWs+CkRhdGU6IFdlZCwgMTIgU2VwIDIwMTIgMTU6NTg6MjMgLTA0MDAKU3ViamVjdDogW1BB VENIIDEvMl0gU291cmNlL1dlYkNvcmU6IFtHVEtdIEF2b2lkIGluY2x1ZGluZwogUmVkaXJlY3Rl ZFhDb21wb3NpdGVXaW5kb3cgZmlsZXMgd2hlbiBidWlsZGluZyB0aGUKIGNsdXR0ZXIgQUMgYmFj a2VuZAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2MTY1CgpSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93LmNwcCBh bmQgUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cuaCBmaWxlcyByZXF1aWVzIG9wZW5HTCBzcGVj aWZpYwpoZWFkZXJzIHRvIGNvbXBpbGUgc28gd2hlbiB3ZSBidWlsZCB3ZWJraXQgY2x1dHRlciBB QyBiYWNrZW5kIHRoZXNlIGZpbGVzIGZhaWxlZCB0byBjb21waWxlLApUaGlzIHBhdGNoIG1vdmVz IHRoZXNlIHR3byBmaWxlcyBmcm9tIHRoZSBjb21tb24gc291cmNlIGZpbGVzIHRvIGEgc3BlcmF0 ZSBibG9jayB3aGljaCB3b3VsZCBnZXQKYnVpbHQgb25seSB3aXRoIG9wZW5nbCBiYWNrbmVkIGZv ciBHVEsuCgpObyBuZXcgdGVzdHMgc2luY2UgdGhpcyBpcyBhIGJ1aWxkIGZpeAoKKiBHTlVtYWtl ZmlsZS5saXN0LmFtOgpNb3ZlIFJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93LmNwcCBhbmQgUmVk aXJlY3RlZFhDb21wb3NpdGVXaW5kb3cuaCB0byBhIG5ldyBibG9jawoKU291cmNlL1dlYktpdC9n dGs6IFtHVEtdIFVwZGF0ZSBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dENsdXR0ZXIgdG8g bWF0Y2ggQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQuaCBBUEkgdXBkYXRlCmh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjE2NQoKUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCgpEdWUgdG8gdGhlIHJlZmFjdG9yaW5nIGRvbmUgaW4gYnVnICM5MDA4NSBBY2Nl bGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dCBBUEkgY2hhbmdlZCwgYXMgYSByZXN1bHQKQWNjZWxl cmF0ZWRDb21wb3NpdGluZ0NvbnRleHRDbHV0dGVyIGRvZXNuJ3QgY29tcGlsZSBhbnltb3JlLiBU aGlzIHBhdGNoIGlzIHRvIHVwZGF0ZSB0aGUKQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRD bHV0dGVyIGltcGxlbWVudGF0aW9ucyB0byBtYXRjaCB0aGUgQVBJIHVwZGF0ZSwgYW5kIE1ha2Ug d2Via2l0CkFDIGJhY2tlbmQgY29tcGlsZSBhZ2Fpbi4KCiogV2ViQ29yZVN1cHBvcnQvQWNjZWxl cmF0ZWRDb21wb3NpdGluZ0NvbnRleHRDbHV0dGVyLmNwcDoKKFdlYktpdDo6QWNjZWxlcmF0ZWRD b21wb3NpdGluZ0NvbnRleHQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0KToKKFdlYktp dDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6On5BY2NlbGVyYXRlZENvbXBvc2l0aW5n Q29udGV4dCk6CihXZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpzZXRSb290 Q29tcG9zaXRpbmdMYXllcik6CihXZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0 OjpzZXROb25Db21wb3NpdGVkQ29udGVudHNOZWVkRGlzcGxheSk6CihXZWJLaXQ6OmZsdXNoQW5k UmVuZGVyTGF5ZXJzQ2FsbGJhY2spOgooV2ViS2l0OjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29u dGV4dDo6c2NoZWR1bGVMYXllckZsdXNoKToKKFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3NpdGlu Z0NvbnRleHQ6OmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcyk6CihXZWJLaXQ6OkFjY2VsZXJhdGVk Q29tcG9zaXRpbmdDb250ZXh0OjpmbHVzaEFuZFJlbmRlckxheWVycyk6Ci0tLQogU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE3ICsrKysrKysr KysrCiBTb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5saXN0LmFtICAgICAgICAgICAgICAgICB8 ICAgIDkgKysrKy0tCiBTb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAgICAg ICAgICAgICB8ICAgMjIgKysrKysrKysrKysrKysKIC4uLi9BY2NlbGVyYXRlZENvbXBvc2l0aW5n Q29udGV4dENsdXR0ZXIuY3BwICAgICAgIHwgICAzMCArKysrKysrKysrLS0tLS0tLS0tLQogNCBm aWxlcyBjaGFuZ2VkLCA2MSBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggMzg3NDE4My4uNzljMjc0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEy LTA5LTExICBTaXJhaiBSYXppY2sgIDxzaXJhai5yYXppY2tAY29sbGFib3JhLmNvLnVrPgorCisg ICAgICAgIFtHVEtdIEF2b2lkIGluY2x1ZGluZyBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdyBm aWxlcyB3aGVuIGJ1aWxkaW5nIHRoZSBjbHV0dGVyIEFDIGJhY2tlbmQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2MTY1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5k b3cuY3BwIGFuZCBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdy5oIGZpbGVzIHJlcXVpZXMgb3Bl bkdMIHNwZWNpZmljCisgICAgICAgIGhlYWRlcnMgdG8gY29tcGlsZSBzbyB3aGVuIHdlIGJ1aWxk IHdlYmtpdCBjbHV0dGVyIEFDIGJhY2tlbmQgdGhlc2UgZmlsZXMgZmFpbGVkIHRvIGNvbXBpbGUs CisgICAgICAgIFRoaXMgcGF0Y2ggbW92ZXMgdGhlc2UgdHdvIGZpbGVzIGZyb20gdGhlIGNvbW1v biBzb3VyY2UgZmlsZXMgdG8gYSBzcGVyYXRlIGJsb2NrIHdoaWNoIHdvdWxkIGdldAorICAgICAg ICBidWlsdCBvbmx5IHdpdGggb3BlbmdsIGJhY2tuZWQgZm9yIEdUSy4KKworICAgICAgICBObyBu ZXcgdGVzdHMgc2luY2UgdGhpcyBpcyBhIGJ1aWxkIGZpeAorCisgICAgICAgICogR05VbWFrZWZp bGUubGlzdC5hbToKKyAgICAgICAgTW92ZSBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdy5jcHAg YW5kIFJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93LmggdG8gYSBuZXcgYmxvY2sKKwogMjAxMi0w OS0xMCAgQ2F0YWxpbiBCYWRlYSAgPGJhZGVhQGFkb2JlLmNvbT4KIAogICAgICAgICB3ZWJraXQg YnVpbGQgZm9yIDY0LWJpdCBNYWMgY2hyb21pdW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L0dOVW1ha2VmaWxlLmxpc3QuYW0gYi9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5saXN0LmFt CmluZGV4IDJjNzM0ZjQuLjIxYmRiNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0dOVW1h a2VmaWxlLmxpc3QuYW0KKysrIGIvU291cmNlL1dlYkNvcmUvR05VbWFrZWZpbGUubGlzdC5hbQpA QCAtNTk0Nyw2ICs1OTQ3LDEzIEBAIHdlYmNvcmVndGtfc291cmNlcyArPSBcCiAJU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL1dpZGdldFJlbmRlcmluZ0NvbnRleHQuY3BwIFwKIAlTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvV2lkZ2V0UmVuZGVyaW5nQ29udGV4dC5oCiAKK2lmIFVTRV9U RVhUVVJFX01BUFBFUl9HTAord2ViY29yZWd0a19zb3VyY2VzICs9IFwKKwlTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cuY3BwIFwKKwlTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cuaAorZW5kaWYK KworCiBpZiBUQVJHRVRfWDExCiB3ZWJjb3JlZ3RrX3NvdXJjZXMgKz0gXAogCVNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dseC9HTENvbnRleHRHTFguY3BwIFwKQEAgLTU5NTQsOCAr NTk2MSw2IEBAIHdlYmNvcmVndGtfc291cmNlcyArPSBcCiAJU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2Fpcm8vR0xDb250ZXh0LmNwcCBcCiAJU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2Fpcm8vR0xDb250ZXh0LmggXAogCVNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9HdGtXaWRnZXRCYWNraW5nU3RvcmVYMTEuY3BwIFwKLQlTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cuY3BwIFwKLQlTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cuaCBcCiAJU291cmNlL1dl YkNvcmUvcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmMgXAogCVNvdXJjZS9XZWJDb3JlL3BsdWdpbnMv Z3RrL2d0azJ4dGJpbi5oIFwKIAlTb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2d0ay9QbHVnaW5QYWNr YWdlR3RrLmNwcCBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggNzc4ZGFiYy4uMjQ0MzM4ZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3Rr L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA5LTExICBTaXJhaiBSYXppY2sgIDxz aXJhai5yYXppY2tAY29sbGFib3JhLmNvLnVrPgorCisgICAgICAgIFtHVEtdIFVwZGF0ZSBBY2Nl bGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dENsdXR0ZXIgdG8gbWF0Y2ggQWNjZWxlcmF0ZWRDb21w b3NpdGluZ0NvbnRleHQuaCBBUEkgdXBkYXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD05NjE2NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIER1ZSB0byB0aGUgcmVmYWN0b3JpbmcgZG9uZSBpbiBidWcgIzkw MDg1IEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0IEFQSSBjaGFuZ2VkLCBhcyBhIHJlc3Vs dAorICAgICAgICBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dENsdXR0ZXIgZG9lc24ndCBj b21waWxlIGFueW1vcmUuIFRoaXMgcGF0Y2ggaXMgdG8gdXBkYXRlIHRoZQorICAgICAgICBBY2Nl bGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dENsdXR0ZXIgaW1wbGVtZW50YXRpb25zIHRvIG1hdGNo IHRoZSBBUEkgdXBkYXRlLCBhbmQgTWFrZSB3ZWJraXQKKyAgICAgICAgQUMgYmFja2VuZCBjb21w aWxlIGFnYWluLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3Np dGluZ0NvbnRleHRDbHV0dGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRDb21w b3NpdGluZ0NvbnRleHQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0KToKKyAgICAgICAg KFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6On5BY2NlbGVyYXRlZENvbXBv c2l0aW5nQ29udGV4dCk6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdD b250ZXh0OjpzZXRSb290Q29tcG9zaXRpbmdMYXllcik6CisgICAgICAgIChXZWJLaXQ6OkFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpzZXROb25Db21wb3NpdGVkQ29udGVudHNOZWVkRGlz cGxheSk6CisgICAgICAgIChXZWJLaXQ6OmZsdXNoQW5kUmVuZGVyTGF5ZXJzQ2FsbGJhY2spOgor ICAgICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6c2NoZWR1bGVM YXllckZsdXNoKToKKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRl eHQ6OmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcyk6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJh dGVkQ29tcG9zaXRpbmdDb250ZXh0OjpmbHVzaEFuZFJlbmRlckxheWVycyk6CisKIDIwMTItMDkt MDkgIEVtaWwgQSBFa2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlbmFtZSBO b2RlOjpnZXRSZWN0L2dldFBpeGVsU25hcHBlZFJlY3QgYW5kIHJlbW92ZSBDb250YWluZXJOb2Rl OjpnZXRSZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9B Y2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dENsdXR0ZXIuY3BwIGIvU291cmNlL1dlYktpdC9n dGsvV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRDbHV0dGVyLmNw cAppbmRleCA2ZmUwYzM2Li40NTExMTdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9X ZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dENsdXR0ZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRp bmdDb250ZXh0Q2x1dHRlci5jcHAKQEAgLTM2LDcgKzM2LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7 CiAKIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpBY2NlbGVyYXRlZENvbXBvc2l0aW5n Q29udGV4dChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogICAgIDogbV93ZWJWaWV3KHdlYlZpZXcp Ci0gICAgLCBtX3N5bmNUaW1lckNhbGxiYWNrSWQoMCkKKyAgICAsIG1fbGF5ZXJGbHVzaFRpbWVy Q2FsbGJhY2tJZCgwKQogICAgICwgbV9yb290R3JhcGhpY3NMYXllcigwKQogICAgICwgbV9yb290 TGF5ZXJFbWJlZGRlcigwKQogewpAQCAtNDQsOCArNDQsOCBAQCBBY2NlbGVyYXRlZENvbXBvc2l0 aW5nQ29udGV4dDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQoV2ViS2l0V2ViVmlldyog d2ViVgogCiBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6fkFjY2VsZXJhdGVkQ29tcG9z aXRpbmdDb250ZXh0KCkKIHsKLSAgICBpZiAobV9zeW5jVGltZXJDYWxsYmFja0lkKQotICAgICAg ICBnX3NvdXJjZV9yZW1vdmUobV9zeW5jVGltZXJDYWxsYmFja0lkKTsKKyAgICBpZiAobV9sYXll ckZsdXNoVGltZXJDYWxsYmFja0lkKQorICAgICAgICBnX3NvdXJjZV9yZW1vdmUobV9sYXllckZs dXNoVGltZXJDYWxsYmFja0lkKTsKIH0KIAogYm9vbCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29u dGV4dDo6ZW5hYmxlZCgpCkBAIC01OSw3ICs1OSw3IEBAIGJvb2wgQWNjZWxlcmF0ZWRDb21wb3Np dGluZ0NvbnRleHQ6OnJlbmRlckxheWVyc1RvV2luZG93KGNhaXJvX3QqLCBjb25zdCBJbnRSZWN0 CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lkIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250 ZXh0OjphdHRhY2hSb290R3JhcGhpY3NMYXllcihHcmFwaGljc0xheWVyKiBncmFwaGljc0xheWVy KQordm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6c2V0Um9vdENvbXBvc2l0aW5n TGF5ZXIoR3JhcGhpY3NMYXllciogZ3JhcGhpY3NMYXllcikKIHsKICAgICBpZiAoIWdyYXBoaWNz TGF5ZXIpIHsKICAgICAgICAgZ3RrX2NvbnRhaW5lcl9yZW1vdmUoR1RLX0NPTlRBSU5FUihtX3dl YlZpZXcpLCBtX3Jvb3RMYXllckVtYmVkZGVyKTsKQEAgLTg2LDcgKzg2LDcgQEAgdm9pZCBBY2Nl bGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6YXR0YWNoUm9vdEdyYXBoaWNzTGF5ZXIoR3JhcGhp Y3NMYXllciogZ3JhcGgKICAgICB9CiB9CiAKLXZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Nv bnRleHQ6OnNjaGVkdWxlUm9vdExheWVyUmVwYWludChjb25zdCBJbnRSZWN0JiByZWN0KQordm9p ZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6c2V0Tm9uQ29tcG9zaXRlZENvbnRlbnRz TmVlZERpc3BsYXkoY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKICAgICBpZiAoIW1fcm9vdEdyYXBo aWNzTGF5ZXIpCiAgICAgICAgIHJldHVybjsKQEAgLTExMiwzNCArMTEyLDM0IEBAIHZvaWQgQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnJlc2l6ZVJvb3RMYXllcihjb25zdCBJbnRTaXpl JiBzaXplKQogICAgIGd0a193aWRnZXRfc2l6ZV9hbGxvY2F0ZShHVEtfV0lER0VUKG1fcm9vdExh eWVyRW1iZWRkZXIpLCAmYWxsb2NhdGlvbik7CiB9CiAKLXN0YXRpYyBnYm9vbGVhbiBzeW5jTGF5 ZXJzVGltZW91dENhbGxiYWNrKEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0KiBjb250ZXh0 KQorc3RhdGljIGdib29sZWFuIGZsdXNoQW5kUmVuZGVyTGF5ZXJzQ2FsbGJhY2soQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0NvbnRleHQqIGNvbnRleHQpCiB7Ci0gICAgY29udGV4dC0+c3luY0xheWVy c1RpbWVvdXQoKTsKKyAgICBjb250ZXh0LT5mbHVzaEFuZFJlbmRlckxheWVycygpOwogICAgIHJl dHVybiBGQUxTRTsKIH0KIAotdm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6bWFy a0ZvclN5bmMoKQordm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6c2NoZWR1bGVM YXllckZsdXNoKCkKIHsKLSAgICBpZiAobV9zeW5jVGltZXJDYWxsYmFja0lkKQorICAgIGlmICht X2xheWVyRmx1c2hUaW1lckNhbGxiYWNrSWQpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIFdl IHVzZSBhIEdMaWIgdGltZXIgYmVjYXVzZSBvdGhlcndpc2UgR1RLKyBldmVudCBoYW5kbGluZyBk dXJpbmcKICAgICAvLyBkcmFnZ2luZyBjYW4gc3RhcnZlIFdlYkNvcmUgdGltZXJzLCB3aGljaCBo YXZlIGEgbG93ZXIgcHJpb3JpdHkuCi0gICAgbV9zeW5jVGltZXJDYWxsYmFja0lkID0gZ190aW1l b3V0X2FkZF9mdWxsKEdES19QUklPUklUWV9FVkVOVFMsIDAsIHJlaW50ZXJwcmV0X2Nhc3Q8R1Nv dXJjZUZ1bmM+KHN5bmNMYXllcnNUaW1lb3V0Q2FsbGJhY2spLCB0aGlzLCAwKTsKKyAgICBtX2xh eWVyRmx1c2hUaW1lckNhbGxiYWNrSWQgPSBnX3RpbWVvdXRfYWRkX2Z1bGwoR0RLX1BSSU9SSVRZ X0VWRU5UUywgMCwgcmVpbnRlcnByZXRfY2FzdDxHU291cmNlRnVuYz4oZmx1c2hBbmRSZW5kZXJM YXllcnNDYWxsYmFjayksIHRoaXMsIDApOwogfQogCi12b2lkIEFjY2VsZXJhdGVkQ29tcG9zaXRp bmdDb250ZXh0OjpzeW5jTGF5ZXJzTm93KCkKK2Jvb2wgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Nv bnRleHQ6OmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcygpCiB7CiAgICAgaWYgKG1fcm9vdEdyYXBo aWNzTGF5ZXIpCiAgICAgICAgIG1fcm9vdEdyYXBoaWNzTGF5ZXItPnN5bmNDb21wb3NpdGluZ1N0 YXRlRm9yVGhpc0xheWVyT25seSgpOwogCi0gICAgY29yZShtX3dlYlZpZXcpLT5tYWluRnJhbWUo KS0+dmlldygpLT5zeW5jQ29tcG9zaXRpbmdTdGF0ZUluY2x1ZGluZ1N1YmZyYW1lcygpOworICAg IHJldHVybiBjb3JlKG1fd2ViVmlldyktPm1haW5GcmFtZSgpLT52aWV3KCktPnN5bmNDb21wb3Np dGluZ1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVzKCk7CiB9CiAKLXZvaWQgQWNjZWxlcmF0ZWRDb21w b3NpdGluZ0NvbnRleHQ6OnN5bmNMYXllcnNUaW1lb3V0KCkKK3ZvaWQgQWNjZWxlcmF0ZWRDb21w b3NpdGluZ0NvbnRleHQ6OmZsdXNoQW5kUmVuZGVyTGF5ZXJzKCkKIHsKLSAgICBtX3N5bmNUaW1l ckNhbGxiYWNrSWQgPSAwOwotICAgIHN5bmNMYXllcnNOb3coKTsKKyAgICBtX2xheWVyRmx1c2hU aW1lckNhbGxiYWNrSWQgPSAwOworICAgIGZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcygpOwogICAg IGlmICghbV9yb290R3JhcGhpY3NMYXllcikKICAgICAgICAgcmV0dXJuOwogCi0tIAoxLjcuOS41 Cgo= 163684 2012-09-12 13:51:01 -0700 2012-09-12 13:51:01 -0700 Error Log error-log.txt text/plain 2196 siraj ICBDWFggICAgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2xpYldl YkNvcmVHdGtfbGEtR1JlZlB0ckdTdHJlYW1lci5sbwpJbiBmaWxlIGluY2x1ZGVkIGZyb20gLi4v Li4vU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93 LmNwcDoyODowOgouLi8uLi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVkaXJlY3RlZFhD b21wb3NpdGVXaW5kb3cuaDo0MToxMjogZXJyb3I6IOKAmFBhc3NPd25QdHLigJkgZG9lcyBub3Qg bmFtZSBhIHR5cGUKLi4vLi4vU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlZGlyZWN0ZWRY Q29tcG9zaXRlV2luZG93Lmg6NDg6NTogZXJyb3I6IOKAmEdMQ29udGV4dOKAmSBkb2VzIG5vdCBu YW1lIGEgdHlwZQouLi8uLi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVkaXJlY3RlZFhD b21wb3NpdGVXaW5kb3cuaDo2Mzo1OiBlcnJvcjog4oCYT3duUHRy4oCZIGRvZXMgbm90IG5hbWUg YSB0eXBlCi4uLy4uL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZWRpcmVjdGVkWENvbXBv c2l0ZVdpbmRvdy5jcHA6NDA6MTogZXJyb3I6IOKAmFBhc3NPd25QdHLigJkgZG9lcyBub3QgbmFt ZSBhIHR5cGUKLi4vLi4vU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlZGlyZWN0ZWRYQ29t cG9zaXRlV2luZG93LmNwcDogSW4gY29uc3RydWN0b3Ig4oCYV2ViQ29yZTo6UmVkaXJlY3RlZFhD b21wb3NpdGVXaW5kb3c6OlJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93KGNvbnN0IFdlYkNvcmU6 OkludFNpemUmKeKAmToKLi4vLi4vU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlZGlyZWN0 ZWRYQ29tcG9zaXRlV2luZG93LmNwcDo1MzoyNDogZXJyb3I6IOKAmEdMQ29udGV4dEdMWOKAmSBo YXMgbm90IGJlZW4gZGVjbGFyZWQKLi4vLi4vU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Jl ZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93LmNwcDogSW4gZGVzdHJ1Y3RvciDigJh2aXJ0dWFsIFdl YkNvcmU6OlJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93Ojp+UmVkaXJlY3RlZFhDb21wb3NpdGVX aW5kb3coKeKAmToKLi4vLi4vU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlZGlyZWN0ZWRY Q29tcG9zaXRlV2luZG93LmNwcDo5ODoyNDogZXJyb3I6IOKAmEdMQ29udGV4dEdMWOKAmSBoYXMg bm90IGJlZW4gZGVjbGFyZWQKLi4vLi4vU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlZGly ZWN0ZWRYQ29tcG9zaXRlV2luZG93LmNwcDogSW4gbWVtYmVyIGZ1bmN0aW9uIOKAmHZvaWQgV2Vi Q29yZTo6UmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3c6OnJlc2l6ZShjb25zdCBXZWJDb3JlOjpJ bnRTaXplJinigJk6Ci4uLy4uL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZWRpcmVjdGVk WENvbXBvc2l0ZVdpbmRvdy5jcHA6MTM3OjI0OiBlcnJvcjog4oCYR0xDb250ZXh0R0xY4oCZIGhh cyBub3QgYmVlbiBkZWNsYXJlZAouLi8uLi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVk aXJlY3RlZFhDb21wb3NpdGVXaW5kb3cuY3BwOjE0MzoxNzogZXJyb3I6IOKAmGNvbnRleHTigJkg d2FzIG5vdCBkZWNsYXJlZCBpbiB0aGlzIHNjb3BlCi4uLy4uL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2d0ay9SZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdy5jcHA6MTQzOjIyOiBlcnJvcjog4oCY R0xDb250ZXh04oCZIGhhcyBub3QgYmVlbiBkZWNsYXJlZAouLi8uLi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ndGsvUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cuY3BwOiBBdCBnbG9iYWwgc2Nv cGU6Ci4uLy4uL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZWRpcmVjdGVkWENvbXBvc2l0 ZVdpbmRvdy5jcHA6MTUwOjE6IGVycm9yOiDigJhHTENvbnRleHTigJkgZG9lcyBub3QgbmFtZSBh IHR5cGUKbWFrZVsxXTogKioqIFtTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvbGliV2ViQ29y ZUd0a19sYS1SZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdy5sb10gRXJyb3IgMQptYWtlWzFdOiAq KiogV2FpdGluZyBmb3IgdW5maW5pc2hlZCBqb2JzLi4uLgptYWtlWzFdOiBMZWF2aW5nIGRpcmVj dG9yeSBgL2hvbWUvc2lyYWovcHJvamVjdC93ZWJraXQvV2ViS2l0L1dlYktpdEJ1aWxkL1JlbGVh c2UnCm1ha2U6ICoqKiBbYWxsXSBFcnJvciAyCgoK 163703 2012-09-12 14:48:26 -0700 2012-09-12 15:35:45 -0700 Updated patch with USE(GLX) 0001-Source-WebCore-GTK-Protect-RedirectedXCompositeWindo.patch text/plain 9750 siraj RnJvbSA3MDg3ZWQzNDAyMjMwZGVjNTc0YTk5MzQ1YTI2MTYzZDBhZjJlZWM2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTaXJhaiBSYXppY2sgPHNpcmFqLnJhemlja0Bjb2xsYWJvcmEu Y28udWs+CkRhdGU6IFdlZCwgMTIgU2VwIDIwMTIgMTU6NTg6MjMgLTA0MDAKU3ViamVjdDogW1BB VENIXSBTb3VyY2UvV2ViQ29yZTogW0dUS10gUHJvdGVjdCBSZWRpcmVjdGVkWENvbXBvc2l0ZVdp bmRvdwogd2l0aCBVU0UoR0xYKSB3aGVuIGJ1aWxkaW5nIHRoZSBjbHV0dGVyIEFDIGJhY2tlbmQK IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjE2NQoKUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCgpSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdy5jcHAgYW5kIFJl ZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93LmggZmlsZXMgcmVxdWllcyBvcGVuR0wgc3BlY2lmaWMK aGVhZGVycyB0byBjb21waWxlIHNvIHdoZW4gd2UgYnVpbGQgd2Via2l0IGNsdXR0ZXIgQUMgYmFj a2VuZCB0aGVzZSBmaWxlcyBmYWlsZWQgdG8gY29tcGlsZSwKVGhpcyBwYXRjaCBwcm90ZWN0cyB0 aGVzZSB0d28gZmlsZXMgd2l0aCBVU0UoR0xYKSB3aGVuIGJ1aWxkaW5nIHdlYmtpdCB3aXRoIENs dXR0ZXIgQUMgYmFja2VuZC4KCk5vIG5ldyB0ZXN0cyBzaW5jZSB0aGlzIGlzIGEgYnVpbGQgZml4 CgoqIHBsYXRmb3JtL2d0ay9SZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdy5jcHA6CiogcGxhdGZv cm0vZ3RrL1JlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93Lmg6CnByb3RlY3RzIGJvdGggdGhlIGZp bGVzIHdpdGggVVNFKEdMWCkKClNvdXJjZS9XZWJLaXQvZ3RrOiBbR1RLXSBVcGRhdGUgQWNjZWxl cmF0ZWRDb21wb3NpdGluZ0NvbnRleHRDbHV0dGVyIHRvIG1hdGNoIEFjY2VsZXJhdGVkQ29tcG9z aXRpbmdDb250ZXh0LmggQVBJIHVwZGF0ZQpodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTYxNjUKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKRHVlIHRvIHRoZSBy ZWZhY3RvcmluZyBkb25lIGluIGJ1ZyAjOTAwODUgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRl eHQgQVBJIGNoYW5nZWQsIGFzIGEgcmVzdWx0CkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0 Q2x1dHRlciBkb2Vzbid0IGNvbXBpbGUgYW55bW9yZS4gVGhpcyBwYXRjaCBpcyB0byB1cGRhdGUg dGhlCkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Q2x1dHRlciBpbXBsZW1lbnRhdGlvbnMg dG8gbWF0Y2ggdGhlIEFQSSB1cGRhdGUsIGFuZCBNYWtlIHdlYmtpdApBQyBiYWNrZW5kIGNvbXBp bGUgYWdhaW4uCgoqIFdlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0 Q2x1dHRlci5jcHA6CihXZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpBY2Nl bGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dCk6CihXZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRp bmdDb250ZXh0Ojp+QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQpOgooV2ViS2l0OjpBY2Nl bGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6c2V0Um9vdENvbXBvc2l0aW5nTGF5ZXIpOgooV2Vi S2l0OjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6c2V0Tm9uQ29tcG9zaXRlZENvbnRl bnRzTmVlZERpc3BsYXkpOgooV2ViS2l0OjpmbHVzaEFuZFJlbmRlckxheWVyc0NhbGxiYWNrKToK KFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnNjaGVkdWxlTGF5ZXJGbHVz aCk6CihXZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpmbHVzaFBlbmRpbmdM YXllckNoYW5nZXMpOgooV2ViS2l0OjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6Zmx1 c2hBbmRSZW5kZXJMYXllcnMpOgotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAg ICAgICAgICAgICAgICAgICAgIHwgICAxNyArKysrKysrKysrKwogLi4uL3BsYXRmb3JtL2d0ay9S ZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdy5jcHAgICAgfCAgICAzICsrCiAuLi4vcGxhdGZvcm0v Z3RrL1JlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93LmggICAgICB8ICAgIDQgKysrCiBTb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjIgKysrKysr KysrKysrKysKIC4uLi9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dENsdXR0ZXIuY3BwICAg ICAgIHwgICAzMCArKysrKysrKysrLS0tLS0tLS0tLQogNSBmaWxlcyBjaGFuZ2VkLCA2MSBpbnNl cnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzg3NDE4My4uOGUzOWNj YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA5LTEyICBTaXJhaiBSYXppY2sg IDxzaXJhai5yYXppY2tAY29sbGFib3JhLmNvLnVrPgorCisgICAgICAgIFtHVEtdIFByb3RlY3Qg UmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cgd2l0aCBVU0UoR0xYKSB3aGVuIGJ1aWxkaW5nIHRo ZSBjbHV0dGVyIEFDIGJhY2tlbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTk2MTY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cuY3BwIGFuZCBSZWRpcmVjdGVk WENvbXBvc2l0ZVdpbmRvdy5oIGZpbGVzIHJlcXVpZXMgb3BlbkdMIHNwZWNpZmljCisgICAgICAg IGhlYWRlcnMgdG8gY29tcGlsZSBzbyB3aGVuIHdlIGJ1aWxkIHdlYmtpdCBjbHV0dGVyIEFDIGJh Y2tlbmQgdGhlc2UgZmlsZXMgZmFpbGVkIHRvIGNvbXBpbGUsCisgICAgICAgIFRoaXMgcGF0Y2gg cHJvdGVjdHMgdGhlc2UgdHdvIGZpbGVzIHdpdGggVVNFKEdMWCkgd2hlbiBidWlsZGluZyB3ZWJr aXQgd2l0aCBDbHV0dGVyIEFDIGJhY2tlbmQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNl IHRoaXMgaXMgYSBidWlsZCBmaXgKKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9SZWRpcmVjdGVk WENvbXBvc2l0ZVdpbmRvdy5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1JlZGlyZWN0ZWRY Q29tcG9zaXRlV2luZG93Lmg6CisgICAgICAgIHByb3RlY3RzIGJvdGggdGhlIGZpbGVzIHdpdGgg VVNFKEdMWCkKKwogMjAxMi0wOS0xMCAgQ2F0YWxpbiBCYWRlYSAgPGJhZGVhQGFkb2JlLmNvbT4K IAogICAgICAgICB3ZWJraXQgYnVpbGQgZm9yIDY0LWJpdCBNYWMgY2hyb21pdW0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRv dy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVkaXJlY3RlZFhDb21wb3NpdGVX aW5kb3cuY3BwCmluZGV4IGFlMWQyNjIuLjE1NzJhNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2d0ay9SZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93LmNwcApA QCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlJlZGlyZWN0 ZWRYQ29tcG9zaXRlV2luZG93LmgiCiAKKyNpZiBVU0UoR0xYKQogI2luY2x1ZGUgIkdMQ29udGV4 dEdMWC5oIgogI2luY2x1ZGUgPEdML2dseC5oPgogI2luY2x1ZGUgPFgxMS9leHRlbnNpb25zL1hj b21wb3NpdGUuaD4KQEAgLTIxNCwzICsyMTUsNSBAQCBjYWlyb19zdXJmYWNlX3QqIFJlZGlyZWN0 ZWRYQ29tcG9zaXRlV2luZG93OjpjYWlyb1N1cmZhY2VGb3JXaWRnZXQoR3RrV2lkZ2V0KiB3aQog fQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisKKyNlbmRpZiAvLyBVU0UoR0xYKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlZGlyZWN0ZWRYQ29tcG9zaXRlV2lu ZG93LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVkaXJlY3RlZFhDb21wb3NpdGVX aW5kb3cuaAppbmRleCAzOWVjN2VkLi5kNmNkNzQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cuaApAQCAtMjcs NiArMjcsOCBAQAogI2lmbmRlZiAgUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3dfaAogI2RlZmlu ZSAgUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3dfaAogCisjaWYgVVNFKEdMWCkKKwogI2luY2x1 ZGUgIkdMQ29udGV4dEdMWC5oIgogI2luY2x1ZGUgIkludFNpemUuaCIKICNpbmNsdWRlICJSZWZQ dHJDYWlyby5oIgpAQCAtNjgsNCArNzAsNiBAQCBwcml2YXRlOgogCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCiAKKyNlbmRpZiAvLyBVU0UoR0xYKQorCiAjZW5kaWYgLy8gUmVkaXJlY3RlZFhDb21w b3NpdGVXaW5kb3dfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IDc3OGRhYmMuLjI0NDMzOGQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMi0wOS0xMSAgU2lyYWogUmF6aWNrICA8 c2lyYWoucmF6aWNrQGNvbGxhYm9yYS5jby51az4KKworICAgICAgICBbR1RLXSBVcGRhdGUgQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRDbHV0dGVyIHRvIG1hdGNoIEFjY2VsZXJhdGVkQ29t cG9zaXRpbmdDb250ZXh0LmggQVBJIHVwZGF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTYxNjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBEdWUgdG8gdGhlIHJlZmFjdG9yaW5nIGRvbmUgaW4gYnVnICM5 MDA4NSBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dCBBUEkgY2hhbmdlZCwgYXMgYSByZXN1 bHQKKyAgICAgICAgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRDbHV0dGVyIGRvZXNuJ3Qg Y29tcGlsZSBhbnltb3JlLiBUaGlzIHBhdGNoIGlzIHRvIHVwZGF0ZSB0aGUKKyAgICAgICAgQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRDbHV0dGVyIGltcGxlbWVudGF0aW9ucyB0byBtYXRj aCB0aGUgQVBJIHVwZGF0ZSwgYW5kIE1ha2Ugd2Via2l0CisgICAgICAgIEFDIGJhY2tlbmQgY29t cGlsZSBhZ2Fpbi4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9z aXRpbmdDb250ZXh0Q2x1dHRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVkQ29t cG9zaXRpbmdDb250ZXh0OjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dCk6CisgICAgICAg IChXZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Ojp+QWNjZWxlcmF0ZWRDb21w b3NpdGluZ0NvbnRleHQpOgorICAgICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZENvbXBvc2l0aW5n Q29udGV4dDo6c2V0Um9vdENvbXBvc2l0aW5nTGF5ZXIpOgorICAgICAgICAoV2ViS2l0OjpBY2Nl bGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6c2V0Tm9uQ29tcG9zaXRlZENvbnRlbnRzTmVlZERp c3BsYXkpOgorICAgICAgICAoV2ViS2l0OjpmbHVzaEFuZFJlbmRlckxheWVyc0NhbGxiYWNrKToK KyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnNjaGVkdWxl TGF5ZXJGbHVzaCk6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250 ZXh0OjpmbHVzaFBlbmRpbmdMYXllckNoYW5nZXMpOgorICAgICAgICAoV2ViS2l0OjpBY2NlbGVy YXRlZENvbXBvc2l0aW5nQ29udGV4dDo6Zmx1c2hBbmRSZW5kZXJMYXllcnMpOgorCiAyMDEyLTA5 LTA5ICBFbWlsIEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW5hbWUg Tm9kZTo6Z2V0UmVjdC9nZXRQaXhlbFNuYXBwZWRSZWN0IGFuZCByZW1vdmUgQ29udGFpbmVyTm9k ZTo6Z2V0UmVjdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQv QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRDbHV0dGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQv Z3RrL1dlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Q2x1dHRlci5j cHAKaW5kZXggNmZlMGMzNi4uNDUxMTE3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsv V2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRDbHV0dGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0 aW5nQ29udGV4dENsdXR0ZXIuY3BwCkBAIC0zNiw3ICszNiw3IEBAIG5hbWVzcGFjZSBXZWJLaXQg ewogCiBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6QWNjZWxlcmF0ZWRDb21wb3NpdGlu Z0NvbnRleHQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICA6IG1fd2ViVmlldyh3ZWJWaWV3 KQotICAgICwgbV9zeW5jVGltZXJDYWxsYmFja0lkKDApCisgICAgLCBtX2xheWVyRmx1c2hUaW1l ckNhbGxiYWNrSWQoMCkKICAgICAsIG1fcm9vdEdyYXBoaWNzTGF5ZXIoMCkKICAgICAsIG1fcm9v dExheWVyRW1iZWRkZXIoMCkKIHsKQEAgLTQ0LDggKzQ0LDggQEAgQWNjZWxlcmF0ZWRDb21wb3Np dGluZ0NvbnRleHQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0KFdlYktpdFdlYlZpZXcq IHdlYlYKIAogQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6On5BY2NlbGVyYXRlZENvbXBv c2l0aW5nQ29udGV4dCgpCiB7Ci0gICAgaWYgKG1fc3luY1RpbWVyQ2FsbGJhY2tJZCkKLSAgICAg ICAgZ19zb3VyY2VfcmVtb3ZlKG1fc3luY1RpbWVyQ2FsbGJhY2tJZCk7CisgICAgaWYgKG1fbGF5 ZXJGbHVzaFRpbWVyQ2FsbGJhY2tJZCkKKyAgICAgICAgZ19zb3VyY2VfcmVtb3ZlKG1fbGF5ZXJG bHVzaFRpbWVyQ2FsbGJhY2tJZCk7CiB9CiAKIGJvb2wgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Nv bnRleHQ6OmVuYWJsZWQoKQpAQCAtNTksNyArNTksNyBAQCBib29sIEFjY2VsZXJhdGVkQ29tcG9z aXRpbmdDb250ZXh0OjpyZW5kZXJMYXllcnNUb1dpbmRvdyhjYWlyb190KiwgY29uc3QgSW50UmVj dAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotdm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29u dGV4dDo6YXR0YWNoUm9vdEdyYXBoaWNzTGF5ZXIoR3JhcGhpY3NMYXllciogZ3JhcGhpY3NMYXll cikKK3ZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnNldFJvb3RDb21wb3NpdGlu Z0xheWVyKEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNzTGF5ZXIpCiB7CiAgICAgaWYgKCFncmFwaGlj c0xheWVyKSB7CiAgICAgICAgIGd0a19jb250YWluZXJfcmVtb3ZlKEdUS19DT05UQUlORVIobV93 ZWJWaWV3KSwgbV9yb290TGF5ZXJFbWJlZGRlcik7CkBAIC04Niw3ICs4Niw3IEBAIHZvaWQgQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OmF0dGFjaFJvb3RHcmFwaGljc0xheWVyKEdyYXBo aWNzTGF5ZXIqIGdyYXBoCiAgICAgfQogfQogCi12b2lkIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdD b250ZXh0OjpzY2hlZHVsZVJvb3RMYXllclJlcGFpbnQoY29uc3QgSW50UmVjdCYgcmVjdCkKK3Zv aWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnNldE5vbkNvbXBvc2l0ZWRDb250ZW50 c05lZWREaXNwbGF5KGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAgaWYgKCFtX3Jvb3RHcmFw aGljc0xheWVyKQogICAgICAgICByZXR1cm47CkBAIC0xMTIsMzQgKzExMiwzNCBAQCB2b2lkIEFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpyZXNpemVSb290TGF5ZXIoY29uc3QgSW50U2l6 ZSYgc2l6ZSkKICAgICBndGtfd2lkZ2V0X3NpemVfYWxsb2NhdGUoR1RLX1dJREdFVChtX3Jvb3RM YXllckVtYmVkZGVyKSwgJmFsbG9jYXRpb24pOwogfQogCi1zdGF0aWMgZ2Jvb2xlYW4gc3luY0xh eWVyc1RpbWVvdXRDYWxsYmFjayhBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dCogY29udGV4 dCkKK3N0YXRpYyBnYm9vbGVhbiBmbHVzaEFuZFJlbmRlckxheWVyc0NhbGxiYWNrKEFjY2VsZXJh dGVkQ29tcG9zaXRpbmdDb250ZXh0KiBjb250ZXh0KQogewotICAgIGNvbnRleHQtPnN5bmNMYXll cnNUaW1lb3V0KCk7CisgICAgY29udGV4dC0+Zmx1c2hBbmRSZW5kZXJMYXllcnMoKTsKICAgICBy ZXR1cm4gRkFMU0U7CiB9CiAKLXZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6Om1h cmtGb3JTeW5jKCkKK3ZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnNjaGVkdWxl TGF5ZXJGbHVzaCgpCiB7Ci0gICAgaWYgKG1fc3luY1RpbWVyQ2FsbGJhY2tJZCkKKyAgICBpZiAo bV9sYXllckZsdXNoVGltZXJDYWxsYmFja0lkKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBX ZSB1c2UgYSBHTGliIHRpbWVyIGJlY2F1c2Ugb3RoZXJ3aXNlIEdUSysgZXZlbnQgaGFuZGxpbmcg ZHVyaW5nCiAgICAgLy8gZHJhZ2dpbmcgY2FuIHN0YXJ2ZSBXZWJDb3JlIHRpbWVycywgd2hpY2gg aGF2ZSBhIGxvd2VyIHByaW9yaXR5LgotICAgIG1fc3luY1RpbWVyQ2FsbGJhY2tJZCA9IGdfdGlt ZW91dF9hZGRfZnVsbChHREtfUFJJT1JJVFlfRVZFTlRTLCAwLCByZWludGVycHJldF9jYXN0PEdT b3VyY2VGdW5jPihzeW5jTGF5ZXJzVGltZW91dENhbGxiYWNrKSwgdGhpcywgMCk7CisgICAgbV9s YXllckZsdXNoVGltZXJDYWxsYmFja0lkID0gZ190aW1lb3V0X2FkZF9mdWxsKEdES19QUklPUklU WV9FVkVOVFMsIDAsIHJlaW50ZXJwcmV0X2Nhc3Q8R1NvdXJjZUZ1bmM+KGZsdXNoQW5kUmVuZGVy TGF5ZXJzQ2FsbGJhY2spLCB0aGlzLCAwKTsKIH0KIAotdm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0 aW5nQ29udGV4dDo6c3luY0xheWVyc05vdygpCitib29sIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdD b250ZXh0OjpmbHVzaFBlbmRpbmdMYXllckNoYW5nZXMoKQogewogICAgIGlmIChtX3Jvb3RHcmFw aGljc0xheWVyKQogICAgICAgICBtX3Jvb3RHcmFwaGljc0xheWVyLT5zeW5jQ29tcG9zaXRpbmdT dGF0ZUZvclRoaXNMYXllck9ubHkoKTsKIAotICAgIGNvcmUobV93ZWJWaWV3KS0+bWFpbkZyYW1l KCktPnZpZXcoKS0+c3luY0NvbXBvc2l0aW5nU3RhdGVJbmNsdWRpbmdTdWJmcmFtZXMoKTsKKyAg ICByZXR1cm4gY29yZShtX3dlYlZpZXcpLT5tYWluRnJhbWUoKS0+dmlldygpLT5zeW5jQ29tcG9z aXRpbmdTdGF0ZUluY2x1ZGluZ1N1YmZyYW1lcygpOwogfQogCi12b2lkIEFjY2VsZXJhdGVkQ29t cG9zaXRpbmdDb250ZXh0OjpzeW5jTGF5ZXJzVGltZW91dCgpCit2b2lkIEFjY2VsZXJhdGVkQ29t cG9zaXRpbmdDb250ZXh0OjpmbHVzaEFuZFJlbmRlckxheWVycygpCiB7Ci0gICAgbV9zeW5jVGlt ZXJDYWxsYmFja0lkID0gMDsKLSAgICBzeW5jTGF5ZXJzTm93KCk7CisgICAgbV9sYXllckZsdXNo VGltZXJDYWxsYmFja0lkID0gMDsKKyAgICBmbHVzaFBlbmRpbmdMYXllckNoYW5nZXMoKTsKICAg ICBpZiAoIW1fcm9vdEdyYXBoaWNzTGF5ZXIpCiAgICAgICAgIHJldHVybjsKIAotLSAKMS43Ljku NQoK