[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
sullivan
sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:54:52 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5297f51cf9032c973b0fad61940c1c6d3b49369a
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 2 01:52:49 2003 +0000
WebCore:
- WebCore part of fix for 3402489 -- REGRESSION (7B48-7B55): Some
printed web pages are too small (width is half a page)
This was a regression caused by the fix for 3378810.
Reviewed by Maciej
* kwq/WebCoreBridge.h:
add adjustingViewSize flag to forceLayout and forceLayoutForPageWidth:
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge forceLayoutAdjustingViewSize:]):
respect new flag while we are set up for printing.
(-[WebCoreBridge forceLayoutForPageWidth:adjustingViewSize:]):
ditto
(-[WebCoreBridge adjustFrames:]):
pass NO for new flag here
WebKit:
- WebKit part of fix for 3402489 -- REGRESSION (7B48-7B55): Some printed web pages are too small (width is half a page)
This was a regression caused by the fix for 3378810.
Reviewed by Maciej
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView layoutToPageWidth:adjustingViewSize:]):
now takes adjustViewSize flag, and passes it down to
one of bridge's forceLayout calls.
(-[WebHTMLView layout]):
pass NO for adjustViewSize flag in this case
(-[WebHTMLView _setPrinting:pageWidth:adjustViewSize:]):
pass adjustViewSize flag down to layoutToPageWidth instead
of using it directly here; this is the wrong level to use
it directly since the bridge is no longer set up for
printing after the layoutToPageWidth call completes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4923 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e93c60d..b529091 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,24 @@
2003-09-01 John Sullivan <sullivan at apple.com>
+ - WebCore part of fix for 3402489 -- REGRESSION (7B48-7B55): Some
+ printed web pages are too small (width is half a page)
+
+ This was a regression caused by the fix for 3378810.
+
+ Reviewed by Maciej
+
+ * kwq/WebCoreBridge.h:
+ add adjustingViewSize flag to forceLayout and forceLayoutForPageWidth:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge forceLayoutAdjustingViewSize:]):
+ respect new flag while we are set up for printing.
+ (-[WebCoreBridge forceLayoutForPageWidth:adjustingViewSize:]):
+ ditto
+ (-[WebCoreBridge adjustFrames:]):
+ pass NO for new flag here
+
+2003-09-01 John Sullivan <sullivan at apple.com>
+
* kwq/KWQPainter.mm:
(QPainter::drawLine):
Removed the ERROR that warns of the CG memory trashing bug, now
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e93c60d..b529091 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,24 @@
2003-09-01 John Sullivan <sullivan at apple.com>
+ - WebCore part of fix for 3402489 -- REGRESSION (7B48-7B55): Some
+ printed web pages are too small (width is half a page)
+
+ This was a regression caused by the fix for 3378810.
+
+ Reviewed by Maciej
+
+ * kwq/WebCoreBridge.h:
+ add adjustingViewSize flag to forceLayout and forceLayoutForPageWidth:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge forceLayoutAdjustingViewSize:]):
+ respect new flag while we are set up for printing.
+ (-[WebCoreBridge forceLayoutForPageWidth:adjustingViewSize:]):
+ ditto
+ (-[WebCoreBridge adjustFrames:]):
+ pass NO for new flag here
+
+2003-09-01 John Sullivan <sullivan at apple.com>
+
* kwq/KWQPainter.mm:
(QPainter::drawLine):
Removed the ERROR that warns of the CG memory trashing bug, now
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index dfc9aa2..ef8a42c 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -145,8 +145,8 @@ enum FrameBorderStyle {
- (BOOL)isFrameSet;
- (void)reapplyStylesForDeviceType:(WebCoreDeviceType)deviceType;
-- (void)forceLayout;
-- (void)forceLayoutForPageWidth:(float)pageWidth;
+- (void)forceLayoutAdjustingViewSize:(BOOL)adjustSizeFlag;
+- (void)forceLayoutForPageWidth:(float)pageWidth adjustingViewSize:(BOOL)adjustSizeFlag;
- (void)sendResizeEvent;
- (BOOL)needsLayout;
- (void)adjustFrames:(NSRect)rect;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 9987e3c..cbb9c0b 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -374,17 +374,23 @@ static BOOL nowPrinting(WebCoreBridge *self)
}
}
-- (void)forceLayout
+- (void)forceLayoutAdjustingViewSize:(BOOL)flag
{
[self _setupRootForPrinting:YES];
_part->forceLayout();
+ if (flag) {
+ [self adjustViewSize];
+ }
[self _setupRootForPrinting:NO];
}
-- (void)forceLayoutForPageWidth:(float)pageWidth
+- (void)forceLayoutForPageWidth:(float)pageWidth adjustingViewSize:(BOOL)flag
{
[self _setupRootForPrinting:YES];
_part->forceLayoutForPageWidth(pageWidth);
+ if (flag) {
+ [self adjustViewSize];
+ }
[self _setupRootForPrinting:NO];
}
@@ -417,7 +423,7 @@ static BOOL nowPrinting(WebCoreBridge *self)
// the frame origins during drawing! So we have to
// layout and do a draw with rendering disabled to
// correctly adjust the frames.
- [self forceLayout];
+ [self forceLayoutAdjustingViewSize:NO];
QPainter painter(nowPrinting(self));
painter.setPaintingDisabled(YES);
[self drawRect:rect withPainter:&painter];
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e52742a..44dd89d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2003-09-01 John Sullivan <sullivan at apple.com>
+
+ - WebKit part of fix for 3402489 -- REGRESSION (7B48-7B55): Some printed web pages are too small (width is half a page)
+
+ This was a regression caused by the fix for 3378810.
+
+ Reviewed by Maciej
+
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView layoutToPageWidth:adjustingViewSize:]):
+ now takes adjustViewSize flag, and passes it down to
+ one of bridge's forceLayout calls.
+ (-[WebHTMLView layout]):
+ pass NO for adjustViewSize flag in this case
+ (-[WebHTMLView _setPrinting:pageWidth:adjustViewSize:]):
+ pass adjustViewSize flag down to layoutToPageWidth instead
+ of using it directly here; this is the wrong level to use
+ it directly since the bridge is no longer set up for
+ printing after the layoutToPageWidth call completes.
+
2003-08-30 Maciej Stachowiak <mjs at apple.com>
Reviewed by John.
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index aba5810..14781be 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -330,7 +330,7 @@
// Do a layout, but set up a new fixed width for the purposes of doing printing layout.
// pageWidth==0 implies a non-printing layout
-- (void)layoutToPageWidth:(float)pageWidth
+- (void)layoutToPageWidth:(float)pageWidth adjustingViewSize:(BOOL)adjustViewSize
{
[self reapplyStyles];
@@ -349,9 +349,9 @@
LOG(View, "%@ doing layout", self);
if (pageWidth > 0.0) {
- [[self _bridge] forceLayoutForPageWidth:pageWidth];
+ [[self _bridge] forceLayoutForPageWidth:pageWidth adjustingViewSize:adjustViewSize];
} else {
- [[self _bridge] forceLayout];
+ [[self _bridge] forceLayoutAdjustingViewSize:adjustViewSize];
}
_private->needsLayout = NO;
@@ -378,7 +378,7 @@
- (void)layout
{
- [self layoutToPageWidth:0.0];
+ [self layoutToPageWidth:0.0 adjustingViewSize:NO];
}
- (NSMenu *)menuForEvent:(NSEvent *)event
@@ -893,11 +893,8 @@
_private->printing = printing;
[self setNeedsToApplyStyles:YES];
[self setNeedsLayout:YES];
- [self layoutToPageWidth:pageWidth];
+ [self layoutToPageWidth:pageWidth adjustingViewSize:adjustViewSize];
[self setNeedsDisplay:NO];
- if (adjustViewSize) {
- [[self _bridge] adjustViewSize];
- }
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list