[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:55:56 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 82c8a8e2ff676530306c8c5a543ce6aae8051471
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 12 00:19:43 2003 +0000
WebKit:
Fixed 3406671. Added a private method for Mail to get selection
rect.
Reviewed by Darin Adler.
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView updateTextBackgroundColor]):
* WebView.subproj/WebHTMLViewPrivate.h:
* WebView.subproj/WebHTMLViewPrivate.m:
(-[WebHTMLView _handleMouseDragged:]):
(-[WebHTMLView _pluginController]):
(-[WebHTMLView _selectionRect]):
WebCore:
Fixed 3406671. Added a private method for Mail to get selection
rect.
Fixed 3417688. Don't allow https page into page cache.
Reviewed by Darin.
* kwq/KWQFrame.h:
* kwq/KWQFrame.mm:
(QFrame::setFrameStyle):
(QFrame::frameWidth):
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::canCachePage):
* kwq/WebCoreBridge.h:
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge selectionRect]):
(-[WebCoreBridge visibleSelectionRect]):
(-[WebCoreBridge selectionImage]):
(-[WebCoreBridge adjustViewSize]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4967 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 991db99..011a6ec 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,25 @@
+2003-09-11 Richard Williamson <rjw at apple.com>
+
+ Fixed 3406671. Added a private method for Mail to get selection
+ rect.
+
+ Fixed 3417688. Don't allow https page into page cache.
+
+ Reviewed by Darin.
+
+ * kwq/KWQFrame.h:
+ * kwq/KWQFrame.mm:
+ (QFrame::setFrameStyle):
+ (QFrame::frameWidth):
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::canCachePage):
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge selectionRect]):
+ (-[WebCoreBridge visibleSelectionRect]):
+ (-[WebCoreBridge selectionImage]):
+ (-[WebCoreBridge adjustViewSize]):
+
=== Safari-100 ===
2003-09-09 Darin Adler <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 991db99..011a6ec 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,25 @@
+2003-09-11 Richard Williamson <rjw at apple.com>
+
+ Fixed 3406671. Added a private method for Mail to get selection
+ rect.
+
+ Fixed 3417688. Don't allow https page into page cache.
+
+ Reviewed by Darin.
+
+ * kwq/KWQFrame.h:
+ * kwq/KWQFrame.mm:
+ (QFrame::setFrameStyle):
+ (QFrame::frameWidth):
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::canCachePage):
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge selectionRect]):
+ (-[WebCoreBridge visibleSelectionRect]):
+ (-[WebCoreBridge selectionImage]):
+ (-[WebCoreBridge adjustViewSize]):
+
=== Safari-100 ===
2003-09-09 Darin Adler <darin at apple.com>
diff --git a/WebCore/kwq/KWQFrame.h b/WebCore/kwq/KWQFrame.h
index 24532fb..5b47ca7 100644
--- a/WebCore/kwq/KWQFrame.h
+++ b/WebCore/kwq/KWQFrame.h
@@ -35,7 +35,7 @@ public:
QFrame() : _frameStyle(QFrame::NoFrame) { }
- virtual void setFrameStyle(int);
+ void setFrameStyle(int);
int frameStyle();
int frameWidth() const;
diff --git a/WebCore/kwq/KWQFrame.mm b/WebCore/kwq/KWQFrame.mm
index 74fc080..8a92e7f 100644
--- a/WebCore/kwq/KWQFrame.mm
+++ b/WebCore/kwq/KWQFrame.mm
@@ -25,9 +25,22 @@
#import "KWQFrame.h"
+#import "khtmlview.h"
+#import "KWQKHTMLPart.h"
+#import "WebCoreBridge.h"
+
void QFrame::setFrameStyle(int s)
{
_frameStyle = s;
+
+ // Tell the other side of the bridge about the frame style change.
+ KHTMLView *view = dynamic_cast<KHTMLView *>(this);
+ if (view) {
+ KHTMLPart *part = view->part();
+ if (part) {
+ [KWQ(part)->bridge() setHasBorder:(s != NoFrame)];
+ }
+ }
}
int QFrame::frameStyle()
@@ -37,7 +50,7 @@ int QFrame::frameStyle()
int QFrame::frameWidth() const
{
- if (_frameStyle == (QFrame::StyledPanel | QFrame::Sunken))
+ if (_frameStyle == (StyledPanel | Sunken))
return 3;
return 0;
}
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 1d269b2..279c57a 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -982,8 +982,10 @@ bool KWQKHTMLPart::canCachePage()
// 1. We're not a frame or frameset.
// 2. The page has no unload handler.
// 3. The page has no password fields.
+ // 4. The URL for the page is https.
if (d->m_frames.count() ||
parentPart() ||
+ m_url.protocol().startsWith("https") ||
(d->m_doc && (d->m_doc->hasWindowEventListener(EventImpl::UNLOAD_EVENT) ||
d->m_doc->hasPasswordField()))) {
return false;
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index ef8a42c..d6218db 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -47,8 +47,6 @@ typedef khtml::RenderPart KHTMLRenderPart;
#endif
- at class WebError;
- at class WebFrame;
@class WebCoreSettings;
@protocol WebCoreDOMTreeCopier;
@@ -85,12 +83,6 @@ typedef enum {
// The WebCoreBridge interface contains methods for use by the non-WebCore side of the bridge.
-enum FrameBorderStyle {
- NoFrameBorder = 1,
- SunkenFrameBorder = 2,
- PlainFrameBorder = 4
-};
-
@interface WebCoreBridge : NSObject
{
KWQKHTMLPart *_part;
@@ -204,6 +196,7 @@ enum FrameBorderStyle {
- (void)deselectAll;
- (NSRect)selectionRect;
+- (NSRect)visibleSelectionRect;
- (NSImage *)selectionImage;
- (id <WebDOMNode>)selectionStart;
@@ -213,8 +206,6 @@ enum FrameBorderStyle {
- (NSAttributedString *)attributedStringFrom:(id <WebDOMNode>)startNode startOffset:(int)startOffset to:(id <WebDOMNode>)endNode endOffset:(int)endOffset;
-- (int)frameBorderStyle;
-
+ (NSString *)stringWithData:(NSData *)data textEncoding:(CFStringEncoding)textEncoding;
+ (NSString *)stringWithData:(NSData *)data textEncodingName:(NSString *)textEncodingName;
@@ -348,6 +339,8 @@ enum FrameBorderStyle {
- (NSView <WebCoreFileButton> *)fileButton;
+- (void)setHasBorder:(BOOL)hasBorder;
+
@end
// This interface definition allows those who hold a WebCoreBridge * to call all the methods
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 9e6c40f..a15ce87 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -864,6 +864,11 @@ static HTMLFormElementImpl *formElementFromDOMElement(id <WebDOMElement>element)
- (NSRect)selectionRect
{
+ return _part->selectionRect();
+}
+
+- (NSRect)visibleSelectionRect
+{
KHTMLView *view = _part->view();
if (!view) {
return NSZeroRect;
@@ -882,7 +887,7 @@ static HTMLFormElementImpl *formElementFromDOMElement(id <WebDOMElement>element)
return nil;
}
- NSRect rect = [self selectionRect];
+ NSRect rect = [self visibleSelectionRect];
NSRect bounds = [view bounds];
NSImage *selectionImage = [[[NSImage alloc] initWithSize:rect.size] autorelease];
[selectionImage setFlipped:YES];
@@ -924,18 +929,6 @@ static HTMLFormElementImpl *formElementFromDOMElement(id <WebDOMElement>element)
return _part->referrer().getNSString();
}
-- (int)frameBorderStyle
-{
- KHTMLView *view = _part->view();
- if (view) {
- if (view->frameStyle() & QFrame::Sunken)
- return SunkenFrameBorder;
- if (view->frameStyle() & QFrame::Plain)
- return PlainFrameBorder;
- }
- return NoFrameBorder;
-}
-
+ (NSString *)stringWithData:(NSData *)data textEncoding:(CFStringEncoding)textEncoding
{
if (textEncoding == kCFStringEncodingInvalidId || textEncoding == kCFStringEncodingISOLatin1) {
@@ -1007,5 +1000,4 @@ static HTMLFormElementImpl *formElementFromDOMElement(id <WebDOMElement>element)
view->adjustViewSize();
}
-
@end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 41b2a78..4c020fb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2003-09-11 Richard Williamson <rjw at apple.com>
+
+ Fixed 3406671. Added a private method for Mail to get selection
+ rect.
+
+ Reviewed by Darin Adler.
+
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView updateTextBackgroundColor]):
+ * WebView.subproj/WebHTMLViewPrivate.h:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _handleMouseDragged:]):
+ (-[WebHTMLView _pluginController]):
+ (-[WebHTMLView _selectionRect]):
+
2003-09-10 Richard Williamson <rjw at apple.com>
Fixed 3231031. Use the normal methodology for displaying each frame of a GIF. That is,
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 4508b80..bd278bf 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -155,7 +155,7 @@
WebBridge *bridge = [self _bridge];
if ([bridge usesInactiveTextBackgroundColor] != shouldUseInactiveTextBackgroundColor) {
[bridge setUsesInactiveTextBackgroundColor:shouldUseInactiveTextBackgroundColor];
- [self setNeedsDisplayInRect:[bridge selectionRect]];
+ [self setNeedsDisplayInRect:[bridge visibleSelectionRect]];
}
}
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 722fda4..ae56ba4 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -72,4 +72,6 @@
- (WebPluginController *)_pluginController;
+- (NSRect)_selectionRect;
+
@end
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 9660351..4b4b8be 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -513,9 +513,9 @@ static WebHTMLView *lastHitView = nil;
[self _writeSelectionToPasteboard:pasteboard];
NSImage *selectionImage = [[self _bridge] selectionImage];
[selectionImage _web_dissolveToFraction:WebDragImageAlpha];
- NSRect selectionRect = [[self _bridge] selectionRect];
+ NSRect visibleSelectionRect = [[self _bridge] visibleSelectionRect];
[self dragImage:selectionImage
- at:NSMakePoint(NSMinX(selectionRect), NSMaxY(selectionRect))
+ at:NSMakePoint(NSMinX(visibleSelectionRect), NSMaxY(visibleSelectionRect))
offset:NSMakeSize(mouseDownPoint.x, mouseDownPoint.y)
event:_private->mouseDownEvent
pasteboard:pasteboard
@@ -554,6 +554,11 @@ static WebHTMLView *lastHitView = nil;
return _private->pluginController;
}
+- (NSRect)_selectionRect
+{
+ return [[self _bridge] selectionRect];
+}
+
@end
@implementation NSView (WebHTMLViewPrivate)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list