[webkit-changes] [189147] trunk/Source/WebKit/win

Fri, 28 Aug 2015 23:50:14 -0700

Title: [189147] trunk/Source/WebKit/win
Revision
189147
Author
mmaxfi...@apple.com
Date
2015-08-28 23:49:44 -0700 (Fri, 28 Aug 2015)

Log Message

Fix the Windows build more after r189144
https://bugs.webkit.org/show_bug.cgi?id=148561

Unreviewed.

* WebFrame.cpp:
(WebFrame::paintDocumentRectToContext):
(WebFrame::paintScrollViewRectToContextAtPoint):
(WebFrame::spoolPage):
(WebFrame::spoolPages):
* WebFrame.h:
* WebView.cpp:
(WebView::paintIntoBackingStore):
(WebView::paintContents):

Modified Paths

Diff

Modified: trunk/Source/WebKit/win/ChangeLog (189146 => 189147)


--- trunk/Source/WebKit/win/ChangeLog	2015-08-29 06:39:37 UTC (rev 189146)
+++ trunk/Source/WebKit/win/ChangeLog	2015-08-29 06:49:44 UTC (rev 189147)
@@ -1,5 +1,22 @@
 2015-08-28  Myles C. Maxfield  <mmaxfi...@apple.com>
 
+        Fix the Windows build more after r189144
+        https://bugs.webkit.org/show_bug.cgi?id=148561
+
+        Unreviewed.
+
+        * WebFrame.cpp:
+        (WebFrame::paintDocumentRectToContext):
+        (WebFrame::paintScrollViewRectToContextAtPoint):
+        (WebFrame::spoolPage):
+        (WebFrame::spoolPages):
+        * WebFrame.h:
+        * WebView.cpp:
+        (WebView::paintIntoBackingStore):
+        (WebView::paintContents):
+
+2015-08-28  Myles C. Maxfield  <mmaxfi...@apple.com>
+
         Fix the Windows build after r189144
         https://bugs.webkit.org/show_bug.cgi?id=148561

Modified: trunk/Source/WebKit/win/WebFrame.cpp (189146 => 189147)


--- trunk/Source/WebKit/win/WebFrame.cpp	2015-08-29 06:39:37 UTC (rev 189146)
+++ trunk/Source/WebKit/win/WebFrame.cpp	2015-08-29 06:49:44 UTC (rev 189147)
@@ -335,7 +335,7 @@
     gc.translate(-rect.left, -rect.top);
     float scaleFactor = webView()->deviceScaleFactor();
     gc.scale(WebCore::FloatSize(scaleFactor, scaleFactor));
-    view->paintContents(&gc, rect);
+    view->paintContents(gc, rect);
     gc.restore();
 
     return S_OK;
@@ -361,7 +361,7 @@
     dirtyRect.move(-pt.x, -pt.y);
     float scaleFactor = webView()->deviceScaleFactor();
     gc.scale(WebCore::FloatSize(scaleFactor, scaleFactor));
-    view->paint(&gc, dirtyRect);
+    view->paint(gc, dirtyRect);
     gc.restore();
 
     return S_OK;
@@ -1579,7 +1579,7 @@
     ui->drawFooterInRect(d->webView, &footerRect, reinterpret_cast<ULONG_PTR>(pctx), page + 1, pageCount);
 }
 
-void WebFrame::spoolPage(PlatformGraphicsContext* pctx, GraphicsContext* spoolCtx, HDC printDC, IWebUIDelegate* ui, float headerHeight, float footerHeight, UINT page, UINT pageCount)
+void WebFrame::spoolPage(PlatformGraphicsContext* pctx, GraphicsContext& spoolCtx, HDC printDC, IWebUIDelegate* ui, float headerHeight, float footerHeight, UINT page, UINT pageCount)
 {
     Frame* coreFrame = core(this);
 
@@ -1676,7 +1676,7 @@
     return scaled;
 }
 
