Changeset 187178 in webkit

Timestamp:

Jul 22, 2015 1:59:49 PM (9 years ago)

Author:

Simon Fraser

Message:

Add logging for TiledCoreAnimationDrawingArea resizing
​https://bugs.webkit.org/show_bug.cgi?id=147180

Reviewed by Tim Horton.

Add a "Resize" log channel for WebKit2, and use it to log data in scaleViewToFitDocumentIfNeeded().

• Platform/Logging.h:
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:

(WebKit::TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/Logging.h (modified) (1 diff)
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (modified) (6 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-21  Simon Fraser  <simon.fraser@apple.com>
+
+        Add logging for TiledCoreAnimationDrawingArea resizing
+        https://bugs.webkit.org/show_bug.cgi?id=147180
+
+        Reviewed by Tim Horton.
+
+        Add a "Resize" log channel for WebKit2, and use it to log data in scaleViewToFitDocumentIfNeeded().
+
+        * Platform/Logging.h:
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded):
+
 2015-07-22  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/Platform/Logging.h

@@ -51 +51 @@
     M(Printing) \
     M(RemoteLayerTree) \
+    M(Resize) \
     M(SessionState) \
     M(StorageAPI) \

trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

@@ -33 +33 @@
 #import "LayerHostingContext.h"
 #import "LayerTreeContext.h"
+#import "Logging.h"
 #import "ViewGestureControllerMessages.h"
 #import "WebFrame.h"
@@ -281 +282 @@
         return;
 
+    LOG(Resize, "TiledCoreAnimationDrawingArea %p scaleViewToFitDocumentIfNeeded", this);
     m_webPage.layoutIfNeeded();
 
@@ -288 +290 @@
     bool documentWidthChanged = m_lastDocumentSizeForScaleToFit.width() != documentWidth;
     bool viewWidthChanged = m_lastViewSizeForScaleToFit.width() != viewWidth;
+
+    LOG(Resize, "  documentWidthChanged=%d, viewWidthChanged=%d", documentWidthChanged, viewWidthChanged);
 
     if (!documentWidthChanged && !viewWidthChanged)
@@ -308 +312 @@
         m_webPage.setFixedLayoutSize(fixedLayoutSize);
         m_webPage.scaleView(viewScale);
-        return;
-    }
+
+        LOG(Resize, "  using fixed layout at %dx%d. document width %d unchanged, scaled to %.4f to fit view width %d", fixedLayoutSize.width(), fixedLayoutSize.height(), documentWidth, viewScale, viewWidth);
+        return;
+    }
+
+
+    LOG(Resize, "  doing unconstrained layout");
 
     // Lay out at the view size.
@@ -322 +331 @@
 
     float viewScale = 1;
+
+    LOG(Resize, "  unscaled document size %dx%d. need to scale down: %d", documentSize.width(), documentSize.height(), documentWidth && documentWidth < maximumDocumentWidthForScaling && viewWidth < documentWidth);
 
     // Avoid scaling down documents that don't fit in a certain width, to allow
@@ -336 +347 @@
         IntSize fixedLayoutSize(documentWidth, std::ceil((m_webPage.size().height() - m_webPage.corePage()->topContentInset()) / viewScale));
         m_webPage.setFixedLayoutSize(fixedLayoutSize);
+
+        LOG(Resize, "  using fixed layout at %dx%d. document width %d, scaled to %.4f to fit view width %d", fixedLayoutSize.width(), fixedLayoutSize.height(), documentWidth, viewScale, viewWidth);
     }