summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/icecat-CVE-2015-2710-pt2.patch
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-06-05 23:15:25 -0400
committerMark H Weaver <mhw@netris.org>2015-06-06 08:02:45 -0400
commit716e20a2bccbbff71ff1839de2d9f97e7efd5a5f (patch)
treea777888d51c92ab6c0f5fd15e4d7b5ca3ea9116c /gnu/packages/patches/icecat-CVE-2015-2710-pt2.patch
parent8850303e769a742f407193e08388692cfcd09e67 (diff)
gnu: icecat: Update to 31.7.0-gnu1.
* gnu/packages/patches/icecat-CVE-2015-0797.patch, gnu/packages/patches/icecat-CVE-2015-2708-pt1.patch, gnu/packages/patches/icecat-CVE-2015-2708-pt2.patch, gnu/packages/patches/icecat-CVE-2015-2708-pt3.patch, gnu/packages/patches/icecat-CVE-2015-2708-pt4.patch, gnu/packages/patches/icecat-CVE-2015-2710-pt1.patch, gnu/packages/patches/icecat-CVE-2015-2710-pt2.patch, gnu/packages/patches/icecat-CVE-2015-2710-pt3.patch, gnu/packages/patches/icecat-CVE-2015-2713-pt1.patch, gnu/packages/patches/icecat-CVE-2015-2713-pt2.patch, gnu/packages/patches/icecat-CVE-2015-2716.patch: Remove files. * gnu-system.am (dist_patch_DATA): Remove them. * gnu/packages/gnuzilla.scm (icecat): Update to 31.7.0-gnu1. Remove patches.
Diffstat (limited to 'gnu/packages/patches/icecat-CVE-2015-2710-pt2.patch')
-rw-r--r--gnu/packages/patches/icecat-CVE-2015-2710-pt2.patch64
1 files changed, 0 insertions, 64 deletions
diff --git a/gnu/packages/patches/icecat-CVE-2015-2710-pt2.patch b/gnu/packages/patches/icecat-CVE-2015-2710-pt2.patch
deleted file mode 100644
index 26a10ca2e4..0000000000
--- a/gnu/packages/patches/icecat-CVE-2015-2710-pt2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From f7c0070831e72735c43beb426ac0c2ce33403f4f Mon Sep 17 00:00:00 2001
-From: Cameron McCormack <cam@mcc.id.au>
-Date: Mon, 6 Apr 2015 09:12:06 -0400
-Subject: [PATCH] Bug 1149542 - Part 2: Track undisplayed characters before
- empty text frames properly. r=dholbert, a=sledru
-
----
- layout/svg/SVGTextFrame.cpp | 29 ++++++++++++++++-------------
- 1 file changed, 16 insertions(+), 13 deletions(-)
-
-diff --git a/layout/svg/SVGTextFrame.cpp b/layout/svg/SVGTextFrame.cpp
-index 45327881..9d331b8 100644
---- a/layout/svg/SVGTextFrame.cpp
-+++ b/layout/svg/SVGTextFrame.cpp
-@@ -290,22 +290,25 @@ GetNonEmptyTextFrameAndNode(nsIFrame* aFrame,
- nsTextNode*& aTextNode)
- {
- nsTextFrame* text = do_QueryFrame(aFrame);
-- if (!text) {
-- return false;
-- }
-+ bool isNonEmptyTextFrame = text && text->GetContentLength() != 0;
-
-- nsIContent* content = text->GetContent();
-- NS_ASSERTION(content && content->IsNodeOfType(nsINode::eTEXT),
-- "unexpected content type for nsTextFrame");
-+ if (isNonEmptyTextFrame) {
-+ nsIContent* content = text->GetContent();
-+ NS_ASSERTION(content && content->IsNodeOfType(nsINode::eTEXT),
-+ "unexpected content type for nsTextFrame");
-
-- nsTextNode* node = static_cast<nsTextNode*>(content);
-- if (node->TextLength() == 0) {
-- return false;
-+ nsTextNode* node = static_cast<nsTextNode*>(content);
-+ MOZ_ASSERT(node->TextLength() != 0,
-+ "frame's GetContentLength() should be 0 if the text node "
-+ "has no content");
-+
-+ aTextFrame = text;
-+ aTextNode = node;
- }
-
-- aTextFrame = text;
-- aTextNode = node;
-- return true;
-+ MOZ_ASSERT(IsNonEmptyTextFrame(aFrame) == isNonEmptyTextFrame,
-+ "our logic should agree with IsNonEmptyTextFrame");
-+ return isNonEmptyTextFrame;
- }
-
- /**
-@@ -1298,7 +1301,7 @@ GetUndisplayedCharactersBeforeFrame(nsTextFrame* aFrame)
- /**
- * Traverses the nsTextFrames for an SVGTextFrame and records a
- * TextNodeCorrespondenceProperty on each for the number of undisplayed DOM
-- * characters between each frame. This is done by iterating simultaenously
-+ * characters between each frame. This is done by iterating simultaneously
- * over the nsTextNodes and nsTextFrames and noting when nsTextNodes (or
- * parts of them) are skipped when finding the next nsTextFrame.
- */
---
-2.2.1
-