Revert of Rename AXObject to AXObjectImpl in modules/ and web/ (patchset #9 id:160001 of https://co…

third_party/WebKit/Source/web/WebPagePopupImpl.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 30 matching lines @@
 #include "core/frame/VisualViewport.h"
 #include "core/input/EventHandler.h"
 #include "core/layout/api/LayoutAPIShim.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/loader/EmptyClients.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/page/PagePopupClient.h"
 #include "core/page/PagePopupSupplement.h"
+#include "modules/accessibility/AXObject.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
-#include "modules/accessibility/AXObjectImpl.h"
 #include "platform/EventDispatchForbiddenScope.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/ScriptForbiddenScope.h"
 #include "platform/animation/CompositorAnimationHost.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/heap/Handle.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "platform/wtf/PtrUtil.h"
 #include "public/platform/WebCompositeAndReadbackAsyncCallback.h"
 #include "public/platform/WebCursorInfo.h"
@@ skipping 150 matching lines @@
     if (WebWidgetClient* client = widget->Client())
       client->SetTouchAction(static_cast<WebTouchAction>(touch_action));
   }
 
   void AttachRootGraphicsLayer(GraphicsLayer* graphics_layer,
                                LocalFrame* local_root) override {
     popup_->SetRootGraphicsLayer(graphics_layer);
   }
 
   void PostAccessibilityNotification(
-      AXObjectImpl* obj,
+      AXObject* obj,
       AXObjectCache::AXNotification notification) override {
     WebLocalFrameImpl* frame = WebLocalFrameImpl::FromFrame(
         popup_->popup_client_->OwnerElement().GetDocument().GetFrame());
     if (obj && frame && frame->Client())
       frame->Client()->PostAccessibilityEvent(
           WebAXObject(obj), static_cast<WebAXEvent>(notification));
   }
 
   void SetToolTip(LocalFrame&,
                   const String& tooltip_text,
@@ skipping 113 matching lines @@
 }
 
 void WebPagePopupImpl::DestroyPage() {
   if (!page_)
     return;
 
   page_->WillBeDestroyed();
   page_.Clear();
 }
 
-AXObjectImpl* WebPagePopupImpl::RootAXObject() {
+AXObject* WebPagePopupImpl::RootAXObject() {
   if (!page_ || !page_->MainFrame())
     return 0;
   Document* document = ToLocalFrame(page_->MainFrame())->GetDocument();
   if (!document)
     return 0;
   AXObjectCache* cache = document->AxObjectCache();
   DCHECK(cache);
   return ToAXObjectCacheImpl(cache)->GetOrCreate(ToLayoutView(
       LayoutAPIShim::LayoutObjectFrom(document->GetLayoutViewItem())));
 }
@@ skipping 234 matching lines @@
   // A WebPagePopupImpl instance usually has two references.
   //  - One owned by the instance itself. It represents the visible widget.
   //  - One owned by a WebViewBase. It's released when the WebViewBase ask the
   //    WebPagePopupImpl to close.
   // We need them because the closing operation is asynchronous and the widget
   // can be closed while the WebViewBase is unaware of it.
   return AdoptRef(new WebPagePopupImpl(client)).LeakRef();
 }
 
 }  // namespace blink