[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:50:21 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2bd3a5087cef88df8bcdc1c08bc2bc67a339e476
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 16 23:24:57 2002 +0000
- fixed 3045570 -- can't select a printer at inkfinder.com
* khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
Call the new openURL for the case where we are reusing a part.
We do this backwards from how KHTML does, so it's twisted.
* kwq/KWQKHTMLPartImpl.h: Add openURL.
* kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::openURL):
Tell the bridge to load the URL.
* kwq/mac-encodings.txt: Tweak Korean encoding names.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2344 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 2873d45..631612d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-10-16 Darin Adler <darin at apple.com>
+
+ - fixed 3045570 -- can't select a printer at inkfinder.com
+
+ * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
+ Call the new openURL for the case where we are reusing a part.
+ We do this backwards from how KHTML does, so it's twisted.
+
+ * kwq/KWQKHTMLPartImpl.h: Add openURL.
+ * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::openURL):
+ Tell the bridge to load the URL.
+
+ * kwq/mac-encodings.txt: Tweak Korean encoding names.
+
2002-10-16 David Hyatt <hyatt at apple.com>
A very substantial change. Absolute/fixed positioned elements that
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 2873d45..631612d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2002-10-16 Darin Adler <darin at apple.com>
+
+ - fixed 3045570 -- can't select a printer at inkfinder.com
+
+ * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
+ Call the new openURL for the case where we are reusing a part.
+ We do this backwards from how KHTML does, so it's twisted.
+
+ * kwq/KWQKHTMLPartImpl.h: Add openURL.
+ * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::openURL):
+ Tell the bridge to load the URL.
+
+ * kwq/mac-encodings.txt: Tweak Korean encoding names.
+
2002-10-16 David Hyatt <hyatt at apple.com>
A very substantial change. Absolute/fixed positioned elements that
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2873d45..631612d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2002-10-16 Darin Adler <darin at apple.com>
+
+ - fixed 3045570 -- can't select a printer at inkfinder.com
+
+ * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
+ Call the new openURL for the case where we are reusing a part.
+ We do this backwards from how KHTML does, so it's twisted.
+
+ * kwq/KWQKHTMLPartImpl.h: Add openURL.
+ * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::openURL):
+ Tell the bridge to load the URL.
+
+ * kwq/mac-encodings.txt: Tweak Korean encoding names.
+
2002-10-16 David Hyatt <hyatt at apple.com>
A very substantial change. Absolute/fixed positioned elements that
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 629b766..a42d3dd 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -2747,7 +2747,13 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
}
#if APPLE_CHANGES
- if ( !child->m_part )
+ if ( child->m_part )
+ {
+ KHTMLPart *part = dynamic_cast<KHTMLPart *>(&*child->m_part);
+ if (part)
+ part->impl->openURL(url);
+ }
+ else
{
KParts::ReadOnlyPart *part = impl->createPart(*child, url, mimetype);
#else
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 595c672..2d7c01d 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -75,6 +75,7 @@ public:
void setView(KHTMLView *view);
KHTMLView *view() const;
+ void openURL(const KURL &);
void openURLRequest(const KURL &, const KParts::URLArgs &);
void slotData(NSString *, bool forceEncoding, const char *bytes, int length, bool complete = false);
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 2597298..af174a6 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -126,15 +126,24 @@ WebCoreBridge *KWQKHTMLPartImpl::bridgeForFrameName(const QString &frameName)
return frame;
}
-void KWQKHTMLPartImpl::openURLRequest(const KURL &url, const URLArgs &args)
+void KWQKHTMLPartImpl::openURL(const KURL &url)
{
NSURL *cocoaURL = url.getNSURL();
if (cocoaURL == nil) {
// FIXME: We need to report this error to someone.
- return;
+ } else {
+ [_bridge loadURL:cocoaURL];
}
+}
- [bridgeForFrameName(args.frameName) loadURL:cocoaURL];
+void KWQKHTMLPartImpl::openURLRequest(const KURL &url, const URLArgs &args)
+{
+ NSURL *cocoaURL = url.getNSURL();
+ if (cocoaURL == nil) {
+ // FIXME: We need to report this error to someone.
+ } else {
+ [bridgeForFrameName(args.frameName) loadURL:cocoaURL];
+ }
}
void KWQKHTMLPartImpl::slotData(NSString *encoding, bool forceEncoding, const char *bytes, int length, bool complete)
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index 595c672..2d7c01d 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -75,6 +75,7 @@ public:
void setView(KHTMLView *view);
KHTMLView *view() const;
+ void openURL(const KURL &);
void openURLRequest(const KURL &, const KParts::URLArgs &);
void slotData(NSString *, bool forceEncoding, const char *bytes, int length, bool complete = false);
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 2597298..af174a6 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -126,15 +126,24 @@ WebCoreBridge *KWQKHTMLPartImpl::bridgeForFrameName(const QString &frameName)
return frame;
}
-void KWQKHTMLPartImpl::openURLRequest(const KURL &url, const URLArgs &args)
+void KWQKHTMLPartImpl::openURL(const KURL &url)
{
NSURL *cocoaURL = url.getNSURL();
if (cocoaURL == nil) {
// FIXME: We need to report this error to someone.
- return;
+ } else {
+ [_bridge loadURL:cocoaURL];
}
+}
- [bridgeForFrameName(args.frameName) loadURL:cocoaURL];
+void KWQKHTMLPartImpl::openURLRequest(const KURL &url, const URLArgs &args)
+{
+ NSURL *cocoaURL = url.getNSURL();
+ if (cocoaURL == nil) {
+ // FIXME: We need to report this error to someone.
+ } else {
+ [bridgeForFrameName(args.frameName) loadURL:cocoaURL];
+ }
}
void KWQKHTMLPartImpl::slotData(NSString *encoding, bool forceEncoding, const char *bytes, int length, bool complete)
diff --git a/WebCore/kwq/mac-encodings.txt b/WebCore/kwq/mac-encodings.txt
index a551170..cc083e0 100644
--- a/WebCore/kwq/mac-encodings.txt
+++ b/WebCore/kwq/mac-encodings.txt
@@ -21,7 +21,7 @@ NonLossyASCII
MacJapanese: x-mac-japanese
MacChineseTrad: x-mac-chinesetrad, x-mac-trad-chinese
-MacKorean: x-mac-korean
+MacKorean: ks_c_5601, ks_c_5601-1987, ks_c_5601_1987, ksc5601, x-mac-korean
MacArabic: x-mac-arabic
MacHebrew: x-mac-hebrew
MacGreek: x-mac-greek
@@ -122,7 +122,7 @@ ShiftJIS_X0213_00
GB_2312_80: csgb231280, gb2312-80, gb231280, gb_2312-80
GBK_95: x-gbk
GB_18030_2000: gb18030
-KSC_5601_87: ks_c_5601, ks_c_5601-1987, ks_c_5601_1987, ksc5601
+KSC_5601_87
KSC_5601_92_Johab
CNS_11643_92_P1
CNS_11643_92_P2
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list