Bug 136412 - Fix a harmless mismerge in BitmapImage::destroyDecodedDataIfNecessary
Summary: Fix a harmless mismerge in BitmapImage::destroyDecodedDataIfNecessary
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Tim Horton
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-08-31 02:08 PDT by Tim Horton
Modified: 2014-08-31 15:03 PDT (History)
3 users (show)

See Also:


Attachments
Patch (2.47 KB, patch)
2014-08-31 02:08 PDT, Tim Horton
ap: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
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