Title: [190485] branches/safari-601-branch/Source/WebCore
Revision
190485
Author
[email protected]
Date
2015-10-02 06:56:05 -0700 (Fri, 02 Oct 2015)

Log Message

Merge r187145. rdar://problem/22801952

Modified Paths

Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (190484 => 190485)


--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-10-02 12:14:49 UTC (rev 190484)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-10-02 13:56:05 UTC (rev 190485)
@@ -1,3 +1,19 @@
+2015-10-02  Matthew Hanson  <[email protected]>
+
+        Merge r187145. rdar://problem/22801952
+
+    2015-07-21  Joseph Pecoraro  <[email protected]>
+
+            Web Inspector: Node highlights are wrong when the page is zoomed
+            https://bugs.webkit.org/show_bug.cgi?id=147177
+
+            Reviewed by Simon Fraser.
+
+            * inspector/InspectorOverlay.cpp:
+            (WebCore::InspectorOverlay::update):
+            Remove scaling that appears to no longer be needed, it was double
+            scaling the overlay content and misplacing it in the process.
+
 2015-09-25  Brent Fulgham  <[email protected]>
 
         Merge r190235. rdar://problem/22852382

Modified: branches/safari-601-branch/Source/WebCore/inspector/InspectorOverlay.cpp (190484 => 190485)


--- branches/safari-601-branch/Source/WebCore/inspector/InspectorOverlay.cpp	2015-10-02 12:14:49 UTC (rev 190484)
+++ branches/safari-601-branch/Source/WebCore/inspector/InspectorOverlay.cpp	2015-10-02 13:56:05 UTC (rev 190485)
@@ -316,8 +316,6 @@
     FrameView* overlayView = overlayPage()->mainFrame().view();
     IntSize viewportSize = view->unscaledVisibleContentSizeIncludingObscuredArea();
     IntSize frameViewFullSize = view->unscaledVisibleContentSizeIncludingObscuredArea(ScrollableArea::IncludeScrollbars);
-    overlayPage()->setPageScaleFactor(m_page.pageScaleFactor(), IntPoint());
-    frameViewFullSize.scale(m_page.pageScaleFactor());
     overlayView->resize(frameViewFullSize);
 
     // Clear canvas and paint things.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to