63848 2011-07-01 14:29:19 -0700 Consider backing scale when setting up graphics layers 2011-07-01 16:13:32 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 darin darin oldest_to_newest 431450 0 darin 2011-07-01 14:29:19 -0700 Consider backing scale factor when setting up graphics layers 431453 1 99524 darin 2011-07-01 14:34:12 -0700 Created attachment 99524 Patch 431454 2 darin 2011-07-01 14:34:53 -0700 <rdar://problem/8669917> 431461 3 99524 simon.fraser 2011-07-01 14:42:08 -0700 Comment on attachment 99524 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=99524&action=review > Source/WebCore/rendering/RenderLayerBacking.cpp:111 > + ASSERT(renderer()); > + ASSERT(renderer()->document()); > + ASSERT(renderer()->document()->frame()); Should these be moved to pageContentsScale()? > Source/WebCore/rendering/RenderLayerBacking.h:195 > + float pageContentsScale() const; Why not just call this pageScaleFactor() to avoid introducing another term? 431472 4 99524 darin 2011-07-01 14:55:28 -0700 Comment on attachment 99524 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=99524&action=review >> Source/WebCore/rendering/RenderLayerBacking.cpp:111 >> + ASSERT(renderer()->document()->frame()); > > Should these be moved to pageContentsScale()? Probably not. At other call sites it may be OK for some of these things to be null. >> Source/WebCore/rendering/RenderLayerBacking.h:195 >> + float pageContentsScale() const; > > Why not just call this pageScaleFactor() to avoid introducing another term? Will do. 431506 5 99534 darin 2011-07-01 16:09:19 -0700 Created attachment 99534 Patch 431508 6 darin 2011-07-01 16:13:32 -0700 Committed r90293: <http://trac.webkit.org/changeset/90293> 99524 2011-07-01 14:34:12 -0700 2011-07-01 16:09:16 -0700 Patch bug-63848-20110701143412.patch text/plain 8979 darin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkwMjc3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDctMDEgIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIENvbnNpZGVyIGJhY2tpbmcgc2NhbGUg d2hlbiBzZXR0aW5nIHVwIGdyYXBoaWNzIGxheWVycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM4NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5 ZXJDQS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0E6OmNsYW1wZWRDb250 ZW50c1NjYWxlRm9yU2NhbGUpOgorICAgICAgICBJbmNyZWFzZWQgdGhlIG1heGltdW0gc2NhbGUg c2luY2Ugc2NhbGUgZmFjdG9yIGNhbiBub3cgaW5jbHVkZQorICAgICAgICBib3RoIHBhZ2UgY29u dGVudHMgc2NhbGUgYW5kIGJhY2tpbmcgc2NhbGUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2lu Zzo6Y3JlYXRlR3JhcGhpY3NMYXllcik6IE11bHRpcGx5IGluIHRoZQorICAgICAgICBiYWNraW5n IHNjYWxlIGFzIHdlbGwgYXMgdGhlIHBhZ2UgY29udGVudHMgc2NhbGUuCisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUZvcmVncm91bmRMYXllcik6IERpdHRvLgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVNYXNrTGF5ZXIpOiBE aXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6cGFnZUNvbnRlbnRz U2NhbGUpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6YmFj a2luZ1NjYWxlKTogQWRkZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5oOiBBZGRlZCBuZXcgcHJpdmF0ZSBmdW5jdGlvbnMuCisKIDIwMTEtMDctMDEgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2phbiBWYWZh aS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5 ZXJDQS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2EvR3JhcGhpY3NMYXllckNBLmNwcAkocmV2aXNpb24gOTAyNTcpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xOTUxLDcgKzE5NTEsNyBAQCBmbG9hdCBHcmFwaGljc0xheWVyQ0E6OmNsYW1wZWRDb250 ZW50c1NjCiB7CiAgICAgLy8gRGVmaW5lIHNvbWUgbGltaXRzIGFzIGEgc2FuaXR5IGNoZWNrIGZv ciB0aGUgaW5jb21pbmcgc2NhbGUgdmFsdWUKICAgICAvLyB0aG9zZSB0b28gc21hbGwgdG8gc2Vl LgotICAgIGNvbnN0IGZsb2F0IG1heFNjYWxlID0gNS4wZjsKKyAgICBjb25zdCBmbG9hdCBtYXhT Y2FsZSA9IDEwLjBmOwogICAgIGNvbnN0IGZsb2F0IG1pblNjYWxlID0gMC4wMWY7CiAgICAgCiAg ICAgLy8gQXZvaWQgdmVyeSBzbGlnaHQgc2NhbGUgY2hhbmdlcyB0aGF0IHdvdWxkIGJlIGRvaW5n IGV4dHJhIHdvcmsgZm9yIG5vIGJlbmVmaXQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCShyZXZpc2lvbiA5MDI1NykKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwOSBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDksIDIwMTAsIDIwMTEgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCkBAIC0zMSwxNCArMzEsMTMgQEAKIAogI2luY2x1ZGUgIkFuaW1hdGlvbkNvbnRyb2xsZXIu aCIKICNpbmNsdWRlICJDYW52YXNSZW5kZXJpbmdDb250ZXh0LmgiCi0jaW5jbHVkZSAiQ2FudmFz UmVuZGVyaW5nQ29udGV4dDJELmgiCiAjaW5jbHVkZSAiQ1NTUHJvcGVydHlOYW1lcy5oIgogI2lu Y2x1ZGUgIkNTU1N0eWxlU2VsZWN0b3IuaCIKKyNpbmNsdWRlICJDaHJvbWUuaCIKICNpbmNsdWRl ICJGcmFtZVZpZXcuaCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJH cmFwaGljc0xheWVyLmgiCiAjaW5jbHVkZSAiSFRNTENhbnZhc0VsZW1lbnQuaCIKLSNpbmNsdWRl ICJIVE1MRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxJRnJhbWVFbGVtZW50LmgiCiAjaW5jbHVk ZSAiSFRNTE1lZGlhRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgpAQCAtNDYsMTQg KzQ1LDEyIEBACiAjaW5jbHVkZSAiS2V5ZnJhbWVMaXN0LmgiCiAjaW5jbHVkZSAiUGx1Z2luVmll d0Jhc2UuaCIKICNpbmNsdWRlICJSZW5kZXJBcHBsZXQuaCIKLSNpbmNsdWRlICJSZW5kZXJCb3gu aCIKICNpbmNsdWRlICJSZW5kZXJJRnJhbWUuaCIKICNpbmNsdWRlICJSZW5kZXJJbWFnZS5oIgog I2luY2x1ZGUgIlJlbmRlckxheWVyQ29tcG9zaXRvci5oIgogI2luY2x1ZGUgIlJlbmRlckVtYmVk ZGVkT2JqZWN0LmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlkZW8uaCIKICNpbmNsdWRlICJSZW5kZXJW aWV3LmgiCi0jaW5jbHVkZSAiU2V0dGluZ3MuaCIKIAogI2lmIEVOQUJMRShXRUJHTCkgfHwgRU5B QkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQzRC5o IgpAQCAtMTA2LDEyICsxMDMsMTMgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OmNyZWF0ZUdy YXBoaWNzTAogICAgIAogI2lmbmRlZiBOREVCVUcKICAgICBtX2dyYXBoaWNzTGF5ZXItPnNldE5h bWUobmFtZUZvckxheWVyKCkpOwotI2VuZGlmICAvLyBOREVCVUcKKyNlbmRpZgogCiAjaWYgVVNF KEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgIEFTU0VSVChyZW5kZXJlcigpICYmIHJlbmRl cmVyKCktPmRvY3VtZW50KCkgJiYgcmVuZGVyZXIoKS0+ZG9jdW1lbnQoKS0+ZnJhbWUoKSk7Ci0g ICAgaWYgKEZyYW1lKiBmcmFtZSA9IHJlbmRlcmVyKCktPmRvY3VtZW50KCktPmZyYW1lKCkpCi0g ICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0Q29udGVudHNTY2FsZShmcmFtZS0+cGFnZVNjYWxl RmFjdG9yKCkpOworICAgIEFTU0VSVChyZW5kZXJlcigpKTsKKyAgICBBU1NFUlQocmVuZGVyZXIo KS0+ZG9jdW1lbnQoKSk7CisgICAgQVNTRVJUKHJlbmRlcmVyKCktPmRvY3VtZW50KCktPmZyYW1l KCkpOworICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0Q29udGVudHNTY2FsZShwYWdlQ29udGVudHNT Y2FsZSgpICogYmFja2luZ1NjYWxlKCkpOwogI2VuZGlmCiAKICAgICB1cGRhdGVMYXllck9wYWNp dHkocmVuZGVyZXIoKS0+c3R5bGUoKSk7CkBAIC02MTAsNyArNjA4LDcgQEAgYm9vbCBSZW5kZXJM YXllckJhY2tpbmc6OnVwZGF0ZU92ZXJmbG93QwogICAgICAgICBpZiAoIW1fbGF5ZXJGb3JIb3Jp em9udGFsU2Nyb2xsYmFyKSB7CiAgICAgICAgICAgICBtX2xheWVyRm9ySG9yaXpvbnRhbFNjcm9s bGJhciA9IEdyYXBoaWNzTGF5ZXI6OmNyZWF0ZSh0aGlzKTsKICNpZm5kZWYgTkRFQlVHCi0gICAg ICAgICAgICBtX2xheWVyRm9ySG9yaXpvbnRhbFNjcm9sbGJhciAtPnNldE5hbWUoImhvcml6b250 YWwgc2Nyb2xsYmFyIik7CisgICAgICAgICAgICBtX2xheWVyRm9ySG9yaXpvbnRhbFNjcm9sbGJh ci0+c2V0TmFtZSgiaG9yaXpvbnRhbCBzY3JvbGxiYXIiKTsKICNlbmRpZgogICAgICAgICAgICAg bGF5ZXJzQ2hhbmdlZCA9IHRydWU7CiAgICAgICAgIH0KQEAgLTY1OSw4ICs2NTcsNyBAQCBib29s IFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlRm9yZWdyb3VuCiAjZW5kaWYKICAgICAgICAgICAg IG1fZm9yZWdyb3VuZExheWVyLT5zZXREcmF3c0NvbnRlbnQodHJ1ZSk7CiAgICAgICAgICAgICBt X2ZvcmVncm91bmRMYXllci0+c2V0UGFpbnRpbmdQaGFzZShHcmFwaGljc0xheWVyUGFpbnRGb3Jl Z3JvdW5kKTsKLSAgICAgICAgICAgIGlmIChGcmFtZSogZnJhbWUgPSByZW5kZXJlcigpLT5kb2N1 bWVudCgpLT5mcmFtZSgpKQotICAgICAgICAgICAgICAgIG1fZm9yZWdyb3VuZExheWVyLT5zZXRD b250ZW50c1NjYWxlKGZyYW1lLT5wYWdlU2NhbGVGYWN0b3IoKSk7CisgICAgICAgICAgICBtX2Zv cmVncm91bmRMYXllci0+c2V0Q29udGVudHNTY2FsZShwYWdlQ29udGVudHNTY2FsZSgpICogYmFj a2luZ1NjYWxlKCkpOwogICAgICAgICAgICAgbGF5ZXJDaGFuZ2VkID0gdHJ1ZTsKICAgICAgICAg fQogICAgIH0gZWxzZSBpZiAobV9mb3JlZ3JvdW5kTGF5ZXIpIHsKQEAgLTY4Niw4ICs2ODMsNyBA QCBib29sIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlTWFza0xheWVyCiAjZW5kaWYKICAgICAg ICAgICAgIG1fbWFza0xheWVyLT5zZXREcmF3c0NvbnRlbnQodHJ1ZSk7CiAgICAgICAgICAgICBt X21hc2tMYXllci0+c2V0UGFpbnRpbmdQaGFzZShHcmFwaGljc0xheWVyUGFpbnRNYXNrKTsKLSAg ICAgICAgICAgIGlmIChGcmFtZSogZnJhbWUgPSByZW5kZXJlcigpLT5kb2N1bWVudCgpLT5mcmFt ZSgpKQotICAgICAgICAgICAgICAgIG1fbWFza0xheWVyLT5zZXRDb250ZW50c1NjYWxlKGZyYW1l LT5wYWdlU2NhbGVGYWN0b3IoKSk7CisgICAgICAgICAgICBtX21hc2tMYXllci0+c2V0Q29udGVu dHNTY2FsZShwYWdlQ29udGVudHNTY2FsZSgpICogYmFja2luZ1NjYWxlKCkpOwogICAgICAgICAg ICAgbGF5ZXJDaGFuZ2VkID0gdHJ1ZTsKICAgICAgICAgfQogICAgIH0gZWxzZSBpZiAobV9tYXNr TGF5ZXIpIHsKQEAgLTE0OTEsNiArMTQ4NywyNSBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6 dXBkYXRlQ29udGVudHNTCiAgICAgICAgIG1fbWFza0xheWVyLT5zZXRDb250ZW50c1NjYWxlKHNj YWxlKTsKIH0KIAorZmxvYXQgUmVuZGVyTGF5ZXJCYWNraW5nOjpwYWdlQ29udGVudHNTY2FsZSgp IGNvbnN0Cit7CisgICAgRnJhbWUqIGZyYW1lID0gcmVuZGVyZXIoKS0+ZG9jdW1lbnQoKS0+ZnJh bWUoKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm4gMTsKKyAgICByZXR1cm4gZnJh bWUtPnBhZ2VTY2FsZUZhY3RvcigpOworfQorCitmbG9hdCBSZW5kZXJMYXllckJhY2tpbmc6OmJh Y2tpbmdTY2FsZSgpIGNvbnN0Cit7CisgICAgRnJhbWUqIGZyYW1lID0gcmVuZGVyZXIoKS0+ZG9j dW1lbnQoKS0+ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm4gMTsKKyAg ICBQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2UoKTsKKyAgICBpZiAoIXBhZ2UpCisgICAgICAgIHJl dHVybiAxOworICAgIHJldHVybiBwYWdlLT5jaHJvbWUoKS0+c2NhbGVGYWN0b3IoKTsKK30KKwog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gVVNFKEFDQ0VMRVJBVEVEX0NPTVBP U0lUSU5HKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuaAkocmV2aXNpb24gOTAyNTcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJCYWNraW5nLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICog Q29weXJpZ2h0IChDKSAyMDA5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENv cHlyaWdodCAoQykgMjAwOSwgMjAxMCwgMjAxMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTE5MiwxMSArMTkyLDEzIEBA IHByaXZhdGU6CiAgICAgc3RhdGljIGludCBncmFwaGljc0xheWVyVG9DU1NQcm9wZXJ0eShBbmlt YXRlZFByb3BlcnR5SUQpOwogICAgIHN0YXRpYyBBbmltYXRlZFByb3BlcnR5SUQgY3NzVG9HcmFw aGljc0xheWVyUHJvcGVydHkoaW50KTsKIAorICAgIGZsb2F0IHBhZ2VDb250ZW50c1NjYWxlKCkg Y29uc3Q7CisgICAgZmxvYXQgYmFja2luZ1NjYWxlKCkgY29uc3Q7CisKICNpZm5kZWYgTkRFQlVH CiAgICAgU3RyaW5nIG5hbWVGb3JMYXllcigpIGNvbnN0OwogI2VuZGlmCiAKLXByaXZhdGU6CiAg ICAgUmVuZGVyTGF5ZXIqIG1fb3duaW5nTGF5ZXI7CiAKICAgICBPd25QdHI8R3JhcGhpY3NMYXll cj4gbV9hbmNlc3RvckNsaXBwaW5nTGF5ZXI7IC8vIG9ubHkgdXNlZCBpZiB3ZSBhcmUgY2xpcHBl ZCBieSBhbiBhbmNlc3RvciB3aGljaCBpcyBub3QgYSBzdGFja2luZyBjb250ZXh0CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCShyZXZpc2lvbiA5MDI3NykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDExLTA3LTAxICBEYXJpbiBBZGxlciAgPGRh cmluQGFwcGxlLmNvbT4KKworICAgICAgICBDb25zaWRlciBiYWNraW5nIHNjYWxlIGZhY3RvciB3 aGVuIHNldHRpbmcgdXAgZ3JhcGhpY3MgbGF5ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Mzg0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2NhL0xheWVyVHJlZUhv c3RDQS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RDQTo6aW5pdGlhbGl6ZSk6 IFNldCBjb250ZW50cyBzY2FsZSBvbiB0aGUKKyAgICAgICAgbm9uLWNvbXBvc2l0ZWQgY29udGVu dCBsYXllciBiYXNlZCBvbiB0aGUgYmFja2luZyBzY2FsZSBmYWN0b3IuCisgICAgICAgIChXZWJL aXQ6OkxheWVyVHJlZUhvc3RDQTo6Y3JlYXRlUGFnZU92ZXJsYXlMYXllcik6IFNldCBjb250ZW50 cworICAgICAgICBzY2FsZSBvbiB0aGUgcGFnZSBvdmVybGF5IGxheWVyIGJhc2VkIG9uIHRoZSBi YWNraW5nIHNjYWxlIGZhY3Rvci4KKwogMjAxMS0wNi0zMCAgQnJpYW4gV2VpbnN0ZWluICA8Yndl aW5zdGVpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvY2EvTGF5ZXJUcmVlSG9zdENB LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvY2Ev TGF5ZXJUcmVlSG9zdENBLmNwcAkocmV2aXNpb24gOTAyNTcpCisrKyBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvY2EvTGF5ZXJUcmVlSG9zdENBLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNjcsNiArNjcsNyBAQCB2b2lkIExheWVyVHJlZUhvc3RDQTo6aW5pdGlhbGl6ZSgpCiAgICAg bV9ub25Db21wb3NpdGVkQ29udGVudExheWVyLT5zZXREcmF3c0NvbnRlbnQodHJ1ZSk7CiAgICAg bV9ub25Db21wb3NpdGVkQ29udGVudExheWVyLT5zZXRDb250ZW50c09wYXF1ZShtX3dlYlBhZ2Ut PmRyYXdzQmFja2dyb3VuZCgpICYmICFtX3dlYlBhZ2UtPmRyYXdzVHJhbnNwYXJlbnRCYWNrZ3Jv dW5kKCkpOwogICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci0+c2V0U2l6ZShtX3dlYlBh Z2UtPnNpemUoKSk7CisgICAgbV9ub25Db21wb3NpdGVkQ29udGVudExheWVyLT5zZXRDb250ZW50 c1NjYWxlKG1fd2ViUGFnZS0+dXNlclNwYWNlU2NhbGVGYWN0b3IoKSk7CiAgICAgaWYgKG1fd2Vi UGFnZS0+Y29yZVBhZ2UoKS0+c2V0dGluZ3MoKS0+YWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZCgp KQogICAgICAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXItPnNldEFjY2VsZXJhdGVzRHJh d2luZyh0cnVlKTsKIApAQCAtMjUyLDYgKzI1Myw3IEBAIHZvaWQgTGF5ZXJUcmVlSG9zdENBOjpj cmVhdGVQYWdlT3ZlcmxheUwKIAogICAgIG1fcGFnZU92ZXJsYXlMYXllci0+c2V0RHJhd3NDb250 ZW50KHRydWUpOwogICAgIG1fcGFnZU92ZXJsYXlMYXllci0+c2V0U2l6ZShtX3dlYlBhZ2UtPnNp emUoKSk7CisgICAgbV9wYWdlT3ZlcmxheUxheWVyLT5zZXRDb250ZW50c1NjYWxlKG1fd2ViUGFn ZS0+dXNlclNwYWNlU2NhbGVGYWN0b3IoKSk7CiAKICAgICBtX3Jvb3RMYXllci0+YWRkQ2hpbGQo bV9wYWdlT3ZlcmxheUxheWVyLmdldCgpKTsKIH0K 99534 2011-07-01 16:09:19 -0700 2011-07-01 16:09:48 -0700 Patch bug-63848-20110701160919.patch text/plain 9465 darin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkwMjg5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDctMDEgIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIENvbnNpZGVyIGJhY2tpbmcgc2NhbGUg d2hlbiBzZXR0aW5nIHVwIGdyYXBoaWNzIGxheWVycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM4NDgKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1v biBGcmFzZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVy Q0EuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNBOjpjbGFtcGVkQ29udGVu dHNTY2FsZUZvclNjYWxlKToKKyAgICAgICAgSW5jcmVhc2VkIHRoZSBtYXhpbXVtIHNjYWxlIHNp bmNlIHNjYWxlIGZhY3RvciBjYW4gbm93IGluY2x1ZGUKKyAgICAgICAgYm90aCBwYWdlIGNvbnRl bnRzIHNjYWxlIGFuZCBiYWNraW5nIHNjYWxlLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6 OmNyZWF0ZUdyYXBoaWNzTGF5ZXIpOiBNdWx0aXBseSBpbiB0aGUKKyAgICAgICAgYmFja2luZyBz Y2FsZSBhcyB3ZWxsIGFzIHRoZSBwYWdlIGNvbnRlbnRzIHNjYWxlLgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVGb3JlZ3JvdW5kTGF5ZXIpOiBEaXR0by4KKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlTWFza0xheWVyKTogRGl0 dG8uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnBhZ2VDb250ZW50c1Nj YWxlKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OmJhY2tp bmdTY2FsZSk6IEFkZGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcu aDogQWRkZWQgbmV3IHByaXZhdGUgZnVuY3Rpb25zLgorCiAyMDExLTA3LTAxICBMZXZpIFdlaW50 cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KIAogICAgICAgICBTd2l0Y2ggb3ZlcmZsb3cgYW5k IGNvbGxhcHNlZE1hcmdpbnMgdG8gbmV3IGxheW91dCB0eXBlcwpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3Bw CShyZXZpc2lvbiA5MDI4OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nh L0dyYXBoaWNzTGF5ZXJDQS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5NTEsNyArMTk1MSw3IEBA IGZsb2F0IEdyYXBoaWNzTGF5ZXJDQTo6Y2xhbXBlZENvbnRlbnRzU2MKIHsKICAgICAvLyBEZWZp bmUgc29tZSBsaW1pdHMgYXMgYSBzYW5pdHkgY2hlY2sgZm9yIHRoZSBpbmNvbWluZyBzY2FsZSB2 YWx1ZQogICAgIC8vIHRob3NlIHRvbyBzbWFsbCB0byBzZWUuCi0gICAgY29uc3QgZmxvYXQgbWF4 U2NhbGUgPSA1LjBmOworICAgIGNvbnN0IGZsb2F0IG1heFNjYWxlID0gMTAuMGY7CiAgICAgY29u c3QgZmxvYXQgbWluU2NhbGUgPSAwLjAxZjsKICAgICAKICAgICAvLyBBdm9pZCB2ZXJ5IHNsaWdo dCBzY2FsZSBjaGFuZ2VzIHRoYXQgd291bGQgYmUgZG9pbmcgZXh0cmEgd29yayBmb3Igbm8gYmVu ZWZpdApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFj a2luZy5jcHAJKHJldmlzaW9uIDkwMjg5KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQmFja2luZy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgot ICogQ29weXJpZ2h0IChDKSAyMDA5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq IENvcHlyaWdodCAoQykgMjAwOSwgMjAxMCwgMjAxMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTMxLDE0ICszMSwxMyBA QAogCiAjaW5jbHVkZSAiQW5pbWF0aW9uQ29udHJvbGxlci5oIgogI2luY2x1ZGUgIkNhbnZhc1Jl bmRlcmluZ0NvbnRleHQuaCIKLSNpbmNsdWRlICJDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuaCIK ICNpbmNsdWRlICJDU1NQcm9wZXJ0eU5hbWVzLmgiCiAjaW5jbHVkZSAiQ1NTU3R5bGVTZWxlY3Rv ci5oIgorI2luY2x1ZGUgIkNocm9tZS5oIgogI2luY2x1ZGUgIkZyYW1lVmlldy5oIgogI2luY2x1 ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIkdyYXBoaWNzTGF5ZXIuaCIKICNpbmNs dWRlICJIVE1MQ2FudmFzRWxlbWVudC5oIgotI2luY2x1ZGUgIkhUTUxFbGVtZW50LmgiCiAjaW5j bHVkZSAiSFRNTElGcmFtZUVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MTWVkaWFFbGVtZW50Lmgi CiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCkBAIC00NiwxNCArNDUsMTIgQEAKICNpbmNsdWRlICJL ZXlmcmFtZUxpc3QuaCIKICNpbmNsdWRlICJQbHVnaW5WaWV3QmFzZS5oIgogI2luY2x1ZGUgIlJl bmRlckFwcGxldC5oIgotI2luY2x1ZGUgIlJlbmRlckJveC5oIgogI2luY2x1ZGUgIlJlbmRlcklG cmFtZS5oIgogI2luY2x1ZGUgIlJlbmRlckltYWdlLmgiCiAjaW5jbHVkZSAiUmVuZGVyTGF5ZXJD b21wb3NpdG9yLmgiCiAjaW5jbHVkZSAiUmVuZGVyRW1iZWRkZWRPYmplY3QuaCIKICNpbmNsdWRl ICJSZW5kZXJWaWRlby5oIgogI2luY2x1ZGUgIlJlbmRlclZpZXcuaCIKLSNpbmNsdWRlICJTZXR0 aW5ncy5oIgogCiAjaWYgRU5BQkxFKFdFQkdMKSB8fCBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FO VkFTKQogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNELmgiCkBAIC0xMDYsMTIgKzEwMywxMyBA QCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6Y3JlYXRlR3JhcGhpY3NMCiAgICAgCiAjaWZuZGVm IE5ERUJVRwogICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0TmFtZShuYW1lRm9yTGF5ZXIoKSk7Ci0j ZW5kaWYgIC8vIE5ERUJVRworI2VuZGlmCiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcpCi0gICAgQVNTRVJUKHJlbmRlcmVyKCkgJiYgcmVuZGVyZXIoKS0+ZG9jdW1lbnQoKSAmJiBy ZW5kZXJlcigpLT5kb2N1bWVudCgpLT5mcmFtZSgpKTsKLSAgICBpZiAoRnJhbWUqIGZyYW1lID0g cmVuZGVyZXIoKS0+ZG9jdW1lbnQoKS0+ZnJhbWUoKSkKLSAgICAgICAgbV9ncmFwaGljc0xheWVy LT5zZXRDb250ZW50c1NjYWxlKGZyYW1lLT5wYWdlU2NhbGVGYWN0b3IoKSk7CisgICAgQVNTRVJU KHJlbmRlcmVyKCkpOworICAgIEFTU0VSVChyZW5kZXJlcigpLT5kb2N1bWVudCgpKTsKKyAgICBB U1NFUlQocmVuZGVyZXIoKS0+ZG9jdW1lbnQoKS0+ZnJhbWUoKSk7CisgICAgbV9ncmFwaGljc0xh eWVyLT5zZXRDb250ZW50c1NjYWxlKHBhZ2VTY2FsZUZhY3RvcigpICogYmFja2luZ1NjYWxlRmFj dG9yKCkpOwogI2VuZGlmCiAKICAgICB1cGRhdGVMYXllck9wYWNpdHkocmVuZGVyZXIoKS0+c3R5 bGUoKSk7CkBAIC02MTAsNyArNjA4LDcgQEAgYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0 ZU92ZXJmbG93QwogICAgICAgICBpZiAoIW1fbGF5ZXJGb3JIb3Jpem9udGFsU2Nyb2xsYmFyKSB7 CiAgICAgICAgICAgICBtX2xheWVyRm9ySG9yaXpvbnRhbFNjcm9sbGJhciA9IEdyYXBoaWNzTGF5 ZXI6OmNyZWF0ZSh0aGlzKTsKICNpZm5kZWYgTkRFQlVHCi0gICAgICAgICAgICBtX2xheWVyRm9y SG9yaXpvbnRhbFNjcm9sbGJhciAtPnNldE5hbWUoImhvcml6b250YWwgc2Nyb2xsYmFyIik7Cisg ICAgICAgICAgICBtX2xheWVyRm9ySG9yaXpvbnRhbFNjcm9sbGJhci0+c2V0TmFtZSgiaG9yaXpv bnRhbCBzY3JvbGxiYXIiKTsKICNlbmRpZgogICAgICAgICAgICAgbGF5ZXJzQ2hhbmdlZCA9IHRy dWU7CiAgICAgICAgIH0KQEAgLTY1OSw4ICs2NTcsNyBAQCBib29sIFJlbmRlckxheWVyQmFja2lu Zzo6dXBkYXRlRm9yZWdyb3VuCiAjZW5kaWYKICAgICAgICAgICAgIG1fZm9yZWdyb3VuZExheWVy LT5zZXREcmF3c0NvbnRlbnQodHJ1ZSk7CiAgICAgICAgICAgICBtX2ZvcmVncm91bmRMYXllci0+ c2V0UGFpbnRpbmdQaGFzZShHcmFwaGljc0xheWVyUGFpbnRGb3JlZ3JvdW5kKTsKLSAgICAgICAg ICAgIGlmIChGcmFtZSogZnJhbWUgPSByZW5kZXJlcigpLT5kb2N1bWVudCgpLT5mcmFtZSgpKQot ICAgICAgICAgICAgICAgIG1fZm9yZWdyb3VuZExheWVyLT5zZXRDb250ZW50c1NjYWxlKGZyYW1l LT5wYWdlU2NhbGVGYWN0b3IoKSk7CisgICAgICAgICAgICBtX2ZvcmVncm91bmRMYXllci0+c2V0 Q29udGVudHNTY2FsZShwYWdlU2NhbGVGYWN0b3IoKSAqIGJhY2tpbmdTY2FsZUZhY3RvcigpKTsK ICAgICAgICAgICAgIGxheWVyQ2hhbmdlZCA9IHRydWU7CiAgICAgICAgIH0KICAgICB9IGVsc2Ug aWYgKG1fZm9yZWdyb3VuZExheWVyKSB7CkBAIC02ODYsOCArNjgzLDcgQEAgYm9vbCBSZW5kZXJM YXllckJhY2tpbmc6OnVwZGF0ZU1hc2tMYXllcgogI2VuZGlmCiAgICAgICAgICAgICBtX21hc2tM YXllci0+c2V0RHJhd3NDb250ZW50KHRydWUpOwogICAgICAgICAgICAgbV9tYXNrTGF5ZXItPnNl dFBhaW50aW5nUGhhc2UoR3JhcGhpY3NMYXllclBhaW50TWFzayk7Ci0gICAgICAgICAgICBpZiAo RnJhbWUqIGZyYW1lID0gcmVuZGVyZXIoKS0+ZG9jdW1lbnQoKS0+ZnJhbWUoKSkKLSAgICAgICAg ICAgICAgICBtX21hc2tMYXllci0+c2V0Q29udGVudHNTY2FsZShmcmFtZS0+cGFnZVNjYWxlRmFj dG9yKCkpOworICAgICAgICAgICAgbV9tYXNrTGF5ZXItPnNldENvbnRlbnRzU2NhbGUocGFnZVNj YWxlRmFjdG9yKCkgKiBiYWNraW5nU2NhbGVGYWN0b3IoKSk7CiAgICAgICAgICAgICBsYXllckNo YW5nZWQgPSB0cnVlOwogICAgICAgICB9CiAgICAgfSBlbHNlIGlmIChtX21hc2tMYXllcikgewpA QCAtMTQ5MSw2ICsxNDg3LDI1IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVDb250 ZW50c1MKICAgICAgICAgbV9tYXNrTGF5ZXItPnNldENvbnRlbnRzU2NhbGUoc2NhbGUpOwogfQog CitmbG9hdCBSZW5kZXJMYXllckJhY2tpbmc6OnBhZ2VTY2FsZUZhY3RvcigpIGNvbnN0Cit7Cisg ICAgRnJhbWUqIGZyYW1lID0gcmVuZGVyZXIoKS0+ZG9jdW1lbnQoKS0+ZnJhbWUoKTsKKyAgICBp ZiAoIWZyYW1lKQorICAgICAgICByZXR1cm4gMTsKKyAgICByZXR1cm4gZnJhbWUtPnBhZ2VTY2Fs ZUZhY3RvcigpOworfQorCitmbG9hdCBSZW5kZXJMYXllckJhY2tpbmc6OmJhY2tpbmdTY2FsZUZh Y3RvcigpIGNvbnN0Cit7CisgICAgRnJhbWUqIGZyYW1lID0gcmVuZGVyZXIoKS0+ZG9jdW1lbnQo KS0+ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm4gMTsKKyAgICBQYWdl KiBwYWdlID0gZnJhbWUtPnBhZ2UoKTsKKyAgICBpZiAoIXBhZ2UpCisgICAgICAgIHJldHVybiAx OworICAgIHJldHVybiBwYWdlLT5jaHJvbWUoKS0+c2NhbGVGYWN0b3IoKTsKK30KKwogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5H KQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcu aAkocmV2aXNpb24gOTAyODkpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJCYWNraW5nLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJp Z2h0IChDKSAyMDA5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdo dCAoQykgMjAwOSwgMjAxMCwgMjAxMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAg KgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTE4NiwxNyArMTg2LDE4IEBAIHByaXZh dGU6CiAKICAgICBib29sIGhhc05vbkNvbXBvc2l0aW5nRGVzY2VuZGFudHMoKSBjb25zdDsKICAg ICAKLSAgICB2b2lkIHBhaW50SW50b0xheWVyKFJlbmRlckxheWVyKiByb290TGF5ZXIsIEdyYXBo aWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmIHBhaW50RGlydHlSZWN0LAotICAgICAgICAgICAg ICAgICAgICBQYWludEJlaGF2aW9yIHBhaW50QmVoYXZpb3IsIEdyYXBoaWNzTGF5ZXJQYWludGlu Z1BoYXNlLCBSZW5kZXJPYmplY3QqIHBhaW50aW5nUm9vdCk7CisgICAgdm9pZCBwYWludEludG9M YXllcihSZW5kZXJMYXllciogcm9vdExheWVyLCBHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRS ZWN0JiBwYWludERpcnR5UmVjdCwgUGFpbnRCZWhhdmlvciwgR3JhcGhpY3NMYXllclBhaW50aW5n UGhhc2UsIFJlbmRlck9iamVjdCogcGFpbnRpbmdSb290KTsKIAogICAgIHN0YXRpYyBpbnQgZ3Jh cGhpY3NMYXllclRvQ1NTUHJvcGVydHkoQW5pbWF0ZWRQcm9wZXJ0eUlEKTsKICAgICBzdGF0aWMg QW5pbWF0ZWRQcm9wZXJ0eUlEIGNzc1RvR3JhcGhpY3NMYXllclByb3BlcnR5KGludCk7CiAKKyAg ICBmbG9hdCBwYWdlU2NhbGVGYWN0b3IoKSBjb25zdDsKKyAgICBmbG9hdCBiYWNraW5nU2NhbGVG YWN0b3IoKSBjb25zdDsKKwogI2lmbmRlZiBOREVCVUcKICAgICBTdHJpbmcgbmFtZUZvckxheWVy KCkgY29uc3Q7CiAjZW5kaWYKIAotcHJpdmF0ZToKICAgICBSZW5kZXJMYXllciogbV9vd25pbmdM YXllcjsKIAogICAgIE93blB0cjxHcmFwaGljc0xheWVyPiBtX2FuY2VzdG9yQ2xpcHBpbmdMYXll cjsgLy8gb25seSB1c2VkIGlmIHdlIGFyZSBjbGlwcGVkIGJ5IGFuIGFuY2VzdG9yIHdoaWNoIGlz IG5vdCBhIHN0YWNraW5nIGNvbnRleHQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDkwMjg5KQor KysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDctMDEgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAg IENvbnNpZGVyIGJhY2tpbmcgc2NhbGUgZmFjdG9yIHdoZW4gc2V0dGluZyB1cCBncmFwaGljcyBs YXllcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYz ODQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL2NhL0xheWVyVHJlZUhvc3RDQS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OkxheWVyVHJlZUhvc3RDQTo6aW5pdGlhbGl6ZSk6IFNldCBjb250ZW50cyBzY2FsZSBvbiB0aGUK KyAgICAgICAgbm9uLWNvbXBvc2l0ZWQgY29udGVudCBsYXllciBiYXNlZCBvbiB0aGUgYmFja2lu ZyBzY2FsZSBmYWN0b3IuCisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RDQTo6Y3JlYXRl UGFnZU92ZXJsYXlMYXllcik6IFNldCBjb250ZW50cworICAgICAgICBzY2FsZSBvbiB0aGUgcGFn ZSBvdmVybGF5IGxheWVyIGJhc2VkIG9uIHRoZSBiYWNraW5nIHNjYWxlIGZhY3Rvci4KKwogMjAx MS0wNi0zMCAgQnJpYW4gV2VpbnN0ZWluICA8YndlaW5zdGVpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvY2EvTGF5ZXJUcmVlSG9zdENBLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvY2EvTGF5ZXJUcmVlSG9zdENBLmNwcAkocmV2aXNp b24gOTAyODkpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvY2EvTGF5ZXJU cmVlSG9zdENBLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjcsNiArNjcsNyBAQCB2b2lkIExheWVy VHJlZUhvc3RDQTo6aW5pdGlhbGl6ZSgpCiAgICAgbV9ub25Db21wb3NpdGVkQ29udGVudExheWVy LT5zZXREcmF3c0NvbnRlbnQodHJ1ZSk7CiAgICAgbV9ub25Db21wb3NpdGVkQ29udGVudExheWVy LT5zZXRDb250ZW50c09wYXF1ZShtX3dlYlBhZ2UtPmRyYXdzQmFja2dyb3VuZCgpICYmICFtX3dl YlBhZ2UtPmRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKCkpOwogICAgIG1fbm9uQ29tcG9zaXRl ZENvbnRlbnRMYXllci0+c2V0U2l6ZShtX3dlYlBhZ2UtPnNpemUoKSk7CisgICAgbV9ub25Db21w b3NpdGVkQ29udGVudExheWVyLT5zZXRDb250ZW50c1NjYWxlKG1fd2ViUGFnZS0+dXNlclNwYWNl U2NhbGVGYWN0b3IoKSk7CiAgICAgaWYgKG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+c2V0dGluZ3Mo KS0+YWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZCgpKQogICAgICAgICBtX25vbkNvbXBvc2l0ZWRD b250ZW50TGF5ZXItPnNldEFjY2VsZXJhdGVzRHJhd2luZyh0cnVlKTsKIApAQCAtMjUyLDYgKzI1 Myw3IEBAIHZvaWQgTGF5ZXJUcmVlSG9zdENBOjpjcmVhdGVQYWdlT3ZlcmxheUwKIAogICAgIG1f cGFnZU92ZXJsYXlMYXllci0+c2V0RHJhd3NDb250ZW50KHRydWUpOwogICAgIG1fcGFnZU92ZXJs YXlMYXllci0+c2V0U2l6ZShtX3dlYlBhZ2UtPnNpemUoKSk7CisgICAgbV9wYWdlT3ZlcmxheUxh eWVyLT5zZXRDb250ZW50c1NjYWxlKG1fd2ViUGFnZS0+dXNlclNwYWNlU2NhbGVGYWN0b3IoKSk7 CiAKICAgICBtX3Jvb3RMYXllci0+YWRkQ2hpbGQobV9wYWdlT3ZlcmxheUxheWVyLmdldCgpKTsK IH0K