Title: [113903] trunk/Source/WebCore
- Revision
- 113903
- Author
- [email protected]
- Date
- 2012-04-11 13:25:27 -0700 (Wed, 11 Apr 2012)
Log Message
[BlackBerry] Upstream BlackBerry change to PatternSkia.cpp
https://bugs.webkit.org/show_bug.cgi?id=83361
Reviewed by Antonio Gomes.
Upstream a cleaned up version.
* platform/graphics/skia/PatternSkia.cpp:
(WebCore::Pattern::platformDestroy):
(WebCore::Pattern::platformPattern):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (113902 => 113903)
--- trunk/Source/WebCore/ChangeLog 2012-04-11 20:19:45 UTC (rev 113902)
+++ trunk/Source/WebCore/ChangeLog 2012-04-11 20:25:27 UTC (rev 113903)
@@ -1,3 +1,16 @@
+2012-04-11 Rob Buis <[email protected]>
+
+ [BlackBerry] Upstream BlackBerry change to PatternSkia.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=83361
+
+ Reviewed by Antonio Gomes.
+
+ Upstream a cleaned up version.
+
+ * platform/graphics/skia/PatternSkia.cpp:
+ (WebCore::Pattern::platformDestroy):
+ (WebCore::Pattern::platformPattern):
+
2012-04-10 James Robinson <[email protected]>
[chromium] Add OVERRIDE annotations for cc layer types
Modified: trunk/Source/WebCore/platform/graphics/skia/PatternSkia.cpp (113902 => 113903)
--- trunk/Source/WebCore/platform/graphics/skia/PatternSkia.cpp 2012-04-11 20:19:45 UTC (rev 113902)
+++ trunk/Source/WebCore/platform/graphics/skia/PatternSkia.cpp 2012-04-11 20:25:27 UTC (rev 113903)
@@ -38,7 +38,9 @@
#include "SkColorShader.h"
#include "SkShader.h"
+#if USE(V8)
#include <v8.h>
+#endif
using namespace std;
@@ -49,7 +51,9 @@
SkSafeUnref(m_pattern);
m_pattern = 0;
if (m_externalMemoryAllocated) {
+#if USE(V8)
v8::V8::AdjustAmountOfExternalAllocatedMemory(-m_externalMemoryAllocated);
+#endif
m_externalMemoryAllocated = 0;
}
}
@@ -100,7 +104,9 @@
// Clamp to int, since that's what the adjust function takes.
m_externalMemoryAllocated = static_cast<int>(min(static_cast<size_t>(INT_MAX), bm2.getSafeSize()));
+#if USE(V8)
v8::V8::AdjustAmountOfExternalAllocatedMemory(m_externalMemoryAllocated);
+#endif
}
m_pattern->setLocalMatrix(m_patternSpaceTransformation);
return m_pattern;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
