36529 2010-03-24 06:40:55 -0700 [Qt] Compilation error on Qt for Embedded Linux built with -qconfig medium 2010-04-09 07:22:03 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Other Linux CLOSED FIXED Qt P2 Normal --- 35784 0 tasuku.suzuki webkit-unassigned abarth chinmaya commit-queue eric hausmann webkit.review.bot oldest_to_newest 203398 0 tasuku.suzuki 2010-03-24 06:40:55 -0700 -qconfig medium disables some features like textcodecs, action and so on. 203403 1 51494 tasuku.suzuki 2010-03-24 07:21:17 -0700 Created attachment 51494 add #ifndef QT_NO_TEXTCODEC ~ #endif 203404 2 51495 tasuku.suzuki 2010-03-24 07:21:58 -0700 Created attachment 51495 add #ifndef QT_NO_ACTION ~ #endif 203829 3 51494 eric 2010-03-24 23:40:10 -0700 Comment on attachment 51494 add #ifndef QT_NO_TEXTCODEC ~ #endif How does this even compile? What encodings does it use if not the TextCodecQt? 203830 4 51495 eric 2010-03-24 23:41:56 -0700 Comment on attachment 51495 add #ifndef QT_NO_ACTION ~ #endif What does this do, and why is it useful? Please explain in the ChangeLog. 203978 5 tasuku.suzuki 2010-03-25 03:56:14 -0700 (In reply to comment #3) > (From update of attachment 51494 [details]) > How does this even compile? What encodings does it use if not the TextCodecQt? TextCodecQt is useless if QTextCodec is disabled in Qt. No codec would be used. 204052 6 51640 tasuku.suzuki 2010-03-25 07:41:24 -0700 Created attachment 51640 add #ifndef QT_NO_ACTION ~ #endif to use QAction made a smaller patch and added description in the ChangeLog. 205118 7 51494 hausmann 2010-03-28 02:19:31 -0700 Comment on attachment 51494 add #ifndef QT_NO_TEXTCODEC ~ #endif The patch itself is fine, but I don't think we should add these defines, as WebKit cannot be used without codecs. Therefore the right thing to do is to disable the compilation of WebKit altogether if Qt is compiled with QT_NO_TEXTCODEC. 205119 8 hausmann 2010-03-28 02:21:23 -0700 (In reply to comment #6) > Created an attachment (id=51640) [details] > add #ifndef QT_NO_ACTION ~ #endif to use QAction > > made a smaller patch and added description in the ChangeLog. I'm wondering about this one, too. The API is rendered almost useless if it's not possible to access the actions. There isn't much you can do with WebKit if you don't have QAction objects. Tasuku, what's the use-case for this? Shouldn't WebKit be disabled in this configuration instead? 205164 9 tasuku.suzuki 2010-03-28 06:13:39 -0700 (In reply to comment #7) > (From update of attachment 51494 [details]) > The patch itself is fine, but I don't think we should add these defines, as > WebKit cannot be used without codecs. Therefore the right thing to do is to > disable the compilation of WebKit altogether if Qt is compiled with > QT_NO_TEXTCODEC. (In reply to comment #8) > (In reply to comment #6) > I'm wondering about this one, too. The API is rendered almost useless if it's > not possible to access the actions. There isn't much you can do with WebKit if > you don't have QAction objects. > > Tasuku, what's the use-case for this? Shouldn't WebKit be disabled in this > configuration instead? From a general browser point of view, WebKit is useless without these two features. On the other hand, for people who uses WebKit as a platform for html and javascript apps, it can be useful even if such features are not available. WebKit should be enabled as much as possible. 205217 10 hausmann 2010-03-28 13:15:01 -0700 (In reply to comment #9) > (In reply to comment #7) > > (From update of attachment 51494 [details] [details]) > > The patch itself is fine, but I don't think we should add these defines, as > > WebKit cannot be used without codecs. Therefore the right thing to do is to > > disable the compilation of WebKit altogether if Qt is compiled with > > QT_NO_TEXTCODEC. > > (In reply to comment #8) > > (In reply to comment #6) > > I'm wondering about this one, too. The API is rendered almost useless if it's > > not possible to access the actions. There isn't much you can do with WebKit if > > you don't have QAction objects. > > > > Tasuku, what's the use-case for this? Shouldn't WebKit be disabled in this > > configuration instead? > > From a general browser point of view, WebKit is useless without these two > features. On the other hand, for people who uses WebKit as a platform for html > and javascript apps, it can be useful even if such features are not available. > WebKit should be enabled as much as possible. Even if you just want to display html and run JavaScript you're going to need text codecs, to properly convert the 8-bit input into unicode. 205271 11 tasuku.suzuki 2010-03-28 17:56:18 -0700 (In reply to comment #10) > (In reply to comment #9) > > (In reply to comment #7) > > > (From update of attachment 51494 [details] [details] [details]) > > > The patch itself is fine, but I don't think we should add these defines, as > > > WebKit cannot be used without codecs. Therefore the right thing to do is to > > > disable the compilation of WebKit altogether if Qt is compiled with > > > QT_NO_TEXTCODEC. > > > > (In reply to comment #8) > > > (In reply to comment #6) > > > I'm wondering about this one, too. The API is rendered almost useless if it's > > > not possible to access the actions. There isn't much you can do with WebKit if > > > you don't have QAction objects. > > > > > > Tasuku, what's the use-case for this? Shouldn't WebKit be disabled in this > > > configuration instead? > > > > From a general browser point of view, WebKit is useless without these two > > features. On the other hand, for people who uses WebKit as a platform for html > > and javascript apps, it can be useful even if such features are not available. > > WebKit should be enabled as much as possible. > > Even if you just want to display html and run JavaScript you're going to need > text codecs, to properly convert the 8-bit input into unicode. I see. I'll find a way to disable WebKit when Qt is compiled without textcodec support. How about QAction? 210080 12 hausmann 2010-04-08 01:48:11 -0700 (In reply to comment #11) > > Even if you just want to display html and run JavaScript you're going to need > > text codecs, to properly convert the 8-bit input into unicode. > > I see. I'll find a way to disable WebKit when Qt is compiled without textcodec > support. How about QAction? I'm inclined to apply the same argument to QAction. There's very basic stuff that can't be done without QActions, such as determining whether you can go back or forward in the history, or creating a context menu. I propose to discuss this on the mailing list first, I'd like to know if there are other people interested in having this feature. I've started a thread on the mailing list: https://lists.webkit.org/pipermail/webkit-qt/2010-April/000332.html Let's find a concensus there first and then continue with these patches. 210083 13 51640 hausmann 2010-04-08 01:49:13 -0700 Comment on attachment 51640 add #ifndef QT_NO_ACTION ~ #endif to use QAction Clearning review as per comment 12. 210678 14 51640 commit-queue 2010-04-09 03:55:32 -0700 Comment on attachment 51640 add #ifndef QT_NO_ACTION ~ #endif to use QAction Clearing flags on attachment: 51640 Committed r57327: <http://trac.webkit.org/changeset/57327> 210679 15 commit-queue 2010-04-09 03:55:38 -0700 All reviewed patches have been landed. Closing bug. 210682 16 webkit.review.bot 2010-04-09 04:17:06 -0700 http://trac.webkit.org/changeset/57327 might have broken Leopard Intel Release (Tests) The following changes are on the blame list: http://trac.webkit.org/changeset/57326 http://trac.webkit.org/changeset/57327 210713 17 hausmann 2010-04-09 07:21:54 -0700 Revision r57327 cherry-picked into qtwebkit-2.0 with commit 2ad5e21e9a363de2b2c837a04d37e63460d4df59 51494 2010-03-24 07:21:17 -0700 2010-03-28 02:19:31 -0700 add #ifndef QT_NO_TEXTCODEC ~ #endif qtwebkit-qconfig-medium-qt_no_textcodec.patch text/plain 2219 tasuku.suzuki ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTUzZDQxNi4uMzNkNDFhOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wMy0yNCAgVGFzdWt1IFN1enVr aSAgPHRhc3VrdS5zdXp1a2lAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF1GaXggY29tcGlsZSBlcnJvciB3aXRoIFFUX05PX1RF WFRDT0RFQworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzY1MjkKKworICAgICAgICAqIHBsYXRmb3JtL3RleHQvVGV4dEVuY29kaW5nUmVnaXN0cnkuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6ZXh0ZW5kVGV4dENvZGVjTWFwcyk6CisgICAgICAgICogcGxh dGZvcm0vdGV4dC9xdC9UZXh0Q29kZWNRdC5jcHA6CisgICAgICAgICogcGxhdGZvcm0vdGV4dC9x dC9UZXh0Q29kZWNRdC5oOgorCiAyMDEwLTAzLTI1ICBUYXN1a3UgU3V6dWtpICA8dGFzdWt1LnN1 enVraUBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRp ZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvVGV4dEVuY29kaW5nUmVnaXN0cnkuY3Bw IGIvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1RleHRFbmNvZGluZ1JlZ2lzdHJ5LmNwcAppbmRleCAw MGFkMmM5Li5hYjM5MGY0IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvVGV4dEVu Y29kaW5nUmVnaXN0cnkuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9UZXh0RW5jb2Rp bmdSZWdpc3RyeS5jcHAKQEAgLTI0NCw5ICsyNDQsMTEgQEAgc3RhdGljIHZvaWQgZXh0ZW5kVGV4 dENvZGVjTWFwcygpCiAjZW5kaWYKIAogI2lmIFVTRShRVDRfVU5JQ09ERSkKKyNpZm5kZWYgUVRf Tk9fVEVYVENPREVDCiAgICAgVGV4dENvZGVjUXQ6OnJlZ2lzdGVyRW5jb2RpbmdOYW1lcyhhZGRU b1RleHRFbmNvZGluZ05hbWVNYXApOwogICAgIFRleHRDb2RlY1F0OjpyZWdpc3RlckNvZGVjcyhh ZGRUb1RleHRDb2RlY01hcCk7CiAjZW5kaWYKKyNlbmRpZgogCiAjaWYgUExBVEZPUk0oTUFDKQog ICAgIFRleHRDb2RlY01hYzo6cmVnaXN0ZXJFbmNvZGluZ05hbWVzKGFkZFRvVGV4dEVuY29kaW5n TmFtZU1hcCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvcXQvVGV4dENvZGVj UXQuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L3F0L1RleHRDb2RlY1F0LmNwcAppbmRleCAy MWU2ZTEyLi44M2MwMGY1IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvcXQvVGV4 dENvZGVjUXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9xdC9UZXh0Q29kZWNRdC5j cHAKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlIDxxc2V0Lmg+CiAvLyAjaW5jbHVkZSA8UURl YnVnPgogCisjaWZuZGVmIFFUX05PX1RFWFRDT0RFQwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBz dGF0aWMgUVNldDxRQnl0ZUFycmF5PiAqdW5pcXVlX25hbWVzID0gMDsKQEAgLTEzOCwzICsxMzks NSBAQCBDU3RyaW5nIFRleHRDb2RlY1F0OjplbmNvZGUoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMs IHNpemVfdCBsZW5ndGgsIFVuZW5jb2RhYmxlSAogCiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK KworI2VuZGlmIC8vIFFUX05PX1RFWFRDT0RFQwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9y bS90ZXh0L3F0L1RleHRDb2RlY1F0LmggYi9XZWJDb3JlL3BsYXRmb3JtL3RleHQvcXQvVGV4dENv ZGVjUXQuaAppbmRleCBmMjhmMGJiLi4yNTdiZDJmIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRm b3JtL3RleHQvcXQvVGV4dENvZGVjUXQuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL3RleHQvcXQv VGV4dENvZGVjUXQuaApAQCAtMjgsNiArMjgsOSBAQAogCiAjaW5jbHVkZSAiVGV4dENvZGVjLmgi CiAjaW5jbHVkZSAiVGV4dEVuY29kaW5nLmgiCisKKyNpZm5kZWYgUVRfTk9fVEVYVENPREVDCisK ICNpbmNsdWRlIDxRVGV4dENvZGVjPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC01MSw0ICs1 NCw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCisj ZW5kaWYgLy8gUVRfTk9fVEVYVENPREVDCisKICNlbmRpZiAvLyBUZXh0Q29kZWNJQ1VfaAo= 51495 2010-03-24 07:21:58 -0700 2010-03-25 07:41:24 -0700 add #ifndef QT_NO_ACTION ~ #endif qtwebkit-qconfig-medium-qt_no_action.patch text/plain 11308 tasuku.suzuki ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAgYi9XZWJLaXQv cXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IDEwN2EzNzYuLjM2NjU3OTEgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0 L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtNjU5LDcgKzY1OSw5IEBAIGJvb2wgUUdyYXBo aWNzV2ViVmlldzo6ZXZlbnQoUUV2ZW50KiBldmVudCkKICAgICAgICAgICAgICAgICBldmVudC0+ YWNjZXB0KCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9Cisj aWZuZGVmIFFUX05PX0FDVElPTgogICAgICAgICAgICAgZC0+cGFnZS0+dXBkYXRlUG9zaXRpb25E ZXBlbmRlbnRBY3Rpb25zKGZha2VFdmVudC5wb3MoKSk7CisjZW5kaWYKICAgICAgICAgfSBlbHNl CiAjZW5kaWYgLy8gUVRfTk9fQ09OVEVYVE1FTlUKICAgICAgICAgewpAQCAtMTAwMyw2ICsxMDA1 LDcgQEAgUVdlYlNldHRpbmdzKiBRR3JhcGhpY3NXZWJWaWV3OjpzZXR0aW5ncygpIGNvbnN0CiAg ICAgcmV0dXJuIHBhZ2UoKS0+c2V0dGluZ3MoKTsKIH0KIAorI2lmbmRlZiBRVF9OT19BQ1RJT04K IC8qIQogICAgIFJldHVybnMgYSBwb2ludGVyIHRvIGEgUUFjdGlvbiB0aGF0IGVuY2Fwc3VsYXRl cyB0aGUgc3BlY2lmaWVkIHdlYiBhY3Rpb24gXGEgYWN0aW9uLgogKi8KQEAgLTEwMTAsNiArMTAx Myw3IEBAIFFBY3Rpb24gKlFHcmFwaGljc1dlYlZpZXc6OnBhZ2VBY3Rpb24oUVdlYlBhZ2U6Oldl YkFjdGlvbiBhY3Rpb24pIGNvbnN0CiB7CiAgICAgcmV0dXJuIHBhZ2UoKS0+YWN0aW9uKGFjdGlv bik7CiB9CisjZW5kaWYKIAogLyohCiAgICAgVHJpZ2dlcnMgdGhlIHNwZWNpZmllZCBcYSBhY3Rp b24uIElmIGl0IGlzIGEgY2hlY2thYmxlIGFjdGlvbiB0aGUgc3BlY2lmaWVkCmRpZmYgLS1naXQg YS9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuaCBiL1dlYktpdC9xdC9BcGkvcWdyYXBo aWNzd2Vidmlldy5oCmluZGV4IGU3MGEwYjguLmE0NjRlZTEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9x dC9BcGkvcWdyYXBoaWNzd2Vidmlldy5oCisrKyBiL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vi dmlldy5oCkBAIC03Niw3ICs3Niw5IEBAIHB1YmxpYzoKICAgICBRV2ViSGlzdG9yeSogaGlzdG9y eSgpIGNvbnN0OwogICAgIFFXZWJTZXR0aW5ncyogc2V0dGluZ3MoKSBjb25zdDsKIAorI2lmbmRl ZiBRVF9OT19BQ1RJT04KICAgICBRQWN0aW9uKiBwYWdlQWN0aW9uKFFXZWJQYWdlOjpXZWJBY3Rp b24gYWN0aW9uKSBjb25zdDsKKyNlbmRpZgogICAgIHZvaWQgdHJpZ2dlclBhZ2VBY3Rpb24oUVdl YlBhZ2U6OldlYkFjdGlvbiBhY3Rpb24sIGJvb2wgY2hlY2tlZCA9IGZhbHNlKTsKIAogICAgIGJv b2wgZmluZFRleHQoY29uc3QgUVN0cmluZyYgc3ViU3RyaW5nLCBRV2ViUGFnZTo6RmluZEZsYWdz IG9wdGlvbnMgPSAwKTsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmhpc3RvcnkuY3Bw IGIvV2ViS2l0L3F0L0FwaS9xd2ViaGlzdG9yeS5jcHAKaW5kZXggZDg1MjAxMi4uNzcxMGE0YSAx MDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2ViaGlzdG9yeS5jcHAKKysrIGIvV2ViS2l0L3F0 L0FwaS9xd2ViaGlzdG9yeS5jcHAKQEAgLTI3NSw3ICsyNzUsOSBAQCB2b2lkIFFXZWJIaXN0b3J5 OjpjbGVhcigpCiAgICAgbHN0LT5hZGRJdGVtKGN1cnJlbnQuZ2V0KCkpOyAgLy9pbnNlcnQgb2xk IGN1cnJlbnQgaXRlbQogICAgIGxzdC0+Z29Ub0l0ZW0oY3VycmVudC5nZXQoKSk7IC8vYW5kIHNl dCBpdCBhcyBjdXJyZW50IGFnYWluCiAKKyNpZm5kZWYgUVRfTk9fQUNUSU9OCiAgICAgZC0+cGFn ZSgpLT51cGRhdGVOYXZpZ2F0aW9uQWN0aW9ucygpOworI2VuZGlmCiB9CiAKIC8qIQpAQCAtNTQ0 LDggKzU0Niw5IEBAIFFEYXRhU3RyZWFtJiBvcGVyYXRvcj4+KFFEYXRhU3RyZWFtJiBzb3VyY2Us IFFXZWJIaXN0b3J5JiBoaXN0b3J5KQogICAgICAgICB9CiAgICAgfQogCisjaWZuZGVmIFFUX05P X0FDVElPTgogICAgIGQtPnBhZ2UoKS0+dXBkYXRlTmF2aWdhdGlvbkFjdGlvbnMoKTsKLQorI2Vu ZGlmCiAgICAgcmV0dXJuIHNvdXJjZTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9x d2VicGFnZS5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAppbmRleCAxYTAxN2EwLi4y YzdlMWY4IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAorKysgYi9XZWJL aXQvcXQvQXBpL3F3ZWJwYWdlLmNwcApAQCAtNTk2LDYgKzU5Niw3IEBAIFFNZW51ICpRV2ViUGFn ZVByaXZhdGU6OmNyZWF0ZUNvbnRleHRNZW51KGNvbnN0IFdlYkNvcmU6OkNvbnRleHRNZW51ICp3 ZWJjb3JlTWVuCiB9CiAjZW5kaWYgLy8gUVRfTk9fQ09OVEVYVE1FTlUKIAorI2lmbmRlZiBRVF9O T19BQ1RJT04KIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjpfcV93ZWJBY3Rpb25UcmlnZ2VyZWQoYm9v bCBjaGVja2VkKQogewogICAgIFFBY3Rpb24gKmEgPSBxb2JqZWN0X2Nhc3Q8UUFjdGlvbiAqPihx LT5zZW5kZXIoKSk7CkBAIC02MDQsNiArNjA1LDcgQEAgdm9pZCBRV2ViUGFnZVByaXZhdGU6Ol9x X3dlYkFjdGlvblRyaWdnZXJlZChib29sIGNoZWNrZWQpCiAgICAgUVdlYlBhZ2U6OldlYkFjdGlv biBhY3Rpb24gPSBzdGF0aWNfY2FzdDxRV2ViUGFnZTo6V2ViQWN0aW9uPihhLT5kYXRhKCkudG9J bnQoKSk7CiAgICAgcS0+dHJpZ2dlckFjdGlvbihhY3Rpb24sIGNoZWNrZWQpOwogfQorI2VuZGlm IC8vIFFUX05PX0FDVElPTgogCiB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6X3FfY2xlYW51cExlYWtN ZXNzYWdlcygpCiB7CkBAIC02MTMsNiArNjE1LDcgQEAgdm9pZCBRV2ViUGFnZVByaXZhdGU6Ol9x X2NsZWFudXBMZWFrTWVzc2FnZXMoKQogI2VuZGlmCiB9CiAKKyNpZm5kZWYgUVRfTk9fQUNUSU9O CiB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6dXBkYXRlQWN0aW9uKFFXZWJQYWdlOjpXZWJBY3Rpb24g YWN0aW9uKQogewogICAgIFFBY3Rpb24gKmEgPSBhY3Rpb25zW2FjdGlvbl07CkBAIC03MzgsNiAr NzQxLDcgQEAgdm9pZCBRV2ViUGFnZVByaXZhdGU6OnVwZGF0ZUVkaXRvckFjdGlvbnMoKQogICAg IHVwZGF0ZUFjdGlvbihRV2ViUGFnZTo6QWxpZ25MZWZ0KTsKICAgICB1cGRhdGVBY3Rpb24oUVdl YlBhZ2U6OkFsaWduUmlnaHQpOwogfQorI2VuZGlmIC8vIFFUX05PX0FDVElPTgogCiB2b2lkIFFX ZWJQYWdlUHJpdmF0ZTo6dGltZXJFdmVudChRVGltZXJFdmVudCAqZXYpCiB7CkBAIC0yMjY1LDYg KzIyNjksNyBAQCBRU3RyaW5nIFFXZWJQYWdlOjpzZWxlY3RlZFRleHQoKSBjb25zdAogICAgIHJl dHVybiBkLT5wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCktPnNl bGVjdGVkVGV4dCgpOwogfQogCisjaWZuZGVmIFFUX05PX0FDVElPTgogLyohCiAgICBSZXR1cm5z IGEgUUFjdGlvbiBmb3IgdGhlIHNwZWNpZmllZCBXZWJBY3Rpb24gXGEgYWN0aW9uLgogCkBAIC0y NTM3LDYgKzI1NDIsNyBAQCBRQWN0aW9uICpRV2ViUGFnZTo6YWN0aW9uKFdlYkFjdGlvbiBhY3Rp b24pIGNvbnN0CiAgICAgZC0+dXBkYXRlQWN0aW9uKGFjdGlvbik7CiAgICAgcmV0dXJuIGE7CiB9 CisjZW5kaWYgLy8gUVRfTk9fQUNUSU9OCiAKIC8qIQogICAgIFxwcm9wZXJ0eSBRV2ViUGFnZTo6 bW9kaWZpZWQKQEAgLTI3MTksOCArMjcyNSw5IEBAIHZvaWQgUVdlYlBhZ2U6OnNldENvbnRlbnRF ZGl0YWJsZShib29sIGVkaXRhYmxlKQogICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAg ICAgZnJhbWUtPnJlbW92ZUVkaXRpbmdTdHlsZUZyb21Cb2R5RWxlbWVudCgpOwogICAgICAgICB9 Ci0KKyNpZm5kZWYgUVRfTk9fQUNUSU9OCiAgICAgICAgIGQtPnVwZGF0ZUVkaXRvckFjdGlvbnMo KTsKKyNlbmRpZgogICAgIH0KIH0KIApAQCAtMjgwMCw2ICsyODA3LDcgQEAgYm9vbCBRV2ViUGFn ZTo6c3dhbGxvd0NvbnRleHRNZW51RXZlbnQoUUNvbnRleHRNZW51RXZlbnQgKmV2ZW50KQogfQog I2VuZGlmIC8vIFFUX05PX0NPTlRFWFRNRU5VCiAKKyNpZm5kZWYgUVRfTk9fQUNUSU9OCiAvKiEK ICAgICBVcGRhdGVzIHRoZSBwYWdlJ3MgYWN0aW9ucyBkZXBlbmRpbmcgb24gdGhlIHBvc2l0aW9u IFxhIHBvcy4gRm9yIGV4YW1wbGUgaWYgXGEgcG9zIGlzIG92ZXIgYW4gaW1hZ2UKICAgICBlbGVt ZW50IHRoZSBDb3B5SW1hZ2VUb0NsaXBib2FyZCBhY3Rpb24gaXMgZW5hYmxlZC4KQEAgLTI4NTUs NyArMjg2Myw3IEBAIHZvaWQgUVdlYlBhZ2U6OnVwZGF0ZVBvc2l0aW9uRGVwZW5kZW50QWN0aW9u cyhjb25zdCBRUG9pbnQgJnBvcykKICAgICAvLyB0aGUgbWVudS4KIAogfQotCisjZW5kaWYgLy8g UVRfTk9fQUNUSU9OCiAKIAogLyohCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdl LmggYi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmgKaW5kZXggMDc2ZmI3Yy4uYjU0NzM1YSAxMDA2 NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5oCisrKyBiL1dlYktpdC9xdC9BcGkvcXdl YnBhZ2UuaApAQCAtMjIwLDcgKzIyMCw5IEBAIHB1YmxpYzoKIAogICAgIFFTdHJpbmcgc2VsZWN0 ZWRUZXh0KCkgY29uc3Q7CiAKKyNpZm5kZWYgUVRfTk9fQUNUSU9OCiAgICAgUUFjdGlvbiAqYWN0 aW9uKFdlYkFjdGlvbiBhY3Rpb24pIGNvbnN0OworI2VuZGlmCiAgICAgdmlydHVhbCB2b2lkIHRy aWdnZXJBY3Rpb24oV2ViQWN0aW9uIGFjdGlvbiwgYm9vbCBjaGVja2VkID0gZmFsc2UpOwogCiAg ICAgUVNpemUgdmlld3BvcnRTaXplKCkgY29uc3Q7CkBAIC0yNTEsNyArMjUzLDkgQEAgcHVibGlj OgogI2lmbmRlZiBRVF9OT19DT05URVhUTUVOVQogICAgIGJvb2wgc3dhbGxvd0NvbnRleHRNZW51 RXZlbnQoUUNvbnRleHRNZW51RXZlbnQgKmV2ZW50KTsKICNlbmRpZgorI2lmbmRlZiBRVF9OT19B Q1RJT04KICAgICB2b2lkIHVwZGF0ZVBvc2l0aW9uRGVwZW5kZW50QWN0aW9ucyhjb25zdCBRUG9p bnQgJnBvcyk7CisjZW5kaWYKIAogICAgIFFNZW51ICpjcmVhdGVTdGFuZGFyZENvbnRleHRNZW51 KCk7CiAKQEAgLTM0OCw3ICszNTIsOSBAQCBwcm90ZWN0ZWQ6CiAKIHByaXZhdGU6CiAgICAgUV9Q UklWQVRFX1NMT1QoZCwgdm9pZCBfcV9vbkxvYWRQcm9ncmVzc0NoYW5nZWQoaW50KSkKKyNpZm5k ZWYgUVRfTk9fQUNUSU9OCiAgICAgUV9QUklWQVRFX1NMT1QoZCwgdm9pZCBfcV93ZWJBY3Rpb25U cmlnZ2VyZWQoYm9vbCBjaGVja2VkKSkKKyNlbmRpZgogICAgIFFfUFJJVkFURV9TTE9UKGQsIHZv aWQgX3FfY2xlYW51cExlYWtNZXNzYWdlcygpKQogCiAgICAgUVdlYlBhZ2VQcml2YXRlICpkOwpk aWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2VicGFnZV9wLmggYi9XZWJLaXQvcXQvQXBpL3F3 ZWJwYWdlX3AuaAppbmRleCAxNWRkZmIyLi45ZjU5NThkIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQv QXBpL3F3ZWJwYWdlX3AuaAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlX3AuaApAQCAtNzIs OSArNzIsMTEgQEAgcHVibGljOgogICAgIHZvaWQgX3Ffb25Mb2FkUHJvZ3Jlc3NDaGFuZ2VkKGlu dCk7CiAgICAgdm9pZCBfcV93ZWJBY3Rpb25UcmlnZ2VyZWQoYm9vbCBjaGVja2VkKTsKICAgICB2 b2lkIF9xX2NsZWFudXBMZWFrTWVzc2FnZXMoKTsKKyNpZm5kZWYgUVRfTk9fQUNUSU9OCiAgICAg dm9pZCB1cGRhdGVBY3Rpb24oUVdlYlBhZ2U6OldlYkFjdGlvbiBhY3Rpb24pOwogICAgIHZvaWQg dXBkYXRlTmF2aWdhdGlvbkFjdGlvbnMoKTsKICAgICB2b2lkIHVwZGF0ZUVkaXRvckFjdGlvbnMo KTsKKyNlbmRpZgogCiAgICAgdm9pZCB0aW1lckV2ZW50KFFUaW1lckV2ZW50Kik7CiAKZGlmZiAt LWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2Vidmll dy5jcHAKaW5kZXggMTU1MzI0NC4uYmRmNTcxNiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9x d2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAKQEAgLTU2NSw2ICs1 NjUsNyBAQCBRU3RyaW5nIFFXZWJWaWV3OjpzZWxlY3RlZFRleHQoKSBjb25zdAogICAgIHJldHVy biBRU3RyaW5nKCk7CiB9CiAKKyNpZm5kZWYgUVRfTk9fQUNUSU9OCiAvKiEKICAgICBSZXR1cm5z IGEgcG9pbnRlciB0byBhIFFBY3Rpb24gdGhhdCBlbmNhcHN1bGF0ZXMgdGhlIHNwZWNpZmllZCB3 ZWIgYWN0aW9uIFxhIGFjdGlvbi4KICovCkBAIC01NzIsNiArNTczLDcgQEAgUUFjdGlvbiAqUVdl YlZpZXc6OnBhZ2VBY3Rpb24oUVdlYlBhZ2U6OldlYkFjdGlvbiBhY3Rpb24pIGNvbnN0CiB7CiAg ICAgcmV0dXJuIHBhZ2UoKS0+YWN0aW9uKGFjdGlvbik7CiB9CisjZW5kaWYKIAogLyohCiAgICAg VHJpZ2dlcnMgdGhlIHNwZWNpZmllZCBcYSBhY3Rpb24uIElmIGl0IGlzIGEgY2hlY2thYmxlIGFj dGlvbiB0aGUgc3BlY2lmaWVkCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3Lmgg Yi9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmgKaW5kZXggZjY4MWZiYy4uMWQ2NTFkNSAxMDA2NDQK LS0tIGEvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5oCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnZp ZXcuaApAQCAtNzUsNyArNzUsOSBAQCBwdWJsaWM6CiAKICAgICBRU3RyaW5nIHNlbGVjdGVkVGV4 dCgpIGNvbnN0OwogCisjaWZuZGVmIFFUX05PX0FDVElPTgogICAgIFFBY3Rpb24qIHBhZ2VBY3Rp b24oUVdlYlBhZ2U6OldlYkFjdGlvbiBhY3Rpb24pIGNvbnN0OworI2VuZGlmCiAgICAgdm9pZCB0 cmlnZ2VyUGFnZUFjdGlvbihRV2ViUGFnZTo6V2ViQWN0aW9uIGFjdGlvbiwgYm9vbCBjaGVja2Vk ID0gZmFsc2UpOwogCiAgICAgYm9vbCBpc01vZGlmaWVkKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9X ZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCAyMTBiMmQ2Li5l YWI1MThkIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9D aGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAxMC0wMy0yNCAgVGFzdWt1IFN1enVraSAgPHRh c3VrdS5zdXp1a2lAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtRdF1GaXggY29tcGlsZSBlcnJvciB3aXRoIFFUX05PX0FDVElPTgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY1MjkKKwor ICAgICAgICAqIEFwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFHcmFwaGljc1dl YlZpZXc6OmV2ZW50KToKKyAgICAgICAgKiBBcGkvcWdyYXBoaWNzd2Vidmlldy5oOgorICAgICAg ICAqIEFwaS9xd2ViaGlzdG9yeS5jcHA6CisgICAgICAgIChRV2ViSGlzdG9yeTo6Y2xlYXIpOgor ICAgICAgICAob3BlcmF0b3I+Pik6CisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAgICAg ICAgKFFXZWJQYWdlOjpzZXRDb250ZW50RWRpdGFibGUpOgorICAgICAgICAqIEFwaS9xd2VicGFn ZS5oOgorICAgICAgICAqIEFwaS9xd2VicGFnZV9wLmg6CisgICAgICAgICogQXBpL3F3ZWJ2aWV3 LmNwcDoKKyAgICAgICAgKiBBcGkvcXdlYnZpZXcuaDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9y dC9FZGl0b3JDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3JDbGllbnRRdDo6 cmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvckNsaWVu dFF0OjpyZXNwb25kVG9DaGFuZ2VkU2VsZWN0aW9uKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9y dC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVy Q2xpZW50UXQ6OmRpc3BhdGNoRGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlKToKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCk6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERpZEZpbmlzaERv Y3VtZW50TG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNw YXRjaERpZEZpbmlzaExvYWQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRR dDo6cG9zdFByb2dyZXNzU3RhcnRlZE5vdGlmaWNhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZUxvYWRlckNsaWVudFF0OjpkaWRQZXJmb3JtRmlyc3ROYXZpZ2F0aW9uKToKKwogMjAxMC0w My0yNCAgVGFzdWt1IFN1enVraSAgPHRhc3VrdS5zdXp1a2lAbm9raWEuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNv cmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcCBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9F ZGl0b3JDbGllbnRRdC5jcHAKaW5kZXggOTBlYmIxZC4uNjMyMjU2NCAxMDA2NDQKLS0tIGEvV2Vi S2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcAorKysgYi9XZWJLaXQvcXQv V2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50UXQuY3BwCkBAIC0yMDYsOCArMjA2LDkgQEAgdm9p ZCBFZGl0b3JDbGllbnRRdDo6cmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzKCkKIHsKICAgICBpZiAo ZHVtcEVkaXRpbmdDYWxsYmFja3MpCiAgICAgICAgIHByaW50ZigiRURJVElORyBERUxFR0FURTog d2ViVmlld0RpZENoYW5nZTpXZWJWaWV3RGlkQ2hhbmdlTm90aWZpY2F0aW9uXG4iKTsKKyNpZm5k ZWYgUVRfTk9fQUNUSU9OCiAgICAgbV9wYWdlLT5kLT51cGRhdGVFZGl0b3JBY3Rpb25zKCk7Ci0K KyNlbmRpZgogICAgIGVtaXQgbV9wYWdlLT5jb250ZW50c0NoYW5nZWQoKTsKIH0KIApAQCAtMjIw LDcgKzIyMSw5IEBAIHZvaWQgRWRpdG9yQ2xpZW50UXQ6OnJlc3BvbmRUb0NoYW5nZWRTZWxlY3Rp b24oKQogLy8gICAgIHNlbGVjdGlvbi5mb3JtYXRGb3JEZWJ1Z2dlcihidWZmZXIsIHNpemVvZihi dWZmZXIpKTsKIC8vICAgICBwcmludGYoIiVzXG4iLCBidWZmZXIpOwogCisjaWZuZGVmIFFUX05P X0FDVElPTgogICAgIG1fcGFnZS0+ZC0+dXBkYXRlRWRpdG9yQWN0aW9ucygpOworI2VuZGlmCiAg ICAgZW1pdCBtX3BhZ2UtPnNlbGVjdGlvbkNoYW5nZWQoKTsKICAgICBGcmFtZSogZnJhbWUgPSBt X3BhZ2UtPmQtPnBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2VkT3JNYWluRnJhbWUoKTsK ICAgICBpZiAoIWZyYW1lLT5lZGl0b3IoKS0+aWdub3JlQ29tcG9zaXRpb25TZWxlY3Rpb25DaGFu Z2UoKSkKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNs aWVudFF0LmNwcCBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0 LmNwcAppbmRleCAyZWIyNzYxLi5kMjRjOGZhIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVT dXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCkBAIC0zMDIsNyArMzAyLDkgQEAgdm9pZCBG cmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZSgp CiAgICAgICAgIHJldHVybjsKIAogICAgIGVtaXQgbV93ZWJGcmFtZS0+dXJsQ2hhbmdlZChtX3dl YkZyYW1lLT51cmwoKSk7CisjaWZuZGVmIFFUX05PX0FDVElPTgogICAgIG1fd2ViRnJhbWUtPnBh Z2UoKS0+ZC0+dXBkYXRlTmF2aWdhdGlvbkFjdGlvbnMoKTsKKyNlbmRpZgogfQogCiB2b2lkIEZy YW1lTG9hZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGlkUHVzaFN0YXRlV2l0aGluUGFnZSgpCkBAIC0z NjUsNyArMzY3LDkgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERpZENvbW1p dExvYWQoKQogICAgICAgICByZXR1cm47CiAKICAgICBlbWl0IG1fd2ViRnJhbWUtPnVybENoYW5n ZWQobV93ZWJGcmFtZS0+dXJsKCkpOworI2lmbmRlZiBRVF9OT19BQ1RJT04KICAgICBtX3dlYkZy YW1lLT5wYWdlKCktPmQtPnVwZGF0ZU5hdmlnYXRpb25BY3Rpb25zKCk7CisjZW5kaWYKIAogICAg IC8vIFdlIHNob3VsZCBhc3N1bWUgZmlyc3QgdGhlIGZyYW1lIGhhcyBubyB0aXRsZS4gSWYgaXQg aGFzLCB0aGVuIHRoZSBhYm92ZSBkaXNwYXRjaERpZFJlY2VpdmVUaXRsZSgpCiAgICAgLy8gd2ls bCBiZSBjYWxsZWQgdmVyeSBzb29uIHdpdGggdGhlIGNvcnJlY3QgdGl0bGUuCkBAIC0zODgsNyAr MzkyLDkgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERpZEZpbmlzaERvY3Vt ZW50TG9hZCgpCiAgICAgaWYgKG1fZnJhbWUtPnRyZWUoKS0+cGFyZW50KCkgfHwgIW1fd2ViRnJh bWUpCiAgICAgICAgIHJldHVybjsKIAorI2lmbmRlZiBRVF9OT19BQ1RJT04KICAgICBtX3dlYkZy YW1lLT5wYWdlKCktPmQtPnVwZGF0ZU5hdmlnYXRpb25BY3Rpb25zKCk7CisjZW5kaWYKIH0KIAog CkBAIC00MDIsNyArNDA4LDkgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERp ZEZpbmlzaExvYWQoKQogCiAgICAgaWYgKCFtX3dlYkZyYW1lKQogICAgICAgICByZXR1cm47Cisj aWZuZGVmIFFUX05PX0FDVElPTgogICAgIG1fd2ViRnJhbWUtPnBhZ2UoKS0+ZC0+dXBkYXRlTmF2 aWdhdGlvbkFjdGlvbnMoKTsKKyNlbmRpZgogfQogCiAKQEAgLTQ1OSw3ICs0NjcsOSBAQCB2b2lk IEZyYW1lTG9hZGVyQ2xpZW50UXQ6OnBvc3RQcm9ncmVzc1N0YXJ0ZWROb3RpZmljYXRpb24oKQog ICAgIH0KICAgICBpZiAobV9mcmFtZS0+dHJlZSgpLT5wYXJlbnQoKSB8fCAhbV93ZWJGcmFtZSkK ICAgICAgICAgcmV0dXJuOworI2lmbmRlZiBRVF9OT19BQ1RJT04KICAgICBtX3dlYkZyYW1lLT5w YWdlKCktPmQtPnVwZGF0ZU5hdmlnYXRpb25BY3Rpb25zKCk7CisjZW5kaWYKIH0KIAogdm9pZCBG cmFtZUxvYWRlckNsaWVudFF0Ojpwb3N0UHJvZ3Jlc3NFc3RpbWF0ZUNoYW5nZWROb3RpZmljYXRp b24oKQpAQCAtNjM0LDcgKzY0NCw5IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlkUGVy Zm9ybUZpcnN0TmF2aWdhdGlvbigpIGNvbnN0CiB7CiAgICAgaWYgKG1fZnJhbWUtPnRyZWUoKS0+ cGFyZW50KCkgfHwgIW1fd2ViRnJhbWUpCiAgICAgICAgIHJldHVybjsKKyNpZm5kZWYgUVRfTk9f QUNUSU9OCiAgICAgbV93ZWJGcmFtZS0+cGFnZSgpLT5kLT51cGRhdGVOYXZpZ2F0aW9uQWN0aW9u cygpOworI2VuZGlmCiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6cmVnaXN0ZXJGb3JJ Y29uTm90aWZpY2F0aW9uKGJvb2wpCg== 51640 2010-03-25 07:41:24 -0700 2010-04-09 03:55:32 -0700 add #ifndef QT_NO_ACTION ~ #endif to use QAction qtwebkit-qconfig-medium-qt_no_action2.patch text/plain 6221 tasuku.suzuki ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAgYi9XZWJLaXQv cXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IDRjNzdmMDIuLjQyYzYyMTUgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0 L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtMTAzNiw3ICsxMDM2LDEyIEBAIFFXZWJTZXR0 aW5ncyogUUdyYXBoaWNzV2ViVmlldzo6c2V0dGluZ3MoKSBjb25zdAogKi8KIFFBY3Rpb24gKlFH cmFwaGljc1dlYlZpZXc6OnBhZ2VBY3Rpb24oUVdlYlBhZ2U6OldlYkFjdGlvbiBhY3Rpb24pIGNv bnN0CiB7CisjaWZkZWYgUVRfTk9fQUNUSU9OCisgICAgUV9VTlVTRUQoYWN0aW9uKQorICAgIHJl dHVybiAwOworI2Vsc2UKICAgICByZXR1cm4gcGFnZSgpLT5hY3Rpb24oYWN0aW9uKTsKKyNlbmRp ZgogfQogCiAvKiEKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIGIvV2Vi S2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKaW5kZXggYWQxMjVhNC4uMjQ2MDgzNCAxMDA2NDQKLS0t IGEvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFn ZS5jcHAKQEAgLTU5Niw2ICs1OTYsNyBAQCBRTWVudSAqUVdlYlBhZ2VQcml2YXRlOjpjcmVhdGVD b250ZXh0TWVudShjb25zdCBXZWJDb3JlOjpDb250ZXh0TWVudSAqd2ViY29yZU1lbgogfQogI2Vu ZGlmIC8vIFFUX05PX0NPTlRFWFRNRU5VCiAKKyNpZm5kZWYgUVRfTk9fQUNUSU9OCiB2b2lkIFFX ZWJQYWdlUHJpdmF0ZTo6X3Ffd2ViQWN0aW9uVHJpZ2dlcmVkKGJvb2wgY2hlY2tlZCkKIHsKICAg ICBRQWN0aW9uICphID0gcW9iamVjdF9jYXN0PFFBY3Rpb24gKj4ocS0+c2VuZGVyKCkpOwpAQCAt NjA0LDYgKzYwNSw3IEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjpfcV93ZWJBY3Rpb25UcmlnZ2Vy ZWQoYm9vbCBjaGVja2VkKQogICAgIFFXZWJQYWdlOjpXZWJBY3Rpb24gYWN0aW9uID0gc3RhdGlj X2Nhc3Q8UVdlYlBhZ2U6OldlYkFjdGlvbj4oYS0+ZGF0YSgpLnRvSW50KCkpOwogICAgIHEtPnRy aWdnZXJBY3Rpb24oYWN0aW9uLCBjaGVja2VkKTsKIH0KKyNlbmRpZiAvLyBRVF9OT19BQ1RJT04K IAogdm9pZCBRV2ViUGFnZVByaXZhdGU6Ol9xX2NsZWFudXBMZWFrTWVzc2FnZXMoKQogewpAQCAt NjE1LDYgKzYxNyw5IEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjpfcV9jbGVhbnVwTGVha01lc3Nh Z2VzKCkKIAogdm9pZCBRV2ViUGFnZVByaXZhdGU6OnVwZGF0ZUFjdGlvbihRV2ViUGFnZTo6V2Vi QWN0aW9uIGFjdGlvbikKIHsKKyNpZmRlZiBRVF9OT19BQ1RJT04KKyAgICBRX1VOVVNFRChhY3Rp b24pCisjZWxzZQogICAgIFFBY3Rpb24gKmEgPSBhY3Rpb25zW2FjdGlvbl07CiAgICAgaWYgKCFh IHx8ICFtYWluRnJhbWUpCiAgICAgICAgIHJldHVybjsKQEAgLTY3NCw2ICs2NzksNyBAQCB2b2lk IFFXZWJQYWdlUHJpdmF0ZTo6dXBkYXRlQWN0aW9uKFFXZWJQYWdlOjpXZWJBY3Rpb24gYWN0aW9u KQogCiAgICAgaWYgKGEtPmlzQ2hlY2thYmxlKCkpCiAgICAgICAgIGEtPnNldENoZWNrZWQoY2hl Y2tlZCk7CisjZW5kaWYgLy8gUVRfTk9fQUNUSU9OCiB9CiAKIHZvaWQgUVdlYlBhZ2VQcml2YXRl Ojp1cGRhdGVOYXZpZ2F0aW9uQWN0aW9ucygpCkBAIC0yMjcwLDYgKzIyNzYsNyBAQCBRU3RyaW5n IFFXZWJQYWdlOjpzZWxlY3RlZFRleHQoKSBjb25zdAogICAgIHJldHVybiBkLT5wYWdlLT5mb2N1 c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCktPnNlbGVjdGVkVGV4dCgpOwogfQog CisjaWZuZGVmIFFUX05PX0FDVElPTgogLyohCiAgICBSZXR1cm5zIGEgUUFjdGlvbiBmb3IgdGhl IHNwZWNpZmllZCBXZWJBY3Rpb24gXGEgYWN0aW9uLgogCkBAIC0yNTQyLDYgKzI1NDksNyBAQCBR QWN0aW9uICpRV2ViUGFnZTo6YWN0aW9uKFdlYkFjdGlvbiBhY3Rpb24pIGNvbnN0CiAgICAgZC0+ dXBkYXRlQWN0aW9uKGFjdGlvbik7CiAgICAgcmV0dXJuIGE7CiB9CisjZW5kaWYgLy8gUVRfTk9f QUNUSU9OCiAKIC8qIQogICAgIFxwcm9wZXJ0eSBRV2ViUGFnZTo6bW9kaWZpZWQKQEAgLTI4MTEs NiArMjgxOSw3IEBAIGJvb2wgUVdlYlBhZ2U6OnN3YWxsb3dDb250ZXh0TWVudUV2ZW50KFFDb250 ZXh0TWVudUV2ZW50ICpldmVudCkKICovCiB2b2lkIFFXZWJQYWdlOjp1cGRhdGVQb3NpdGlvbkRl cGVuZGVudEFjdGlvbnMoY29uc3QgUVBvaW50ICZwb3MpCiB7CisjaWZuZGVmIFFUX05PX0FDVElP TgogICAgIC8vIEZpcnN0IHdlIGRpc2FibGUgYWxsIGFjdGlvbnMsIGJ1dCBrZWVwIHRyYWNrIG9m IHdoaWNoIG9uZXMgd2VyZSBvcmlnaW5hbGx5IGVuYWJsZWQuCiAgICAgUUJpdEFycmF5IG9yaWdp bmFsbHlFbmFibGVkV2ViQWN0aW9ucyhRV2ViUGFnZTo6V2ViQWN0aW9uQ291bnQpOwogICAgIGZv ciAoaW50IGkgPSBDb250ZXh0TWVudUl0ZW1UYWdOb0FjdGlvbjsgaSA8IENvbnRleHRNZW51SXRl bUJhc2VBcHBsaWNhdGlvblRhZzsgKytpKSB7CkBAIC0yODIwLDYgKzI4MjksNyBAQCB2b2lkIFFX ZWJQYWdlOjp1cGRhdGVQb3NpdGlvbkRlcGVuZGVudEFjdGlvbnMoY29uc3QgUVBvaW50ICZwb3Mp CiAgICAgICAgICAgICBhLT5zZXRFbmFibGVkKGZhbHNlKTsKICAgICAgICAgfQogICAgIH0KKyNl bmRpZiAvLyBRVF9OT19BQ1RJT04KIAogICAgIGQtPmNyZWF0ZU1haW5GcmFtZSgpOwogICAgIFdl YkNvcmU6OkZyYW1lKiBmb2N1c2VkRnJhbWUgPSBkLT5wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS0+ Zm9jdXNlZE9yTWFpbkZyYW1lKCk7CkBAIC0yODQ2LDYgKzI4NTYsNyBAQCB2b2lkIFFXZWJQYWdl Ojp1cGRhdGVQb3NpdGlvbkRlcGVuZGVudEFjdGlvbnMoY29uc3QgUVBvaW50ICZwb3MpCiAgICAg ZC0+Y3VycmVudENvbnRleHRNZW51ID0gZC0+Y3JlYXRlQ29udGV4dE1lbnUoJm1lbnUsIG1lbnUu cGxhdGZvcm1EZXNjcmlwdGlvbigpLCAmdmlzaXRlZFdlYkFjdGlvbnMpOwogI2VuZGlmIC8vIFFU X05PX0NPTlRFWFRNRU5VCiAKKyNpZm5kZWYgUVRfTk9fQUNUSU9OCiAgICAgLy8gRmluYWxseSwg d2UgcmVzdG9yZSB0aGUgb3JpZ2luYWwgZW5hYmxlbWVudCBmb3IgdGhlIGFjdGlvbnMgdGhhdCB3 ZXJlIG5vdCBwdXQgaW50byB0aGUgbWVudS4KICAgICBvcmlnaW5hbGx5RW5hYmxlZFdlYkFjdGlv bnMgJj0gfnZpc2l0ZWRXZWJBY3Rpb25zOyAvLyBNYXNrIG91dCB2aXNpdGVkIGFjdGlvbnMgKHRo ZXkncmUgcGFydCBvZiB0aGUgbWVudSkKICAgICBmb3IgKGludCBpID0gMDsgaSA8IFFXZWJQYWdl OjpXZWJBY3Rpb25Db3VudDsgKytpKSB7CkBAIC0yODU0LDYgKzI4NjUsNyBAQCB2b2lkIFFXZWJQ YWdlOjp1cGRhdGVQb3NpdGlvbkRlcGVuZGVudEFjdGlvbnMoY29uc3QgUVBvaW50ICZwb3MpCiAg ICAgICAgICAgICAgICAgYS0+c2V0RW5hYmxlZCh0cnVlKTsKICAgICAgICAgfQogICAgIH0KKyNl bmRpZiAvLyBRVF9OT19BQ1RJT04KIAogICAgIC8vIFRoaXMgd2hvbGUgcHJvY2VzcyBlbnN1cmVz IHRoYXQgYW55IGFjdGlvbnMgcHV0IGludG8gdG8gdGhlIGNvbnRleHQgbWVudSBoYXMgdGhlIHJp Z2h0CiAgICAgLy8gZW5hYmxlbWVudCwgd2hpbGUgYWxzbyBrZWVwaW5nIHRoZSBjb3JyZWN0IGVu YWJsZW1lbnQgZm9yIGFjdGlvbnMgdGhhdCB3ZXJlIGxlZnQgb3V0IG9mCmRpZmYgLS1naXQgYS9X ZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmggYi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmgKaW5kZXgg MjRkMGVkOS4uMWFkZGUwNiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5oCisr KyBiL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuaApAQCAtMjIwLDcgKzIyMCw5IEBAIHB1YmxpYzoK IAogICAgIFFTdHJpbmcgc2VsZWN0ZWRUZXh0KCkgY29uc3Q7CiAKKyNpZm5kZWYgUVRfTk9fQUNU SU9OCiAgICAgUUFjdGlvbiAqYWN0aW9uKFdlYkFjdGlvbiBhY3Rpb24pIGNvbnN0OworI2VuZGlm CiAgICAgdmlydHVhbCB2b2lkIHRyaWdnZXJBY3Rpb24oV2ViQWN0aW9uIGFjdGlvbiwgYm9vbCBj aGVja2VkID0gZmFsc2UpOwogCiAgICAgUVNpemUgdmlld3BvcnRTaXplKCkgY29uc3Q7CkBAIC0z NDgsNyArMzUwLDkgQEAgcHJvdGVjdGVkOgogCiBwcml2YXRlOgogICAgIFFfUFJJVkFURV9TTE9U KGQsIHZvaWQgX3Ffb25Mb2FkUHJvZ3Jlc3NDaGFuZ2VkKGludCkpCisjaWZuZGVmIFFUX05PX0FD VElPTgogICAgIFFfUFJJVkFURV9TTE9UKGQsIHZvaWQgX3Ffd2ViQWN0aW9uVHJpZ2dlcmVkKGJv b2wgY2hlY2tlZCkpCisjZW5kaWYKICAgICBRX1BSSVZBVEVfU0xPVChkLCB2b2lkIF9xX2NsZWFu dXBMZWFrTWVzc2FnZXMoKSkKIAogICAgIFFXZWJQYWdlUHJpdmF0ZSAqZDsKZGlmZiAtLWdpdCBh L1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAK aW5kZXggNDM4N2Y0YS4uZmNkMWY0YiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2Vidmll dy5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAKQEAgLTU4NSw2ICs1ODUsNyBA QCBRU3RyaW5nIFFXZWJWaWV3OjpzZWxlY3RlZFRleHQoKSBjb25zdAogICAgIHJldHVybiBRU3Ry aW5nKCk7CiB9CiAKKyNpZm5kZWYgUVRfTk9fQUNUSU9OCiAvKiEKICAgICBSZXR1cm5zIGEgcG9p bnRlciB0byBhIFFBY3Rpb24gdGhhdCBlbmNhcHN1bGF0ZXMgdGhlIHNwZWNpZmllZCB3ZWIgYWN0 aW9uIFxhIGFjdGlvbi4KICovCkBAIC01OTIsNiArNTkzLDcgQEAgUUFjdGlvbiAqUVdlYlZpZXc6 OnBhZ2VBY3Rpb24oUVdlYlBhZ2U6OldlYkFjdGlvbiBhY3Rpb24pIGNvbnN0CiB7CiAgICAgcmV0 dXJuIHBhZ2UoKS0+YWN0aW9uKGFjdGlvbik7CiB9CisjZW5kaWYKIAogLyohCiAgICAgVHJpZ2dl cnMgdGhlIHNwZWNpZmllZCBcYSBhY3Rpb24uIElmIGl0IGlzIGEgY2hlY2thYmxlIGFjdGlvbiB0 aGUgc3BlY2lmaWVkCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmggYi9XZWJL aXQvcXQvQXBpL3F3ZWJ2aWV3LmgKaW5kZXggZjY4MWZiYy4uMWQ2NTFkNSAxMDA2NDQKLS0tIGEv V2ViS2l0L3F0L0FwaS9xd2Vidmlldy5oCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuaApA QCAtNzUsNyArNzUsOSBAQCBwdWJsaWM6CiAKICAgICBRU3RyaW5nIHNlbGVjdGVkVGV4dCgpIGNv bnN0OwogCisjaWZuZGVmIFFUX05PX0FDVElPTgogICAgIFFBY3Rpb24qIHBhZ2VBY3Rpb24oUVdl YlBhZ2U6OldlYkFjdGlvbiBhY3Rpb24pIGNvbnN0OworI2VuZGlmCiAgICAgdm9pZCB0cmlnZ2Vy UGFnZUFjdGlvbihRV2ViUGFnZTo6V2ViQWN0aW9uIGFjdGlvbiwgYm9vbCBjaGVja2VkID0gZmFs c2UpOwogCiAgICAgYm9vbCBpc01vZGlmaWVkKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9XZWJLaXQv cXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCAxODBhNzI4Li4zNDRkZGZl IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wMy0yNSAgVGFzdWt1IFN1enVraSAgPHRhc3VrdS5z dXp1a2lAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtRdF0gRml4IGNvbXBpbGUgZXJyb3Igd2l0aCBRVF9OT19BQ1RJT04KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NTI5CisKKyAgICAg ICAgTWFrZSBzdXJlIFFUX05PX0FDVElPTiBpcyBub3QgZGVmaW5lZCB0byB1c2UgUUFjdGlvbgor CisgICAgICAgICogQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwOgorICAgICAgICAoUUdyYXBoaWNz V2ViVmlldzo6cGFnZUFjdGlvbik6CisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAgICAg ICAgKFFXZWJQYWdlUHJpdmF0ZTo6dXBkYXRlQWN0aW9uKToKKyAgICAgICAgKFFXZWJQYWdlOjp1 cGRhdGVQb3NpdGlvbkRlcGVuZGVudEFjdGlvbnMpOgorICAgICAgICAqIEFwaS9xd2VicGFnZS5o OgorICAgICAgICAqIEFwaS9xd2Vidmlldy5jcHA6CisgICAgICAgICogQXBpL3F3ZWJ2aWV3Lmg6 CisKIDIwMTAtMDMtMjQgIEplc3VzIFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNpYUBv cGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0 aWFuc2VuLgo=