Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1024)

Unified Diff: third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-13-platform: . Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
index 8e47908c47ee13170c92c9b8582891dc0242bd59..d7e5a06b3d93e845749c12907c03f5ffbb1737c7 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
@@ -55,10 +55,10 @@ ImageFrame& ImageFrame::operator=(const ImageFrame& other)
m_pixelsChanged = other.m_pixelsChanged;
setMemoryAllocator(other.allocator());
setOriginalFrameRect(other.originalFrameRect());
- setStatus(other.status());
+ setStatus(other.getStatus());
setDuration(other.duration());
- setDisposalMethod(other.disposalMethod());
- setAlphaBlendSource(other.alphaBlendSource());
+ setDisposalMethod(other.getDisposalMethod());
+ setAlphaBlendSource(other.getAlphaBlendSource());
setPremultiplyAlpha(other.premultiplyAlpha());
// Be sure that this is called after we've called setStatus(), since we
// look at our status to know what to do with the alpha value.

Powered by Google App Engine
This is Rietveld 408576698