Revert to changeset e048ac9eb279 for bustage.
authorMs2ger <ms2ger@gmail.com>
Fri, 24 Aug 2012 15:44:54 +0200
changeset 103286 46365c62935cfc66b86e7179e9d6d0ce976413bf
parent 103285 269195e72bf9f48f7dec0dc635da4b6a034e5be6
child 103287 e764ad3c6c688e5075eecf8e893a1791d54e74ae
push id13918
push userMs2ger@gmail.com
push dateFri, 24 Aug 2012 13:45:17 +0000
treeherdermozilla-inbound@46365c62935c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone17.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Revert to changeset e048ac9eb279 for bustage.
accessible/src/mac/mozAccessible.mm
accessible/src/mac/mozActionElements.mm
netwerk/test/unit/data/test_psl.txt
netwerk/test/unit/xpcshell.ini
--- a/accessible/src/mac/mozAccessible.mm
+++ b/accessible/src/mac/mozAccessible.mm
@@ -96,18 +96,17 @@ GetClosestInterestingAccessible(id anObj
 #pragma mark -
 
 - (BOOL)accessibilityIsIgnored
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
   // 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);
 }
 
 - (NSArray*)accessibilityAttributeNames
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
--- a/accessible/src/mac/mozActionElements.mm
+++ b/accessible/src/mac/mozActionElements.mm
@@ -333,29 +333,16 @@ enum CheckboxValue {
   [mTabs release];
   mTabs = nil;
 }
 
 @end
 
 @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)
     return nil;
 
   nsDeckFrame* deckFrame = do_QueryFrame(mGeckoAccessible->GetFrame());
   nsIFrame* selectedFrame = deckFrame ? deckFrame->GetSelectedBox() : nullptr;
 
deleted file mode 100644
--- 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');
--- a/netwerk/test/unit/xpcshell.ini
+++ b/netwerk/test/unit/xpcshell.ini
@@ -155,17 +155,16 @@ skip-if = os == "win"
 [test_plaintext_sniff.js]
 [test_post.js]
 [test_progress.js]
 [test_protocolproxyservice.js]
 [test_proxy-failover_canceled.js]
 [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]
 [test_redirect-caching_failure.js]
 [test_redirect-caching_passing.js]
 [test_redirect_canceled.js]
 [test_redirect_failure.js]
 [test_redirect_passing.js]