44719 2010-08-26 13:47:10 -0700 Fix RenderStyle::addCursor to use a StyleImage, not a CachedImage 2010-08-30 09:01:05 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser hyatt oldest_to_newest 270094 0 simon.fraser 2010-08-26 13:47:10 -0700 Per comment in CSSStyleSelector: // FIXME: Temporary clumsiness to pass off a CachedImage to an API that will eventually convert to using // StyleImage. 270810 1 65786 simon.fraser 2010-08-27 16:47:34 -0700 Created attachment 65786 Patch 271195 2 65786 darin 2010-08-29 12:54:19 -0700 Comment on attachment 65786 Patch > case CSSPropertyBackgroundImage: > + // FIXME: broken for multiple backgrounds. It would be better if this was capitalized sentence-style like our comments usually are, and if there was a corresponding bug umber. > + case CSSPropertyCursor: { > + if (CursorList* cursorList = m_style->cursors()) { > + for (size_t i = 0; i < cursorList->size(); ++i) { > + CursorData& currentCursor = (*cursorList)[i]; > + if (currentCursor.image()->isPendingImage()) { > + CSSImageValue* imageValue = static_cast<StylePendingImage*>(currentCursor.image())->cssImageValue(); > + currentCursor.setImage(imageValue->cachedImage(docLoader)); > + } > + } > + } > break; > + } Is it correct to do nothing if there are not cursors? > + void setImage(StyleImage* image) { m_image = image; } This function should take a PassRefPtr, not a raw pointer. > + void addCursor(StyleImage*, const IntPoint& = IntPoint()); Should this take a PassRefPtr instead of a raw pointer? The IntPoint argument should have a name, hotSpot, instead of being unnamed. I don't think it's obvious what it is without a name. 271451 3 simon.fraser 2010-08-30 09:01:05 -0700 http://trac.webkit.org/changeset/66391 65786 2010-08-27 16:47:34 -0700 2010-08-29 12:54:19 -0700 Patch bug-44719-20100827164732.patch text/plain 11406 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODRjOWJlODQxNzkwY2UwYmUzNjM2ZDUwYmEzOWQzYTc4ZWVmNTEzYi4uZmI4ZGNhNWU1YTIzNGIx OTVjMzAyNDgzZDhiZmM5OGMyNDMzNzEwZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzNiBAQAogMjAxMC0wOC0yNyAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggUmVuZGVyU3R5bGU6OmFkZEN1cnNvciB0 byB1c2UgYSBTdHlsZUltYWdlLCBub3QgYSBDYWNoZWRJbWFnZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ3MTkKKyAgICAgICAgCisgICAgICAgIE1v ZGVybml6ZSB0aGUgQ1NTIGN1cnNvciBjb2RlIHRvIHVzZSBhIFN0eWxlSW1hZ2UsIHJhdGhlcgor ICAgICAgICB0aGFuIGEgQ2FjaGVkSW1hZ2UgaW4gdGhlIEN1cnNvckRhdGEsIGFuZCBoYW5kbGUg dGhlIGxvYWRpbmcKKyAgICAgICAgb2YgcGVuZGluZyBpbWFnZXMgZm9yIHRoZSBjdXJzb3IgcHJv cGVydHkuCisKKyAgICAgICAgQ292ZXJlZCBieSBtYW51YWwgdGVzdHMgaW4gV2ViQ29yZS9tYW51 YWwtdGVzdHMKKworICAgICAgICAqIGNzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9w ZXJ0eUNTU1ZhbHVlKToKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToKKyAgICAgICAg KFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OmxvYWRQZW5kaW5nSW1hZ2VzKToKKyAgICAgICAg KiBodG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwOgorICAgICAgICAqIHBhZ2Uv RXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6c2VsZWN0 Q3Vyc29yKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvQ3Vyc29yRGF0YS5oOgorICAgICAg ICAoV2ViQ29yZTo6Q3Vyc29yRGF0YTo6Q3Vyc29yRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpD dXJzb3JEYXRhOjppbWFnZSk6CisgICAgICAgIChXZWJDb3JlOjpDdXJzb3JEYXRhOjpzZXRJbWFn ZSk6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL0N1cnNvckxpc3QuaDoKKyAgICAgICAgKFdl YkNvcmU6OkN1cnNvckxpc3Q6Om9wZXJhdG9yW10pOgorICAgICAgICAqIHJlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6YWRkQ3Vy c29yKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKworMjAxMC0w OC0yNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBS ZXZpZXdlZCBieSBUb255IENoYW5nLgogCiAgICAgICAgIEluc2VydGlvbiBwb2ludCBkb2VzIG5v dCBzaG93IHdoZW4gZHJhZ2dpbmcgdGV4dCBpbnRvIGFuIGVkaXRhYmxlIGFyZWEKZGlmZiAtLWdp dCBhL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9XZWJDb3Jl L2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCmluZGV4IDdiNGYzMjlmNzk0Zjk1 ZmQ5OTRjNGU1ODEzMmE4NTMyYWY0OTQ2MjUuLjQ3M2ZkMmY3NzYxYzM1NDVjNjZhOWUzNTg4NmZh ZWI1ZTNmYzI0NDEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNs YXJhdGlvbi5jcHAKKysrIGIvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9u LmNwcApAQCAtNjkyLDYgKzY5Miw3IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IENTU0NvbXB1dGVk U3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJvcGVydHlDU1NWYWx1ZShpbnQgcHJvcGVyCiAgICAgICAg IGNhc2UgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3I6CiAgICAgICAgICAgICByZXR1cm4gQ1NT UHJpbWl0aXZlVmFsdWU6OmNyZWF0ZUNvbG9yKG1fYWxsb3dWaXNpdGVkU3R5bGU/IHN0eWxlLT52 aXNpdGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpLnJnYigpIDog c3R5bGUtPmJhY2tncm91bmRDb2xvcigpLnJnYigpKTsKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0 eUJhY2tncm91bmRJbWFnZToKKyAgICAgICAgICAgIC8vIEZJWE1FOiBicm9rZW4gZm9yIG11bHRp cGxlIGJhY2tncm91bmRzLgogICAgICAgICAgICAgaWYgKHN0eWxlLT5iYWNrZ3JvdW5kSW1hZ2Uo KSkKICAgICAgICAgICAgICAgICByZXR1cm4gc3R5bGUtPmJhY2tncm91bmRJbWFnZSgpLT5jc3NW YWx1ZSgpOwogICAgICAgICAgICAgcmV0dXJuIENTU1ByaW1pdGl2ZVZhbHVlOjpjcmVhdGVJZGVu dGlmaWVyKENTU1ZhbHVlTm9uZSk7CkBAIC04MzgsNyArODM5LDcgQEAgUGFzc1JlZlB0cjxDU1NW YWx1ZT4gQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0eUNTU1ZhbHVlKGlu dCBwcm9wZXIKICAgICAgICAgICAgIGlmIChjdXJzb3JzICYmIGN1cnNvcnMtPnNpemUoKSA+IDAp IHsKICAgICAgICAgICAgICAgICBsaXN0ID0gQ1NTVmFsdWVMaXN0OjpjcmVhdGVDb21tYVNlcGFy YXRlZCgpOwogICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBjdXJzb3Jz LT5zaXplKCk7ICsraSkKLSAgICAgICAgICAgICAgICAgICAgbGlzdC0+YXBwZW5kKENTU1ByaW1p dGl2ZVZhbHVlOjpjcmVhdGUoKCpjdXJzb3JzKVtpXS5pbWFnZSgpLT51cmwoKSwgQ1NTUHJpbWl0 aXZlVmFsdWU6OkNTU19VUkkpKTsKKyAgICAgICAgICAgICAgICAgICAgbGlzdC0+YXBwZW5kKCgq Y3Vyc29ycylbaV0uaW1hZ2UoKS0+Y3NzVmFsdWUoKSk7CiAgICAgICAgICAgICB9CiAgICAgICAg ICAgICBSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlID0gQ1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZShz dHlsZS0+Y3Vyc29yKCkpOwogICAgICAgICAgICAgaWYgKGxpc3QpIHsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwIGIvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxl Y3Rvci5jcHAKaW5kZXggMGJhNjNlMDdjNDQwMmJmZTVmMzBlYzJiZjlkMjE0MWE0Yjg1MGJkNC4u NGQ4M2M0OGU0Y2JjMjczNDc1MDYyYmQzZjNiNDQ3MGRkMjI2ZmE2YiAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKKysrIGIvV2ViQ29yZS9jc3MvQ1NTU3R5bGVT ZWxlY3Rvci5jcHAKQEAgLTM1NTMsMTEgKzM1NTMsNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6 OmFwcGx5UHJvcGVydHkoaW50IGlkLCBDU1NWYWx1ZSAqdmFsdWUpCiAgICAgICAgICAgICAgICAg ICAgIENTU0N1cnNvckltYWdlVmFsdWUqIGltYWdlID0gc3RhdGljX2Nhc3Q8Q1NTQ3Vyc29ySW1h Z2VWYWx1ZSo+KHByaW1pdGl2ZVZhbHVlKTsKICAgICAgICAgICAgICAgICAgICAgaWYgKGltYWdl LT51cGRhdGVJZlNWR0N1cnNvcklzVXNlZChtX2VsZW1lbnQpKSAvLyBFbGVtZW50cyB3aXRoIFNW RyBjdXJzb3JzIGFyZSBub3QgYWxsb3dlZCB0byBzaGFyZSBzdHlsZS4KICAgICAgICAgICAgICAg ICAgICAgICAgIG1fc3R5bGUtPnNldFVuaXF1ZSgpOwotICAgICAgICAgICAgICAgICAgICAvLyBG SVhNRTogVGVtcG9yYXJ5IGNsdW1zaW5lc3MgdG8gcGFzcyBvZmYgYSBDYWNoZWRJbWFnZSB0byBh biBBUEkgdGhhdCB3aWxsIGV2ZW50dWFsbHkgY29udmVydCB0byB1c2luZwotICAgICAgICAgICAg ICAgICAgICAvLyBTdHlsZUltYWdlLiBTaG91bGQgYWxzbyBiZSBmaXhlZCB0byB1c2UgU3R5bGVQ ZW5kaW5nSW1hZ2UgYXQgdGhlIHNhbWUgdGltZS4KLSAgICAgICAgICAgICAgICAgICAgUmVmUHRy PFN0eWxlQ2FjaGVkSW1hZ2U+IHN0eWxlQ2FjaGVkSW1hZ2UoaW1hZ2UtPmNhY2hlZEltYWdlKG1f ZWxlbWVudC0+ZG9jdW1lbnQoKS0+ZG9jTG9hZGVyKCkpKTsKLSAgICAgICAgICAgICAgICAgICAg aWYgKHN0eWxlQ2FjaGVkSW1hZ2UpCi0gICAgICAgICAgICAgICAgICAgICAgICBtX3N0eWxlLT5h ZGRDdXJzb3Ioc3R5bGVDYWNoZWRJbWFnZS0+Y2FjaGVkSW1hZ2UoKSwgaW1hZ2UtPmhvdFNwb3Qo KSk7CisgICAgICAgICAgICAgICAgICAgIG1fc3R5bGUtPmFkZEN1cnNvcihjYWNoZWRPclBlbmRp bmdGcm9tVmFsdWUoQ1NTUHJvcGVydHlDdXJzb3IsIGltYWdlKSwgaW1hZ2UtPmhvdFNwb3QoKSk7 CiAgICAgICAgICAgICAgICAgfSBlbHNlIGlmICh0eXBlID09IENTU1ByaW1pdGl2ZVZhbHVlOjpD U1NfSURFTlQpCiAgICAgICAgICAgICAgICAgICAgIG1fc3R5bGUtPnNldEN1cnNvcigqcHJpbWl0 aXZlVmFsdWUpOwogICAgICAgICAgICAgfQpAQCAtNjc1Nyw2ICs2NzUzLDcgQEAgdm9pZCBDU1NT dHlsZVNlbGVjdG9yOjpsb2FkUGVuZGluZ0ltYWdlcygpCiAgICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQorCiAgICAgICAgICAgICBjYXNlIENT U1Byb3BlcnR5Q29udGVudDogewogICAgICAgICAgICAgICAgIGZvciAoQ29udGVudERhdGEqIGNv bnRlbnREYXRhID0gY29uc3RfY2FzdDxDb250ZW50RGF0YSo+KG1fc3R5bGUtPmNvbnRlbnREYXRh KCkpOyBjb250ZW50RGF0YTsgY29udGVudERhdGEgPSBjb250ZW50RGF0YS0+bmV4dCgpKSB7CiAg ICAgICAgICAgICAgICAgICAgIGlmIChjb250ZW50RGF0YS0+aXNJbWFnZSgpICYmIGNvbnRlbnRE YXRhLT5pbWFnZSgpLT5pc1BlbmRpbmdJbWFnZSgpKSB7CkBAIC02NzY2LDkgKzY3NjMsMTkgQEAg dm9pZCBDU1NTdHlsZVNlbGVjdG9yOjpsb2FkUGVuZGluZ0ltYWdlcygpCiAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQotICAgICAgICAgICAg Y2FzZSBDU1NQcm9wZXJ0eUN1cnNvcjoKLSAgICAgICAgICAgICAgICAvLyBDdXJzb3IgZG9lc24n dCB1c2UgU3R5bGVQZW5kaW5nSW1hZ2UgeWV0LgorCisgICAgICAgICAgICBjYXNlIENTU1Byb3Bl cnR5Q3Vyc29yOiB7CisgICAgICAgICAgICAgICAgaWYgKEN1cnNvckxpc3QqIGN1cnNvckxpc3Qg PSBtX3N0eWxlLT5jdXJzb3JzKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBjdXJzb3JMaXN0LT5zaXplKCk7ICsraSkgeworICAgICAgICAgICAgICAgICAg ICAgICAgQ3Vyc29yRGF0YSYgY3VycmVudEN1cnNvciA9ICgqY3Vyc29yTGlzdClbaV07CisgICAg ICAgICAgICAgICAgICAgICAgICBpZiAoY3VycmVudEN1cnNvci5pbWFnZSgpLT5pc1BlbmRpbmdJ bWFnZSgpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ1NTSW1hZ2VWYWx1ZSogaW1h Z2VWYWx1ZSA9IHN0YXRpY19jYXN0PFN0eWxlUGVuZGluZ0ltYWdlKj4oY3VycmVudEN1cnNvci5p bWFnZSgpKS0+Y3NzSW1hZ2VWYWx1ZSgpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGN1 cnJlbnRDdXJzb3Iuc2V0SW1hZ2UoaW1hZ2VWYWx1ZS0+Y2FjaGVkSW1hZ2UoZG9jTG9hZGVyKSk7 CisgICAgICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAg ICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CiAKICAg ICAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlMaXN0U3R5bGVJbWFnZTogewogICAgICAgICAgICAg ICAgIGlmIChtX3N0eWxlLT5saXN0U3R5bGVJbWFnZSgpICYmIG1fc3R5bGUtPmxpc3RTdHlsZUlt YWdlKCktPmlzUGVuZGluZ0ltYWdlKCkpIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9jYW52 YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcCBiL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xS ZW5kZXJpbmdDb250ZXh0LmNwcAppbmRleCBlODEyMDY4MmE2ZjY4NmZlZWFhYWFjMDllOWUwYmIz OGQ5ZWQ4MzkxLi5mZGQyMGFhMTdkNTQ1MTRjYzgyMWYwMDg1YWQ2YjZjNmFjMjVjMTQzIDEwMDY0 NAotLS0gYS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKKysr IGIvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCkBAIC0yOSw2 ICsyOSw3IEBACiAKICNpbmNsdWRlICJXZWJHTFJlbmRlcmluZ0NvbnRleHQuaCIKIAorI2luY2x1 ZGUgIkNhY2hlZEltYWdlLmgiCiAjaW5jbHVkZSAiQ2FudmFzUGl4ZWxBcnJheS5oIgogI2luY2x1 ZGUgIkNoZWNrZWRJbnQuaCIKICNpbmNsdWRlICJDb25zb2xlLmgiCmRpZmYgLS1naXQgYS9XZWJD b3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBiL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3Bw CmluZGV4IGQwYWRiNGU0N2ExNDI5ODgzNGMzNDNkZWViMjA5M2FjYjRkMTgxZWEuLjk1MGU4NTdl M2I3ODBlZTM3NjNmNjQwNzU3NGMwMjg3ZDY4YjJjNWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFn ZS9FdmVudEhhbmRsZXIuY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCkBA IC02Niw2ICs2Niw3IEBACiAjaW5jbHVkZSAiU2Nyb2xsYmFyLmgiCiAjaW5jbHVkZSAiU2VsZWN0 aW9uQ29udHJvbGxlci5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCisjaW5jbHVkZSAiU3R5bGVD YWNoZWRJbWFnZS5oIgogI2luY2x1ZGUgIlRleHRFdmVudC5oIgogI2luY2x1ZGUgIlRleHRJdGVy YXRvci5oIgogI2luY2x1ZGUgIlVzZXJHZXN0dXJlSW5kaWNhdG9yLmgiCkBAIC0xMDc2LDEwICsx MDc3LDEzIEBAIEN1cnNvciBFdmVudEhhbmRsZXI6OnNlbGVjdEN1cnNvcihjb25zdCBNb3VzZUV2 ZW50V2l0aEhpdFRlc3RSZXN1bHRzJiBldmVudCwgU2NyCiAgICAgaWYgKHN0eWxlICYmIHN0eWxl LT5jdXJzb3JzKCkpIHsKICAgICAgICAgY29uc3QgQ3Vyc29yTGlzdCogY3Vyc29ycyA9IHN0eWxl LT5jdXJzb3JzKCk7CiAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBjdXJzb3JzLT5z aXplKCk7ICsraSkgewotICAgICAgICAgICAgY29uc3QgQ2FjaGVkSW1hZ2UqIGNpbWFnZSA9ICgq Y3Vyc29ycylbaV0uaW1hZ2UoKTsKLSAgICAgICAgICAgIEludFBvaW50IGhvdFNwb3QgPSAoKmN1 cnNvcnMpW2ldLmhvdFNwb3QoKTsKKyAgICAgICAgICAgIGNvbnN0IENhY2hlZEltYWdlKiBjaW1h Z2UgPSAwOworICAgICAgICAgICAgU3R5bGVJbWFnZSogaW1hZ2UgPSAoKmN1cnNvcnMpW2ldLmlt YWdlKCk7CisgICAgICAgICAgICBpZiAoaW1hZ2UtPmlzQ2FjaGVkSW1hZ2UoKSkKKyAgICAgICAg ICAgICAgICBjaW1hZ2UgPSBzdGF0aWNfY2FzdDxTdHlsZUNhY2hlZEltYWdlKj4oaW1hZ2UpLT5j YWNoZWRJbWFnZSgpOwogICAgICAgICAgICAgaWYgKCFjaW1hZ2UpCiAgICAgICAgICAgICAgICAg Y29udGludWU7CisgICAgICAgICAgICBJbnRQb2ludCBob3RTcG90ID0gKCpjdXJzb3JzKVtpXS5o b3RTcG90KCk7CiAgICAgICAgICAgICAvLyBMaW1pdCB0aGUgc2l6ZSBvZiBjdXJzb3JzIHNvIHRo YXQgdGhleSBjYW5ub3QgYmUgdXNlZCB0byBjb3ZlciBVSSBlbGVtZW50cyBpbiBjaHJvbWUuCiAg ICAgICAgICAgICBJbnRTaXplIHNpemUgPSBjaW1hZ2UtPmltYWdlKCktPnNpemUoKTsKICAgICAg ICAgICAgIGlmIChzaXplLndpZHRoKCkgPiAxMjggfHwgc2l6ZS5oZWlnaHQoKSA+IDEyOCkKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0N1cnNvckRhdGEuaCBiL1dlYkNvcmUv cmVuZGVyaW5nL3N0eWxlL0N1cnNvckRhdGEuaAppbmRleCAyMzQxZTcxOTAxZDBlNTBhYmYzMzUy OTBlMTAxMjlkNGZhMDhjMDc4Li43NTA0ZmRkZjZmYTA0NjgxZDg5YWYzMmVhNTMwMDE1NzUwM2Jj MDUxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9DdXJzb3JEYXRhLmgKKysr IGIvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQ3Vyc29yRGF0YS5oCkBAIC0yNSwxNSArMjUsMTQg QEAKICNpZm5kZWYgQ3Vyc29yRGF0YV9oCiAjZGVmaW5lIEN1cnNvckRhdGFfaAogCi0jaW5jbHVk ZSAiQ2FjaGVkSW1hZ2UuaCIKLSNpbmNsdWRlICJDYWNoZWRSZXNvdXJjZUhhbmRsZS5oIgogI2lu Y2x1ZGUgIkludFBvaW50LmgiCisjaW5jbHVkZSAiU3R5bGVJbWFnZS5oIgogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIGNsYXNzIEN1cnNvckRhdGEgewogcHVibGljOgotICAgIEN1cnNvckRhdGEo Q2FjaGVkSW1hZ2UqIGltYWdlLCBjb25zdCBJbnRQb2ludCYgaG90U3BvdCkKKyAgICBDdXJzb3JE YXRhKFN0eWxlSW1hZ2UqIGltYWdlLCBjb25zdCBJbnRQb2ludCYgaG90U3BvdCkKICAgICAgICAg OiBtX2ltYWdlKGltYWdlKQogICAgICAgICAsIG1faG90U3BvdChob3RTcG90KQogICAgIHsKQEAg LTQ5LDExICs0OCwxMyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiAhKCp0aGlzID09IG8pOwog ICAgIH0KIAotICAgIGNvbnN0IENhY2hlZEltYWdlKiBpbWFnZSgpIGNvbnN0IHsgcmV0dXJuIG1f aW1hZ2UuZ2V0KCk7IH0gICAgCisgICAgU3R5bGVJbWFnZSogaW1hZ2UoKSBjb25zdCB7IHJldHVy biBtX2ltYWdlLmdldCgpOyB9ICAgIAorICAgIHZvaWQgc2V0SW1hZ2UoU3R5bGVJbWFnZSogaW1h Z2UpIHsgbV9pbWFnZSA9IGltYWdlOyB9ICAgIAorCiAgICAgY29uc3QgSW50UG9pbnQmIGhvdFNw b3QoKSBjb25zdCB7IHJldHVybiBtX2hvdFNwb3Q7IH0KICAgICAKIHByaXZhdGU6Ci0gICAgQ2Fj aGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkSW1hZ2U+IG1faW1hZ2U7CisgICAgUmVmUHRyPFN0eWxl SW1hZ2U+IG1faW1hZ2U7CiAgICAgSW50UG9pbnQgbV9ob3RTcG90OyAvLyBmb3IgQ1NTMyBzdXBw b3J0CiB9OwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9DdXJzb3JMaXN0 LmggYi9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9DdXJzb3JMaXN0LmgKaW5kZXggYmRkNjVkNDFj YzAwYjlmNDY5MmQxZjA0OTUwYjE0NmM4YTU2Y2ZiNS4uMWI4MjY4NGMzN2YwMzJmNjBkZDMyMjk1 N2M0NzVlMmEzMTE1YjJkZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQ3Vy c29yTGlzdC5oCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0N1cnNvckxpc3QuaApAQCAt MzksNiArMzksNyBAQCBwdWJsaWM6CiAgICAgfQogCiAgICAgY29uc3QgQ3Vyc29yRGF0YSYgb3Bl cmF0b3JbXShpbnQgaSkgY29uc3QgeyByZXR1cm4gbV92ZWN0b3JbaV07IH0KKyAgICBDdXJzb3JE YXRhJiBvcGVyYXRvcltdKGludCBpKSB7IHJldHVybiBtX3ZlY3RvcltpXTsgfQogCiAgICAgYm9v bCBvcGVyYXRvcj09KGNvbnN0IEN1cnNvckxpc3QmIG8pIGNvbnN0IHsgcmV0dXJuIG1fdmVjdG9y ID09IG8ubV92ZWN0b3I7IH0KICAgICBib29sIG9wZXJhdG9yIT0oY29uc3QgQ3Vyc29yTGlzdCYg bykgY29uc3QgeyByZXR1cm4gbV92ZWN0b3IgIT0gby5tX3ZlY3RvcjsgfQpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwIGIvV2ViQ29yZS9yZW5kZXJp bmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCmluZGV4IDZjOTI1YjIyMDhiYjFkODQ2NDg3OTg5ODI5 ZmEzY2VkODhhNGYzYTUuLjFlNDY3ZGJjNjIyZGE1ODBiMjAyNTVjNzJmMGI0YmQwYjhjMjMzOGUg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAorKysg Yi9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKQEAgLTI0LDcgKzI0LDYg QEAKIAogI2luY2x1ZGUgIkNTU1Byb3BlcnR5TmFtZXMuaCIKICNpbmNsdWRlICJDU1NTdHlsZVNl bGVjdG9yLmgiCi0jaW5jbHVkZSAiQ2FjaGVkSW1hZ2UuaCIKICNpbmNsdWRlICJDb3VudGVyQ29u dGVudC5oIgogI2luY2x1ZGUgIkZvbnRTZWxlY3Rvci5oIgogI2luY2x1ZGUgIlJlbmRlckFyZW5h LmgiCkBAIC01NTEsNyArNTUwLDcgQEAgdm9pZCBSZW5kZXJTdHlsZTo6c2V0Q2xpcChMZW5ndGgg dG9wLCBMZW5ndGggcmlnaHQsIExlbmd0aCBib3R0b20sIExlbmd0aCBsZWZ0KQogICAgIGRhdGEt PmNsaXAubV9sZWZ0ID0gbGVmdDsKIH0KIAotdm9pZCBSZW5kZXJTdHlsZTo6YWRkQ3Vyc29yKENh Y2hlZEltYWdlKiBpbWFnZSwgY29uc3QgSW50UG9pbnQmIGhvdFNwb3QpCit2b2lkIFJlbmRlclN0 eWxlOjphZGRDdXJzb3IoU3R5bGVJbWFnZSogaW1hZ2UsIGNvbnN0IEludFBvaW50JiBob3RTcG90 KQogewogICAgIGlmICghcmFyZUluaGVyaXRlZERhdGEuYWNjZXNzKCktPmN1cnNvckRhdGEpCiAg ICAgICAgIHJhcmVJbmhlcml0ZWREYXRhLmFjY2VzcygpLT5jdXJzb3JEYXRhID0gQ3Vyc29yTGlz dDo6Y3JlYXRlKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZS5oIGIvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAppbmRleCAyMzYz YTllMGU4ZTQ0ZmVmMGY4ZDkyZjUxOTBkZjE3OTU0MzJiZjM4Li4yNWFmMjI2MmQyM2M3NzE0OGMz YzIyMmZkZGE2MDdkYWZjMTEzYjM2IDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5oCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxl LmgKQEAgLTM1LDcgKzM1LDYgQEAKICNpbmNsdWRlICJDU1NQcm9wZXJ0eU5hbWVzLmgiCiAjaW5j bHVkZSAiQ1NTUmVmbGVjdGlvbkRpcmVjdGlvbi5oIgogI2luY2x1ZGUgIkNTU1ZhbHVlTGlzdC5o IgotI2luY2x1ZGUgIkNhY2hlZEltYWdlLmgiCiAjaW5jbHVkZSAiQ29sbGFwc2VkQm9yZGVyVmFs dWUuaCIKICNpbmNsdWRlICJDb2xvci5oIgogI2luY2x1ZGUgIkNvbG9yU3BhY2UuaCIKQEAgLTEw Myw3ICsxMDIsNiBAQCB1c2luZyBzdGQ6Om1heDsKIAogY2xhc3MgQ1NTU3R5bGVTZWxlY3RvcjsK IGNsYXNzIENTU1ZhbHVlTGlzdDsKLWNsYXNzIENhY2hlZEltYWdlOwogY2xhc3MgUGFpcjsKIGNs YXNzIFN0eWxlSW1hZ2U7CiAKQEAgLTkxMSw3ICs5MDksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBz ZXRQYWRkaW5nUmlnaHQoTGVuZ3RoIHYpIHsgU0VUX1ZBUihzdXJyb3VuZCwgcGFkZGluZy5tX3Jp Z2h0LCB2KSB9CiAKICAgICB2b2lkIHNldEN1cnNvcihFQ3Vyc29yIGMpIHsgaW5oZXJpdGVkX2Zs YWdzLl9jdXJzb3Jfc3R5bGUgPSBjOyB9Ci0gICAgdm9pZCBhZGRDdXJzb3IoQ2FjaGVkSW1hZ2Uq LCBjb25zdCBJbnRQb2ludCYgPSBJbnRQb2ludCgpKTsKKyAgICB2b2lkIGFkZEN1cnNvcihTdHls ZUltYWdlKiwgY29uc3QgSW50UG9pbnQmID0gSW50UG9pbnQoKSk7CiAgICAgdm9pZCBzZXRDdXJz b3JMaXN0KFBhc3NSZWZQdHI8Q3Vyc29yTGlzdD4pOwogICAgIHZvaWQgY2xlYXJDdXJzb3JMaXN0 KCk7CiAK