89150 2012-06-14 18:44:07 -0700 [chromium] Use WebImageLayer in GraphicsLayerChromium for image layers 2012-06-18 16:54:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89134 1 jamesr jamesr enne oldest_to_newest 649723 0 jamesr 2012-06-14 18:44:07 -0700 [chromium] Use WebImageLayer in GraphicsLayerChromium for image layers 649725 1 147702 jamesr 2012-06-14 18:45:28 -0700 Created attachment 147702 Patch 649726 2 jamesr 2012-06-14 18:45:58 -0700 Next piece o' the puzzle 650219 3 147702 enne 2012-06-15 08:42:42 -0700 Comment on attachment 147702 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147702&action=review R=me. > Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp:463 > + setupContentsLayer(imageLayer.unwrap<LayerChromium>()); I guess this has to wait until you change the PlatformLayer define... 651878 4 jamesr 2012-06-18 16:54:32 -0700 Committed r120644: <http://trac.webkit.org/changeset/120644> 147702 2012-06-14 18:45:28 -0700 2012-06-15 08:42:42 -0700 Patch bug-89150-20120614184527.patch text/plain 11009 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA5NTNmMjllODQ2Zjhl ZThhNGI0ZGRhZWM3NmRhNzQwZWI3ZmIzYzFjLi5lM2JjOTVlNWM2MTlmZjU2MDU0ZjNkMDNiN2Rj MmM1M2FhYzA5ZGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMi0wNi0xNCAg SmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1 bV0gVXNlIFdlYkltYWdlTGF5ZXIgaW4gR3JhcGhpY3NMYXllckNocm9taXVtIGZvciBpbWFnZSBs YXllcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5 MTUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk cyBhIFdlYkltYWdlTGF5ZXIgdHlwZSB0byByZXByZXNlbnQgbGF5ZXJzIGJhY2tlZCBieSAoZ3Vl c3Mgd2hhdCkgSW1hZ2VzLgorCisgICAgICAgICogUGxhdGZvcm0uZ3lwaToKKyAgICAgICAgKiBj aHJvbWl1bS9wdWJsaWMvV2ViSW1hZ2VMYXllci5oOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmUp OgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYkltYWdlTGF5ZXIpOgorICAgICAgICAo V2ViS2l0OjpXZWJJbWFnZUxheWVyOjpXZWJJbWFnZUxheWVyKToKKyAgICAgICAgKFdlYktpdDo6 V2ViSW1hZ2VMYXllcjo6fldlYkltYWdlTGF5ZXIpOgorCiAyMDEyLTA2LTE0ICBJYW4gVm9sbGlj ayAgPHZvbGxpY2tAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gQ2VydGFpbiBz ZXR0aW5ncyBpbiBDQ1NldHRpbmdzIGNvdWxkIGJlIGdsb2JhbApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDhiODFi Mzc2ZGI2NDc3ZjNiNDA0N2U5YWM0MTkzZTFlYWM3NGNhNmMuLmNiMjQ1NDZmMWEwNzQxNzA1M2Ex NmUzZGExMTNhODk3OTQ2NmNiMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNyBAQAogMjAxMi0w Ni0xNCAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFtj aHJvbWl1bV0gVXNlIFdlYkltYWdlTGF5ZXIgaW4gR3JhcGhpY3NMYXllckNocm9taXVtIGZvciBp bWFnZSBsYXllcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg5MTUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVXNlcyBXZWJJbWFnZUxheWVyIGluc3RlYWQgb2YgSW1hZ2VMYXllckNocm9taXVtIGZvciBH cmFwaGljc0xheWVyQ2hyb21pdW06OnNldENvbnRlbnRzVG9JbWFnZS4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ2hyb21pdW06OnNldENvbnRlbnRzVG9JbWFnZSk6 CisKKzIwMTItMDYtMTQgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KKwog ICAgICAgICBbY2hyb21pdW1dIFVzZSBTa0JpdG1hcCBpbiBJbWFnZUxheWVyQ2hyb21pdW0KICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MTM0CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggYzM1MGI3YzE0Nzc0Mzg0OWRjMDM0ZjU4MGQzY2Qz NzQxZTdiMDBhMi4uNjZjZjU3NDE0NGRjODE5ZmE1YmRmMGI3YTI1MjMzZWM0NDc3YzJiMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMi0wNi0xNCAgSmFt ZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g VXNlIFdlYkltYWdlTGF5ZXIgaW4gR3JhcGhpY3NMYXllckNocm9taXVtIGZvciBpbWFnZSBsYXll cnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MTUw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVt ZW50YXRpb24gb2YgV2ViSW1hZ2VMYXllci4gTm90ZTogVGhpcyBjb3VsZCAoc2hvdWxkPykgbGl2 ZSBpbiBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvLCBidXQgaXQncworICAgICAg ICBoZXJlIHRvIGJlIG5leHQgdG8gdGhlIG90aGVyIFdlYipMYXllci5jcHAgaW1wbGVtZW50YXRp b24gZmlsZXMuCisKKyAgICAgICAgKiBXZWJLaXQuZ3lwOgorICAgICAgICAqIHNyYy9XZWJJbWFn ZUxheWVyLmNwcDogQWRkZWQuCisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpX ZWJJbWFnZUxheWVyOjpjcmVhdGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbWFnZUxheWVyOjpX ZWJJbWFnZUxheWVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViSW1hZ2VMYXllcjo6c2V0Qml0bWFw KToKKwogMjAxMi0wNi0xNCAgRGF2aWQgUmV2ZW1hbiAgPHJldmVtYW5AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFtDaHJvbWl1bV0gU3ViLXBpeGVsIHRleHQgcmVuZGVyaW5nIGlzIGluY29ycmVj dGx5IHVzZWQgZm9yIFdlYlZpZXcgd2l0aCB0cmFuc3BhcmVudCBiYWNrZ3JvdW5kLgpkaWZmIC0t Z2l0IGEvU291cmNlL1BsYXRmb3JtL1BsYXRmb3JtLmd5cGkgYi9Tb3VyY2UvUGxhdGZvcm0vUGxh dGZvcm0uZ3lwaQppbmRleCAxMjMyMjI3NGJjOTg2Zjc5MGYyYjkxNzUxMGQ2YmE1YTE4ZWM0NzMz Li5kNzlmODUzYjMxOWZmMTBmZjQ4YTFlMDBjYWJjZWU3N2VkZDYxZGM4IDEwMDY0NAotLS0gYS9T b3VyY2UvUGxhdGZvcm0vUGxhdGZvcm0uZ3lwaQorKysgYi9Tb3VyY2UvUGxhdGZvcm0vUGxhdGZv cm0uZ3lwaQpAQCAtNjYsNiArNjYsNyBAQAogICAgICAgICAgICAgJ2Nocm9taXVtL3B1YmxpYy9X ZWJJQ0VDYW5kaWRhdGVEZXNjcmlwdG9yLmgnLAogICAgICAgICAgICAgJ2Nocm9taXVtL3B1Ymxp Yy9XZWJJQ0VPcHRpb25zLmgnLAogICAgICAgICAgICAgJ2Nocm9taXVtL3B1YmxpYy9XZWJJbWFn ZS5oJywKKyAgICAgICAgICAgICdjaHJvbWl1bS9wdWJsaWMvV2ViSW1hZ2VMYXllci5oJywKICAg ICAgICAgICAgICdjaHJvbWl1bS9wdWJsaWMvV2ViSU9TdXJmYWNlTGF5ZXIuaCcsCiAgICAgICAg ICAgICAnY2hyb21pdW0vcHVibGljL1dlYkxheWVyLmgnLAogICAgICAgICAgICAgJ2Nocm9taXVt L3B1YmxpYy9XZWJMYXllclRyZWVWaWV3LmgnLApAQCAtMTE1LDYgKzExNiw3IEBACiAgICAgICAg ICAgICAnY2hyb21pdW0vcHVibGljL1dlYlVSTFJlcXVlc3QuaCcsCiAgICAgICAgICAgICAnY2hy b21pdW0vcHVibGljL1dlYlVSTFJlc3BvbnNlLmgnLAogICAgICAgICAgICAgJ2Nocm9taXVtL3B1 YmxpYy9XZWJWZWN0b3IuaCcsCisgICAgICAgICAgICAnY2hyb21pdW0vcHVibGljL1dlYlZpZGVv TGF5ZXIuaCcsCiAgICAgICAgICAgICAnY2hyb21pdW0vcHVibGljL1dlYlZpZGVvRnJhbWUuaCcs CiAgICAgICAgICAgICAnY2hyb21pdW0vcHVibGljL1dlYlZpZGVvRnJhbWVQcm92aWRlci5oJywK ICAgICAgICAgICAgICdjaHJvbWl1bS9wdWJsaWMvV2ViV29ya2VyUnVuTG9vcC5oJywKZGlmZiAt LWdpdCBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViSW1hZ2VMYXllci5oIGIv U291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJJbWFnZUxheWVyLmgKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uYTkxNjgzNWYyMDViYzA2ZjU4NGQ0MjMzMmE0MWU0YzYwZTk5MDBiNAotLS0gL2Rldi9udWxs CisrKyBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViSW1hZ2VMYXllci5oCkBA IC0wLDAgKzEsNTUgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJl IG1ldDoKKyAqCisgKiAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0 YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiAgUmVkaXN0cmlidXRp b25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAq ICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRp c2NsYWltZXIgaW4gdGhlCisgKiAgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJp YWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJF IElTIFBST1ZJREVEIEJZIEFQUExFIEFORCBJVFMgQ09OVFJJQlVUT1JTICJBUyBJUyIgQU5EIEFO WQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBM SU1JVEVEIFRPLCBUSEUgSU1QTElFRAorICogV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkg QU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQorICogRElTQ0xBSU1FRC4g SU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgT1IgSVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9S IEFOWQorICogRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZ LCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMKKyAqIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsKKyAqIExP U1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhP V0VWRVIgQ0FVU0VEIEFORAorICogT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIg SU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVH TElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBP RgorICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBP RiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIFdlYkltYWdlTGF5ZXJfaAorI2RlZmluZSBX ZWJJbWFnZUxheWVyX2gKKworI2luY2x1ZGUgIlNrQml0bWFwLmgiCisjaW5jbHVkZSAiV2ViQ29t bW9uLmgiCisjaW5jbHVkZSAiV2ViTGF5ZXIuaCIKKworbmFtZXNwYWNlIFdlYkNvcmUgeworY2xh c3MgSW1hZ2VMYXllckNocm9taXVtOworfQorCituYW1lc3BhY2UgV2ViS2l0IHsKKworY2xhc3Mg V2ViSW1hZ2VMYXllciA6IHB1YmxpYyBXZWJMYXllciB7CitwdWJsaWM6CisgICAgV0VCS0lUX0VY UE9SVCBzdGF0aWMgV2ViSW1hZ2VMYXllciBjcmVhdGUoKTsKKworICAgIFdlYkltYWdlTGF5ZXIo KSB7IH0KKyAgICB2aXJ0dWFsIH5XZWJJbWFnZUxheWVyKCkgeyB9CisKKyAgICBXRUJLSVRfRVhQ T1JUIHZvaWQgc2V0Qml0bWFwKFNrQml0bWFwKTsKKworI2lmIFdFQktJVF9JTVBMRU1FTlRBVElP TgorICAgIGV4cGxpY2l0IFdlYkltYWdlTGF5ZXIoUGFzc1JlZlB0cjxXZWJDb3JlOjpJbWFnZUxh eWVyQ2hyb21pdW0+KTsKKyNlbmRpZgorfTsKKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0CisKKyNl bmRpZiAvLyBXZWJJbWFnZUxheWVyX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0u Y3BwCmluZGV4IGM4N2E3MmI3M2Y2YWRjZTgwN2YxYWJhMmRkZTZkNzllYzViOWMyNGQuLjk1ODc3 MTMxYmI5YTRjYjAyNmRiYTc3YjNjM2ZjOGNjYjVlNWEzODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhp Y3NMYXllckNocm9taXVtLmNwcApAQCAtNTIsNyArNTIsNiBAQAogI2luY2x1ZGUgIkZsb2F0UmVj dC5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIkltYWdlLmgiCi0j aW5jbHVkZSAiSW1hZ2VMYXllckNocm9taXVtLmgiCiAjaW5jbHVkZSAiTGF5ZXJDaHJvbWl1bS5o IgogI2luY2x1ZGUgIkxpbmtIaWdobGlnaHQuaCIKICNpbmNsdWRlICJOYXRpdmVJbWFnZVNraWEu aCIKQEAgLTY3LDYgKzY2LDcgQEAKICNpbmNsdWRlIDxwdWJsaWMvV2ViRmlsdGVyT3BlcmF0aW9u cy5oPgogI2luY2x1ZGUgPHB1YmxpYy9XZWJGbG9hdFBvaW50Lmg+CiAjaW5jbHVkZSA8cHVibGlj L1dlYkZsb2F0UmVjdC5oPgorI2luY2x1ZGUgPHB1YmxpYy9XZWJJbWFnZUxheWVyLmg+CiAjaW5j bHVkZSA8cHVibGljL1dlYlNpemUuaD4KICNpbmNsdWRlIDxwdWJsaWMvV2ViVHJhbnNmb3JtYXRp b25NYXRyaXguaD4KICNpbmNsdWRlIDx3dGYvQ3VycmVudFRpbWUuaD4KQEAgLTQ1OSwxNSArNDU5 LDE1IEBAIHZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjpzZXRDb250ZW50c1RvSW1hZ2UoSW1h Z2UqIGltYWdlKQogICAgIGJvb2wgY2hpbGRyZW5DaGFuZ2VkID0gZmFsc2U7CiAgICAgaWYgKGlt YWdlKSB7CiAgICAgICAgIGlmIChtX2NvbnRlbnRzTGF5ZXIuaXNOdWxsKCkgfHwgbV9jb250ZW50 c0xheWVyUHVycG9zZSAhPSBDb250ZW50c0xheWVyRm9ySW1hZ2UpIHsKLSAgICAgICAgICAgIFJl ZlB0cjxJbWFnZUxheWVyQ2hyb21pdW0+IGltYWdlTGF5ZXIgPSBJbWFnZUxheWVyQ2hyb21pdW06 OmNyZWF0ZSgpOwotICAgICAgICAgICAgc2V0dXBDb250ZW50c0xheWVyKGltYWdlTGF5ZXIuZ2V0 KCkpOworICAgICAgICAgICAgV2ViS2l0OjpXZWJJbWFnZUxheWVyIGltYWdlTGF5ZXIgPSBXZWJL aXQ6OldlYkltYWdlTGF5ZXI6OmNyZWF0ZSgpOworICAgICAgICAgICAgc2V0dXBDb250ZW50c0xh eWVyKGltYWdlTGF5ZXIudW53cmFwPExheWVyQ2hyb21pdW0+KCkpOwogICAgICAgICAgICAgbV9j b250ZW50c0xheWVyUHVycG9zZSA9IENvbnRlbnRzTGF5ZXJGb3JJbWFnZTsKICAgICAgICAgICAg IGNoaWxkcmVuQ2hhbmdlZCA9IHRydWU7CiAgICAgICAgIH0KLSAgICAgICAgSW1hZ2VMYXllckNo cm9taXVtKiBpbWFnZUxheWVyID0gc3RhdGljX2Nhc3Q8SW1hZ2VMYXllckNocm9taXVtKj4obV9j b250ZW50c0xheWVyLnVud3JhcDxMYXllckNocm9taXVtPigpKTsKKyAgICAgICAgV2ViS2l0OjpX ZWJJbWFnZUxheWVyIGltYWdlTGF5ZXIgPSBtX2NvbnRlbnRzTGF5ZXIudG88V2ViS2l0OjpXZWJJ bWFnZUxheWVyPigpOwogICAgICAgICBOYXRpdmVJbWFnZVNraWEqIG5hdGl2ZUltYWdlID0gaW1h Z2UtPm5hdGl2ZUltYWdlRm9yQ3VycmVudEZyYW1lKCk7Ci0gICAgICAgIGltYWdlTGF5ZXItPnNl dEJpdG1hcChuYXRpdmVJbWFnZS0+Yml0bWFwKCkpOwotICAgICAgICBpbWFnZUxheWVyLT5zZXRP cGFxdWUoaW1hZ2UtPmlzQml0bWFwSW1hZ2UoKSAmJiAhaW1hZ2UtPmN1cnJlbnRGcmFtZUhhc0Fs cGhhKCkpOworICAgICAgICBpbWFnZUxheWVyLnNldEJpdG1hcChuYXRpdmVJbWFnZS0+Yml0bWFw KCkpOworICAgICAgICBpbWFnZUxheWVyLnNldE9wYXF1ZShpbWFnZS0+aXNCaXRtYXBJbWFnZSgp ICYmICFpbWFnZS0+Y3VycmVudEZyYW1lSGFzQWxwaGEoKSk7CiAgICAgICAgIHVwZGF0ZUNvbnRl bnRzUmVjdCgpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmICghbV9jb250ZW50c0xheWVyLmlz TnVsbCgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKaW5kZXggMjc2YzVhNDVlZmFlMDA4 YjIxZjc0ZGI0MWEzNGRmNDAzNjY4NzdmNy4uYzYyMzQ2Zjc2YTQ5OGM3MjcxZmZlMDgxYTc2Yzk2 OTVkMzAxZjZlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lw CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cApAQCAtNTY5LDYgKzU2OSw3 IEBACiAgICAgICAgICAgICAgICAgJ3NyYy9XZWJJT1N1cmZhY2VMYXllci5jcHAnLAogICAgICAg ICAgICAgICAgICdzcmMvV2ViSW1hZ2VDRy5jcHAnLAogICAgICAgICAgICAgICAgICdzcmMvV2Vi SW1hZ2VEZWNvZGVyLmNwcCcsCisgICAgICAgICAgICAgICAgJ3NyYy9XZWJJbWFnZUxheWVyLmNw cCcsCiAgICAgICAgICAgICAgICAgJ3NyYy9XZWJJbWFnZVNraWEuY3BwJywKICAgICAgICAgICAg ICAgICAnc3JjL1dlYklucHV0RWxlbWVudC5jcHAnLAogICAgICAgICAgICAgICAgICdzcmMvV2Vi SW5wdXRFdmVudC5jcHAnLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViSW1hZ2VMYXllci5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbWFnZUxh eWVyLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi45M2RiZjM5MzBjNjkyZWEwNjBlMGQ3N2Y3YWE4OGMyYTY2OTk3 ZDE3Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW1h Z2VMYXllci5jcHAKQEAgLTAsMCArMSw0OCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMiBH b29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9k aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k aXRpb25zCisgKiBhcmUgbWV0OgorICoKKyAqIDEuICBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNl IGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIu ICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3Zl IGNvcHlyaWdodAorICogICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgICBkb2N1bWVudGF0aW9uIGFuZC9v ciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAq IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgQU5EIElUUyBDT05UUklCVVRPUlMg IkFTIElTIiBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVE SU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRSBJTVBMSUVECisgKiBXQVJSQU5USUVTIE9GIE1F UkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFCisg KiBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBPUiBJVFMgQ09OVFJJQlVUT1JT IEJFIExJQUJMRSBGT1IgQU5ZCisgKiBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVD SUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUworICogKElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNF UlZJQ0VTOworICogTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElO VEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5ECisgKiBPTiBBTlkgVEhFT1JZIE9GIExJQUJJ TElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICog KElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9V VCBPRiBUSEUgVVNFIE9GCisgKiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIK KyNpbmNsdWRlIDxwdWJsaWMvV2ViSW1hZ2VMYXllci5oPgorCisjaW5jbHVkZSAiSW1hZ2VMYXll ckNocm9taXVtLmgiCisKK25hbWVzcGFjZSBXZWJLaXQgeworCitXZWJJbWFnZUxheWVyIFdlYklt YWdlTGF5ZXI6OmNyZWF0ZSgpCit7CisgICAgcmV0dXJuIFdlYkltYWdlTGF5ZXIoV2ViQ29yZTo6 SW1hZ2VMYXllckNocm9taXVtOjpjcmVhdGUoKSk7Cit9CisKK1dlYkltYWdlTGF5ZXI6OldlYklt YWdlTGF5ZXIoUGFzc1JlZlB0cjxXZWJDb3JlOjpJbWFnZUxheWVyQ2hyb21pdW0+IGxheWVyKQor ICAgIDogV2ViTGF5ZXIobGF5ZXIpCit7Cit9CisKK3ZvaWQgV2ViSW1hZ2VMYXllcjo6c2V0Qml0 bWFwKFNrQml0bWFwIGJpdG1hcCkKK3sKKyAgICByZXR1cm4gdW53cmFwPFdlYkNvcmU6OkltYWdl TGF5ZXJDaHJvbWl1bT4oKS0+c2V0Qml0bWFwKGJpdG1hcCk7Cit9CisKK30gLy8gbmFtZXNwYWNl IFdlYktpdAo=