Title: [105117] branches/safari-534.54-branch/Source/WebKit2
Diff
Modified: branches/safari-534.54-branch/Source/WebKit2/ChangeLog (105116 => 105117)
--- branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-01-17 01:21:43 UTC (rev 105116)
+++ branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-01-17 01:33:06 UTC (rev 105117)
@@ -1,5 +1,24 @@
2012-01-16 Mark Rowe <[email protected]>
+ Merge r104049.
+
+ 2012-01-04 Alexey Proskuryakov <[email protected]>
+
+ First sentence is missing or clipped when printing a inline PDF
+ https://bugs.webkit.org/show_bug.cgi?id=75514
+ <rdar://problem/10640680>
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::headerHeight):
+ (WebKit::WebPageProxy::footerHeight):
+ (WebKit::WebPageProxy::drawHeader):
+ (WebKit::WebPageProxy::drawFooter):
+ Do not ask the client about headers and footers when printing a PDF.
+
+2012-01-16 Mark Rowe <[email protected]>
+
Merge r103925.
2012-01-02 Dan Bernstein <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (105116 => 105117)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-01-17 01:21:43 UTC (rev 105116)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-01-17 01:33:06 UTC (rev 105117)
@@ -3127,21 +3127,29 @@
float WebPageProxy::headerHeight(WebFrameProxy* frame)
{
+ if (frame->isDisplayingPDFDocument())
+ return 0;
return m_uiClient.headerHeight(this, frame);
}
float WebPageProxy::footerHeight(WebFrameProxy* frame)
{
+ if (frame->isDisplayingPDFDocument())
+ return 0;
return m_uiClient.footerHeight(this, frame);
}
void WebPageProxy::drawHeader(WebFrameProxy* frame, const FloatRect& rect)
{
+ if (frame->isDisplayingPDFDocument())
+ return;
m_uiClient.drawHeader(this, frame, rect);
}
void WebPageProxy::drawFooter(WebFrameProxy* frame, const FloatRect& rect)
{
+ if (frame->isDisplayingPDFDocument())
+ return;
m_uiClient.drawFooter(this, frame, rect);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
