Title: [103680] trunk/Source/WebCore
- Revision
- 103680
- Author
- [email protected]
- Date
- 2011-12-26 02:41:12 -0800 (Mon, 26 Dec 2011)
Log Message
Unreviewed bad merge fix.
Patch by Hajime Morrita <[email protected]> on 2011-12-26
* svg/SVGSVGElement.cpp:
(WebCore::SVGSVGElement::didMoveToNewDocument):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (103679 => 103680)
--- trunk/Source/WebCore/ChangeLog 2011-12-26 07:05:00 UTC (rev 103679)
+++ trunk/Source/WebCore/ChangeLog 2011-12-26 10:41:12 UTC (rev 103680)
@@ -1,3 +1,10 @@
+2011-12-26 Hajime Morrita <[email protected]>
+
+ Unreviewed bad merge fix.
+
+ * svg/SVGSVGElement.cpp:
+ (WebCore::SVGSVGElement::didMoveToNewDocument):
+
2011-12-25 Hajime Morrita <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=74067
Modified: trunk/Source/WebCore/svg/SVGSVGElement.cpp (103679 => 103680)
--- trunk/Source/WebCore/svg/SVGSVGElement.cpp 2011-12-26 07:05:00 UTC (rev 103679)
+++ trunk/Source/WebCore/svg/SVGSVGElement.cpp 2011-12-26 10:41:12 UTC (rev 103680)
@@ -108,9 +108,6 @@
void SVGSVGElement::didMoveToNewDocument(Document* oldDocument)
{
- document()->registerForPageCacheSuspensionCallbacks(this);
- SVGStyledLocatableElement::didMoveToNewDocument(oldDocument);
-
if (oldDocument)
oldDocument->unregisterForPageCacheSuspensionCallbacks(this);
document()->registerForPageCacheSuspensionCallbacks(this);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
