One AXObjectCache per frame

Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 2215 matching lines @@
 void Document::removeAllEventListeners()
 {
     ContainerNode::removeAllEventListeners();
 
     if (LocalDOMWindow* domWindow = this->domWindow())
         domWindow->removeAllEventListeners();
 }
 
 Document& Document::axObjectCacheOwner() const
 {
-    Document& top = topDocument();
-    if (top.frame() && top.frame()->pagePopupOwner()) {
-        ASSERT(!top.m_axObjectCache);
-        return top.frame()->pagePopupOwner()->document().axObjectCacheOwner();
+    if (frame() && frame()->pagePopupOwner()) {
+        ASSERT(!m_axObjectCache);
+        return frame()->pagePopupOwner()->document().axObjectCacheOwner();
     }
-    return top;
+    return *const_cast<Document*>(this);
 }
 
 void Document::clearAXObjectCache()
 {
     ASSERT(&axObjectCacheOwner() == this);
     // Clear the cache member variable before calling delete because attempts
     // are made to access it during destruction.
     if (m_axObjectCache)
         m_axObjectCache->dispose();
     m_axObjectCache.clear();
@@ skipping 1269 matching lines @@
                 // Re-get the widget in case updating the layout changed things.
                 focusWidget = widgetForElement(*m_focusedElement);
             }
             if (focusWidget)
                 focusWidget->setFocus(true, type);
             else
                 view()->setFocus(true, type);
         }
     }
 
-    if (!focusChangeBlocked && m_focusedElement) {
+    if (!focusChangeBlocked) {

[aboxhall, 2015/09/22 21:48:27]

Why this change?

[dmazzoni, 2015/09/22 22:08:44]

A consequence of this change is that when focus moves between frames, we were no
longer getting focus events fired in each frame, but we should have - because
previously when everything was in one big AXObjectCache we just fired an event
on the new node that had focus, no matter what it was.

Now when focus is lost from a frame, m_focusedElement might be null - but we do
want to fire an event, so that Chromium knows that this particular frame doesn't
have a focused element anymore.

         // Create the AXObject cache in a focus change because Chromium relies on it.
         if (AXObjectCache* cache = axObjectCache())
             cache->handleFocusedUIElementChanged(oldFocusedElement.get(), newFocusedElement.get());
     }
 
     if (!focusChangeBlocked && frameHost())
         frameHost()->chromeClient().focusedNodeChanged(oldFocusedElement.get(), m_focusedElement.get());
 
 SetFocusedElementDone:
     updateLayoutTreeIfNeeded();
@@ skipping 2197 matching lines @@
 #ifndef NDEBUG
 using namespace blink;
 void showLiveDocumentInstances()
 {
     Document::WeakDocumentSet& set = Document::liveDocumentSet();
     fprintf(stderr, "There are %u documents currently alive:\n", set.size());
     for (Document* document : set)
         fprintf(stderr, "- Document %p URL: %s\n", document, document->url().string().utf8().data());
 }
 #endif