Merge 138991

Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

 /*
  * Copyright (C) 2011 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 118 matching lines @@
 #if USE(ACCELERATED_COMPOSITING)
     RenderView* renderView = m_page->mainFrame()->contentRenderer();
     if (!renderView)
         return false;
     return renderView->usesCompositing();
 #else
     return false;
 #endif
 }
 
-Region ScrollingCoordinator::computeNonFastScrollableRegion(Frame* frame, const IntPoint& frameLocation)
+Region ScrollingCoordinator::computeNonFastScrollableRegion(const Frame* frame, const IntPoint& frameLocation) const
 {
     Region nonFastScrollableRegion;
     FrameView* frameView = frame->view();
     if (!frameView)
         return nonFastScrollableRegion;
 
     IntPoint offset = frameLocation;
     offset.moveBy(frameView->frameRect().location());
 
     if (const FrameView::ScrollableAreaSet* scrollableAreas = frameView->scrollableAreas()) {
@@ skipping 331 matching lines @@
         stringBuilder.resize(stringBuilder.length() - 2);
     return stringBuilder.toString();
 }
 
 String ScrollingCoordinator::mainThreadScrollingReasonsAsText() const
 {
     return mainThreadScrollingReasonsAsText(mainThreadScrollingReasons());
 }
 
 } // namespace WebCore