Commit fce330e0 authored by Martin Robinson's avatar Martin Robinson Committed by Commit Bot

Fix some memory leaks in AuraLinux tests

These are typically caused by ATK GObjects that are reffed, but then
never unreffed.

Bug: 961578
Change-Id: I6455044685f7253b6088ddaf32e611eaa97971f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1605402Reviewed-by: default avatarJoanmarie Diggs <jdiggs@igalia.com>
Commit-Queue: Martin Robinson <mrobinson@igalia.com>
Cr-Commit-Position: refs/heads/master@{#658483}
parent 9826339a
......@@ -193,6 +193,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
CheckTextAtOffset(atk_text, 0, ATK_TEXT_BOUNDARY_LINE_START, 0,
InputContentsString().size(),
InputContentsString().c_str());
g_object_unref(atk_text);
}
IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
......@@ -209,6 +211,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
// Last line does not have a trailing newline.
CheckTextAtOffset(atk_text, 32, ATK_TEXT_BOUNDARY_LINE_START, 32,
InputContentsString().size(), "\"KHTML, like\".");
g_object_unref(atk_text);
}
IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
......@@ -236,6 +240,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
n_characters,
"cooperation between intelligent rational decision-makers.\"");
}
g_object_unref(atk_text);
}
IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
......@@ -328,6 +334,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
EXPECT_EQ(0, y);
EXPECT_EQ(0, width);
EXPECT_EQ(0, height);
g_object_unref(atk_text);
}
AtkCoordType kCoordinateTypes[] = {
......@@ -430,6 +438,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
EXPECT_EQ(combined_extents.height(), atk_rect.height);
}
}
g_object_unref(atk_text);
}
IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
......@@ -509,6 +519,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest,
EXPECT_EQ(previous_height, height);
}
}
g_object_unref(atk_text);
}
#if defined(ATK_230)
......@@ -575,6 +587,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest, TestScrollToPoint) {
atk_component_get_extents(ATK_COMPONENT(frame), nullptr, &frame_y, nullptr,
nullptr, ATK_XY_SCREEN);
EXPECT_EQ(frame_y, y);
g_object_unref(atk_text);
}
IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest, TestScrollTo) {
......@@ -714,6 +728,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest, TestSetSelection) {
EXPECT_EQ(1, start_offset);
EXPECT_EQ(contents_string_length, end_offset);
g_free(selected_text);
g_object_unref(atk_text);
}
IN_PROC_BROWSER_TEST_F(AccessibilityAuraLinuxBrowserTest, TestAtkTextListItem) {
......
......@@ -1499,9 +1499,10 @@ TEST_F(AXPlatformNodeAuraLinuxTest, TestFocusTriggersAtkWindowActive) {
AtkObject* root_atk_object(GetRootAtkObject());
EXPECT_TRUE(ATK_IS_OBJECT(root_atk_object));
g_object_ref(root_atk_object);
EXPECT_TRUE(ATK_IS_WINDOW(root_atk_object));
g_object_ref(root_atk_object);
AXNode* child_node = GetRootNode()->children()[0];
// A focus event on a child node should not cause the window to
......@@ -1761,17 +1762,14 @@ TEST_F(AXPlatformNodeAuraLinuxTest, TestAtkObjectSetSizePosInSet) {
AXNode* radiobutton1 = GetRootNode()->children()[0];
AtkObject* radiobutton1_atk_object(AtkObjectFromNode(radiobutton1));
EXPECT_TRUE(ATK_IS_OBJECT(radiobutton1_atk_object));
g_object_ref(radiobutton1_atk_object);
AXNode* radiobutton2 = GetRootNode()->children()[1];
AtkObject* radiobutton2_atk_object(AtkObjectFromNode(radiobutton2));
EXPECT_TRUE(ATK_IS_OBJECT(radiobutton2_atk_object));
g_object_ref(radiobutton2_atk_object);
AXNode* radiobutton3 = GetRootNode()->children()[2];
AtkObject* radiobutton3_atk_object(AtkObjectFromNode(radiobutton3));
EXPECT_TRUE(ATK_IS_OBJECT(radiobutton3_atk_object));
g_object_ref(radiobutton3_atk_object);
// Notice that setsize was never assigned to any of the kRadioButtons, but was
// inferred.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment