<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[189147] trunk/Source/WebKit/win</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/189147">189147</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-08-28 23:49:44 -0700 (Fri, 28 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the Windows build more after <a href="http://trac.webkit.org/projects/webkit/changeset/189144">r189144</a>
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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebFramecpp">trunk/Source/WebKit/win/WebFrame.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebFrameh">trunk/Source/WebKit/win/WebFrame.h</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (189146 => 189147)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-08-28 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><ins>+ 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 <mmaxfield@apple.com>
+
</ins><span class="cx"> Fix the Windows build after r189144
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=148561
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebFrame.cpp (189146 => 189147)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx"> gc.translate(-rect.left, -rect.top);
</span><span class="cx"> float scaleFactor = webView()->deviceScaleFactor();
</span><span class="cx"> gc.scale(WebCore::FloatSize(scaleFactor, scaleFactor));
</span><del>- view->paintContents(&gc, rect);
</del><ins>+ view->paintContents(gc, rect);
</ins><span class="cx"> gc.restore();
</span><span class="cx">
</span><span class="cx"> return S_OK;
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx"> dirtyRect.move(-pt.x, -pt.y);
</span><span class="cx"> float scaleFactor = webView()->deviceScaleFactor();
</span><span class="cx"> gc.scale(WebCore::FloatSize(scaleFactor, scaleFactor));
</span><del>- view->paint(&gc, dirtyRect);
</del><ins>+ view->paint(gc, dirtyRect);
</ins><span class="cx"> gc.restore();
</span><span class="cx">
</span><span class="cx"> return S_OK;
</span><span class="lines">@@ -1579,7 +1579,7 @@
</span><span class="cx"> ui->drawFooterInRect(d->webView, &footerRect, reinterpret_cast<ULONG_PTR>(pctx), page + 1, pageCount);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrame::spoolPage(PlatformGraphicsContext* pctx, GraphicsContext* spoolCtx, HDC printDC, IWebUIDelegate* ui, float headerHeight, float footerHeight, UINT page, UINT pageCount)
</del><ins>+void WebFrame::spoolPage(PlatformGraphicsContext* pctx, GraphicsContext& spoolCtx, HDC printDC, IWebUIDelegate* ui, float headerHeight, float footerHeight, UINT page, UINT pageCount)
</ins><span class="cx"> {
</span><span class="cx"> Frame* coreFrame = core(this);
</span><span class="cx">
</span><span class="lines">@@ -1676,7 +1676,7 @@
</span><span class="cx"> return scaled;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrame::spoolPage(PlatformGraphicsContext* pctx, GraphicsContext* spoolCtx, HDC printDC, IWebUIDelegate* ui, float headerHeight, float footerHeight, UINT page, UINT pageCount)
</del><ins>+void WebFrame::spoolPage(PlatformGraphicsContext* pctx, GraphicsContext& spoolCtx, HDC printDC, IWebUIDelegate* ui, float headerHeight, float footerHeight, UINT page, UINT pageCount)
</ins><span class="cx"> {
</span><span class="cx"> Frame* coreFrame = core(this);
</span><span class="cx">
</span><span class="lines">@@ -1686,7 +1686,7 @@
</span><span class="cx"> // In preview, the printDC is a placeholder, so just always use the HDC backing the graphics context.
</span><span class="cx"> HDC hdc = hdcFromContext(pctx);
</span><span class="cx">
</span><del>- spoolCtx->save();
</del><ins>+ spoolCtx.save();
</ins><span class="cx">
</span><span class="cx"> XFORM original, scaled;
</span><span class="cx"> GetWorldTransform(hdc, &original);
</span><span class="lines">@@ -1737,7 +1737,7 @@
</span><span class="cx">
</span><span class="cx"> cairo_show_page(cr);
</span><span class="cx"> ASSERT(!cairo_status(cr));
</span><del>- spoolCtx->restore();
</del><ins>+ spoolCtx.restore();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void setCairoTransformToPreviewHDC(cairo_t* previewCtx, HDC previewDC)
</span><span class="lines">@@ -1842,7 +1842,7 @@
</span><span class="cx"> spoolCtx.setShouldIncludeChildWindows(true);
</span><span class="cx">
</span><span class="cx"> for (UINT ii = startPage; ii < endPage; ii++)
</span><del>- spoolPage(pctx, &spoolCtx, printDC, ui.get(), headerHeight, footerHeight, ii, pageCount);
</del><ins>+ spoolPage(pctx, spoolCtx, printDC, ui.get(), headerHeight, footerHeight, ii, pageCount);
</ins><span class="cx">
</span><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> cairo_surface_finish(printSurface);
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebFrame.h (189146 => 189147)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> void setPrinting(bool printing, const WebCore::FloatSize& pageSize, const WebCore::FloatSize& originalPageSize, float maximumShrinkRatio, WebCore::AdjustViewSizeOrNot);
</span><span class="cx"> void headerAndFooterHeights(float*, float*);
</span><span class="cx"> WebCore::IntRect printerMarginRect(HDC);
</span><del>- void spoolPage (PlatformGraphicsContext* pctx, WebCore::GraphicsContext* spoolCtx, HDC printDC, IWebUIDelegate*, float headerHeight, float footerHeight, UINT page, UINT pageCount);
</del><ins>+ void spoolPage (PlatformGraphicsContext* pctx, WebCore::GraphicsContext& spoolCtx, HDC printDC, IWebUIDelegate*, float headerHeight, float footerHeight, UINT page, UINT pageCount);
</ins><span class="cx"> void drawHeader(PlatformGraphicsContext* pctx, IWebUIDelegate*, const WebCore::IntRect& pageRect, float headerHeight);
</span><span class="cx"> void drawFooter(PlatformGraphicsContext* pctx, IWebUIDelegate*, const WebCore::IntRect& pageRect, UINT page, UINT pageCount, float headerHeight, float footerHeight);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (189146 => 189147)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1254,7 +1254,7 @@
</span><span class="cx"> gc.save();
</span><span class="cx"> gc.scale(FloatSize(scaleFactor, scaleFactor));
</span><span class="cx"> gc.clip(logicalDirtyRect);
</span><del>- frameView->paint(&gc, logicalDirtyRect);
</del><ins>+ frameView->paint(gc, logicalDirtyRect);
</ins><span class="cx"> gc.restore();
</span><span class="cx"> if (m_shouldInvertColors)
</span><span class="cx"> gc.fillRect(logicalDirtyRect, Color::white, ColorSpaceDeviceRGB, CompositeDifference);
</span><span class="lines">@@ -6989,7 +6989,7 @@
</span><span class="cx"> context.save();
</span><span class="cx"> context.scale(FloatSize(scaleFactor, scaleFactor));
</span><span class="cx"> context.clip(logicalClip);
</span><del>- frame->view()->paint(&context, enclosingIntRect(logicalClip));
</del><ins>+ frame->view()->paint(context, enclosingIntRect(logicalClip));
</ins><span class="cx"> context.restore();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>