Introduced WebFactory and WebFactoryImpl for constructing web/ classes

third_party/WebKit/Source/web/WebViewImpl.h

 /*
  * Copyright (C) 2010 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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebViewImpl_h
 #define WebViewImpl_h
 
 #include <memory>
 #include "core/exported/WebViewBase.h"
 #include "core/frame/ResizeViewportAnchor.h"
+#include "core/page/ChromeClient.h"
 #include "core/page/ContextMenuProvider.h"
 #include "core/page/EventWithHitTestResults.h"
 #include "platform/animation/CompositorAnimationTimeline.h"
 #include "platform/geometry/IntPoint.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/TouchAction.h"
 #include "platform/heap/Handle.h"
 #include "platform/scheduler/child/web_scheduler.h"
 #include "platform/wtf/Compiler.h"
 #include "platform/wtf/HashSet.h"
 #include "platform/wtf/Vector.h"
 #include "public/platform/WebDisplayMode.h"
 #include "public/platform/WebFloatSize.h"
 #include "public/platform/WebGestureCurveTarget.h"
 #include "public/platform/WebGestureEvent.h"
 #include "public/platform/WebInputEvent.h"
 #include "public/platform/WebInputEventResult.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebPoint.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebSize.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebVector.h"
 #include "public/web/WebNavigationPolicy.h"
 #include "public/web/WebPageImportanceSignals.h"
-#include "web/ChromeClientImpl.h"
 #include "web/ContextMenuClientImpl.h"
 #include "web/EditorClientImpl.h"
 #include "web/MediaKeysClientImpl.h"
 #include "web/PageWidgetDelegate.h"
 #include "web/SpellCheckerClientImpl.h"
 #include "web/StorageClientImpl.h"
 #include "web/WebExport.h"
 #include "web/WebPagePopupImpl.h"
 
 namespace blink {
@@ skipping 416 matching lines @@
 
   PageScaleConstraintsSet& GetPageScaleConstraintsSet() const override;
 
   FloatSize ElasticOverscroll() const override { return elastic_overscroll_; }
 
   double LastFrameTimeMonotonic() const override {
     return last_frame_time_monotonic_;
   }
 
   class ChromeClient& ChromeClient() const override {
-    return *chrome_client_impl_.Get();
+    return *chrome_client_.Get();
   }
 
   // Returns the currently active WebInputMethodController which is the one
   // corresponding to the focused frame. It will return nullptr if there is no
   // focused frame, or if the there is one but it belongs to a different local
   // root.
   WebInputMethodControllerImpl* GetActiveWebInputMethodController() const;
 
   void SetLastHiddenPagePopup(WebPagePopupImpl* page_popup) override {
     last_hidden_page_popup_ = page_popup;
@@ skipping 85 matching lines @@
   void DetachCompositorAnimationTimeline(CompositorAnimationTimeline*);
 
   LocalFrame* FocusedLocalFrameInWidget() const;
   LocalFrame* FocusedLocalFrameAvailableForIme() const;
 
   CompositorMutatorImpl& Mutator();
 
   WebViewClient* client_;  // Can be 0 (e.g. unittests, shared workers, etc.)
   WebSpellCheckClient* spell_check_client_;
 
-  Persistent<ChromeClientImpl> chrome_client_impl_;
+  // ChromeClient needs blink:: qualifier so it doesn't clash with ChromeClient
+  // method.

[dcheng, 2017/05/29 08:02:30]

Huh... maybe let's just rename ChromeClient() to GetChromeClient() since that's
how we generally resolved the other naming conflicts.

[sashab, 2017/05/30 02:56:18]

Oh yeah, forgot about the Get prefix trick :) Will do that.

It's a non-tiny change since ChromeClient() is inherited from WebView... Added
TODO and will do in follow-up patch.

+  Persistent<blink::ChromeClient> chrome_client_;
   ContextMenuClientImpl context_menu_client_impl_;
   EditorClientImpl editor_client_impl_;
   SpellCheckerClientImpl spell_checker_client_impl_;
   StorageClientImpl storage_client_impl_;
 
   WebSize size_;
   // If true, automatically resize the layout view around its content.
   bool should_auto_resize_;
   // The lower bound on the size when auto-resizing.
   IntSize min_auto_size_;
@@ skipping 126 matching lines @@
   Persistent<ResizeViewportAnchor> resize_viewport_anchor_;
 };
 
 // We have no ways to check if the specified WebView is an instance of
 // WebViewImpl because WebViewImpl is the only implementation of WebView.
 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
 
 }  // namespace blink
 
 #endif