Merge 141772

Source/WebCore/inspector/InspectorOverlay.cpp

 /*
  * Copyright (C) 2011 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:
  *
  * 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
@@ skipping 267 matching lines @@
     }
 
     FrameView* view = m_page->mainFrame()->view();
     if (!view)
         return;
 
     FrameView* overlayView = overlayPage()->mainFrame()->view();
     IntSize viewportSize = enclosingIntRect(view->visibleContentRect()).size();
     IntSize frameViewFullSize = enclosingIntRect(view->visibleContentRect(true)).size();
     IntSize size = m_size.isEmpty() ? frameViewFullSize : m_size;
+    overlayPage()->setPageScaleFactor(m_page->pageScaleFactor(), IntPoint());
+    size.scale(m_page->pageScaleFactor());
     overlayView->resize(size);
 
     // Clear canvas and paint things.
     reset(viewportSize, m_size.isEmpty() ? IntSize() : frameViewFullSize);
 
     // Include scrollbars to avoid masking them by the gutter.
     drawGutter();
     drawNodeHighlight();
     drawRectHighlight();
     drawPausedInDebuggerMessage();
@@ skipping 212 matching lines @@
 }
 
 void InspectorOverlay::freePage()
 {
     m_overlayPage.clear();
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)