Bug 136412

Summary:

Fix a harmless mismerge in BitmapImage::destroyDecodedDataIfNecessary

Product:

WebKit

Reporter:

Tim Horton <thorton>

Component:

New Bugs

Assignee:

Tim Horton <thorton>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

commit-queue, mitz, simon.fraser

Priority:

Version:

528+ (Nightly build)

Hardware:

Unspecified

OS:

Unspecified

Attachments:

Description	Flags
Patch	ap: review+

Description Tim Horton 2014-08-31 02:08:07 PDT

Fix a harmless mismerge in BitmapImage::destroyDecodedDataIfNecessary

Comment 1 Tim Horton 2014-08-31 02:08:27 PDT

Created attachment 237422 [details]
Patch

Comment 2 WebKit Commit Bot 2014-08-31 02:09:51 PDT

Attachment 237422 [details] 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.

Comment 3 Tim Horton 2014-08-31 15:03:11 PDT

http://trac.webkit.org/changeset/173148