Title: [141033] trunk/Source/WebCore
- Revision
- 141033
- Author
- [email protected]
- Date
- 2013-01-28 18:28:04 -0800 (Mon, 28 Jan 2013)
Log Message
[chromium] Build fix.
Unreviewed build fix. Remove the use of SkMutex from DiscardablePixelRef.
* platform/graphics/chromium/DiscardablePixelRef.cpp:
(WebCore::DiscardablePixelRefAllocator::allocPixelRef):
(WebCore::DiscardablePixelRef::DiscardablePixelRef):
* platform/graphics/chromium/DiscardablePixelRef.h:
(DiscardablePixelRef):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (141032 => 141033)
--- trunk/Source/WebCore/ChangeLog 2013-01-29 02:03:22 UTC (rev 141032)
+++ trunk/Source/WebCore/ChangeLog 2013-01-29 02:28:04 UTC (rev 141033)
@@ -1,3 +1,15 @@
+2013-01-28 Alpha Lam <[email protected]>
+
+ [chromium] Build fix.
+
+ Unreviewed build fix. Remove the use of SkMutex from DiscardablePixelRef.
+
+ * platform/graphics/chromium/DiscardablePixelRef.cpp:
+ (WebCore::DiscardablePixelRefAllocator::allocPixelRef):
+ (WebCore::DiscardablePixelRef::DiscardablePixelRef):
+ * platform/graphics/chromium/DiscardablePixelRef.h:
+ (DiscardablePixelRef):
+
2013-01-28 Benjamin Poulain <[email protected]>
String constructed from Literals should be non-empty
Modified: trunk/Source/WebCore/platform/graphics/chromium/DiscardablePixelRef.cpp (141032 => 141033)
--- trunk/Source/WebCore/platform/graphics/chromium/DiscardablePixelRef.cpp 2013-01-29 02:03:22 UTC (rev 141032)
+++ trunk/Source/WebCore/platform/graphics/chromium/DiscardablePixelRef.cpp 2013-01-29 02:28:04 UTC (rev 141033)
@@ -45,7 +45,7 @@
if (size.isNeg() || !size.is32())
return false;
- SkAutoTUnref<DiscardablePixelRef> pixelRef(new DiscardablePixelRef(ctable, adoptPtr(new SkMutex())));
+ SkAutoTUnref<DiscardablePixelRef> pixelRef(new DiscardablePixelRef(ctable));
if (pixelRef->allocAndLockDiscardableMemory(size.get32())) {
pixelRef->setURI(labelDiscardable);
dst->setPixelRef(pixelRef.get());
@@ -61,11 +61,9 @@
return dst->allocPixels(ctable);
}
-DiscardablePixelRef::DiscardablePixelRef(SkColorTable* ctable, PassOwnPtr<SkMutex> mutex)
- : SkPixelRef(mutex.get())
- , m_colorTable(ctable)
+DiscardablePixelRef::DiscardablePixelRef(SkColorTable* ctable)
+ : m_colorTable(ctable)
, m_lockedMemory(0)
- , m_mutex(mutex)
{
}
Modified: trunk/Source/WebCore/platform/graphics/chromium/DiscardablePixelRef.h (141032 => 141033)
--- trunk/Source/WebCore/platform/graphics/chromium/DiscardablePixelRef.h 2013-01-29 02:03:22 UTC (rev 141032)
+++ trunk/Source/WebCore/platform/graphics/chromium/DiscardablePixelRef.h 2013-01-29 02:28:04 UTC (rev 141033)
@@ -46,7 +46,7 @@
// PixelRef object whose memory can be discarded when pixels are unlocked.
class DiscardablePixelRef : public SkPixelRef {
public:
- DiscardablePixelRef(SkColorTable*, PassOwnPtr<SkMutex>);
+ DiscardablePixelRef(SkColorTable*);
~DiscardablePixelRef();
static bool isDiscardable(SkPixelRef*);
@@ -63,7 +63,6 @@
SkColorTable* m_colorTable;
void* m_lockedMemory;
OwnPtr<WebKit::WebDiscardableMemory> m_discardable;
- OwnPtr<SkMutex> m_mutex;
};
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
