[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 06:04:26 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2d1d5c94d1b519fcc06ad8190d060eba0de0ad0b
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Apr 10 18:48:36 2002 +0000
Fixed 2891396 -- window fills with garbage if you resize or hide/show toolbar
before loading first page
* WebView.subproj/IFWebView.mm: (-[IFWebView drawRect:]):
Made webview fill rect with white if there's no widget.
Fixed 2883815 -- JavaScript window-opening preference should mention ad suppression
Fixed 2890818 -- If Alexander window is opened when home page is invalid, sheet appears
behind window
Fixed 2896685 -- Crash in CFStringAppendCString putting up alert dialog if nonexistent file
has spaces in name
* BrowserDocument.m:
(-[BrowserDocument goHome:]): Changed comments, added assert
(-[BrowserDocument displayError:forFrame:withStage:]): Made error message be a parameter to
format string @"%@" instead of a format string with no parameters, to handle the case where
error message contains % characters that look like format characters.
* BrowserWindow.m:
(-[BrowserWindow _goToInitialURLFromTimer:]): New method, called from timer, just goes to initial URL.
(-[BrowserWindow windowDidLoad]): Use timer to go to initial URL, to ensure that window is visible
before sheet-displaying code runs.
* Preferences.subproj/ActiveContentPreferences.nib: Added another sentence of fine print to JavaScript
preferences.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@994 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a8f4a02..65f050c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-04-10 John Sullivan <sullivan at apple.com>
+
+ Fixed 2891396 -- window fills with garbage if you resize or hide/show toolbar
+ before loading first page
+
+ * WebView.subproj/IFWebView.mm: (-[IFWebView drawRect:]):
+ Made webview fill rect with white if there's no widget.
+
2002-04-09 Chris Blumenberg <cblu at apple.com>
* Plugins.subproj/IFPluginView.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a8f4a02..65f050c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-04-10 John Sullivan <sullivan at apple.com>
+
+ Fixed 2891396 -- window fills with garbage if you resize or hide/show toolbar
+ before loading first page
+
+ * WebView.subproj/IFWebView.mm: (-[IFWebView drawRect:]):
+ Made webview fill rect with white if there's no widget.
+
2002-04-09 Chris Blumenberg <cblu at apple.com>
* Plugins.subproj/IFPluginView.h:
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 781acc5..c7cb883 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -298,53 +298,61 @@
// WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "not drawing, frame in provisional state.\n");
// return;
//}
-
- if (widget != 0l){
- WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "drawing\n");
-
- [self reapplyStyles];
-
- [self layout];
-#ifdef _KWQ_TIMING
+ // Draw plain white bg in empty case, to avoid redraw weirdness when
+ // no page is yet loaded (2890818). We may need to modify this to always
+ // draw the background color, in which case we'll have to make sure the
+ // no-widget case is still handled correctly.
+ if (widget == 0l) {
+ [[NSColor whiteColor] set];
+ NSRectFill(rect);
+ return;
+ }
+
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "drawing\n");
+
+ [self reapplyStyles];
+
+ [self layout];
+
+#ifdef _KWQ_TIMING
double start = CFAbsoluteTimeGetCurrent();
#endif
- QPainter p(widget);
-
- [self lockFocus];
-
- //double start = CFAbsoluteTimeGetCurrent();
- ((KHTMLView *)widget)->drawContents( &p, (int)rect.origin.x,
- (int)rect.origin.y,
- (int)rect.size.width,
- (int)rect.size.height );
- //WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
-
-#ifdef DEBUG_LAYOUT
- NSRect vframe = [self frame];
- [[NSColor blackColor] set];
- NSBezierPath *path;
- path = [NSBezierPath bezierPath];
- [path setLineWidth:(float)0.1];
- [path moveToPoint:NSMakePoint(0, 0)];
- [path lineToPoint:NSMakePoint(vframe.size.width, vframe.size.height)];
- [path closePath];
- [path stroke];
- path = [NSBezierPath bezierPath];
- [path setLineWidth:(float)0.1];
- [path moveToPoint:NSMakePoint(0, vframe.size.height)];
- [path lineToPoint:NSMakePoint(vframe.size.width, 0)];
- [path closePath];
- [path stroke];
+ QPainter p(widget);
+
+ [self lockFocus];
+
+ //double start = CFAbsoluteTimeGetCurrent();
+ ((KHTMLView *)widget)->drawContents( &p, (int)rect.origin.x,
+ (int)rect.origin.y,
+ (int)rect.size.width,
+ (int)rect.size.height );
+ //WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
+
+#ifdef DEBUG_LAYOUT
+ NSRect vframe = [self frame];
+ [[NSColor blackColor] set];
+ NSBezierPath *path;
+ path = [NSBezierPath bezierPath];
+ [path setLineWidth:(float)0.1];
+ [path moveToPoint:NSMakePoint(0, 0)];
+ [path lineToPoint:NSMakePoint(vframe.size.width, vframe.size.height)];
+ [path closePath];
+ [path stroke];
+ path = [NSBezierPath bezierPath];
+ [path setLineWidth:(float)0.1];
+ [path moveToPoint:NSMakePoint(0, vframe.size.height)];
+ [path lineToPoint:NSMakePoint(vframe.size.width, 0)];
+ [path closePath];
+ [path stroke];
#endif
-
- [self unlockFocus];
-#ifdef _KWQ_TIMING
+ [self unlockFocus];
+
+#ifdef _KWQ_TIMING
double thisTime = CFAbsoluteTimeGetCurrent() - start;
WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s draw seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
#endif
- }
}
- (void)setIsFlipped: (bool)flag
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 781acc5..c7cb883 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -298,53 +298,61 @@
// WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "not drawing, frame in provisional state.\n");
// return;
//}
-
- if (widget != 0l){
- WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "drawing\n");
-
- [self reapplyStyles];
-
- [self layout];
-#ifdef _KWQ_TIMING
+ // Draw plain white bg in empty case, to avoid redraw weirdness when
+ // no page is yet loaded (2890818). We may need to modify this to always
+ // draw the background color, in which case we'll have to make sure the
+ // no-widget case is still handled correctly.
+ if (widget == 0l) {
+ [[NSColor whiteColor] set];
+ NSRectFill(rect);
+ return;
+ }
+
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "drawing\n");
+
+ [self reapplyStyles];
+
+ [self layout];
+
+#ifdef _KWQ_TIMING
double start = CFAbsoluteTimeGetCurrent();
#endif
- QPainter p(widget);
-
- [self lockFocus];
-
- //double start = CFAbsoluteTimeGetCurrent();
- ((KHTMLView *)widget)->drawContents( &p, (int)rect.origin.x,
- (int)rect.origin.y,
- (int)rect.size.width,
- (int)rect.size.height );
- //WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
-
-#ifdef DEBUG_LAYOUT
- NSRect vframe = [self frame];
- [[NSColor blackColor] set];
- NSBezierPath *path;
- path = [NSBezierPath bezierPath];
- [path setLineWidth:(float)0.1];
- [path moveToPoint:NSMakePoint(0, 0)];
- [path lineToPoint:NSMakePoint(vframe.size.width, vframe.size.height)];
- [path closePath];
- [path stroke];
- path = [NSBezierPath bezierPath];
- [path setLineWidth:(float)0.1];
- [path moveToPoint:NSMakePoint(0, vframe.size.height)];
- [path lineToPoint:NSMakePoint(vframe.size.width, 0)];
- [path closePath];
- [path stroke];
+ QPainter p(widget);
+
+ [self lockFocus];
+
+ //double start = CFAbsoluteTimeGetCurrent();
+ ((KHTMLView *)widget)->drawContents( &p, (int)rect.origin.x,
+ (int)rect.origin.y,
+ (int)rect.size.width,
+ (int)rect.size.height );
+ //WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
+
+#ifdef DEBUG_LAYOUT
+ NSRect vframe = [self frame];
+ [[NSColor blackColor] set];
+ NSBezierPath *path;
+ path = [NSBezierPath bezierPath];
+ [path setLineWidth:(float)0.1];
+ [path moveToPoint:NSMakePoint(0, 0)];
+ [path lineToPoint:NSMakePoint(vframe.size.width, vframe.size.height)];
+ [path closePath];
+ [path stroke];
+ path = [NSBezierPath bezierPath];
+ [path setLineWidth:(float)0.1];
+ [path moveToPoint:NSMakePoint(0, vframe.size.height)];
+ [path lineToPoint:NSMakePoint(vframe.size.width, 0)];
+ [path closePath];
+ [path stroke];
#endif
-
- [self unlockFocus];
-#ifdef _KWQ_TIMING
+ [self unlockFocus];
+
+#ifdef _KWQ_TIMING
double thisTime = CFAbsoluteTimeGetCurrent() - start;
WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s draw seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
#endif
- }
}
- (void)setIsFlipped: (bool)flag
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list