[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 05:54:55 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1e8474f121104fc83e4f21421ce05d1b88de9522
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 1 01:40:48 2002 +0000
Fixed javascript at head of document problem.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@577 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6bfec9c..1b286ab 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-01-31 Richard Williamson <rjw at apple.com>
+
+ * src/kdelibs/khtml/html/html_headimpl.cpp: (HTMLStyleElementImpl::detach):
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::write):
+
2002-01-31 Kenneth Kocienda <kocienda at apple.com>
Changes to incorporate use of the no-copy NSData object.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6bfec9c..1b286ab 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,8 @@
+2002-01-31 Richard Williamson <rjw at apple.com>
+
+ * src/kdelibs/khtml/html/html_headimpl.cpp: (HTMLStyleElementImpl::detach):
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::write):
+
2002-01-31 Kenneth Kocienda <kocienda at apple.com>
Changes to incorporate use of the no-copy NSData object.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6bfec9c..1b286ab 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,8 @@
+2002-01-31 Richard Williamson <rjw at apple.com>
+
+ * src/kdelibs/khtml/html/html_headimpl.cpp: (HTMLStyleElementImpl::detach):
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::write):
+
2002-01-31 Kenneth Kocienda <kocienda at apple.com>
Changes to incorporate use of the no-copy NSData object.
diff --git a/WebCore/khtml/html/html_headimpl.cpp b/WebCore/khtml/html/html_headimpl.cpp
index 6965c7b..599d2fc 100644
--- a/WebCore/khtml/html/html_headimpl.cpp
+++ b/WebCore/khtml/html/html_headimpl.cpp
@@ -432,7 +432,9 @@ void HTMLStyleElementImpl::attach()
void HTMLStyleElementImpl::detach()
{
- if (m_sheet) getDocument()->createSelector();
+ // RJW: Why is this done?
+ //if (m_sheet)
+ // getDocument()->createSelector();
HTMLElementImpl::detach();
}
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 4d66cb6..638466b 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -167,6 +167,8 @@ public:
bool m_haveCharset:1;
bool m_onlyLocalReferences:1;
bool m_startBeforeEnd:1;
+
+ bool m_decodingStarted:1;
KJSProxy *m_jscript;
int m_runningScripts;
@@ -218,6 +220,7 @@ public:
m_frameNameId = 1;
m_documentSource = "";
+ m_decodingStarted = 0;
}
~KHTMLPartPrivate()
@@ -617,15 +620,25 @@ void KHTMLPart::write(const char *str, int len)
if ( len == -1 )
len = strlen( str );
- double start = CFAbsoluteTimeGetCurrent();
-
#ifdef _KWQ_TIMING
- QString decoded = d->m_decoder->decode( str, len );
+ double start = CFAbsoluteTimeGetCurrent();
#endif
-
- if(decoded.isEmpty())
- return;
+ d->m_documentSource += str;
+
+ QString decoded;
+ if (d->m_decodingStarted)
+ decoded = d->m_decoder->decode( str, len );
+ else
+ decoded = d->m_decoder->decode( d->m_documentSource, d->m_documentSource.length() );
+
+ if(decoded.isEmpty()){
+ fprintf (stderr, "WARNING: DECODER unable to decode string, length = %d, total length = %d\n", len, d->m_documentSource.length());
+ return;
+ }
+
+ d->m_decodingStarted = 1;
+
d->m_doc->applyChanges(true, true);
// end lines added in lieu of big fixme
@@ -640,7 +653,6 @@ void KHTMLPart::write(const char *str, int len)
KWQDEBUGLEVEL3 (0x200, "tokenize/parse length = %d, milliseconds = %f, total = %f\n", len, thisTime, totalWriteTime);
#endif
- d->m_documentSource += str;
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 4d66cb6..638466b 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -167,6 +167,8 @@ public:
bool m_haveCharset:1;
bool m_onlyLocalReferences:1;
bool m_startBeforeEnd:1;
+
+ bool m_decodingStarted:1;
KJSProxy *m_jscript;
int m_runningScripts;
@@ -218,6 +220,7 @@ public:
m_frameNameId = 1;
m_documentSource = "";
+ m_decodingStarted = 0;
}
~KHTMLPartPrivate()
@@ -617,15 +620,25 @@ void KHTMLPart::write(const char *str, int len)
if ( len == -1 )
len = strlen( str );
- double start = CFAbsoluteTimeGetCurrent();
-
#ifdef _KWQ_TIMING
- QString decoded = d->m_decoder->decode( str, len );
+ double start = CFAbsoluteTimeGetCurrent();
#endif
-
- if(decoded.isEmpty())
- return;
+ d->m_documentSource += str;
+
+ QString decoded;
+ if (d->m_decodingStarted)
+ decoded = d->m_decoder->decode( str, len );
+ else
+ decoded = d->m_decoder->decode( d->m_documentSource, d->m_documentSource.length() );
+
+ if(decoded.isEmpty()){
+ fprintf (stderr, "WARNING: DECODER unable to decode string, length = %d, total length = %d\n", len, d->m_documentSource.length());
+ return;
+ }
+
+ d->m_decodingStarted = 1;
+
d->m_doc->applyChanges(true, true);
// end lines added in lieu of big fixme
@@ -640,7 +653,6 @@ void KHTMLPart::write(const char *str, int len)
KWQDEBUGLEVEL3 (0x200, "tokenize/parse length = %d, milliseconds = %f, total = %f\n", len, thisTime, totalWriteTime);
#endif
- d->m_documentSource += str;
}
diff --git a/WebCore/src/kdelibs/khtml/html/html_headimpl.cpp b/WebCore/src/kdelibs/khtml/html/html_headimpl.cpp
index 6965c7b..599d2fc 100644
--- a/WebCore/src/kdelibs/khtml/html/html_headimpl.cpp
+++ b/WebCore/src/kdelibs/khtml/html/html_headimpl.cpp
@@ -432,7 +432,9 @@ void HTMLStyleElementImpl::attach()
void HTMLStyleElementImpl::detach()
{
- if (m_sheet) getDocument()->createSelector();
+ // RJW: Why is this done?
+ //if (m_sheet)
+ // getDocument()->createSelector();
HTMLElementImpl::detach();
}
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 4d66cb6..638466b 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -167,6 +167,8 @@ public:
bool m_haveCharset:1;
bool m_onlyLocalReferences:1;
bool m_startBeforeEnd:1;
+
+ bool m_decodingStarted:1;
KJSProxy *m_jscript;
int m_runningScripts;
@@ -218,6 +220,7 @@ public:
m_frameNameId = 1;
m_documentSource = "";
+ m_decodingStarted = 0;
}
~KHTMLPartPrivate()
@@ -617,15 +620,25 @@ void KHTMLPart::write(const char *str, int len)
if ( len == -1 )
len = strlen( str );
- double start = CFAbsoluteTimeGetCurrent();
-
#ifdef _KWQ_TIMING
- QString decoded = d->m_decoder->decode( str, len );
+ double start = CFAbsoluteTimeGetCurrent();
#endif
-
- if(decoded.isEmpty())
- return;
+ d->m_documentSource += str;
+
+ QString decoded;
+ if (d->m_decodingStarted)
+ decoded = d->m_decoder->decode( str, len );
+ else
+ decoded = d->m_decoder->decode( d->m_documentSource, d->m_documentSource.length() );
+
+ if(decoded.isEmpty()){
+ fprintf (stderr, "WARNING: DECODER unable to decode string, length = %d, total length = %d\n", len, d->m_documentSource.length());
+ return;
+ }
+
+ d->m_decodingStarted = 1;
+
d->m_doc->applyChanges(true, true);
// end lines added in lieu of big fixme
@@ -640,7 +653,6 @@ void KHTMLPart::write(const char *str, int len)
KWQDEBUGLEVEL3 (0x200, "tokenize/parse length = %d, milliseconds = %f, total = %f\n", len, thisTime, totalWriteTime);
#endif
- d->m_documentSource += str;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list