68137 2011-09-14 20:31:16 -0700 Use isAcceleratedContext() on the GraphicsContext instead of flags in ImageBuffer 2011-09-15 00:52:27 -0700 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 68146 68041 1 mdelaney7 mdelaney7 caseq cmarrin jamesr kbr mdelaney7 senorblanco simon.fraser oldest_to_newest 467568 0 mdelaney7 2011-09-14 20:31:16 -0700 The m_acceleratesRendering flag on ImageBuffer is no longer needed. Using the flag on the graphics context via isAcceleratedContext and setIsAcceleratedContext is sufficient and cleaner. 467572 1 107447 mdelaney7 2011-09-14 20:37:32 -0700 Created attachment 107447 Patch 467673 2 mdelaney7 2011-09-14 23:54:48 -0700 Committed r95174: <http://trac.webkit.org/changeset/95174> 467699 3 caseq 2011-09-15 00:52:27 -0700 (In reply to comment #2) > Committed r95174: <http://trac.webkit.org/changeset/95174> This broke chromium build, e.g.: http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Win7/builds/7574/steps/compile/logs/stdio >..\platform\graphics\skia\ImageBufferSkia.cpp(103) : error C2039: 'setIsAcceleratedContext' : is not a member of 'WebCore::GraphicsContext' 5> e:\b\build\slave\Webkit_Win7\build\src\third_party\WebKit\Source\WebCore\platform\graphics\GraphicsContext.h(215) : see declaration of 'WebCore::GraphicsContext' 107447 2011-09-14 20:37:32 -0700 2011-09-14 23:33:01 -0700 Patch bug-68137-20110914203731.patch text/plain 10641 mdelaney7 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1MTU3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDktMTQgIE1hdHRoZXcg RGVsYW5leSAgPG1kZWxhbmV5QGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgaXNBY2NlbGVyYXRl ZENvbnRleHQoKSBvbiB0aGUgR3JhcGhpY3NDb250ZXh0IGluc3RlYWQgb2YgZmxhZ3MgaW4gSW1h Z2VCdWZmZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTY4MTM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBodG1sL2Nh bnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2Fu dmFzUmVuZGVyaW5nQ29udGV4dDJEOjppc0FjY2VsZXJhdGVkKTogSGF2ZSBhbGwganVzdCBxdWVy eSB0aGUgY29udGV4dCBkaXJlY3RseS4KKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc1JlbmRlcmlu Z0NvbnRleHQyRDo6ZmlsbEFuZERpc3BsYXlUcmFuc3BhcmVuY3lFbHNld2hlcmUpOiBqdXN0IHVz ZSBpc0FjY2VsZXJhdGVkIGRpcmVjdGx5CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvSW1h Z2VCdWZmZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlckNH LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlQnVmZmVyOjpJbWFnZUJ1ZmZlcik6IFNldCBp c0FjY2VsZXJhdGVkQ29udGV4dCBvbiB0aGUgR3JhcGhpY3NDb250ZXh0IGluc3RlYWQgb2YgY2Fy cnlpbmcgdGhlCisgICAgICAgICAgICBiaXQgYXJvdW5kIG9uIHRoZSBJbWFnZUJ1ZmZlciBpdHNl bGYuCisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6Y29weU5hdGl2ZUltYWdlKTogVXBk YXRlIHRoZSBjaGVjay4gU2FtZSBmb3IgYWxsIGJlbG93Li4uCisgICAgICAgIChXZWJDb3JlOjpJ bWFnZUJ1ZmZlcjo6ZHJhd1BhdHRlcm4pOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VCdWZmZXI6 OmdldFVubXVsdGlwbGllZEltYWdlRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZl cjo6Z2V0UHJlbXVsdGlwbGllZEltYWdlRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1 ZmZlcjo6cHV0VW5tdWx0aXBsaWVkSW1hZ2VEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdl QnVmZmVyOjpwdXRQcmVtdWx0aXBsaWVkSW1hZ2VEYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHA6IFNldCBpc0FjY2VsZXJhdGVkQ29udGV4 dCBvbiB0aGUgR3JhcGhpY3NDb250ZXh0IGluc3RlYWQgb2YgY2FycnlpbmcgdGhlCisgICAgICAg ICAgICBiaXQgYXJvdW5kIG9uIHRoZSBJbWFnZUJ1ZmZlciBpdHNlbGYuCisgICAgICAgIChXZWJD b3JlOjpJbWFnZUJ1ZmZlcjo6SW1hZ2VCdWZmZXIpOiBSZW1vdmUgbV9hY2NlbGVyYXRlc1JlbmRl cmluZyBmbGFnIGFuZCBnZXR0ZXIuCisKIDIwMTEtMDktMTQgIEFudG9pbmUgTGFib3VyICA8cGlt YW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlbW92ZSB0aGUgZGVwZW5kZW5jeSBvbiBHcmFw aGljc0xheWVyIGZyb20gQ0NMYXllclRyZWVIb3N0LgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRt bC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCShyZXZp c2lvbiA5NDg5NCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmlu Z0NvbnRleHQyRC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1MCwxMCArMTUwLDcgQEAgQ2FudmFz UmVuZGVyaW5nQ29udGV4dDJEOjp+Q2FudmFzUmVuZGVyaQogCiBib29sIENhbnZhc1JlbmRlcmlu Z0NvbnRleHQyRDo6aXNBY2NlbGVyYXRlZCgpIGNvbnN0CiB7Ci0jaWYgVVNFKElPU1VSRkFDRV9D QU5WQVNfQkFDS0lOR19TVE9SRSkKLSAgICBJbWFnZUJ1ZmZlciogYnVmZmVyID0gY2FudmFzKCkt PmJ1ZmZlcigpOwotICAgIHJldHVybiBidWZmZXIgPyBidWZmZXItPmlzQWNjZWxlcmF0ZWQoKSA6 IGZhbHNlOwotI2VsaWYgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKKyNpZiBVU0UoSU9T VVJGQUNFX0NBTlZBU19CQUNLSU5HX1NUT1JFKSB8fCBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FO VkFTKQogICAgIHJldHVybiBjYW52YXMoKS0+aGFzQ3JlYXRlZEltYWdlQnVmZmVyKCkgJiYgZHJh d2luZ0NvbnRleHQoKSAmJiBkcmF3aW5nQ29udGV4dCgpLT5pc0FjY2VsZXJhdGVkQ29udGV4dCgp OwogI2Vsc2UKICAgICByZXR1cm4gZmFsc2U7CkBAIC0xNTExLDcgKzE1MDgsNyBAQCB0ZW1wbGF0 ZTxjbGFzcyBUPiB2b2lkIENhbnZhc1JlbmRlcmluZ0NvCiAgICAgSW50UmVjdCBidWZmZXJSZWN0 ID0gZW5jbG9zaW5nSW50UmVjdChwYXRoLmJvdW5kaW5nUmVjdCgpKTsKICAgICBwYXRoLnRyYW5z bGF0ZShGbG9hdFNpemUoLWJ1ZmZlclJlY3QueCgpLCAtYnVmZmVyUmVjdC55KCkpKTsKIAotICAg IFJlbmRlcmluZ01vZGUgcmVuZGVyTW9kZSA9IGNhbnZhcygpLT5idWZmZXIoKS0+aXNBY2NlbGVy YXRlZCgpID8gQWNjZWxlcmF0ZWQgOiBVbmFjY2VsZXJhdGVkOworICAgIFJlbmRlcmluZ01vZGUg cmVuZGVyTW9kZSA9IGlzQWNjZWxlcmF0ZWQoKSA/IEFjY2VsZXJhdGVkIDogVW5hY2NlbGVyYXRl ZDsKICAgICBPd25QdHI8SW1hZ2VCdWZmZXI+IGJ1ZmZlciA9IEltYWdlQnVmZmVyOjpjcmVhdGUo YnVmZmVyUmVjdC5zaXplKCksIENvbG9yU3BhY2VEZXZpY2VSR0IsIHJlbmRlck1vZGUpOwogICAg IGJ1ZmZlci0+Y29udGV4dCgpLT5zZXRDb21wb3NpdGVPcGVyYXRpb24oQ29tcG9zaXRlU291cmNl T3Zlcik7CiAgICAgc3RhdGUoKS5tX2ZpbGxTdHlsZS0+YXBwbHlGaWxsQ29sb3IoYnVmZmVyLT5j b250ZXh0KCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VC dWZmZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9J bWFnZUJ1ZmZlci5oCShyZXZpc2lvbiA5NDg5NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ltYWdlQnVmZmVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTkwLDcgKzkwLDYgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAKICAgICAgICAgR3JhcGhpY3NDb250ZXh0KiBj b250ZXh0KCkgY29uc3Q7CiAKLSAgICAgICAgYm9vbCBpc0FjY2VsZXJhdGVkKCkgY29uc3QgeyBy ZXR1cm4gbV9hY2NlbGVyYXRlUmVuZGVyaW5nOyB9CiAgICAgICAgIFBhc3NSZWZQdHI8SW1hZ2U+ IGNvcHlJbWFnZShCYWNraW5nU3RvcmVDb3B5ID0gQ29weUJhY2tpbmdTdG9yZSkgY29uc3Q7CiAK ICAgICAgICAgUGFzc1JlZlB0cjxCeXRlQXJyYXk+IGdldFVubXVsdGlwbGllZEltYWdlRGF0YShj b25zdCBJbnRSZWN0JikgY29uc3Q7CkBAIC0xMzIsNyArMTMxLDYgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgICAgICBJbWFnZUJ1ZmZlckRhdGEgbV9kYXRhOwogCiAgICAgICAgIEludFNpemUg bV9zaXplOwotICAgICAgICBib29sIG1fYWNjZWxlcmF0ZVJlbmRlcmluZzsKICAgICAgICAgT3du UHRyPEdyYXBoaWNzQ29udGV4dD4gbV9jb250ZXh0OwogCiAjaWYgIVVTRShDRykKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVyQ0cuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVy Q0cuY3BwCShyZXZpc2lvbiA5NDg5NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NnL0ltYWdlQnVmZmVyQ0cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDYsOSArMTA2LDkg QEAgc3RhdGljIHZvaWQgcmVsZWFzZUltYWdlRGF0YSh2b2lkKiwgY29ucwogSW1hZ2VCdWZmZXI6 OkltYWdlQnVmZmVyKGNvbnN0IEludFNpemUmIHNpemUsIENvbG9yU3BhY2UgaW1hZ2VDb2xvclNw YWNlLCBSZW5kZXJpbmdNb2RlIHJlbmRlcmluZ01vZGUsIGJvb2wmIHN1Y2Nlc3MpCiAgICAgOiBt X2RhdGEoc2l6ZSkKICAgICAsIG1fc2l6ZShzaXplKQotICAgICwgbV9hY2NlbGVyYXRlUmVuZGVy aW5nKHJlbmRlcmluZ01vZGUgPT0gQWNjZWxlcmF0ZWQpCiB7CiAgICAgc3VjY2VzcyA9IGZhbHNl OyAgLy8gTWFrZSBlYXJseSByZXR1cm4gbWVhbiBmYWlsdXJlLgorICAgIGJvb2wgYWNjZWxlcmF0 ZVJlbmRlcmluZyA9IHJlbmRlcmluZ01vZGUgPT0gQWNjZWxlcmF0ZWQ7CiAgICAgaWYgKHNpemUu d2lkdGgoKSA8PSAwIHx8IHNpemUuaGVpZ2h0KCkgPD0gMCkKICAgICAgICAgcmV0dXJuOwogCkBA IC0xMjMsNyArMTIzLDcgQEAgSW1hZ2VCdWZmZXI6OkltYWdlQnVmZmVyKGNvbnN0IEludFNpemUm IAogCiAjaWYgVVNFKElPU1VSRkFDRV9DQU5WQVNfQkFDS0lOR19TVE9SRSkKICAgICBpZiAod2lk dGgudW5zYWZlR2V0KCkgPj0gbWF4SU9TdXJmYWNlRGltZW5zaW9uIHx8IGhlaWdodC51bnNhZmVH ZXQoKSA+PSBtYXhJT1N1cmZhY2VEaW1lbnNpb24gfHwgKHdpZHRoICogaGVpZ2h0KS51bnNhZmVH ZXQoKSA8IG1pbklPU3VyZmFjZUFyZWEpCi0gICAgICAgIG1fYWNjZWxlcmF0ZVJlbmRlcmluZyA9 IGZhbHNlOworICAgICAgICBhY2NlbGVyYXRlUmVuZGVyaW5nID0gZmFsc2U7CiAjZWxzZQogICAg IEFTU0VSVChyZW5kZXJpbmdNb2RlID09IFVuYWNjZWxlcmF0ZWQpOwogI2VuZGlmCkBAIC0xNDEs MTYgKzE0MSwxNiBAQCBJbWFnZUJ1ZmZlcjo6SW1hZ2VCdWZmZXIoY29uc3QgSW50U2l6ZSYgCiAg ICAgfQogCiAgICAgUmV0YWluUHRyPENHQ29udGV4dFJlZj4gY2dDb250ZXh0OwotICAgIGlmICht X2FjY2VsZXJhdGVSZW5kZXJpbmcpIHsKKyAgICBpZiAoYWNjZWxlcmF0ZVJlbmRlcmluZykgewog I2lmIFVTRShJT1NVUkZBQ0VfQ0FOVkFTX0JBQ0tJTkdfU1RPUkUpCiAgICAgICAgIG1fZGF0YS5t X3N1cmZhY2UgPSBjcmVhdGVJT1N1cmZhY2Uoc2l6ZSk7CiAgICAgICAgIGNnQ29udGV4dC5hZG9w dENGKHdrSU9TdXJmYWNlQ29udGV4dENyZWF0ZShtX2RhdGEubV9zdXJmYWNlLmdldCgpLCB3aWR0 aC51bnNhZmVHZXQoKSwgaGVpZ2h0LnVuc2FmZUdldCgpLCBtX2RhdGEubV9jb2xvclNwYWNlKSk7 CiAjZW5kaWYKICAgICAgICAgaWYgKCFjZ0NvbnRleHQpCi0gICAgICAgICAgICBtX2FjY2VsZXJh dGVSZW5kZXJpbmcgPSBmYWxzZTsgLy8gSWYgYWxsb2NhdGlvbiBmYWlscywgZmFsbCBiYWNrIHRv IG5vbi1hY2NlbGVyYXRlZCBwYXRoLgorICAgICAgICAgICAgYWNjZWxlcmF0ZVJlbmRlcmluZyA9 IGZhbHNlOyAvLyBJZiBhbGxvY2F0aW9uIGZhaWxzLCBmYWxsIGJhY2sgdG8gbm9uLWFjY2VsZXJh dGVkIHBhdGguCiAgICAgfQogCi0gICAgaWYgKCFtX2FjY2VsZXJhdGVSZW5kZXJpbmcpIHsKKyAg ICBpZiAoIWFjY2VsZXJhdGVSZW5kZXJpbmcpIHsKICAgICAgICAgaWYgKCF0cnlGYXN0Q2FsbG9j KGhlaWdodC51bnNhZmVHZXQoKSwgbV9kYXRhLm1fYnl0ZXNQZXJSb3cudW5zYWZlR2V0KCkpLmdl dFZhbHVlKG1fZGF0YS5tX2RhdGEpKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBBU1NF UlQoIShyZWludGVycHJldF9jYXN0PHNpemVfdD4obV9kYXRhLm1fZGF0YSkgJiAyKSk7CkBAIC0x NjcsNiArMTY3LDcgQEAgSW1hZ2VCdWZmZXI6OkltYWdlQnVmZmVyKGNvbnN0IEludFNpemUmIAog ICAgIG1fY29udGV4dD0gYWRvcHRQdHIobmV3IEdyYXBoaWNzQ29udGV4dChjZ0NvbnRleHQuZ2V0 KCkpKTsKICAgICBtX2NvbnRleHQtPnNjYWxlKEZsb2F0U2l6ZSgxLCAtMSkpOwogICAgIG1fY29u dGV4dC0+dHJhbnNsYXRlKDAsIC1oZWlnaHQudW5zYWZlR2V0KCkpOworICAgIG1fY29udGV4dC0+ c2V0SXNBY2NlbGVyYXRlZENvbnRleHQoYWNjZWxlcmF0ZVJlbmRlcmluZyk7CiAgICAgc3VjY2Vz cyA9IHRydWU7CiB9CiAKQEAgLTE5Nyw3ICsxOTgsNyBAQCBQYXNzUmVmUHRyPEltYWdlPiBJbWFn ZUJ1ZmZlcjo6Y29weUltYWdlCiBOYXRpdmVJbWFnZVB0ciBJbWFnZUJ1ZmZlcjo6Y29weU5hdGl2 ZUltYWdlKEJhY2tpbmdTdG9yZUNvcHkgY29weUJlaGF2aW9yKSBjb25zdAogewogICAgIENHSW1h Z2VSZWYgaW1hZ2UgPSAwOwotICAgIGlmICghbV9hY2NlbGVyYXRlUmVuZGVyaW5nKSB7CisgICAg aWYgKCFtX2NvbnRleHQtPmlzQWNjZWxlcmF0ZWRDb250ZXh0KCkpIHsKICAgICAgICAgc3dpdGNo IChjb3B5QmVoYXZpb3IpIHsKICAgICAgICAgY2FzZSBEb250Q29weUJhY2tpbmdTdG9yZToKICAg ICAgICAgICAgIGltYWdlID0gQ0dJbWFnZUNyZWF0ZShtX3NpemUud2lkdGgoKSwgbV9zaXplLmhl aWdodCgpLCA4LCAzMiwgbV9kYXRhLm1fYnl0ZXNQZXJSb3cudW5zYWZlR2V0KCksIG1fZGF0YS5t X2NvbG9yU3BhY2UsIG1fZGF0YS5tX2JpdG1hcEluZm8sIG1fZGF0YS5tX2RhdGFQcm92aWRlci5n ZXQoKSwgMCwgdHJ1ZSwga0NHUmVuZGVyaW5nSW50ZW50RGVmYXVsdCk7CkBAIC0yMzQsNyArMjM1 LDcgQEAgdm9pZCBJbWFnZUJ1ZmZlcjo6ZHJhdyhHcmFwaGljc0NvbnRleHQqIAogCiB2b2lkIElt YWdlQnVmZmVyOjpkcmF3UGF0dGVybihHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEZs b2F0UmVjdCYgc3JjUmVjdCwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiBwYXR0ZXJuVHJhbnNmb3Jt LCBjb25zdCBGbG9hdFBvaW50JiBwaGFzZSwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIENv bXBvc2l0ZU9wZXJhdG9yIG9wLCBjb25zdCBGbG9hdFJlY3QmIGRlc3RSZWN0KQogewotICAgIGlm ICghbV9hY2NlbGVyYXRlUmVuZGVyaW5nKSB7CisgICAgaWYgKCFtX2NvbnRleHQtPmlzQWNjZWxl cmF0ZWRDb250ZXh0KCkpIHsKICAgICAgICAgaWYgKGNvbnRleHQgPT0gbV9jb250ZXh0KSB7CiAg ICAgICAgICAgICBSZWZQdHI8SW1hZ2U+IGNvcHkgPSBjb3B5SW1hZ2UoQ29weUJhY2tpbmdTdG9y ZSk7IC8vIERyYXdpbmcgaW50byBvdXIgb3duIGJ1ZmZlciwgbmVlZCB0byBkZWVwIGNvcHkuCiAg ICAgICAgICAgICBjb3B5LT5kcmF3UGF0dGVybihjb250ZXh0LCBzcmNSZWN0LCBwYXR0ZXJuVHJh bnNmb3JtLCBwaGFzZSwgc3R5bGVDb2xvclNwYWNlLCBvcCwgZGVzdFJlY3QpOwpAQCAtMjYxLDMw ICsyNjIsMzAgQEAgdm9pZCBJbWFnZUJ1ZmZlcjo6Y2xpcChHcmFwaGljc0NvbnRleHQqIAogCiBQ YXNzUmVmUHRyPEJ5dGVBcnJheT4gSW1hZ2VCdWZmZXI6OmdldFVubXVsdGlwbGllZEltYWdlRGF0 YShjb25zdCBJbnRSZWN0JiByZWN0KSBjb25zdAogewotICAgIGlmIChtX2FjY2VsZXJhdGVSZW5k ZXJpbmcpCisgICAgaWYgKG1fY29udGV4dC0+aXNBY2NlbGVyYXRlZENvbnRleHQoKSkKICAgICAg ICAgQ0dDb250ZXh0Rmx1c2goY29udGV4dCgpLT5wbGF0Zm9ybUNvbnRleHQoKSk7Ci0gICAgcmV0 dXJuIG1fZGF0YS5nZXREYXRhKHJlY3QsIG1fc2l6ZSwgbV9hY2NlbGVyYXRlUmVuZGVyaW5nLCB0 cnVlKTsKKyAgICByZXR1cm4gbV9kYXRhLmdldERhdGEocmVjdCwgbV9zaXplLCBtX2NvbnRleHQt PmlzQWNjZWxlcmF0ZWRDb250ZXh0KCksIHRydWUpOwogfQogCiBQYXNzUmVmUHRyPEJ5dGVBcnJh eT4gSW1hZ2VCdWZmZXI6OmdldFByZW11bHRpcGxpZWRJbWFnZURhdGEoY29uc3QgSW50UmVjdCYg cmVjdCkgY29uc3QKIHsKLSAgICBpZiAobV9hY2NlbGVyYXRlUmVuZGVyaW5nKQorICAgIGlmICht X2NvbnRleHQtPmlzQWNjZWxlcmF0ZWRDb250ZXh0KCkpCiAgICAgICAgIENHQ29udGV4dEZsdXNo KGNvbnRleHQoKS0+cGxhdGZvcm1Db250ZXh0KCkpOwotICAgIHJldHVybiBtX2RhdGEuZ2V0RGF0 YShyZWN0LCBtX3NpemUsIG1fYWNjZWxlcmF0ZVJlbmRlcmluZywgZmFsc2UpOworICAgIHJldHVy biBtX2RhdGEuZ2V0RGF0YShyZWN0LCBtX3NpemUsIG1fY29udGV4dC0+aXNBY2NlbGVyYXRlZENv bnRleHQoKSwgZmFsc2UpOwogfQogCiB2b2lkIEltYWdlQnVmZmVyOjpwdXRVbm11bHRpcGxpZWRJ bWFnZURhdGEoQnl0ZUFycmF5KiBzb3VyY2UsIGNvbnN0IEludFNpemUmIHNvdXJjZVNpemUsIGNv bnN0IEludFJlY3QmIHNvdXJjZVJlY3QsIGNvbnN0IEludFBvaW50JiBkZXN0UG9pbnQpCiB7Ci0g ICAgaWYgKG1fYWNjZWxlcmF0ZVJlbmRlcmluZykKKyAgICBpZiAobV9jb250ZXh0LT5pc0FjY2Vs ZXJhdGVkQ29udGV4dCgpKQogICAgICAgICBDR0NvbnRleHRGbHVzaChjb250ZXh0KCktPnBsYXRm b3JtQ29udGV4dCgpKTsKLSAgICBtX2RhdGEucHV0RGF0YShzb3VyY2UsIHNvdXJjZVNpemUsIHNv dXJjZVJlY3QsIGRlc3RQb2ludCwgbV9zaXplLCBtX2FjY2VsZXJhdGVSZW5kZXJpbmcsIHRydWUp OworICAgIG1fZGF0YS5wdXREYXRhKHNvdXJjZSwgc291cmNlU2l6ZSwgc291cmNlUmVjdCwgZGVz dFBvaW50LCBtX3NpemUsIG1fY29udGV4dC0+aXNBY2NlbGVyYXRlZENvbnRleHQoKSwgdHJ1ZSk7 CiB9CiAKIHZvaWQgSW1hZ2VCdWZmZXI6OnB1dFByZW11bHRpcGxpZWRJbWFnZURhdGEoQnl0ZUFy cmF5KiBzb3VyY2UsIGNvbnN0IEludFNpemUmIHNvdXJjZVNpemUsIGNvbnN0IEludFJlY3QmIHNv dXJjZVJlY3QsIGNvbnN0IEludFBvaW50JiBkZXN0UG9pbnQpCiB7Ci0gICAgaWYgKG1fYWNjZWxl cmF0ZVJlbmRlcmluZykKKyAgICBpZiAobV9jb250ZXh0LT5pc0FjY2VsZXJhdGVkQ29udGV4dCgp KQogICAgICAgICBDR0NvbnRleHRGbHVzaChjb250ZXh0KCktPnBsYXRmb3JtQ29udGV4dCgpKTsK LSAgICBtX2RhdGEucHV0RGF0YShzb3VyY2UsIHNvdXJjZVNpemUsIHNvdXJjZVJlY3QsIGRlc3RQ b2ludCwgbV9zaXplLCBtX2FjY2VsZXJhdGVSZW5kZXJpbmcsIGZhbHNlKTsKKyAgICBtX2RhdGEu cHV0RGF0YShzb3VyY2UsIHNvdXJjZVNpemUsIHNvdXJjZVJlY3QsIGRlc3RQb2ludCwgbV9zaXpl LCBtX2NvbnRleHQtPmlzQWNjZWxlcmF0ZWRDb250ZXh0KCksIGZhbHNlKTsKIH0KIAogc3RhdGlj IGlubGluZSBDRlN0cmluZ1JlZiBqcGVnVVRJKCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZmZXJTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAJKHJl dmlzaW9uIDk0ODk0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9J bWFnZUJ1ZmZlclNraWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Nyw3ICs2Nyw2IEBAIEltYWdl QnVmZmVyRGF0YTo6SW1hZ2VCdWZmZXJEYXRhKGNvbnN0IEkKIEltYWdlQnVmZmVyOjpJbWFnZUJ1 ZmZlcihjb25zdCBJbnRTaXplJiBzaXplLCBDb2xvclNwYWNlLCBSZW5kZXJpbmdNb2RlIHJlbmRl cmluZ01vZGUsIGJvb2wmIHN1Y2Nlc3MpCiAgICAgOiBtX2RhdGEoc2l6ZSkKICAgICAsIG1fc2l6 ZShzaXplKQotICAgICwgbV9hY2NlbGVyYXRlUmVuZGVyaW5nKGZhbHNlKQogewogICAgIE93blB0 cjxTa0NhbnZhcz4gY2FudmFzID0gYWRvcHRQdHIoc2tpYTo6VHJ5Q3JlYXRlQml0bWFwQ2FudmFz KHNpemUud2lkdGgoKSwgc2l6ZS5oZWlnaHQoKSwgZmFsc2UpKTsKICAgICBpZiAoIWNhbnZhcykg ewpAQCAtMTAxLDcgKzEwMCw3IEBAIEltYWdlQnVmZmVyOjpJbWFnZUJ1ZmZlcihjb25zdCBJbnRT aXplJiAKICAgICAgICAgICAgICAgICBpZiAodGV4dHVyZS5nZXQoKSkgewogICAgICAgICAgICAg ICAgICAgICBtX2RhdGEubV9jYW52YXMtPnNldERldmljZShuZXcgU2tHcHVEZXZpY2UoZ3IsIHRl eHR1cmUuZ2V0KCkpKS0+dW5yZWYoKTsKICAgICAgICAgICAgICAgICAgICAgbV9jb250ZXh0LT5w bGF0Zm9ybUNvbnRleHQoKS0+c2V0R3JhcGhpY3NDb250ZXh0M0QoY29udGV4dDNEKTsKLSAgICAg ICAgICAgICAgICAgICAgbV9hY2NlbGVyYXRlUmVuZGVyaW5nID0gdHJ1ZTsKKyAgICAgICAgICAg ICAgICAgICAgbV9jb250ZXh0LT5zZXRJc0FjY2VsZXJhdGVkQ29udGV4dCh0cnVlKTsKICNpZiBV U0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgICAgICAgICAgICAgICAgIG1fZGF0YS5t X3BsYXRmb3JtTGF5ZXIgPSBDYW52YXMyRExheWVyQ2hyb21pdW06OmNyZWF0ZShjb250ZXh0M0Qp OwogICAgICAgICAgICAgICAgICAgICBtX2RhdGEubV9wbGF0Zm9ybUxheWVyLT5zZXRUZXh0dXJl SWQodGV4dHVyZS5nZXQoKS0+Z2V0VGV4dHVyZUhhbmRsZSgpKTsK