-void WebFrame::spoolPage(PlatformGraphicsContext* pctx, GraphicsContext* spoolCtx, HDC printDC, IWebUIDelegate* ui, float headerHeight, float footerHeight, UINT page, UINT pageCount)
+void WebFrame::spoolPage(PlatformGraphicsContext* pctx, GraphicsContext& spoolCtx, HDC printDC, IWebUIDelegate* ui, float headerHeight, float footerHeight, UINT page, UINT pageCount)
 {
     Frame* coreFrame = core(this);
 
@@ -1686,7 +1686,7 @@
     // In preview, the printDC is a placeholder, so just always use the HDC backing the graphics context.
     HDC hdc = hdcFromContext(pctx);
 
-    spoolCtx->save();
+    spoolCtx.save();
     
     XFORM original, scaled;
     GetWorldTransform(hdc, &original);
@@ -1737,7 +1737,7 @@
 
     cairo_show_page(cr);
     ASSERT(!cairo_status(cr));
-    spoolCtx->restore();
+    spoolCtx.restore();
 }
 
 static void setCairoTransformToPreviewHDC(cairo_t* previewCtx, HDC previewDC)
@@ -1842,7 +1842,7 @@
     spoolCtx.setShouldIncludeChildWindows(true);
 
     for (UINT ii = startPage; ii < endPage; ii++)
-        spoolPage(pctx, &spoolCtx, printDC, ui.get(), headerHeight, footerHeight, ii, pageCount);
+        spoolPage(pctx, spoolCtx, printDC, ui.get(), headerHeight, footerHeight, ii, pageCount);
 
 #if USE(CAIRO)
     cairo_surface_finish(printSurface);

Modified: trunk/Source/WebKit/win/WebFrame.h (189146 => 189147)


--- trunk/Source/WebKit/win/WebFrame.h	2015-08-29 06:39:37 UTC (rev 189146)
+++ trunk/Source/WebKit/win/WebFrame.h	2015-08-29 06:49:44 UTC (rev 189147)
@@ -205,7 +205,7 @@
     void setPrinting(bool printing, const WebCore::FloatSize& pageSize, const WebCore::FloatSize& originalPageSize, float maximumShrinkRatio, WebCore::AdjustViewSizeOrNot);
     void headerAndFooterHeights(float*, float*);
     WebCore::IntRect printerMarginRect(HDC);
-    void spoolPage (PlatformGraphicsContext* pctx, WebCore::GraphicsContext* spoolCtx, HDC printDC, IWebUIDelegate*, float headerHeight, float footerHeight, UINT page, UINT pageCount);
+    void spoolPage (PlatformGraphicsContext* pctx, WebCore::GraphicsContext& spoolCtx, HDC printDC, IWebUIDelegate*, float headerHeight, float footerHeight, UINT page, UINT pageCount);
     void drawHeader(PlatformGraphicsContext* pctx, IWebUIDelegate*, const WebCore::IntRect& pageRect, float headerHeight);
     void drawFooter(PlatformGraphicsContext* pctx, IWebUIDelegate*, const WebCore::IntRect& pageRect, UINT page, UINT pageCount, float headerHeight, float footerHeight);

Modified: trunk/Source/WebKit/win/WebView.cpp (189146 => 189147)


--- trunk/Source/WebKit/win/WebView.cpp	2015-08-29 06:39:37 UTC (rev 189146)
+++ trunk/Source/WebKit/win/WebView.cpp	2015-08-29 06:49:44 UTC (rev 189147)
@@ -1254,7 +1254,7 @@
         gc.save();
         gc.scale(FloatSize(scaleFactor, scaleFactor));
         gc.clip(logicalDirtyRect);
-        frameView->paint(&gc, logicalDirtyRect);
+        frameView->paint(gc, logicalDirtyRect);
         gc.restore();
         if (m_shouldInvertColors)
             gc.fillRect(logicalDirtyRect, Color::white, ColorSpaceDeviceRGB, CompositeDifference);
@@ -6989,7 +6989,7 @@
     context.save();
     context.scale(FloatSize(scaleFactor, scaleFactor));
     context.clip(logicalClip);
-    frame->view()->paint(&context, enclosingIntRect(logicalClip));
+    frame->view()->paint(context, enclosingIntRect(logicalClip));
     context.restore();
 }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to