Remove DOMWindowProperty from PingLoaderImpl

third_party/WebKit/Source/core/loader/PingLoader.cpp

 /*
  * 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 168 matching lines @@
   }
 
   const AtomicString getContentType() const { return m_contentType; }
 
  private:
   const Member<FormData> m_data;
   RefPtr<EncodedFormData> m_entityBody;
   AtomicString m_contentType;
 };
 
 class PingLoaderImpl : public GarbageCollectedFinalized<PingLoaderImpl>,

[sof, 2016/12/12 07:48:21]

final

-                       public DOMWindowProperty,
                        private WebURLLoaderClient {
-  USING_GARBAGE_COLLECTED_MIXIN(PingLoaderImpl);
   WTF_MAKE_NONCOPYABLE(PingLoaderImpl);
 
  public:
   PingLoaderImpl(LocalFrame*,
                  ResourceRequest&,
                  const AtomicString&,
                  StoredCredentials,
                  bool);
   ~PingLoaderImpl() override;
 
   DECLARE_VIRTUAL_TRACE();

[sof, 2016/12/12 07:48:21]

Can be DECLARE_TRACE() now.

 
  private:
   void dispose();
 
   // WebURLLoaderClient
   bool willFollowRedirect(WebURLRequest&, const WebURLResponse&) override;
   void didReceiveResponse(const WebURLResponse&) final;
   void didReceiveData(const char*, int) final;
   void didFinishLoading(double, int64_t, int64_t) final;
   void didFail(const WebURLError&, int64_t, int64_t) final;
 
   void timeout(TimerBase*);
 
   void didFailLoading(LocalFrame*);
 
+  WeakMember<LocalFrame> m_frame;
   std::unique_ptr<WebURLLoader> m_loader;
   Timer<PingLoaderImpl> m_timeout;
   String m_url;
   unsigned long m_identifier;
   SelfKeepAlive<PingLoaderImpl> m_keepAlive;
 
   bool m_isBeacon;
 
   RefPtr<SecurityOrigin> m_origin;
   CORSEnabled m_corsMode;
 };
 
 PingLoaderImpl::PingLoaderImpl(LocalFrame* frame,
                                ResourceRequest& request,
                                const AtomicString& initiator,
                                StoredCredentials credentialsAllowed,
                                bool isBeacon)
-    : DOMWindowProperty(frame),
+    : m_frame(frame),
       m_timeout(this, &PingLoaderImpl::timeout),
       m_url(request.url()),
       m_identifier(createUniqueIdentifier()),
       m_keepAlive(this),
       m_isBeacon(isBeacon),
       m_origin(frame->document()->getSecurityOrigin()),
       m_corsMode(IsCORSEnabled) {
   const AtomicString contentType = request.httpContentType();
   if (!contentType.isNull() &&
       FetchUtils::isSimpleHeader(AtomicString("content-type"), contentType))
@@ skipping 59 matching lines @@
   DCHECK(!newRequest.isNull());
   DCHECK(!redirectResponse.isNull());
 
   String errorDescription;
   ResourceLoaderOptions options;
   // TODO(tyoshino): Save updated data in options.securityOrigin and pass it
   // on the next time.
   if (!CrossOriginAccessControl::handleRedirect(
           m_origin, newRequest, redirectResponse, AllowStoredCredentials,
           options, errorDescription)) {
-    if (LocalFrame* localFrame = frame()) {
-      if (localFrame->document()) {
-        localFrame->document()->addConsoleMessage(ConsoleMessage::create(
+    if (m_frame) {

[sof, 2016/12/12 07:48:21]

 if (m_frame && m_frame->document()) { ... }

or if you prefer keeping the nesting,

 if (m_frame) {
   if (Document* document = m_frame->document()) {
     document->...
   }
 }

+      if (m_frame->document()) {
+        m_frame->document()->addConsoleMessage(ConsoleMessage::create(
             JSMessageSource, ErrorMessageLevel, errorDescription));
       }
     }
     // Cancel the load and self destruct.
     dispose();
 
     return false;
   }
   // FIXME: http://crbug.com/427429 is needed to correctly propagate updates of
   // Origin: following this successful redirect.
 
   return true;
 }
 
 void PingLoaderImpl::didReceiveResponse(const WebURLResponse& response) {
-  if (LocalFrame* frame = this->frame()) {
+  if (m_frame) {
     TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
                  InspectorResourceFinishEvent::data(m_identifier, 0, true));
     const ResourceResponse& resourceResponse = response.toResourceResponse();
-    InspectorInstrumentation::didReceiveResourceResponse(frame, m_identifier, 0,
-                                                         resourceResponse, 0);
-    didFailLoading(frame);
+    InspectorInstrumentation::didReceiveResourceResponse(
+        m_frame, m_identifier, 0, resourceResponse, 0);
+    didFailLoading(m_frame);
   }
   dispose();
 }
 
 void PingLoaderImpl::didReceiveData(const char*, int) {
-  if (LocalFrame* frame = this->frame()) {
+  if (m_frame) {
     TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
                  InspectorResourceFinishEvent::data(m_identifier, 0, true));
-    didFailLoading(frame);
+    didFailLoading(m_frame);
   }
   dispose();
 }
 
 void PingLoaderImpl::didFinishLoading(double, int64_t, int64_t) {
-  if (LocalFrame* frame = this->frame()) {
+  if (m_frame) {
     TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
                  InspectorResourceFinishEvent::data(m_identifier, 0, true));
-    didFailLoading(frame);
+    didFailLoading(m_frame);
   }
   dispose();
 }
 
 void PingLoaderImpl::didFail(const WebURLError& resourceError,
                              int64_t,
                              int64_t) {
-  if (LocalFrame* frame = this->frame()) {
+  if (m_frame) {
     TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
                  InspectorResourceFinishEvent::data(m_identifier, 0, true));
-    didFailLoading(frame);
+    didFailLoading(m_frame);
   }
   dispose();
 }
 
 void PingLoaderImpl::timeout(TimerBase*) {
-  if (LocalFrame* frame = this->frame()) {
+  if (m_frame) {
     TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
                  InspectorResourceFinishEvent::data(m_identifier, 0, true));
-    didFailLoading(frame);
+    didFailLoading(m_frame);
   }
   dispose();
 }
 
 void PingLoaderImpl::didFailLoading(LocalFrame* frame) {
   InspectorInstrumentation::didFailLoading(
       frame, m_identifier, ResourceError::cancelledError(m_url));
   frame->console().didFailLoading(m_identifier,
                                   ResourceError::cancelledError(m_url));
 }
 
 DEFINE_TRACE(PingLoaderImpl) {
-  DOMWindowProperty::trace(visitor);
+  visitor->trace(m_frame);
 }
 
 void finishPingRequestInitialization(
     ResourceRequest& request,
     LocalFrame* frame,
     WebURLRequest::RequestContext requestContext) {
   request.setRequestContext(requestContext);
   FetchContext& fetchContext = frame->document()->fetcher()->context();
   fetchContext.addAdditionalRequestHeaders(request, FetchSubresource);
   fetchContext.populateRequestData(request);
@@ skipping 151 matching lines @@
 bool PingLoader::sendBeacon(LocalFrame* frame,
                             int allowance,
                             const KURL& beaconURL,
                             Blob* data,
                             int& payloadLength) {
   BeaconBlob beacon(data);
   return sendBeaconCommon(frame, allowance, beaconURL, beacon, payloadLength);
 }
 
 }  // namespace blink