[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aestes at apple.com
aestes at apple.com
Wed Dec 22 13:37:31 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 940efb8843e2f9f497c8160140727c26a6783710
Author: aestes at apple.com <aestes at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 21 20:43:51 2010 +0000
2010-09-21 Andy Estes <aestes at apple.com>
Reviewed by Darin Adler.
REGRESSION (r61285): AIM 2.1.296: Code rendered as text in Welcome screen
https://bugs.webkit.org/show_bug.cgi?id=46134
AIM clients linked against versions of WebKit prior to the introduction
of the HTML5 parser contain markup incompatible with the new parser.
Enable parser quirks in this case to remain compatible with these
clients.
* WebView/WebView.mm:
(shouldUsePreHTML5ParserQuirks): Returns true if the embedding
application is AIM and was linked against a version of WebKit prior to
the introduction of the HTML5 parser, or if the
WebKitPreHTML5ParserQuirks WebPreference is enabled.
(-[WebView _preferencesChangedNotification:]): Call
WebCore::Settings::setUsePreHTML5ParserQuirks().
2010-09-21 Andy Estes <aestes at apple.com>
Reviewed by Darin Adler.
REGRESSION (r61285): AIM 2.1.296: Code rendered as text in Welcome screen
https://bugs.webkit.org/show_bug.cgi?id=46134
* WebCore.exp.in: Export __ZN7WebCore32applicationIsAOLInstantMessengerEv.
* platform/mac/RuntimeApplicationChecks.h:
* platform/mac/RuntimeApplicationChecks.mm:
(WebCore::applicationIsAOLInstantMessenger): Determine if the embedding
application is AOL Instant Messenger by checking the bundle identifier.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67983 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index be52d8f..3b6906a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-21 Andy Estes <aestes at apple.com>
+
+ Reviewed by Darin Adler.
+
+ REGRESSION (r61285): AIM 2.1.296: Code rendered as text in Welcome screen
+ https://bugs.webkit.org/show_bug.cgi?id=46134
+
+ * WebCore.exp.in: Export __ZN7WebCore32applicationIsAOLInstantMessengerEv.
+ * platform/mac/RuntimeApplicationChecks.h:
+ * platform/mac/RuntimeApplicationChecks.mm:
+ (WebCore::applicationIsAOLInstantMessenger): Determine if the embedding
+ application is AOL Instant Messenger by checking the bundle identifier.
+
2010-09-21 Chris Guillory <chris.guillory at google.com>
Reviewed by Chris Fleizach.
diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in
index d2a6edb..2a5ad5b 100644
--- a/WebCore/WebCore.exp.in
+++ b/WebCore/WebCore.exp.in
@@ -516,6 +516,7 @@ __ZN7WebCore31contextMenuItemTagIgnoreGrammarEv
__ZN7WebCore31contextMenuItemTagMakeLowerCaseEv
__ZN7WebCore31contextMenuItemTagMakeUpperCaseEv
__ZN7WebCore31contextMenuItemTagStartSpeakingEv
+__ZN7WebCore32applicationIsAOLInstantMessengerEv
__ZN7WebCore32contextMenuItemTagInspectElementEv
__ZN7WebCore32contextMenuItemTagSmartCopyPasteEv
__ZN7WebCore32plainTextToMallocAllocatedBufferEPKNS_5RangeERjbNS_20TextIteratorBehaviorE
diff --git a/WebCore/platform/mac/RuntimeApplicationChecks.h b/WebCore/platform/mac/RuntimeApplicationChecks.h
index 24b8ae1..9b73ba5 100644
--- a/WebCore/platform/mac/RuntimeApplicationChecks.h
+++ b/WebCore/platform/mac/RuntimeApplicationChecks.h
@@ -32,6 +32,7 @@ bool applicationIsAppleMail();
bool applicationIsSafari();
bool applicationIsMicrosoftMessenger();
bool applicationIsAdobeInstaller();
+bool applicationIsAOLInstantMessenger();
} // namespace WebCore
diff --git a/WebCore/platform/mac/RuntimeApplicationChecks.mm b/WebCore/platform/mac/RuntimeApplicationChecks.mm
index bcc1dc9..0f4ff3a 100644
--- a/WebCore/platform/mac/RuntimeApplicationChecks.mm
+++ b/WebCore/platform/mac/RuntimeApplicationChecks.mm
@@ -52,5 +52,11 @@ bool applicationIsAdobeInstaller()
static bool isAdobeInstaller = [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.adobe.Installers.Setup"];
return isAdobeInstaller;
}
+
+bool applicationIsAOLInstantMessenger()
+{
+ static bool isAOLInstantMessenger = [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.aol.aim.desktop"];
+ return isAOLInstantMessenger;
+}
} // namespace WebCore
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 10d80ca..de7c6a1 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,23 @@
+2010-09-21 Andy Estes <aestes at apple.com>
+
+ Reviewed by Darin Adler.
+
+ REGRESSION (r61285): AIM 2.1.296: Code rendered as text in Welcome screen
+ https://bugs.webkit.org/show_bug.cgi?id=46134
+
+ AIM clients linked against versions of WebKit prior to the introduction
+ of the HTML5 parser contain markup incompatible with the new parser.
+ Enable parser quirks in this case to remain compatible with these
+ clients.
+
+ * WebView/WebView.mm:
+ (shouldUsePreHTML5ParserQuirks): Returns true if the embedding
+ application is AIM and was linked against a version of WebKit prior to
+ the introduction of the HTML5 parser, or if the
+ WebKitPreHTML5ParserQuirks WebPreference is enabled.
+ (-[WebView _preferencesChangedNotification:]): Call
+ WebCore::Settings::setUsePreHTML5ParserQuirks().
+
2010-09-21 Steve Block <steveblock at google.com>
Reviewed by Jeremy Orlow.
diff --git a/WebKit/mac/Misc/WebKitVersionChecks.h b/WebKit/mac/Misc/WebKitVersionChecks.h
index 94286d6..4bf2c83 100644
--- a/WebKit/mac/Misc/WebKitVersionChecks.h
+++ b/WebKit/mac/Misc/WebKitVersionChecks.h
@@ -54,6 +54,7 @@
#define WEBKIT_FIRST_VERSION_WITHOUT_BUMPERCAR_BACK_FORWARD_QUIRK 0x02120700 // 530.7.0
#define WEBKIT_FIRST_VERSION_WITHOUT_CONTENT_SNIFFING_FOR_FILE_URLS 0x02120A00 // 530.10.0
#define WEBKIT_FIRST_VERSION_WITHOUT_LINK_ELEMENT_TEXT_CSS_QUIRK 0x02130200 // 531.2.0
+#define WEBKIT_FIRST_VERSION_WITH_HTML5_PARSER 0x02160900 // 534.9.0
#ifdef __cplusplus
extern "C" {
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 20f6e24..23aa99c 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -609,6 +609,16 @@ static bool coreVideoHas7228836Fix()
return true;
}
+static bool shouldUsePreHTML5ParserQuirks(WebPreferences* preferences)
+{
+ // AIM clients linked against versions of WebKit prior to the introduction
+ // of the HTML5 parser contain markup incompatible with the new parser.
+ // Enable parser quirks to remain compatible with these clients. See
+ // <https://bugs.webkit.org/show_bug.cgi?id=46134>.
+ static bool isAIMAndNeedsParserQuirks = applicationIsAOLInstantMessenger() && !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_HTML5_PARSER);
+ return isAIMAndNeedsParserQuirks || [preferences usePreHTML5ParserQuirks];
+}
+
static bool shouldEnableLoadDeferring()
{
return !applicationIsAdobeInstaller();
@@ -1453,7 +1463,7 @@ static bool fastDocumentTeardownEnabled()
settings->setFullScreenEnabled([preferences fullScreenEnabled]);
#endif
settings->setMemoryInfoEnabled([preferences memoryInfoEnabled]);
- settings->setUsePreHTML5ParserQuirks([preferences usePreHTML5ParserQuirks]);
+ settings->setUsePreHTML5ParserQuirks(shouldUsePreHTML5ParserQuirks(preferences));
// Application Cache Preferences are stored on the global cache storage manager, not in Settings.
[WebApplicationCache setDefaultOriginQuota:[preferences applicationCacheDefaultOriginQuota]];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list