Title: [158157] branches/safari-537.73-branch/Source/WebCore
- Revision
- 158157
- Author
- [email protected]
- Date
- 2013-10-28 19:13:36 -0700 (Mon, 28 Oct 2013)
Log Message
Merged r156099. <rdar://problem/15168245>
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/WebCore/ChangeLog (158156 => 158157)
--- branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-10-29 02:10:47 UTC (rev 158156)
+++ branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-10-29 02:13:36 UTC (rev 158157)
@@ -1,5 +1,18 @@
2013-10-28 Lucas Forschler <[email protected]>
+ Merge r156099
+
+ 2013-09-19 Alexey Proskuryakov <[email protected]>
+
+ REGRESSION (r149928): CanvasStyle::operator= leaks everything
+ https://bugs.webkit.org/show_bug.cgi?id=121591
+
+ Reviewed by Andreas Kling.
+
+ * html/canvas/CanvasStyle.cpp: (WebCore::CanvasStyle::operator=): Don't leak.
+
+2013-10-28 Lucas Forschler <[email protected]>
+
Merge r156222
2013-09-20 Ryosuke Niwa <[email protected]>
Modified: branches/safari-537.73-branch/Source/WebCore/html/canvas/CanvasStyle.cpp (158156 => 158157)
--- branches/safari-537.73-branch/Source/WebCore/html/canvas/CanvasStyle.cpp 2013-10-29 02:10:47 UTC (rev 158156)
+++ branches/safari-537.73-branch/Source/WebCore/html/canvas/CanvasStyle.cpp 2013-10-29 02:13:36 UTC (rev 158157)
@@ -238,13 +238,8 @@
CanvasStyle& CanvasStyle::operator=(const CanvasStyle& other)
{
if (this != &other) {
- memcpy(this, &other, sizeof(CanvasStyle));
- if (m_type == Gradient)
- m_gradient->ref();
- else if (m_type == ImagePattern)
- m_pattern->ref();
- else if (m_type == CMYKA)
- m_cmyka = new CMYKAValues(other.m_cmyka->rgba, other.m_cmyka->c, other.m_cmyka->m, other.m_cmyka->y, other.m_cmyka->k, other.m_cmyka->a);
+ this->~CanvasStyle();
+ new (this) CanvasStyle(other);
}
return *this;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
