[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:29:25 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1f4a347c7515fae25a99b08346e9ec1c49fcec38
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 6 04:54:37 2002 +0000
WebCore:
* kwq/KWQKHTMLPartImpl.mm:
(KWQKHTMLPartImpl::openURLInFrame):
(KWQKHTMLPartImpl::urlSelected):
(KWQKHTMLPartImpl::requestFrame):
(KWQKHTMLPartImpl::requestObject):
Add some nil checks before making calls with nil NSURL objects.
But we also have to figure out how to report some kind of error
in these cases, because the current behavior is not so good.
WebKit:
* .cvsignore: Ignore WebCore-combined.exp.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1744 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 621faae..1196166 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-08-05 Darin Adler <darin at apple.com>
+
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::openURLInFrame):
+ (KWQKHTMLPartImpl::urlSelected):
+ (KWQKHTMLPartImpl::requestFrame):
+ (KWQKHTMLPartImpl::requestObject):
+ Add some nil checks before making calls with nil NSURL objects.
+ But we also have to figure out how to report some kind of error
+ in these cases, because the current behavior is not so good.
+
2002-08-05 Maciej Stachowiak <mjs at apple.com>
- fixed 3007072 - need to be able to build fat
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 621faae..1196166 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-08-05 Darin Adler <darin at apple.com>
+
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::openURLInFrame):
+ (KWQKHTMLPartImpl::urlSelected):
+ (KWQKHTMLPartImpl::requestFrame):
+ (KWQKHTMLPartImpl::requestObject):
+ Add some nil checks before making calls with nil NSURL objects.
+ But we also have to figure out how to report some kind of error
+ in these cases, because the current behavior is not so good.
+
2002-08-05 Maciej Stachowiak <mjs at apple.com>
- fixed 3007072 - need to be able to build fat
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 621faae..1196166 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-08-05 Darin Adler <darin at apple.com>
+
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::openURLInFrame):
+ (KWQKHTMLPartImpl::urlSelected):
+ (KWQKHTMLPartImpl::requestFrame):
+ (KWQKHTMLPartImpl::requestObject):
+ Add some nil checks before making calls with nil NSURL objects.
+ But we also have to figure out how to report some kind of error
+ in these cases, because the current behavior is not so good.
+
2002-08-05 Maciej Stachowiak <mjs at apple.com>
- fixed 3007072 - need to be able to build fat
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 72e8c92..54003c0 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -79,8 +79,13 @@ KWQKHTMLPartImpl::~KWQKHTMLPartImpl()
bool KWQKHTMLPartImpl::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs )
{
- WebCoreBridge *frame;
+ NSURL *cocoaURL = url.getNSURL();
+ if (cocoaURL == nil) {
+ // FIXME: Do we need to report an error to someone?
+ return false;
+ }
+ WebCoreBridge *frame;
if (!urlArgs.frameName.isEmpty()) {
frame = [bridge frameNamed:urlArgs.frameName.getNSString()];
if (frame == nil) {
@@ -90,8 +95,7 @@ bool KWQKHTMLPartImpl::openURLInFrame( const KURL &url, const KParts::URLArgs &u
frame = bridge;
}
- [frame loadURL:url.getNSURL()];
-
+ [frame loadURL:cocoaURL];
return true;
}
@@ -117,32 +121,37 @@ void KWQKHTMLPartImpl::slotData(NSString *encoding, const char *bytes, int lengt
void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, const QString &_target, KParts::URLArgs )
{
- KURL clickedURL(part->completeURL( url));
- KURL refLess(clickedURL);
- WebCoreBridge *frame;
-
if ( url.find( "javascript:", 0, false ) == 0 )
{
part->executeScript( url.right( url.length() - 11) );
return;
}
+ KURL clickedURL(part->completeURL(url));
+ NSURL *cocoaURL = clickedURL.getNSURL();
+ if (cocoaURL == nil) {
+ // FIXME: Do we need to report an error to someone?
+ return;
+ }
+
// Open new window on command-click
if (state & MetaButton) {
- [bridge openNewWindowWithURL:clickedURL.getNSURL()];
+ [bridge openNewWindowWithURL:cocoaURL];
return;
}
- part->m_url.setRef ("");
- refLess.setRef ("");
- if (refLess.url() == part->m_url.url()){
+ KURL refLess(clickedURL);
+ part->m_url.setRef("");
+ refLess.setRef("");
+ if (refLess.url() == part->m_url.url()) {
part->m_url = clickedURL;
part->gotoAnchor (clickedURL.ref());
// This URL needs to be added to the back/forward list.
- [bridge addBackForwardItemWithURL: clickedURL.getNSURL() anchor:clickedURL.ref().getNSString()];
+ [bridge addBackForwardItemWithURL:cocoaURL anchor:clickedURL.ref().getNSString()];
return;
}
+ WebCoreBridge *frame;
if (_target.isEmpty()) {
// If we're the only frame in a frameset then pop the frame.
if ([[[bridge parent] childFrames] count] == 1) {
@@ -158,7 +167,7 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
}
}
- [frame loadURL:clickedURL.getNSURL()];
+ [frame loadURL:cocoaURL];
}
bool KWQKHTMLPartImpl::requestFrame( RenderPart *frame, const QString &url, const QString &frameName,
@@ -168,7 +177,7 @@ bool KWQKHTMLPartImpl::requestFrame( RenderPart *frame, const QString &url, cons
NSURL *childURL = part->completeURL(url).getNSURL();
if (childURL == nil) {
- NSLog (@"ERROR (probably need to fix CFURL): unable to create URL with path (base URL %s, relative URL %s)", d->m_doc->baseURL().ascii(), url.ascii());
+ // FIXME: Do we need to report an error to someone?
return false;
}
@@ -207,6 +216,12 @@ bool KWQKHTMLPartImpl::requestObject(RenderPart *frame, const QString &url, cons
if (url.isEmpty()) {
return false;
}
+ NSURL *cocoaURL = part->completeURL(url).getNSURL();
+ if (cocoaURL == nil) {
+ // FIXME: Do we need to report an error to someone?
+ return false;
+ }
+
if (frame->widget()) {
return true;
}
@@ -218,12 +233,11 @@ bool KWQKHTMLPartImpl::requestObject(RenderPart *frame, const QString &url, cons
QWidget *widget = new QWidget();
widget->setView([[WebCoreViewFactory sharedFactory]
- viewForPluginWithURL:part->completeURL(url).getNSURL()
+ viewForPluginWithURL:cocoaURL
serviceType:serviceType.getNSString()
arguments:argsArray
baseURL:KURL(d->m_doc->baseURL()).getNSURL()]);
frame->setWidget(widget);
-
return true;
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 72e8c92..54003c0 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -79,8 +79,13 @@ KWQKHTMLPartImpl::~KWQKHTMLPartImpl()
bool KWQKHTMLPartImpl::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs )
{
- WebCoreBridge *frame;
+ NSURL *cocoaURL = url.getNSURL();
+ if (cocoaURL == nil) {
+ // FIXME: Do we need to report an error to someone?
+ return false;
+ }
+ WebCoreBridge *frame;
if (!urlArgs.frameName.isEmpty()) {
frame = [bridge frameNamed:urlArgs.frameName.getNSString()];
if (frame == nil) {
@@ -90,8 +95,7 @@ bool KWQKHTMLPartImpl::openURLInFrame( const KURL &url, const KParts::URLArgs &u
frame = bridge;
}
- [frame loadURL:url.getNSURL()];
-
+ [frame loadURL:cocoaURL];
return true;
}
@@ -117,32 +121,37 @@ void KWQKHTMLPartImpl::slotData(NSString *encoding, const char *bytes, int lengt
void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, const QString &_target, KParts::URLArgs )
{
- KURL clickedURL(part->completeURL( url));
- KURL refLess(clickedURL);
- WebCoreBridge *frame;
-
if ( url.find( "javascript:", 0, false ) == 0 )
{
part->executeScript( url.right( url.length() - 11) );
return;
}
+ KURL clickedURL(part->completeURL(url));
+ NSURL *cocoaURL = clickedURL.getNSURL();
+ if (cocoaURL == nil) {
+ // FIXME: Do we need to report an error to someone?
+ return;
+ }
+
// Open new window on command-click
if (state & MetaButton) {
- [bridge openNewWindowWithURL:clickedURL.getNSURL()];
+ [bridge openNewWindowWithURL:cocoaURL];
return;
}
- part->m_url.setRef ("");
- refLess.setRef ("");
- if (refLess.url() == part->m_url.url()){
+ KURL refLess(clickedURL);
+ part->m_url.setRef("");
+ refLess.setRef("");
+ if (refLess.url() == part->m_url.url()) {
part->m_url = clickedURL;
part->gotoAnchor (clickedURL.ref());
// This URL needs to be added to the back/forward list.
- [bridge addBackForwardItemWithURL: clickedURL.getNSURL() anchor:clickedURL.ref().getNSString()];
+ [bridge addBackForwardItemWithURL:cocoaURL anchor:clickedURL.ref().getNSString()];
return;
}
+ WebCoreBridge *frame;
if (_target.isEmpty()) {
// If we're the only frame in a frameset then pop the frame.
if ([[[bridge parent] childFrames] count] == 1) {
@@ -158,7 +167,7 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
}
}
- [frame loadURL:clickedURL.getNSURL()];
+ [frame loadURL:cocoaURL];
}
bool KWQKHTMLPartImpl::requestFrame( RenderPart *frame, const QString &url, const QString &frameName,
@@ -168,7 +177,7 @@ bool KWQKHTMLPartImpl::requestFrame( RenderPart *frame, const QString &url, cons
NSURL *childURL = part->completeURL(url).getNSURL();
if (childURL == nil) {
- NSLog (@"ERROR (probably need to fix CFURL): unable to create URL with path (base URL %s, relative URL %s)", d->m_doc->baseURL().ascii(), url.ascii());
+ // FIXME: Do we need to report an error to someone?
return false;
}
@@ -207,6 +216,12 @@ bool KWQKHTMLPartImpl::requestObject(RenderPart *frame, const QString &url, cons
if (url.isEmpty()) {
return false;
}
+ NSURL *cocoaURL = part->completeURL(url).getNSURL();
+ if (cocoaURL == nil) {
+ // FIXME: Do we need to report an error to someone?
+ return false;
+ }
+
if (frame->widget()) {
return true;
}
@@ -218,12 +233,11 @@ bool KWQKHTMLPartImpl::requestObject(RenderPart *frame, const QString &url, cons
QWidget *widget = new QWidget();
widget->setView([[WebCoreViewFactory sharedFactory]
- viewForPluginWithURL:part->completeURL(url).getNSURL()
+ viewForPluginWithURL:cocoaURL
serviceType:serviceType.getNSString()
arguments:argsArray
baseURL:KURL(d->m_doc->baseURL()).getNSURL()]);
frame->setWidget(widget);
-
return true;
}
diff --git a/WebKit/.cvsignore b/WebKit/.cvsignore
index b8dfa87..a65965b 100644
--- a/WebKit/.cvsignore
+++ b/WebKit/.cvsignore
@@ -1,3 +1,4 @@
Makefile.in
Makefile
previous-clean-timestamp
+WebKit-combined.exp
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 07e227d..6c8441c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-05 Darin Adler <darin at apple.com>
+
+ * .cvsignore: Ignore WebCore-combined.exp.
+
2002-08-05 Maciej Stachowiak <mjs at apple.com>
- fixed 3007072 - need to be able to build fat
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 07e227d..6c8441c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,7 @@
+2002-08-05 Darin Adler <darin at apple.com>
+
+ * .cvsignore: Ignore WebCore-combined.exp.
+
2002-08-05 Maciej Stachowiak <mjs at apple.com>
- fixed 3007072 - need to be able to build fat
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list