[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:49:49 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7a8488673026d0040581d50e790f14958289119d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 15 20:49:06 2002 +0000
WebCore:
- fixed 3074558 -- frames multiply at: http://www.iarsn.com/
The key was to make the name attribute work properly.
* khtml/ecma/kjs_window.cpp:
(Window::get): Enable the "name" attribute.
(Window::put): Enable the "name" attribute, but don't do the
conversion to an 8-bit string -- leave it as a QString.
* kwq/WebCoreBridge.h: Add setName/name methods.
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge setName:]): Added. Calls part->setName().
(-[WebCoreBridge name]): Added. Calls part->name().
* kwq/kparts/part.h: Added setName/name to ReadOnlyPart.
* kwq/KWQKHTMLPartImpl.mm: Remove old bogusish comment.
WebKit:
WebKit part of improved frame name support.
* WebView.subproj/WebFrame.m:
(-[WebFrame initWithName:webView:provisionalDataSource:controller:]):
Call setName on the newly created part.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2332 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d065e69..d7a1fe8 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,21 @@
+2002-10-15 Darin Adler <darin at apple.com>
+
+ - fixed 3074558 -- frames multiply at: http://www.iarsn.com/
+
+ The key was to make the name attribute work properly.
+
+ * khtml/ecma/kjs_window.cpp:
+ (Window::get): Enable the "name" attribute.
+ (Window::put): Enable the "name" attribute, but don't do the
+ conversion to an 8-bit string -- leave it as a QString.
+ * kwq/WebCoreBridge.h: Add setName/name methods.
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge setName:]): Added. Calls part->setName().
+ (-[WebCoreBridge name]): Added. Calls part->name().
+ * kwq/kparts/part.h: Added setName/name to ReadOnlyPart.
+
+ * kwq/KWQKHTMLPartImpl.mm: Remove old bogusish comment.
+
2002-10-15 Richard Williamson <rjw at apple.com>
Added text color to attributed string conversion.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d065e69..d7a1fe8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,21 @@
+2002-10-15 Darin Adler <darin at apple.com>
+
+ - fixed 3074558 -- frames multiply at: http://www.iarsn.com/
+
+ The key was to make the name attribute work properly.
+
+ * khtml/ecma/kjs_window.cpp:
+ (Window::get): Enable the "name" attribute.
+ (Window::put): Enable the "name" attribute, but don't do the
+ conversion to an 8-bit string -- leave it as a QString.
+ * kwq/WebCoreBridge.h: Add setName/name methods.
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge setName:]): Added. Calls part->setName().
+ (-[WebCoreBridge name]): Added. Calls part->name().
+ * kwq/kparts/part.h: Added setName/name to ReadOnlyPart.
+
+ * kwq/KWQKHTMLPartImpl.mm: Remove old bogusish comment.
+
2002-10-15 Richard Williamson <rjw at apple.com>
Added text color to attributed string conversion.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d065e69..d7a1fe8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2002-10-15 Darin Adler <darin at apple.com>
+
+ - fixed 3074558 -- frames multiply at: http://www.iarsn.com/
+
+ The key was to make the name attribute work properly.
+
+ * khtml/ecma/kjs_window.cpp:
+ (Window::get): Enable the "name" attribute.
+ (Window::put): Enable the "name" attribute, but don't do the
+ conversion to an 8-bit string -- leave it as a QString.
+ * kwq/WebCoreBridge.h: Add setName/name methods.
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge setName:]): Added. Calls part->setName().
+ (-[WebCoreBridge name]): Added. Calls part->name().
+ * kwq/kparts/part.h: Added setName/name to ReadOnlyPart.
+
+ * kwq/KWQKHTMLPartImpl.mm: Remove old bogusish comment.
+
2002-10-15 Richard Williamson <rjw at apple.com>
Added text color to attributed string conversion.
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 810deed..774f278 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -440,10 +440,8 @@ Value Window::get(ExecState *exec, const UString &p) const
return Value(location());
else
return Undefined();
-#ifndef APPLE_CHANGES
case Name:
return String(m_part->name());
-#endif
case _Navigator:
case ClientInformation:
return Value(new Navigator(exec, m_part));
@@ -820,12 +818,14 @@ void Window::put(ExecState* exec, const UString &propertyName, const Value &valu
if (isSafeScript(exec))
setListener(exec,DOM::EventImpl::UNLOAD_EVENT,value);
return;
-#ifndef APPLE_CHANGES
case Name:
if (isSafeScript(exec))
+#if APPLE_CHANGES
+ m_part->setName( value.toString(exec).qstring() );
+#else
m_part->setName( value.toString(exec).qstring().local8Bit().data() );
- return;
#endif
+ return;
default:
break;
}
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 457933f..8712305 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -144,7 +144,6 @@ void KWQKHTMLPartImpl::openURLRequest(const KURL &url, const URLArgs &args)
void KWQKHTMLPartImpl::slotData(NSString *encoding, bool forceEncoding, const char *bytes, int length, bool complete)
{
-// NOTE: This code emulates the interface used by the original khtml part
if (!d->m_workingURL.isEmpty()) {
part->begin(d->m_workingURL, 0, 0);
d->m_workingURL = KURL();
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 457933f..8712305 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -144,7 +144,6 @@ void KWQKHTMLPartImpl::openURLRequest(const KURL &url, const URLArgs &args)
void KWQKHTMLPartImpl::slotData(NSString *encoding, bool forceEncoding, const char *bytes, int length, bool complete)
{
-// NOTE: This code emulates the interface used by the original khtml part
if (!d->m_workingURL.isEmpty()) {
part->begin(d->m_workingURL, 0, 0);
d->m_workingURL = KURL();
diff --git a/WebCore/kwq/KWQKPartsPart.h b/WebCore/kwq/KWQKPartsPart.h
index c025dac..b19823b 100644
--- a/WebCore/kwq/KWQKPartsPart.h
+++ b/WebCore/kwq/KWQKPartsPart.h
@@ -44,39 +44,44 @@ namespace KParts {
class Part : public QObject {
public:
- Part() : m_widget(0), m_ref(1) { }
+ Part() : _widget(0), _ref(1) { }
- QWidget *widget() const { return m_widget; }
- void setWidget(QWidget *widget) { m_widget = widget; }
+ QWidget *widget() const { return _widget; }
+ void setWidget(QWidget *widget) { _widget = widget; }
- void ref() { ++m_ref; }
- void deref() { if (!--m_ref) delete this; }
+ void ref() { ++_ref; }
+ void deref() { if (!--_ref) delete this; }
bool event(QEvent *event) { customEvent((QCustomEvent *)event); return true; }
virtual void customEvent(QCustomEvent *) { }
private:
- QWidget *m_widget;
- unsigned int m_ref;
+ QWidget *_widget;
+ unsigned int _ref;
};
class ReadOnlyPart : public Part {
public:
- ReadOnlyPart(QObject * = 0, const char * = 0) : m_parent(0) { }
+ ReadOnlyPart(QObject *parent = 0, const char *name = 0) : _parent(parent), _name(name) { }
KURL url() const { return m_url; }
KURL m_url;
+ void setParent(QObject *parent) { _parent = parent; }
+ QObject *parent() const { return _parent; }
+
+ void setName(const QString &name) { _name = name; }
+ QString name() { return _name; }
+
void setXMLFile(const char *) { }
- void setParent(QObject *parent) { m_parent = parent; }
- QObject *parent() const { return m_parent; }
void setInstance(KInstance *, bool) { }
virtual bool openURL(const KURL &) = 0;
virtual bool closeURL() = 0;
private:
- QObject *m_parent;
+ QObject *_parent;
+ QString _name;
};
class GUIActivateEvent { };
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 2185c65..9feca08 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -82,6 +82,9 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (void)setRenderPart:(KHTMLRenderPart *)renderPart;
- (KHTMLRenderPart *)renderPart;
+- (void)setName:(NSString *)name;
+- (NSString *)name;
+
- (KHTMLPart *)part;
- (void)setParent:(WebCoreBridge *)parent;
@@ -133,19 +136,19 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (void)executeJavaScriptFromString:(NSString *)string;
-- (id<WebDOMDocument>)DOMDocument;
+- (id <WebDOMDocument>)DOMDocument;
-- (void)setSelectionFrom:(id<WebDOMNode>)start startOffset:(int)startOffset to:(id<WebDOMNode>)end endOffset:(int) endOffset;
+- (void)setSelectionFrom:(id <WebDOMNode>)start startOffset:(int)startOffset to:(id <WebDOMNode>)end endOffset:(int) endOffset;
- (NSString *)selectedText;
- (void)selectAll;
-- (id<WebDOMNode>)selectionStart;
+- (id <WebDOMNode>)selectionStart;
- (int)selectionStartOffset;
-- (id<WebDOMNode>)selectionEnd;
+- (id <WebDOMNode>)selectionEnd;
- (int)selectionEndOffset;
-- (NSAttributedString *)attributedStringFrom: (id<WebDOMNode>)startNode startOffset: (int)startOffset to: (id<WebDOMNode>)endNode endOffset: (int)endOffset;
+- (NSAttributedString *)attributedStringFrom:(id <WebDOMNode>)startNode startOffset:(int)startOffset to:(id <WebDOMNode>)endNode endOffset:(int)endOffset;
@end
@@ -189,7 +192,7 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (id <WebCoreResourceHandle>)startLoadingResource:(id <WebCoreResourceLoader>)loader withURL:(NSURL *)URL referrer:(NSString *)referrer;
- (void)reportBadURL:(NSString *)badURL;
-- (void)objectLoadedFromCache:(NSURL *)URL response: response size:(unsigned)bytes;
+- (void)objectLoadedFromCache:(NSURL *)URL response:(id)response size:(unsigned)bytes;
- (BOOL)isReloading;
- (void)reportClientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date;
@@ -206,7 +209,7 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (BOOL)defersLoading;
- (void)setDefersLoading:(BOOL)loading;
-- (void)saveDocumentState: (NSArray *)documentState;
+- (void)saveDocumentState:(NSArray *)documentState;
- (NSArray *)documentState;
- (void)setNeedsReapplyStyles;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 1cbe784..1ebd129 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -750,5 +750,14 @@ static NSAttributedString *attributedString(DOM::NodeImpl *_startNode, int start
return part->impl->selectionEndOffset();
}
+- (void)setName:(NSString *)name
+{
+ part->setName(QString::fromNSString(name));
+}
+
+- (NSString *)name
+{
+ return part->name().getNSString();
+}
@end
diff --git a/WebCore/kwq/kparts/part.h b/WebCore/kwq/kparts/part.h
index c025dac..b19823b 100644
--- a/WebCore/kwq/kparts/part.h
+++ b/WebCore/kwq/kparts/part.h
@@ -44,39 +44,44 @@ namespace KParts {
class Part : public QObject {
public:
- Part() : m_widget(0), m_ref(1) { }
+ Part() : _widget(0), _ref(1) { }
- QWidget *widget() const { return m_widget; }
- void setWidget(QWidget *widget) { m_widget = widget; }
+ QWidget *widget() const { return _widget; }
+ void setWidget(QWidget *widget) { _widget = widget; }
- void ref() { ++m_ref; }
- void deref() { if (!--m_ref) delete this; }
+ void ref() { ++_ref; }
+ void deref() { if (!--_ref) delete this; }
bool event(QEvent *event) { customEvent((QCustomEvent *)event); return true; }
virtual void customEvent(QCustomEvent *) { }
private:
- QWidget *m_widget;
- unsigned int m_ref;
+ QWidget *_widget;
+ unsigned int _ref;
};
class ReadOnlyPart : public Part {
public:
- ReadOnlyPart(QObject * = 0, const char * = 0) : m_parent(0) { }
+ ReadOnlyPart(QObject *parent = 0, const char *name = 0) : _parent(parent), _name(name) { }
KURL url() const { return m_url; }
KURL m_url;
+ void setParent(QObject *parent) { _parent = parent; }
+ QObject *parent() const { return _parent; }
+
+ void setName(const QString &name) { _name = name; }
+ QString name() { return _name; }
+
void setXMLFile(const char *) { }
- void setParent(QObject *parent) { m_parent = parent; }
- QObject *parent() const { return m_parent; }
void setInstance(KInstance *, bool) { }
virtual bool openURL(const KURL &) = 0;
virtual bool closeURL() = 0;
private:
- QObject *m_parent;
+ QObject *_parent;
+ QString _name;
};
class GUIActivateEvent { };
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3e624fb..403b6a2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-15 Darin Adler <darin at apple.com>
+
+ WebKit part of improved frame name support.
+
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame initWithName:webView:provisionalDataSource:controller:]):
+ Call setName on the newly created part.
+
2002-10-15 John Sullivan <sullivan at apple.com>
- fixed 3075777 -- hysteresis for dragging links on web pages
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 3e624fb..403b6a2 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-10-15 Darin Adler <darin at apple.com>
+
+ WebKit part of improved frame name support.
+
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame initWithName:webView:provisionalDataSource:controller:]):
+ Call setName on the newly created part.
+
2002-10-15 John Sullivan <sullivan at apple.com>
- fixed 3075777 -- hysteresis for dragging links on web pages
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 0f4955f..642dc27 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -37,20 +37,21 @@
_private = [[WebFramePrivate alloc] init];
- [self setController: c];
+ [self setController:c];
_private->bridge = [[WebBridge alloc] init];
[_private->bridge setFrame:self];
+ [_private->bridge setName:n];
- if (d != nil && [self setProvisionalDataSource: d] == NO){
+ [_private setName:n];
+
+ if (d && ![self setProvisionalDataSource:d]) {
[self release];
return nil;
}
- [_private setName: n];
-
if (v)
- [self setWebView: v];
+ [self setWebView:v];
++WebFrameCount;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list