136412 2014-08-31 02:08:07 -0700 Fix a harmless mismerge in BitmapImage::destroyDecodedDataIfNecessary 2014-08-31 15:03:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton commit-queue mitz simon.fraser oldest_to_newest 1032387 0 thorton 2014-08-31 02:08:07 -0700 Fix a harmless mismerge in BitmapImage::destroyDecodedDataIfNecessary 1032388 1 237422 thorton 2014-08-31 02:08:27 -0700 Created attachment 237422 Patch 1032389 2 commit-queue 2014-08-31 02:09:51 -0700 Attachment 237422 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:3: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1032418 3 thorton 2014-08-31 15:03:11 -0700 http://trac.webkit.org/changeset/173148 237422 2014-08-31 02:08:27 -0700 2014-08-31 08:55:59 -0700 Patch bug-136412-20140831020820.patch text/plain 2534 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTczMTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2ZhNGI3ODc0Yzg1MWJk NGEzZmUxMTE1ZmMxYTc5OWRmYjgxYTY4ZC4uZTM5Y2UyN2IxMmEzMTAwYjdjNjliZDliODZlMDEw MDZiOTE3MWNkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA4LTMxICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBhIGhhcm1s ZXNzIG1pc21lcmdlIGluIEJpdG1hcEltYWdlOjpkZXN0cm95RGVjb2RlZERhdGFJZk5lY2Vzc2Fy eQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cywganVzdCBjbGVhbnVwLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvQml0 bWFwSW1hZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Qml0bWFwSW1hZ2U6OmRlc3Ryb3lEZWNv ZGVkRGF0YUlmTmVjZXNzYXJ5KToKKyAgICAgICAgRHJvcCB0aGUgbGVhZGluZyAnYycgYW5kIHRo ZSAnc3RhdGljJyBvbiB0aGUgY3V0b2ZmIHBhcmFtZXRlci4KKyAgICAgICAgUmVtb3ZlIHRoZSBk dXBsaWNhdGVkIGVhcmx5IHJldHVybiAoc2VlbXMgbGlrZSBpdCBoYXBwZW5lZCBpbiB0aGUgbWVy Z2UpLgorICAgICAgICBSZW1vdmUgcmVmZXJlbmNlIHRvIHRoZSBleGFjdCBzaXplIGluIHRoZSBj b21tZW50LCBzaW5jZSBpdCdzIGRpZmZlcmVudCBvbiBpT1MuCisKIDIwMTQtMDgtMzAgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBDb252ZXJ0IHN0cmlu ZyBsaXRlcmFscyB0byBjaGFyYWN0ZXIgbGl0ZXJhbHMgaW4gbWFrZVN0cmluZyB1c2FnZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuY3BwCmluZGV4 IDY2MDMxNDZhMTE0NjIwY2Y1N2YzMTgyM2M2NjgxOGQ2NGRlZTE3NDIuLmJmYTlkMGY3NDdkNTE1 MWE2NGZmNWRiOWU0YzRkM2UxNDJmOGVhZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5jcHAKQEAgLTEyNCwxNyArMTI0LDEyIEBAIHZvaWQg Qml0bWFwSW1hZ2U6OmRlc3Ryb3lEZWNvZGVkRGF0YShib29sIGRlc3Ryb3lBbGwpCiAKIHZvaWQg Qml0bWFwSW1hZ2U6OmRlc3Ryb3lEZWNvZGVkRGF0YUlmTmVjZXNzYXJ5KGJvb2wgZGVzdHJveUFs bCkKIHsKLSAgICAvLyBBbmltYXRlZCBpbWFnZXMgPjVNQiBhcmUgY29uc2lkZXJlZCBsYXJnZSBl bm91Z2ggdGhhdCB3ZSdsbCBvbmx5IGhhbmcgb24KKyAgICAvLyBBbmltYXRlZCBpbWFnZXMgb3Zl ciBhIGNlcnRhaW4gc2l6ZSBhcmUgY29uc2lkZXJlZCBsYXJnZSBlbm91Z2ggdGhhdCB3ZSdsbCBv bmx5IGhhbmcgb24KICAgICAvLyB0byBvbmUgZnJhbWUgYXQgYSB0aW1lLgogI2lmIFBMQVRGT1JN KElPUykKLSAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgY0xhcmdlQW5pbWF0aW9uQ3V0b2ZmID0g MjA5NzE1MjsKLQotICAgICAvLyBJZiB3ZSBoYXZlIGRlY29kZWQgZnJhbWVzIGJ1dCB0aGVyZSBp cyBubyBlbmNvZGVkIGRhdGEsIHdlIHNob3VsZG4ndCBkZXN0cm95Ci0gICAgIC8vIHRoZSBkZWNv ZGVkIGltYWdlIHNpbmNlIHdlIHdvbid0IGJlIGFibGUgdG8gcmVjb25zdHJ1Y3QgaXQgbGF0ZXIu Ci0gICAgIGlmICghZGF0YSgpICYmIG1fZnJhbWVzLnNpemUoKSkKLSAgICAgICAgIHJldHVybjsK KyAgICBjb25zdCB1bnNpZ25lZCBsYXJnZUFuaW1hdGlvbkN1dG9mZiA9IDIwOTcxNTI7CiAjZWxz ZQotICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBjTGFyZ2VBbmltYXRpb25DdXRvZmYgPSA1MjQy ODgwOworICAgIGNvbnN0IHVuc2lnbmVkIGxhcmdlQW5pbWF0aW9uQ3V0b2ZmID0gNTI0Mjg4MDsK ICNlbmRpZgogCiAgICAgLy8gSWYgd2UgaGF2ZSBkZWNvZGVkIGZyYW1lcyBidXQgdGhlcmUgaXMg bm8gZW5jb2RlZCBkYXRhLCB3ZSBzaG91bGRuJ3QgZGVzdHJveQpAQCAtMTQ2LDcgKzE0MSw3IEBA IHZvaWQgQml0bWFwSW1hZ2U6OmRlc3Ryb3lEZWNvZGVkRGF0YUlmTmVjZXNzYXJ5KGJvb2wgZGVz dHJveUFsbCkKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fZnJhbWVzLnNpemUoKTsgKytp KQogICAgICAgICBhbGxGcmFtZUJ5dGVzICs9IG1fZnJhbWVzW2ldLm1fZnJhbWVCeXRlczsKIAot ICAgIGlmIChhbGxGcmFtZUJ5dGVzID4gY0xhcmdlQW5pbWF0aW9uQ3V0b2ZmKQorICAgIGlmIChh bGxGcmFtZUJ5dGVzID4gbGFyZ2VBbmltYXRpb25DdXRvZmYpCiAgICAgICAgIGRlc3Ryb3lEZWNv ZGVkRGF0YShkZXN0cm95QWxsKTsKIH0KIAo=