73724 2011-12-02 17:40:00 -0800 Upstream the Cursor implementation of iOS 2011-12-05 22:31:59 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin ddkilzer sam webkit.review.bot oldest_to_newest 514301 0 117717 benjamin 2011-12-02 17:40:00 -0800 Created attachment 117717 Patch Reviewed by NOBODY (OOPS!). iOS does not need to support the Cursor of WebKit. For compatibility, Cursor is implemented as an empty class on the platform. * Configurations/WebCore.xcconfig: * WebCore.xcodeproj/project.pbxproj: * platform/Cursor.h: (WebCore::Cursor::Cursor): * platform/ios/CursorIOS.cpp: Added. (WebCore::cursor): (WebCore::pointerCursor): (WebCore::crossCursor): (WebCore::handCursor): (WebCore::moveCursor): (WebCore::iBeamCursor): (WebCore::waitCursor): (WebCore::helpCursor): (WebCore::eastResizeCursor): (WebCore::northResizeCursor): (WebCore::northEastResizeCursor): (WebCore::northWestResizeCursor): (WebCore::southResizeCursor): (WebCore::southEastResizeCursor): (WebCore::southWestResizeCursor): (WebCore::westResizeCursor): (WebCore::northSouthResizeCursor): (WebCore::eastWestResizeCursor): (WebCore::northEastSouthWestResizeCursor): (WebCore::northWestSouthEastResizeCursor): (WebCore::columnResizeCursor): (WebCore::rowResizeCursor): (WebCore::middlePanningCursor): (WebCore::eastPanningCursor): (WebCore::northPanningCursor): (WebCore::northEastPanningCursor): (WebCore::northWestPanningCursor): (WebCore::southPanningCursor): (WebCore::southEastPanningCursor): (WebCore::southWestPanningCursor): (WebCore::westPanningCursor): (WebCore::verticalTextCursor): (WebCore::cellCursor): (WebCore::contextMenuCursor): (WebCore::noDropCursor): (WebCore::notAllowedCursor): (WebCore::progressCursor): (WebCore::aliasCursor): (WebCore::zoomInCursor): (WebCore::zoomOutCursor): (WebCore::copyCursor): (WebCore::noneCursor): (WebCore::grabCursor): (WebCore::grabbingCursor): (WebCore::determineHotSpot): --- 5 files changed, 328 insertions(+), 3 deletions(-) 514306 1 webkit.review.bot 2011-12-02 17:44:11 -0800 Attachment 117717 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 514674 2 117717 ddkilzer 2011-12-04 04:23:00 -0800 Comment on attachment 117717 Patch r=me as long as you add the bug number to the ChangeLog. May also be worth filing a bug about a shared NullCursor implementation since the WinCE port does something similar to this. 515658 3 benjamin 2011-12-05 22:31:59 -0800 Committed r102097: <http://trac.webkit.org/changeset/102097> 117717 2011-12-02 17:40:00 -0800 2011-12-04 04:22:59 -0800 Patch 20111202173959.patch text/plain 13297 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxODc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzU5OTllNjVmOTc0OWQ4 M2M1OWNjNjVkMmVjYzEwMjdhZDQ1NTZkMy4uOTE4Y2M1ZjBiYzU2MWZiMTIwZThmM2JiZDEyMWRk NTNmZTYzYWZmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYzIEBACisyMDExLTEyLTAyICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFVwc3RyZWFtIHRo ZSBDdXJzb3IgaW1wbGVtZW50YXRpb24gb2YgaU9TCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgaU9TIGRvZXMgbm90IG5lZWQgdG8gc3VwcG9ydCB0aGUg Q3Vyc29yIG9mIFdlYktpdC4gRm9yIGNvbXBhdGliaWxpdHksIEN1cnNvcgorICAgICAgICBpcyBp bXBsZW1lbnRlZCBhcyBhbiBlbXB0eSBjbGFzcyBvbiB0aGUgcGxhdGZvcm0uCisKKyAgICAgICAg KiBDb25maWd1cmF0aW9ucy9XZWJDb3JlLnhjY29uZmlnOgorICAgICAgICAqIFdlYkNvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBwbGF0Zm9ybS9DdXJzb3IuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkN1cnNvcjo6Q3Vyc29yKToKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3Mv Q3Vyc29ySU9TLmNwcDogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpjdXJzb3IpOgorICAgICAg ICAoV2ViQ29yZTo6cG9pbnRlckN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpjcm9zc0N1cnNv cik6CisgICAgICAgIChXZWJDb3JlOjpoYW5kQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6Om1v dmVDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6aUJlYW1DdXJzb3IpOgorICAgICAgICAoV2Vi Q29yZTo6d2FpdEN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpoZWxwQ3Vyc29yKToKKyAgICAg ICAgKFdlYkNvcmU6OmVhc3RSZXNpemVDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6bm9ydGhS ZXNpemVDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6bm9ydGhFYXN0UmVzaXplQ3Vyc29yKToK KyAgICAgICAgKFdlYkNvcmU6Om5vcnRoV2VzdFJlc2l6ZUN1cnNvcik6CisgICAgICAgIChXZWJD b3JlOjpzb3V0aFJlc2l6ZUN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpzb3V0aEVhc3RSZXNp emVDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6c291dGhXZXN0UmVzaXplQ3Vyc29yKToKKyAg ICAgICAgKFdlYkNvcmU6Ondlc3RSZXNpemVDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6bm9y dGhTb3V0aFJlc2l6ZUN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjplYXN0V2VzdFJlc2l6ZUN1 cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpub3J0aEVhc3RTb3V0aFdlc3RSZXNpemVDdXJzb3Ip OgorICAgICAgICAoV2ViQ29yZTo6bm9ydGhXZXN0U291dGhFYXN0UmVzaXplQ3Vyc29yKToKKyAg ICAgICAgKFdlYkNvcmU6OmNvbHVtblJlc2l6ZUN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpy b3dSZXNpemVDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6bWlkZGxlUGFubmluZ0N1cnNvcik6 CisgICAgICAgIChXZWJDb3JlOjplYXN0UGFubmluZ0N1cnNvcik6CisgICAgICAgIChXZWJDb3Jl Ojpub3J0aFBhbm5pbmdDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6bm9ydGhFYXN0UGFubmlu Z0N1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpub3J0aFdlc3RQYW5uaW5nQ3Vyc29yKToKKyAg ICAgICAgKFdlYkNvcmU6OnNvdXRoUGFubmluZ0N1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpz b3V0aEVhc3RQYW5uaW5nQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OnNvdXRoV2VzdFBhbm5p bmdDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6d2VzdFBhbm5pbmdDdXJzb3IpOgorICAgICAg ICAoV2ViQ29yZTo6dmVydGljYWxUZXh0Q3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OmNlbGxD dXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6Y29udGV4dE1lbnVDdXJzb3IpOgorICAgICAgICAo V2ViQ29yZTo6bm9Ecm9wQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6Om5vdEFsbG93ZWRDdXJz b3IpOgorICAgICAgICAoV2ViQ29yZTo6cHJvZ3Jlc3NDdXJzb3IpOgorICAgICAgICAoV2ViQ29y ZTo6YWxpYXNDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6em9vbUluQ3Vyc29yKToKKyAgICAg ICAgKFdlYkNvcmU6Onpvb21PdXRDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6Y29weUN1cnNv cik6CisgICAgICAgIChXZWJDb3JlOjpub25lQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6Omdy YWJDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6Z3JhYmJpbmdDdXJzb3IpOgorICAgICAgICAo V2ViQ29yZTo6ZGV0ZXJtaW5lSG90U3BvdCk6CisKIDIwMTEtMTItMDIgIEZhZHkgU2FtdWVsICA8 ZnNhbXVlbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2hlbiBwYWdlIHNjYWxpbmcgaXMgaW4g dXNlIHBvc2l0aW9uOmZpeGVkIGhhcyBpbmNvcnJlY3QgcmVzdWx0cwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvQ29uZmlndXJhdGlvbnMvV2ViQ29yZS54Y2NvbmZpZyBiL1NvdXJjZS9XZWJD b3JlL0NvbmZpZ3VyYXRpb25zL1dlYkNvcmUueGNjb25maWcKaW5kZXggMjdmYmRlZGIyMjM5ZGUw Yzc5MjU4ZTM3ZmFkNjc0MmI4YjU0OWRlOC4uNjc5OWNmYzc1Y2UyZGZhYWUwMjEyMWVlNDg2ZmYy MzY0MGNlZGZkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ29uZmlndXJhdGlvbnMvV2Vi Q29yZS54Y2NvbmZpZworKysgYi9Tb3VyY2UvV2ViQ29yZS9Db25maWd1cmF0aW9ucy9XZWJDb3Jl LnhjY29uZmlnCkBAIC04MSw3ICs4MSw3IEBAIEVYQ0xVREVEX1NPVVJDRV9GSUxFX05BTUVTX1NW R19ET01fT0JKQ19CSU5ESU5HU18gPSBET01TVkcqLiogRE9NSFRNTEZyYW1lRWxlbWVuCiBFWENM VURFRF9TT1VSQ0VfRklMRV9OQU1FU19TVkdfRE9NX09CSkNfQklORElOR1NfRU5BQkxFX1NWR19E T01fT0JKQ19CSU5ESU5HUyA9IDsKIAogRVhDTFVERURfU09VUkNFX0ZJTEVfTkFNRVMgPSAkKEVY Q0xVREVEX1NPVVJDRV9GSUxFX05BTUVTXyQoUkVBTF9QTEFURk9STV9OQU1FKSkgJChFWENMVURF RF9TT1VSQ0VfRklMRV9OQU1FU19TVkdfRE9NX09CSkNfQklORElOR1MpOwotRVhDTFVERURfU09V UkNFX0ZJTEVfTkFNRVNfaXBob25lb3MgPSAqLnRpZmYgKkN1cnNvci5wbmcgbG9jYWxpemVkU3Ry aW5ncy5qczsKK0VYQ0xVREVEX1NPVVJDRV9GSUxFX05BTUVTX2lwaG9uZW9zID0gKi50aWZmICpD dXJzb3IucG5nIEN1cnNvci5jcHAgQ3Vyc29yTWFjLm1tIGxvY2FsaXplZFN0cmluZ3MuanM7CiBF WENMVURFRF9TT1VSQ0VfRklMRV9OQU1FU19pcGhvbmVzaW11bGF0b3IgPSAkKEVYQ0xVREVEX1NP VVJDRV9GSUxFX05BTUVTX2lwaG9uZW9zKTsKIEVYQ0xVREVEX1NPVVJDRV9GSUxFX05BTUVTX21h Y29zeCA9ICpJT1MuaCAqSU9TLmNwcCAqSU9TLm1tCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCAzZjE4M2RiZDk4NmM0YWU1ZjQ4 NTBmYWJiMGEzZmY1NDQ5NDRmNDFjLi43ZDE5MmViMTM4ODZiZmMzM2RkNzI4YTJmMzBjNWY5OGQ1 NGI1ODU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qCkBAIC02NzcsNiArNjc3LDcgQEAKIAkJMjU0MkY0REIxMTY2QzI1QTAwRTg5QTg2 IC8qIFVzZXJHZXN0dXJlSW5kaWNhdG9yLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAyNTQyRjREOTExNjZDMjVBMDBFODlBODYgLyogVXNlckdlc3R1cmVJ bmRpY2F0b3IuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9 OwogCQkyNjU1NDEzOTE0ODk4MTFDMDAwREZDNUQgLyogS2V5RXZlbnRDb2Rlc0lPUy5oIGluIEhl YWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjY1NTQxMzcxNDg5ODEx QzAwMERGQzVEIC8qIEtleUV2ZW50Q29kZXNJT1MuaCAqLzsgfTsKIAkJMjY1NTQxM0ExNDg5ODEx QzAwMERGQzVEIC8qIEtleUV2ZW50SU9TLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMjY1NTQxMzgxNDg5ODExQzAwMERGQzVEIC8qIEtleUV2ZW50SU9T Lm1tICovOyB9OworCQkyNjU1NDE1MjE0ODlCMjMzMDAwREZDNUQgLyogQ3Vyc29ySU9TLmNwcCBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI2NTU0MTRCMTQ4 OUFBMkIwMDBERkM1RCAvKiBDdXJzb3JJT1MuY3BwICovOyB9OwogCQkyNkU5OEExMDEzMEE5RkNB MDA4RUI3QjIgLyogVGV4dENvZGVjQVNDSUlGYXN0UGF0aC5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjZFOThBMEYxMzBBOUZDQTAwOEVCN0IyIC8qIFRl eHRDb2RlY0FTQ0lJRmFzdFBhdGguaCAqLzsgfTsKIAkJMjkxN0I1NjExNDczNDk2QzAwNTJDOUQw IC8qIExheWVyRmx1c2hTY2hlZHVsZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMjkxN0I1NUUxNDczNDk2QzAwNTJDOUQwIC8qIExheWVyRmx1c2hT Y2hlZHVsZXIuY3BwICovOyB9OwogCQkyOTE3QjU2MjE0NzM0OTZDMDA1MkM5RDAgLyogTGF5ZXJG bHVzaFNjaGVkdWxlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gMjkxN0I1NUYxNDczNDk2QzAwNTJDOUQwIC8qIExheWVyRmx1c2hTY2hlZHVsZXIuaCAq Lzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwpAQCAtNzc3Niw2 ICs3Nzc3LDcgQEAKIAkJMjU0MkY0RDkxMTY2QzI1QTAwRTg5QTg2IC8qIFVzZXJHZXN0dXJlSW5k aWNhdG9yLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFVzZXJHZXN0dXJlSW5k aWNhdG9yLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTI2NTU0MTM3MTQ4OTgxMUMw MDBERkM1RCAvKiBLZXlFdmVudENvZGVzSU9TLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg bmFtZSA9IEtleUV2ZW50Q29kZXNJT1MuaDsgcGF0aCA9IGlvcy9LZXlFdmVudENvZGVzSU9TLmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTI2NTU0MTM4MTQ4OTgxMUMwMDBERkM1RCAv KiBLZXlFdmVudElPUy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgbmFtZSA9 IEtleUV2ZW50SU9TLm1tOyBwYXRoID0gaW9zL0tleUV2ZW50SU9TLm1tOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OworCQkyNjU1NDE0QjE0ODlBQTJCMDAwREZDNUQgLyogQ3Vyc29ySU9TLmNw cCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IEN1cnNvcklPUy5jcHA7IHBh dGggPSBpb3MvQ3Vyc29ySU9TLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMjZF OThBMEYxMzBBOUZDQTAwOEVCN0IyIC8qIFRleHRDb2RlY0FTQ0lJRmFzdFBhdGguaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gVGV4dENvZGVjQVNDSUlGYXN0UGF0aC5oOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkyOTE3QjU1RTE0NzM0OTZDMDA1MkM5RDAgLyogTGF5 ZXJGbHVzaFNjaGVkdWxlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IG5hbWUg PSBMYXllckZsdXNoU2NoZWR1bGVyLmNwcDsgcGF0aCA9IGNhL0xheWVyRmx1c2hTY2hlZHVsZXIu Y3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkyOTE3QjU1RjE0NzM0OTZDMDA1MkM5 RDAgLyogTGF5ZXJGbHVzaFNjaGVkdWxlci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5h bWUgPSBMYXllckZsdXNoU2NoZWR1bGVyLmg7IHBhdGggPSBjYS9MYXllckZsdXNoU2NoZWR1bGVy Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0xNzYwMSw2ICsxNzYwMyw3IEBACiAJ CUE1OUUzQzFCMTE1ODBGMzQwMDcyOTI4RSAvKiBpb3MgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91 cDsKIAkJCWNoaWxkcmVuID0gKAorCQkJCTI2NTU0MTRCMTQ4OUFBMkIwMDBERkM1RCAvKiBDdXJz b3JJT1MuY3BwICovLAogCQkJCTI2NTU0MTM3MTQ4OTgxMUMwMDBERkM1RCAvKiBLZXlFdmVudENv ZGVzSU9TLmggKi8sCiAJCQkJMjY1NTQxMzgxNDg5ODExQzAwMERGQzVEIC8qIEtleUV2ZW50SU9T Lm1tICovLAogCQkJKTsKQEAgLTI1MzMwLDYgKzI1MzMzLDcgQEAKIAkJCQk1MEU1NjZENjEzOUUz OEM1MDAyMTQ0MzMgLyogQ1NTV3JhcFNoYXBlcy5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlFMTFB RjE1MTExQjlBMUEzMDA4MDUxMDMgLyogQ3Vyc29yLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTkz RjE5QTI2MDgyNDVFNTkwMDFFOUFCQyAvKiBDdXJzb3JNYWMubW0gaW4gU291cmNlcyAqLywKKwkJ CQkyNjU1NDE1MjE0ODlCMjMzMDAwREZDNUQgLyogQ3Vyc29ySU9TLmNwcCBpbiBTb3VyY2VzICov LAogCQkJCTYyQ0QzMjU5MTE1N0U1N0MwMDYzQjBBNyAvKiBDdXN0b21FdmVudC5jcHAgaW4gU291 cmNlcyAqLywKIAkJCQk1MTk2MTE2QTBDQUM1NjU3MDAxMEE4MEMgLyogRGF0YWJhc2UuY3BwIGlu IFNvdXJjZXMgKi8sCiAJCQkJNTFBNDVCNTcwQ0FEN0ZENzAwMEQyQkU5IC8qIERhdGFiYXNlQXV0 aG9yaXplci5jcHAgaW4gU291cmNlcyAqLywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL0N1cnNvci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ3Vyc29yLmgKaW5kZXgg MTczMzdhMDEzNGM1OGI2NjgyMzZkZjBlMTM2ODlmMzIyNDM0ZGExZi4uYzMyNGVmMDBlZTVkMzE0 M2I1YmVmMWUzZGVlNDU3YzkyMWE3OTRlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vQ3Vyc29yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ3Vyc29yLmgKQEAg LTQ1LDcgKzQ1LDcgQEAgdHlwZWRlZiBISUNPTiBIQ1VSU09SOwogI2luY2x1ZGUgIlBsYXRmb3Jt Q3Vyc29yLmgiCiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKE1BQykKKyNpZiBQTEFURk9STShNQUMp ICYmICFQTEFURk9STShJT1MpCiAjaWZkZWYgX19PQkpDX18KIEBjbGFzcyBOU0N1cnNvcjsKICNl bHNlCkBAIC04MSw3ICs4MSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgSENVUlNP UiBtX25hdGl2ZUN1cnNvcjsKICAgICB9OwogICAgIHR5cGVkZWYgUmVmUHRyPFNoYXJlZEN1cnNv cj4gUGxhdGZvcm1DdXJzb3I7Ci0jZWxpZiBQTEFURk9STShNQUMpCisjZWxpZiBQTEFURk9STShN QUMpICYmICFQTEFURk9STShJT1MpCiAgICAgdHlwZWRlZiBOU0N1cnNvciAqUGxhdGZvcm1DdXJz b3I7CiAjZWxpZiBQTEFURk9STShHVEspCiAgICAgdHlwZWRlZiBHUmVmUHRyPEdka0N1cnNvcj4g UGxhdGZvcm1DdXJzb3I7CkBAIC0xNTAsMTAgKzE1MCwxMyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgICAgIHN0YXRpYyBjb25zdCBDdXJzb3ImIGZyb21UeXBlKEN1cnNvcjo6VHlwZSk7CiAK ICAgICAgICAgQ3Vyc29yKCkKKyNpZiAhUExBVEZPUk0oSU9TKQogICAgICAgICAgICAgOiBtX3Bs YXRmb3JtQ3Vyc29yKDApCisjZW5kaWYKICAgICAgICAgewogICAgICAgICB9CiAKKyNpZiAhUExB VEZPUk0oSU9TKQogICAgICAgICBDdXJzb3IoSW1hZ2UqLCBjb25zdCBJbnRQb2ludCYgaG90U3Bv dCk7CiAgICAgICAgIEN1cnNvcihjb25zdCBDdXJzb3ImKTsKICAgICAgICAgfkN1cnNvcigpOwpA QCAtMTg0LDYgKzE4Nyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICNlbHNlCiAgICAgICAgIG11 dGFibGUgUmV0YWluUHRyPE5TQ3Vyc29yPiBtX3BsYXRmb3JtQ3Vyc29yOwogI2VuZGlmCisjZW5k aWYgLy8gIVBMQVRGT1JNKElPUykKICAgICB9OwogCiAgICAgSW50UG9pbnQgZGV0ZXJtaW5lSG90 U3BvdChJbWFnZSosIGNvbnN0IEludFBvaW50JiBzcGVjaWZpZWRIb3RTcG90KTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9DdXJzb3JJT1MuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL0N1cnNvcklPUy5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjQ2OTNhYTExNmYx ZWMxNzhjNWJmOWI3ZTJhNjcwY2QzMDRlN2ZlMwotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2lvcy9DdXJzb3JJT1MuY3BwCkBAIC0wLDAgKzEsMjU3IEBACisvKgor ICogQ29weXJpZ2h0IChDKSAyMDExIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq CisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJp YnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Cisg KiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRp c2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXBy b2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1l bnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1 dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIENPTVBVVEVS LCBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElF UywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQorICogSU1QTElFRCBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQ VVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgQ09NUFVURVIs IElOQy4gT1IKKyAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElS RUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAorICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFM IERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogUFJPQ1VSRU1FTlQg T0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisg KiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBP TiBBTlkgVEhFT1JZCisgKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklD VCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJ U0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAq LworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiQ3Vyc29yLmgiCisKK25hbWVzcGFj ZSBXZWJDb3JlIHsKKworc3RhdGljIGNvbnN0IEN1cnNvciYgY3Vyc29yKCkKK3sKKyAgICBERUZJ TkVfU1RBVElDX0xPQ0FMKGNvbnN0IEN1cnNvciwgY3Vyc29yLCAoKSk7CisgICAgcmV0dXJuIGN1 cnNvcjsKK30KKworY29uc3QgQ3Vyc29yJiBwb2ludGVyQ3Vyc29yKCkKK3sKKyAgICByZXR1cm4g Y3Vyc29yKCk7Cit9CisKK2NvbnN0IEN1cnNvciYgY3Jvc3NDdXJzb3IoKQoreworICAgIHJldHVy biBjdXJzb3IoKTsKK30KKworY29uc3QgQ3Vyc29yJiBoYW5kQ3Vyc29yKCkKK3sKKyAgICByZXR1 cm4gY3Vyc29yKCk7Cit9CisKK2NvbnN0IEN1cnNvciYgbW92ZUN1cnNvcigpCit7CisgICAgcmV0 dXJuIGN1cnNvcigpOworfQorCitjb25zdCBDdXJzb3ImIGlCZWFtQ3Vyc29yKCkKK3sKKyAgICBy ZXR1cm4gY3Vyc29yKCk7Cit9CisKK2NvbnN0IEN1cnNvciYgd2FpdEN1cnNvcigpCit7CisgICAg cmV0dXJuIGN1cnNvcigpOworfQorCitjb25zdCBDdXJzb3ImIGhlbHBDdXJzb3IoKQoreworICAg IHJldHVybiBjdXJzb3IoKTsKK30KKworY29uc3QgQ3Vyc29yJiBlYXN0UmVzaXplQ3Vyc29yKCkK K3sKKyAgICByZXR1cm4gY3Vyc29yKCk7Cit9CisKK2NvbnN0IEN1cnNvciYgbm9ydGhSZXNpemVD dXJzb3IoKQoreworICAgIHJldHVybiBjdXJzb3IoKTsKK30KKworY29uc3QgQ3Vyc29yJiBub3J0 aEVhc3RSZXNpemVDdXJzb3IoKQoreworICAgIHJldHVybiBjdXJzb3IoKTsKK30KKworY29uc3Qg Q3Vyc29yJiBub3J0aFdlc3RSZXNpemVDdXJzb3IoKQoreworICAgIHJldHVybiBjdXJzb3IoKTsK K30KKworY29uc3QgQ3Vyc29yJiBzb3V0aFJlc2l6ZUN1cnNvcigpCit7CisgICAgcmV0dXJuIGN1 cnNvcigpOworfQorCitjb25zdCBDdXJzb3ImIHNvdXRoRWFzdFJlc2l6ZUN1cnNvcigpCit7Cisg ICAgcmV0dXJuIGN1cnNvcigpOworfQorCitjb25zdCBDdXJzb3ImIHNvdXRoV2VzdFJlc2l6ZUN1 cnNvcigpCit7CisgICAgcmV0dXJuIGN1cnNvcigpOworfQorCitjb25zdCBDdXJzb3ImIHdlc3RS ZXNpemVDdXJzb3IoKQoreworICAgIHJldHVybiBjdXJzb3IoKTsKK30KKworY29uc3QgQ3Vyc29y JiBub3J0aFNvdXRoUmVzaXplQ3Vyc29yKCkKK3sKKyAgICByZXR1cm4gY3Vyc29yKCk7Cit9CisK K2NvbnN0IEN1cnNvciYgZWFzdFdlc3RSZXNpemVDdXJzb3IoKQoreworICAgIHJldHVybiBjdXJz b3IoKTsKK30KKworY29uc3QgQ3Vyc29yJiBub3J0aEVhc3RTb3V0aFdlc3RSZXNpemVDdXJzb3Io KQoreworICAgIHJldHVybiBjdXJzb3IoKTsKK30KKworY29uc3QgQ3Vyc29yJiBub3J0aFdlc3RT b3V0aEVhc3RSZXNpemVDdXJzb3IoKQoreworICAgIHJldHVybiBjdXJzb3IoKTsKK30KKworY29u c3QgQ3Vyc29yJiBjb2x1bW5SZXNpemVDdXJzb3IoKQoreworICAgIHJldHVybiBjdXJzb3IoKTsK K30KKworY29uc3QgQ3Vyc29yJiByb3dSZXNpemVDdXJzb3IoKQoreworICAgIHJldHVybiBjdXJz b3IoKTsKK30KKworY29uc3QgQ3Vyc29yJiBtaWRkbGVQYW5uaW5nQ3Vyc29yKCkKK3sKKyAgICBy ZXR1cm4gY3Vyc29yKCk7Cit9CisKK2NvbnN0IEN1cnNvciYgZWFzdFBhbm5pbmdDdXJzb3IoKQor eworICAgIHJldHVybiBjdXJzb3IoKTsKK30KKworY29uc3QgQ3Vyc29yJiBub3J0aFBhbm5pbmdD dXJzb3IoKQoreworICAgIHJldHVybiBjdXJzb3IoKTsKK30KKworY29uc3QgQ3Vyc29yJiBub3J0 aEVhc3RQYW5uaW5nQ3Vyc29yKCkKK3sKKyAgICByZXR1cm4gY3Vyc29yKCk7Cit9CisKK2NvbnN0 IEN1cnNvciYgbm9ydGhXZXN0UGFubmluZ0N1cnNvcigpCit7CisgICAgcmV0dXJuIGN1cnNvcigp OworfQorCitjb25zdCBDdXJzb3ImIHNvdXRoUGFubmluZ0N1cnNvcigpCit7CisgICAgcmV0dXJu IGN1cnNvcigpOworfQorCitjb25zdCBDdXJzb3ImIHNvdXRoRWFzdFBhbm5pbmdDdXJzb3IoKQor eworICAgIHJldHVybiBjdXJzb3IoKTsKK30KKworY29uc3QgQ3Vyc29yJiBzb3V0aFdlc3RQYW5u aW5nQ3Vyc29yKCkKK3sKKyAgICByZXR1cm4gY3Vyc29yKCk7Cit9CisKK2NvbnN0IEN1cnNvciYg d2VzdFBhbm5pbmdDdXJzb3IoKQoreworICAgIHJldHVybiBjdXJzb3IoKTsKK30KKworY29uc3Qg Q3Vyc29yJiB2ZXJ0aWNhbFRleHRDdXJzb3IoKQoreworICAgIHJldHVybiBjdXJzb3IoKTsKK30K KworY29uc3QgQ3Vyc29yJiBjZWxsQ3Vyc29yKCkKK3sKKyAgICByZXR1cm4gY3Vyc29yKCk7Cit9 CisKK2NvbnN0IEN1cnNvciYgY29udGV4dE1lbnVDdXJzb3IoKQoreworICAgIHJldHVybiBjdXJz b3IoKTsKK30KKworY29uc3QgQ3Vyc29yJiBub0Ryb3BDdXJzb3IoKQoreworICAgIHJldHVybiBj dXJzb3IoKTsKK30KKworY29uc3QgQ3Vyc29yJiBub3RBbGxvd2VkQ3Vyc29yKCkKK3sKKyAgICBy ZXR1cm4gY3Vyc29yKCk7Cit9CisKK2NvbnN0IEN1cnNvciYgcHJvZ3Jlc3NDdXJzb3IoKQorewor ICAgIHJldHVybiBjdXJzb3IoKTsKK30KKworY29uc3QgQ3Vyc29yJiBhbGlhc0N1cnNvcigpCit7 CisgICAgcmV0dXJuIGN1cnNvcigpOworfQorCitjb25zdCBDdXJzb3ImIHpvb21JbkN1cnNvcigp Cit7CisgICAgcmV0dXJuIGN1cnNvcigpOworfQorCitjb25zdCBDdXJzb3ImIHpvb21PdXRDdXJz b3IoKQoreworICAgIHJldHVybiBjdXJzb3IoKTsKK30KKworY29uc3QgQ3Vyc29yJiBjb3B5Q3Vy c29yKCkKK3sKKyAgICByZXR1cm4gY3Vyc29yKCk7Cit9CisKK2NvbnN0IEN1cnNvciYgbm9uZUN1 cnNvcigpCit7CisgICAgcmV0dXJuIGN1cnNvcigpOworfQorCitjb25zdCBDdXJzb3ImIGdyYWJD dXJzb3IoKQoreworICAgIHJldHVybiBjdXJzb3IoKTsKK30KKworY29uc3QgQ3Vyc29yJiBncmFi YmluZ0N1cnNvcigpCit7CisgICAgcmV0dXJuIGN1cnNvcigpOworfQorCitJbnRQb2ludCBkZXRl cm1pbmVIb3RTcG90KEltYWdlKiwgY29uc3QgSW50UG9pbnQmKQoreworICAgIHJldHVybiBJbnRQ b2ludCgpOworfQorCit9Cg==