149820 2015-10-05 15:37:08 -0700 WebCore::IOSurface should ask the IOSurface for the pixel format instead of caching it 2015-10-05 16:18:59 -0700 1 1 1 Unclassified WebKit WebKit2 Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin simon.fraser thorton oldest_to_newest 1130765 0 bdakin 2015-10-05 15:37:08 -0700 WebCore::IOSurface should ask the IOSurface for the pixel format instead of caching it 1130768 1 262470 bdakin 2015-10-05 15:38:59 -0700 Created attachment 262470 Patch 1130777 2 262472 bdakin 2015-10-05 15:54:34 -0700 Created attachment 262472 Patch 1130778 3 262470 thorton 2015-10-05 15:56:33 -0700 Comment on attachment 262470 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262470&action=review > Source/WebCore/platform/graphics/cocoa/IOSurface.mm:242 > + if (pixelFormat == 'BGRA') > + return Format::RGBA; I wonder if we should call the format BGRA since that's what it really is > Source/WebCore/platform/graphics/cocoa/IOSurface.mm:243 > +#if PLATFORM(IOS) Why is this (and the other yuv stuff) iOS specific? Only the transform part should be iOS specific. That will fix your build error, too. 1130783 4 bdakin 2015-10-05 16:09:08 -0700 (In reply to comment #3) > Comment on attachment 262470 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=262470&action=review > > > Source/WebCore/platform/graphics/cocoa/IOSurface.mm:242 > > + if (pixelFormat == 'BGRA') > > + return Format::RGBA; > > I wonder if we should call the format BGRA since that's what it really is > NOOOOOOOOO > > Source/WebCore/platform/graphics/cocoa/IOSurface.mm:243 > > +#if PLATFORM(IOS) > > Why is this (and the other yuv stuff) iOS specific? Only the transform part > should be iOS specific. > > That will fix your build error, too. Okay! 1130784 5 262476 bdakin 2015-10-05 16:09:28 -0700 Created attachment 262476 Patch 1130790 6 bdakin 2015-10-05 16:18:59 -0700 Thanks Tim! http://trac.webkit.org/changeset/190587 262470 2015-10-05 15:38:59 -0700 2015-10-05 16:09:28 -0700 Patch for-review.txt text/plain 3620 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MDU4NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE1LTEwLTA1ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJDb3JlOjpJT1N1cmZhY2Ugc2hv dWxkIGFzayB0aGUgSU9TdXJmYWNlIGZvciB0aGUgcGl4ZWwgZm9ybWF0IGluc3RlYWQgb2YgCisg ICAgICAgIGNhY2hpbmcgaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0OTgyMAorICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIHJk YXI6Ly9wcm9ibGVtLzIyOTc2MjMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9JT1N1cmZhY2UuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9JT1N1cmZhY2UubW06CisgICAgICAgIChJ T1N1cmZhY2U6OklPU3VyZmFjZSk6CisgICAgICAgIChJT1N1cmZhY2U6OmZvcm1hdCk6CisgICAg ICAgICogcGxhdGZvcm0vc3BpL2NvY29hL0lPU3VyZmFjZVNQSS5oOgorCiAyMDE1LTEwLTA1ICBC ZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBCdWlsZCBmaXguIApJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJm YWNlLmgJKHJldmlzaW9uIDE5MDU3NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NvY29hL0lPU3VyZmFjZS5oCSh3b3JraW5nIGNvcHkpCkBAIC04MCw3ICs4MCw3IEBAIHB1 YmxpYzoKICAgICBJbnRTaXplIHNpemUoKSBjb25zdCB7IHJldHVybiBtX3NpemU7IH0KICAgICBz aXplX3QgdG90YWxCeXRlcygpIGNvbnN0IHsgcmV0dXJuIG1fdG90YWxCeXRlczsgfQogICAgIENv bG9yU3BhY2UgY29sb3JTcGFjZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29sb3JTcGFjZTsgfQotICAg IEZvcm1hdCBmb3JtYXQoKSBjb25zdCB7IHJldHVybiBtX2Zvcm1hdDsgfQorICAgIEZvcm1hdCBm b3JtYXQoKSBjb25zdDsKIAogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNJblVzZSgpIGNvbnN0 OwogCkBAIC0xMDIsNyArMTAyLDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldENvbnRleHRTaXpl KEludFNpemUpOwogCiAgICAgQ29sb3JTcGFjZSBtX2NvbG9yU3BhY2U7Ci0gICAgRm9ybWF0IG1f Zm9ybWF0OwogICAgIEludFNpemUgbV9zaXplOwogICAgIEludFNpemUgbV9jb250ZXh0U2l6ZTsK ICAgICBzaXplX3QgbV90b3RhbEJ5dGVzOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0lPU3VyZmFjZS5tbQkocmV2aXNpb24gMTkwNTc2KQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC05OCw3ICs5OCw2IEBAIHN0ZDo6dW5pcXVlX3B0cjxJT1N1cmZhY2U+ IElPU3VyZmFjZTo6Y3IKIAogSU9TdXJmYWNlOjpJT1N1cmZhY2UoSW50U2l6ZSBzaXplLCBDb2xv clNwYWNlIGNvbG9yU3BhY2UsIEZvcm1hdCBmb3JtYXQpCiAgICAgOiBtX2NvbG9yU3BhY2UoY29s b3JTcGFjZSkKLSAgICAsIG1fZm9ybWF0KGZvcm1hdCkKICAgICAsIG1fc2l6ZShzaXplKQogICAg ICwgbV9jb250ZXh0U2l6ZShzaXplKQogewpAQCAtMTUyLDcgKzE1MSw2IEBAIElPU3VyZmFjZTo6 SU9TdXJmYWNlKEludFNpemUgc2l6ZSwgSW50U2kKIAogSU9TdXJmYWNlOjpJT1N1cmZhY2UoSU9T dXJmYWNlUmVmIHN1cmZhY2UsIENvbG9yU3BhY2UgY29sb3JTcGFjZSkKICAgICA6IG1fY29sb3JT cGFjZShjb2xvclNwYWNlKQotICAgICwgbV9mb3JtYXQoRm9ybWF0OjpSR0JBKQogICAgICwgbV9z dXJmYWNlKHN1cmZhY2UpCiB7CiAgICAgbV9zaXplID0gSW50U2l6ZShJT1N1cmZhY2VHZXRXaWR0 aChzdXJmYWNlKSwgSU9TdXJmYWNlR2V0SGVpZ2h0KHN1cmZhY2UpKTsKQEAgLTIzNyw2ICsyMzUs MjAgQEAgSU9TdXJmYWNlOjpTdXJmYWNlU3RhdGUgSU9TdXJmYWNlOjpzZXRJcwogICAgIHJldHVy biBJT1N1cmZhY2U6OlN1cmZhY2VTdGF0ZTo6VmFsaWQ7CiB9CiAKK0lPU3VyZmFjZTo6Rm9ybWF0 IElPU3VyZmFjZTo6Zm9ybWF0KCkgY29uc3QKK3sKKyAgICB1bnNpZ25lZCBwaXhlbEZvcm1hdCA9 IElPU3VyZmFjZUdldFBpeGVsRm9ybWF0KG1fc3VyZmFjZS5nZXQoKSk7CisgICAgaWYgKHBpeGVs Rm9ybWF0ID09ICdCR1JBJykKKyAgICAgICAgcmV0dXJuIEZvcm1hdDo6UkdCQTsKKyNpZiBQTEFU Rk9STShJT1MpCisgICAgaWYgKHBpeGVsRm9ybWF0ID09ICd5dXZmJykKKyAgICAgICAgcmV0dXJu IEZvcm1hdDo6WVVWNDIyOworI2VuZGlmCisKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAg ICByZXR1cm4gRm9ybWF0OjpSR0JBOworfQorCiBib29sIElPU3VyZmFjZTo6aXNJblVzZSgpIGNv bnN0CiB7CiAgICAgcmV0dXJuIElPU3VyZmFjZUlzSW5Vc2UobV9zdXJmYWNlLmdldCgpKTsKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2NvYS9JT1N1cmZhY2VTUEkuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvY29jb2EvSU9TdXJmYWNlU1BJ LmgJKHJldmlzaW9uIDE5MDU4MikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2Nv YS9JT1N1cmZhY2VTUEkuaAkod29ya2luZyBjb3B5KQpAQCAtNjgsNiArNjgsNyBAQCBzaXplX3Qg SU9TdXJmYWNlR2V0Qnl0ZXNQZXJSb3coSU9TdXJmYWNlCiBzaXplX3QgSU9TdXJmYWNlR2V0SGVp Z2h0KElPU3VyZmFjZVJlZiBidWZmZXIpOwogc2l6ZV90IElPU3VyZmFjZUdldFByb3BlcnR5TWF4 aW11bShDRlN0cmluZ1JlZiBwcm9wZXJ0eSk7CiBzaXplX3QgSU9TdXJmYWNlR2V0V2lkdGgoSU9T dXJmYWNlUmVmIGJ1ZmZlcik7CitPU1R5cGUgSU9TdXJmYWNlR2V0UGl4ZWxGb3JtYXQoSU9TdXJm YWNlUmVmIGJ1ZmZlcik7CiBCb29sZWFuIElPU3VyZmFjZUlzSW5Vc2UoSU9TdXJmYWNlUmVmIGJ1 ZmZlcik7CiBJT1JldHVybiBJT1N1cmZhY2VMb2NrKElPU3VyZmFjZVJlZiBidWZmZXIsIHVpbnQz Ml90IG9wdGlvbnMsIHVpbnQzMl90ICpzZWVkKTsKIElPU3VyZmFjZVJlZiBJT1N1cmZhY2VMb29r dXBGcm9tTWFjaFBvcnQobWFjaF9wb3J0X3QpOwo= 262472 2015-10-05 15:54:34 -0700 2015-10-05 16:09:28 -0700 Patch for-review-2.txt text/plain 3845 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MDU4NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE1LTEwLTA1ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJDb3JlOjpJT1N1cmZhY2Ugc2hv dWxkIGFzayB0aGUgSU9TdXJmYWNlIGZvciB0aGUgcGl4ZWwgZm9ybWF0IGluc3RlYWQgb2YgCisg ICAgICAgIGNhY2hpbmcgaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0OTgyMAorICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIHJk YXI6Ly9wcm9ibGVtLzIyOTc2MjMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9JT1N1cmZhY2UuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9JT1N1cmZhY2UubW06CisgICAgICAgIChJ T1N1cmZhY2U6OklPU3VyZmFjZSk6CisgICAgICAgIChJT1N1cmZhY2U6OmZvcm1hdCk6CisgICAg ICAgICogcGxhdGZvcm0vc3BpL2NvY29hL0lPU3VyZmFjZVNQSS5oOgorCiAyMDE1LTEwLTA1ICBC ZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBCdWlsZCBmaXguIApJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJm YWNlLmgJKHJldmlzaW9uIDE5MDU3NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NvY29hL0lPU3VyZmFjZS5oCSh3b3JraW5nIGNvcHkpCkBAIC04MCw3ICs4MCw3IEBAIHB1 YmxpYzoKICAgICBJbnRTaXplIHNpemUoKSBjb25zdCB7IHJldHVybiBtX3NpemU7IH0KICAgICBz aXplX3QgdG90YWxCeXRlcygpIGNvbnN0IHsgcmV0dXJuIG1fdG90YWxCeXRlczsgfQogICAgIENv bG9yU3BhY2UgY29sb3JTcGFjZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29sb3JTcGFjZTsgfQotICAg IEZvcm1hdCBmb3JtYXQoKSBjb25zdCB7IHJldHVybiBtX2Zvcm1hdDsgfQorICAgIEZvcm1hdCBm b3JtYXQoKSBjb25zdDsKIAogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNJblVzZSgpIGNvbnN0 OwogCkBAIC0xMDIsNyArMTAyLDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldENvbnRleHRTaXpl KEludFNpemUpOwogCiAgICAgQ29sb3JTcGFjZSBtX2NvbG9yU3BhY2U7Ci0gICAgRm9ybWF0IG1f Zm9ybWF0OwogICAgIEludFNpemUgbV9zaXplOwogICAgIEludFNpemUgbV9jb250ZXh0U2l6ZTsK ICAgICBzaXplX3QgbV90b3RhbEJ5dGVzOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0lPU3VyZmFjZS5tbQkocmV2aXNpb24gMTkwNTc2KQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC05OCw3ICs5OCw2IEBAIHN0ZDo6dW5pcXVlX3B0cjxJT1N1cmZhY2U+ IElPU3VyZmFjZTo6Y3IKIAogSU9TdXJmYWNlOjpJT1N1cmZhY2UoSW50U2l6ZSBzaXplLCBDb2xv clNwYWNlIGNvbG9yU3BhY2UsIEZvcm1hdCBmb3JtYXQpCiAgICAgOiBtX2NvbG9yU3BhY2UoY29s b3JTcGFjZSkKLSAgICAsIG1fZm9ybWF0KGZvcm1hdCkKICAgICAsIG1fc2l6ZShzaXplKQogICAg ICwgbV9jb250ZXh0U2l6ZShzaXplKQogewpAQCAtMTE0LDYgKzExMyw4IEBAIElPU3VyZmFjZTo6 SU9TdXJmYWNlKEludFNpemUgc2l6ZSwgQ29sb3IKICAgICAgICAgZWxlbWVudFdpZHRoID0gMjsK ICAgICAgICAgYnl0ZXNQZXJFbGVtZW50ID0gNDsKICAgICB9CisjZWxzZQorICAgIEFTU0VSVF9V TlVTRUQoZm9ybWF0LCBmb3JtYXQgPT0gRm9ybWF0OjpSR0JBKTsKICNlbmRpZgogCiAgICAgaW50 IHdpZHRoID0gc2l6ZS53aWR0aCgpOwpAQCAtMTUyLDcgKzE1Myw2IEBAIElPU3VyZmFjZTo6SU9T dXJmYWNlKEludFNpemUgc2l6ZSwgSW50U2kKIAogSU9TdXJmYWNlOjpJT1N1cmZhY2UoSU9TdXJm YWNlUmVmIHN1cmZhY2UsIENvbG9yU3BhY2UgY29sb3JTcGFjZSkKICAgICA6IG1fY29sb3JTcGFj ZShjb2xvclNwYWNlKQotICAgICwgbV9mb3JtYXQoRm9ybWF0OjpSR0JBKQogICAgICwgbV9zdXJm YWNlKHN1cmZhY2UpCiB7CiAgICAgbV9zaXplID0gSW50U2l6ZShJT1N1cmZhY2VHZXRXaWR0aChz dXJmYWNlKSwgSU9TdXJmYWNlR2V0SGVpZ2h0KHN1cmZhY2UpKTsKQEAgLTIzNyw2ICsyMzcsMjAg QEAgSU9TdXJmYWNlOjpTdXJmYWNlU3RhdGUgSU9TdXJmYWNlOjpzZXRJcwogICAgIHJldHVybiBJ T1N1cmZhY2U6OlN1cmZhY2VTdGF0ZTo6VmFsaWQ7CiB9CiAKK0lPU3VyZmFjZTo6Rm9ybWF0IElP U3VyZmFjZTo6Zm9ybWF0KCkgY29uc3QKK3sKKyAgICB1bnNpZ25lZCBwaXhlbEZvcm1hdCA9IElP U3VyZmFjZUdldFBpeGVsRm9ybWF0KG1fc3VyZmFjZS5nZXQoKSk7CisgICAgaWYgKHBpeGVsRm9y bWF0ID09ICdCR1JBJykKKyAgICAgICAgcmV0dXJuIEZvcm1hdDo6UkdCQTsKKyNpZiBQTEFURk9S TShJT1MpCisgICAgaWYgKHBpeGVsRm9ybWF0ID09ICd5dXZmJykKKyAgICAgICAgcmV0dXJuIEZv cm1hdDo6WVVWNDIyOworI2VuZGlmCisKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICBy ZXR1cm4gRm9ybWF0OjpSR0JBOworfQorCiBib29sIElPU3VyZmFjZTo6aXNJblVzZSgpIGNvbnN0 CiB7CiAgICAgcmV0dXJuIElPU3VyZmFjZUlzSW5Vc2UobV9zdXJmYWNlLmdldCgpKTsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2NvYS9JT1N1cmZhY2VTUEkuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvY29jb2EvSU9TdXJmYWNlU1BJLmgJ KHJldmlzaW9uIDE5MDU4MikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2NvYS9J T1N1cmZhY2VTUEkuaAkod29ya2luZyBjb3B5KQpAQCAtNjgsNiArNjgsNyBAQCBzaXplX3QgSU9T dXJmYWNlR2V0Qnl0ZXNQZXJSb3coSU9TdXJmYWNlCiBzaXplX3QgSU9TdXJmYWNlR2V0SGVpZ2h0 KElPU3VyZmFjZVJlZiBidWZmZXIpOwogc2l6ZV90IElPU3VyZmFjZUdldFByb3BlcnR5TWF4aW11 bShDRlN0cmluZ1JlZiBwcm9wZXJ0eSk7CiBzaXplX3QgSU9TdXJmYWNlR2V0V2lkdGgoSU9TdXJm YWNlUmVmIGJ1ZmZlcik7CitPU1R5cGUgSU9TdXJmYWNlR2V0UGl4ZWxGb3JtYXQoSU9TdXJmYWNl UmVmIGJ1ZmZlcik7CiBCb29sZWFuIElPU3VyZmFjZUlzSW5Vc2UoSU9TdXJmYWNlUmVmIGJ1ZmZl cik7CiBJT1JldHVybiBJT1N1cmZhY2VMb2NrKElPU3VyZmFjZVJlZiBidWZmZXIsIHVpbnQzMl90 IG9wdGlvbnMsIHVpbnQzMl90ICpzZWVkKTsKIElPU3VyZmFjZVJlZiBJT1N1cmZhY2VMb29rdXBG cm9tTWFjaFBvcnQobWFjaF9wb3J0X3QpOwo= 262476 2015-10-05 16:09:28 -0700 2015-10-05 16:14:27 -0700 Patch for-review-3.txt text/plain 4676 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MDU4NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE1LTEwLTA1ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJDb3JlOjpJT1N1cmZhY2Ugc2hv dWxkIGFzayB0aGUgSU9TdXJmYWNlIGZvciB0aGUgcGl4ZWwgZm9ybWF0IGluc3RlYWQgb2YgCisg ICAgICAgIGNhY2hpbmcgaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0OTgyMAorICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIHJk YXI6Ly9wcm9ibGVtLzIyOTc2MjMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWxzbyB0aGVyZSBpcyBubyByZWFzb24gdG8gbWFrZSBZVVYgYmUgaU9T IG9ubHksIHNvIHRoaXMgcGF0Y2ggcmVtb3ZlcyB0aG9zZSAKKyAgICAgICAgUExBVEZPUk0gY2hl Y2tzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLmg6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLm1tOgorICAgICAgICAo SU9TdXJmYWNlOjpJT1N1cmZhY2UpOgorICAgICAgICAoSU9TdXJmYWNlOjpmb3JtYXQpOgorICAg ICAgICAqIHBsYXRmb3JtL3NwaS9jb2NvYS9JT1N1cmZhY2VTUEkuaDoKKwogMjAxNS0xMC0wNSAg QmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+CiAKICAgICAgICAgQnVpbGQgZml4LiAKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0lPU3VyZmFjZS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0lPU3Vy ZmFjZS5oCShyZXZpc2lvbiAxOTA1NzQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jb2NvYS9JT1N1cmZhY2UuaAkod29ya2luZyBjb3B5KQpAQCAtNDAsOSArNDAsNyBAQCBj bGFzcyBJT1N1cmZhY2UgZmluYWwgewogcHVibGljOgogICAgIGVudW0gY2xhc3MgRm9ybWF0IHsK ICAgICAgICAgUkdCQSwKLSNpZiBQTEFURk9STShJT1MpCiAgICAgICAgIFlVVjQyMgotI2VuZGlm CiAgICAgfTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8SU9T dXJmYWNlPiBjcmVhdGUoSW50U2l6ZSwgQ29sb3JTcGFjZSwgRm9ybWF0ID0gRm9ybWF0OjpSR0JB KTsKQEAgLTgwLDcgKzc4LDcgQEAgcHVibGljOgogICAgIEludFNpemUgc2l6ZSgpIGNvbnN0IHsg cmV0dXJuIG1fc2l6ZTsgfQogICAgIHNpemVfdCB0b3RhbEJ5dGVzKCkgY29uc3QgeyByZXR1cm4g bV90b3RhbEJ5dGVzOyB9CiAgICAgQ29sb3JTcGFjZSBjb2xvclNwYWNlKCkgY29uc3QgeyByZXR1 cm4gbV9jb2xvclNwYWNlOyB9Ci0gICAgRm9ybWF0IGZvcm1hdCgpIGNvbnN0IHsgcmV0dXJuIG1f Zm9ybWF0OyB9CisgICAgRm9ybWF0IGZvcm1hdCgpIGNvbnN0OwogCiAgICAgV0VCQ09SRV9FWFBP UlQgYm9vbCBpc0luVXNlKCkgY29uc3Q7CiAKQEAgLTEwMiw3ICsxMDAsNiBAQCBwcml2YXRlOgog ICAgIHZvaWQgc2V0Q29udGV4dFNpemUoSW50U2l6ZSk7CiAKICAgICBDb2xvclNwYWNlIG1fY29s b3JTcGFjZTsKLSAgICBGb3JtYXQgbV9mb3JtYXQ7CiAgICAgSW50U2l6ZSBtX3NpemU7CiAgICAg SW50U2l6ZSBtX2NvbnRleHRTaXplOwogICAgIHNpemVfdCBtX3RvdGFsQnl0ZXM7CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9JT1N1cmZhY2UubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNl Lm1tCShyZXZpc2lvbiAxOTA1NzYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jb2NvYS9JT1N1cmZhY2UubW0JKHdvcmtpbmcgY29weSkKQEAgLTk4LDIzICs5OCwyNiBAQCBz dGQ6OnVuaXF1ZV9wdHI8SU9TdXJmYWNlPiBJT1N1cmZhY2U6OmNyCiAKIElPU3VyZmFjZTo6SU9T dXJmYWNlKEludFNpemUgc2l6ZSwgQ29sb3JTcGFjZSBjb2xvclNwYWNlLCBGb3JtYXQgZm9ybWF0 KQogICAgIDogbV9jb2xvclNwYWNlKGNvbG9yU3BhY2UpCi0gICAgLCBtX2Zvcm1hdChmb3JtYXQp CiAgICAgLCBtX3NpemUoc2l6ZSkKICAgICAsIG1fY29udGV4dFNpemUoc2l6ZSkKIHsKLSAgICB1 bnNpZ25lZCBwaXhlbEZvcm1hdCA9ICdCR1JBJzsKLSAgICB1bnNpZ25lZCBieXRlc1BlclBpeGVs ID0gNDsKLSAgICB1bnNpZ25lZCBieXRlc1BlckVsZW1lbnQgPSA0OwotICAgIHVuc2lnbmVkIGVs ZW1lbnRXaWR0aCA9IDE7Ci0KLSNpZiBQTEFURk9STShJT1MpCi0gICAgaWYgKGZvcm1hdCA9PSBG b3JtYXQ6OllVVjQyMikgeworICAgIHVuc2lnbmVkIHBpeGVsRm9ybWF0OworICAgIHVuc2lnbmVk IGJ5dGVzUGVyUGl4ZWw7CisgICAgdW5zaWduZWQgYnl0ZXNQZXJFbGVtZW50OworICAgIHVuc2ln bmVkIGVsZW1lbnRXaWR0aDsKKworICAgIGlmIChmb3JtYXQgPT0gRm9ybWF0OjpSR0JBKSB7Cisg ICAgICAgIHBpeGVsRm9ybWF0ID0gJ0JHUkEnOworICAgICAgICBieXRlc1BlclBpeGVsID0gNDsK KyAgICAgICAgYnl0ZXNQZXJFbGVtZW50ID0gNDsKKyAgICAgICAgZWxlbWVudFdpZHRoID0gMTsK KyAgICB9IGVsc2UgeworICAgICAgICBBU1NFUlQoZm9ybWF0ID09IEZvcm1hdDo6WVVWNDIyKTsK ICAgICAgICAgcGl4ZWxGb3JtYXQgPSAneXV2Zic7CiAgICAgICAgIGJ5dGVzUGVyUGl4ZWwgPSAy OwogICAgICAgICBlbGVtZW50V2lkdGggPSAyOwogICAgICAgICBieXRlc1BlckVsZW1lbnQgPSA0 OwogICAgIH0KLSNlbmRpZgogCiAgICAgaW50IHdpZHRoID0gc2l6ZS53aWR0aCgpOwogICAgIGlu dCBoZWlnaHQgPSBzaXplLmhlaWdodCgpOwpAQCAtMTUyLDcgKzE1NSw2IEBAIElPU3VyZmFjZTo6 SU9TdXJmYWNlKEludFNpemUgc2l6ZSwgSW50U2kKIAogSU9TdXJmYWNlOjpJT1N1cmZhY2UoSU9T dXJmYWNlUmVmIHN1cmZhY2UsIENvbG9yU3BhY2UgY29sb3JTcGFjZSkKICAgICA6IG1fY29sb3JT cGFjZShjb2xvclNwYWNlKQotICAgICwgbV9mb3JtYXQoRm9ybWF0OjpSR0JBKQogICAgICwgbV9z dXJmYWNlKHN1cmZhY2UpCiB7CiAgICAgbV9zaXplID0gSW50U2l6ZShJT1N1cmZhY2VHZXRXaWR0 aChzdXJmYWNlKSwgSU9TdXJmYWNlR2V0SGVpZ2h0KHN1cmZhY2UpKTsKQEAgLTIzNyw2ICsyMzks MTggQEAgSU9TdXJmYWNlOjpTdXJmYWNlU3RhdGUgSU9TdXJmYWNlOjpzZXRJcwogICAgIHJldHVy biBJT1N1cmZhY2U6OlN1cmZhY2VTdGF0ZTo6VmFsaWQ7CiB9CiAKK0lPU3VyZmFjZTo6Rm9ybWF0 IElPU3VyZmFjZTo6Zm9ybWF0KCkgY29uc3QKK3sKKyAgICB1bnNpZ25lZCBwaXhlbEZvcm1hdCA9 IElPU3VyZmFjZUdldFBpeGVsRm9ybWF0KG1fc3VyZmFjZS5nZXQoKSk7CisgICAgaWYgKHBpeGVs Rm9ybWF0ID09ICdCR1JBJykKKyAgICAgICAgcmV0dXJuIEZvcm1hdDo6UkdCQTsKKyAgICBpZiAo cGl4ZWxGb3JtYXQgPT0gJ3l1dmYnKQorICAgICAgICByZXR1cm4gRm9ybWF0OjpZVVY0MjI7CisK KyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gRm9ybWF0OjpSR0JBOworfQor CiBib29sIElPU3VyZmFjZTo6aXNJblVzZSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIElPU3VyZmFj ZUlzSW5Vc2UobV9zdXJmYWNlLmdldCgpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3NwaS9jb2NvYS9JT1N1cmZhY2VTUEkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9zcGkvY29jb2EvSU9TdXJmYWNlU1BJLmgJKHJldmlzaW9uIDE5MDU4MikKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2NvYS9JT1N1cmZhY2VTUEkuaAkod29ya2luZyBj b3B5KQpAQCAtNjgsNiArNjgsNyBAQCBzaXplX3QgSU9TdXJmYWNlR2V0Qnl0ZXNQZXJSb3coSU9T dXJmYWNlCiBzaXplX3QgSU9TdXJmYWNlR2V0SGVpZ2h0KElPU3VyZmFjZVJlZiBidWZmZXIpOwog c2l6ZV90IElPU3VyZmFjZUdldFByb3BlcnR5TWF4aW11bShDRlN0cmluZ1JlZiBwcm9wZXJ0eSk7 CiBzaXplX3QgSU9TdXJmYWNlR2V0V2lkdGgoSU9TdXJmYWNlUmVmIGJ1ZmZlcik7CitPU1R5cGUg SU9TdXJmYWNlR2V0UGl4ZWxGb3JtYXQoSU9TdXJmYWNlUmVmIGJ1ZmZlcik7CiBCb29sZWFuIElP U3VyZmFjZUlzSW5Vc2UoSU9TdXJmYWNlUmVmIGJ1ZmZlcik7CiBJT1JldHVybiBJT1N1cmZhY2VM b2NrKElPU3VyZmFjZVJlZiBidWZmZXIsIHVpbnQzMl90IG9wdGlvbnMsIHVpbnQzMl90ICpzZWVk KTsKIElPU3VyZmFjZVJlZiBJT1N1cmZhY2VMb29rdXBGcm9tTWFjaFBvcnQobWFjaF9wb3J0X3Qp Owo=