Rename WebSourceBuffer::abort into WebSourceBuffer::resetParserState

public/web/WebRemoteFrameClient.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WebRemoteFrameClient_h
 #define WebRemoteFrameClient_h
 
 #include "public/platform/WebSecurityOrigin.h"
 #include "public/web/WebDOMMessageEvent.h"
 
@@ skipping 16 matching lines @@
     virtual void postMessageEvent(
         WebLocalFrame* sourceFrame,
         WebRemoteFrame* targetFrame,
         WebSecurityOrigin targetOrigin,
         WebDOMMessageEvent) { }
 
     // Send initial drawing parameters to a child frame that is being rendered
     // out of process.
     virtual void initializeChildFrame(
         const WebRect& frameRect,
-        float scaleFactor) { }
+        float deviceScaleFactor) { }
 
     // A remote frame was asked to start a navigation.
     virtual void navigate(const WebURLRequest& request, bool shouldReplaceCurrentEntry) { }
     virtual void reload(bool ignoreCache, bool isClientRedirect) { }
 
     // FIXME: Remove this method once we have input routing in the browser
     // process. See http://crbug.com/339659.
     virtual void forwardInputEvent(const WebInputEvent*) { }
 
     virtual void frameRectsChanged(const WebRect&) { }
 
     // This frame updated its opener to another frame.
     virtual void didChangeOpener(WebFrame* opener) { }
 };
 
 } // namespace blink
 
 #endif // WebRemoteFrameClient_h