From e7364eb3f03c9a280ea4f6918c24cf308cbf1f5f Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 24 Aug 2012 15:44:54 +0200 Subject: [PATCH] Revert to changeset e048ac9eb279 for bustage. --- accessible/src/mac/mozAccessible.mm | 3 +- accessible/src/mac/mozActionElements.mm | 13 ----- netwerk/test/unit/data/test_psl.txt | 78 ------------------------- netwerk/test/unit/xpcshell.ini | 1 - 4 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 netwerk/test/unit/data/test_psl.txt diff --git a/accessible/src/mac/mozAccessible.mm b/accessible/src/mac/mozAccessible.mm index 8597da96cefa..51176aa68d6b 100644 --- a/accessible/src/mac/mozAccessible.mm +++ b/accessible/src/mac/mozAccessible.mm @@ -101,8 +101,7 @@ GetClosestInterestingAccessible(id anObject) // unknown (either unimplemented, or irrelevant) elements are marked as ignored // as well as expired elements. - return !mGeckoAccessible || ([[self role] isEqualToString:NSAccessibilityUnknownRole] && - !(mGeckoAccessible->NativeInteractiveState() & states::FOCUSABLE)); + return !mGeckoAccessible || [[self role] isEqualToString:NSAccessibilityUnknownRole]; NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NO); } diff --git a/accessible/src/mac/mozActionElements.mm b/accessible/src/mac/mozActionElements.mm index f673d8c82107..f22cc992f9f0 100644 --- a/accessible/src/mac/mozActionElements.mm +++ b/accessible/src/mac/mozActionElements.mm @@ -338,19 +338,6 @@ enum CheckboxValue { @implementation mozPaneAccessible -- (NSUInteger)accessibilityArrayAttributeCount:(NSString*)attribute -{ - if (!mGeckoAccessible) - return 0; - - // By default this calls -[[mozAccessible children] count]. - // Since we don't cache mChildren. This is faster. - if ([attribute isEqualToString:NSAccessibilityChildrenAttribute]) - return mGeckoAccessible->ChildCount() ? 1 : 0; - - return [super accessibilityArrayAttributeCount:attribute]; -} - - (NSArray*)children { if (!mGeckoAccessible) diff --git a/netwerk/test/unit/data/test_psl.txt b/netwerk/test/unit/data/test_psl.txt deleted file mode 100644 index 5a758317b598..000000000000 --- a/netwerk/test/unit/data/test_psl.txt +++ /dev/null @@ -1,78 +0,0 @@ -// Any copyright is dedicated to the Public Domain. -// http://creativecommons.org/publicdomain/zero/1.0/ - -// null input. -checkPublicSuffix(null, null); -// Mixed case. -checkPublicSuffix('COM', null); -checkPublicSuffix('example.COM', 'example.com'); -checkPublicSuffix('WwW.example.COM', 'example.com'); -// Leading dot. -checkPublicSuffix('.com', null); -checkPublicSuffix('.example', null); -checkPublicSuffix('.example.com', null); -checkPublicSuffix('.example.example', null); -// Unlisted TLD. -checkPublicSuffix('example', null); -checkPublicSuffix('example.example', 'example.example'); -checkPublicSuffix('b.example.example', 'example.example'); -checkPublicSuffix('a.b.example.example', 'example.example'); -// Listed, but non-Internet, TLD. -//checkPublicSuffix('local', null); -//checkPublicSuffix('example.local', null); -//checkPublicSuffix('b.example.local', null); -//checkPublicSuffix('a.b.example.local', null); -// TLD with only 1 rule. -checkPublicSuffix('biz', null); -checkPublicSuffix('domain.biz', 'domain.biz'); -checkPublicSuffix('b.domain.biz', 'domain.biz'); -checkPublicSuffix('a.b.domain.biz', 'domain.biz'); -// TLD with some 2-level rules. -checkPublicSuffix('com', null); -checkPublicSuffix('example.com', 'example.com'); -checkPublicSuffix('b.example.com', 'example.com'); -checkPublicSuffix('a.b.example.com', 'example.com'); -checkPublicSuffix('uk.com', null); -checkPublicSuffix('example.uk.com', 'example.uk.com'); -checkPublicSuffix('b.example.uk.com', 'example.uk.com'); -checkPublicSuffix('a.b.example.uk.com', 'example.uk.com'); -checkPublicSuffix('test.ac', 'test.ac'); -// TLD with only 1 (wildcard) rule. -checkPublicSuffix('cy', null); -checkPublicSuffix('c.cy', null); -checkPublicSuffix('b.c.cy', 'b.c.cy'); -checkPublicSuffix('a.b.c.cy', 'b.c.cy'); -// More complex TLD. -checkPublicSuffix('jp', null); -checkPublicSuffix('test.jp', 'test.jp'); -checkPublicSuffix('www.test.jp', 'test.jp'); -checkPublicSuffix('ac.jp', null); -checkPublicSuffix('test.ac.jp', 'test.ac.jp'); -checkPublicSuffix('www.test.ac.jp', 'test.ac.jp'); -checkPublicSuffix('kyoto.jp', null); -checkPublicSuffix('test.kyoto.jp', 'test.kyoto.jp'); -checkPublicSuffix('ide.kyoto.jp', null); -checkPublicSuffix('b.ide.kyoto.jp', 'b.ide.kyoto.jp'); -checkPublicSuffix('a.b.ide.kyoto.jp', 'b.ide.kyoto.jp'); -checkPublicSuffix('c.kobe.jp', null); -checkPublicSuffix('b.c.kobe.jp', 'b.c.kobe.jp'); -checkPublicSuffix('a.b.c.kobe.jp', 'b.c.kobe.jp'); -checkPublicSuffix('city.kobe.jp', 'city.kobe.jp'); -checkPublicSuffix('www.city.kobe.jp', 'city.kobe.jp'); -// TLD with a wildcard rule and exceptions. -checkPublicSuffix('om', null); -checkPublicSuffix('test.om', null); -checkPublicSuffix('b.test.om', 'b.test.om'); -checkPublicSuffix('a.b.test.om', 'b.test.om'); -checkPublicSuffix('songfest.om', 'songfest.om'); -checkPublicSuffix('www.songfest.om', 'songfest.om'); -// US K12. -checkPublicSuffix('us', null); -checkPublicSuffix('test.us', 'test.us'); -checkPublicSuffix('www.test.us', 'test.us'); -checkPublicSuffix('ak.us', null); -checkPublicSuffix('test.ak.us', 'test.ak.us'); -checkPublicSuffix('www.test.ak.us', 'test.ak.us'); -checkPublicSuffix('k12.ak.us', null); -checkPublicSuffix('test.k12.ak.us', 'test.k12.ak.us'); -checkPublicSuffix('www.test.k12.ak.us', 'test.k12.ak.us'); diff --git a/netwerk/test/unit/xpcshell.ini b/netwerk/test/unit/xpcshell.ini index 32e8870193d9..c83320496e0b 100644 --- a/netwerk/test/unit/xpcshell.ini +++ b/netwerk/test/unit/xpcshell.ini @@ -160,7 +160,6 @@ skip-if = os == "win" [test_proxy-failover_passing.js] [test_proxy-replace_canceled.js] [test_proxy-replace_passing.js] -[test_psl.js] [test_range_requests.js] [test_readline.js] [test_redirect-caching_canceled.js]