[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 0b32734b77b03176773f464aba1275d3a39a56d3
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 21 01:03:32 2010 +0000

    Patch for https://bugs.webkit.org/show_bug.cgi?id=42719
    Make Acid2 pass in WebKit2
    
    Reviewed by Brady Eidson.
    
    WebCore:
    
    * WebCore.exp.in: Update exported functions.
    
    WebKit2:
    
    * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
    (WebKit::WebFrameLoaderClient::objectContentType): Check for supported image mimetypes
    before falling back to plugins.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63794 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index eed894f..ea49079 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-20  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Brady Eidson.
+
+        Patch for https://bugs.webkit.org/show_bug.cgi?id=42719
+        Make Acid2 pass in WebKit2
+
+        * WebCore.exp.in: Update exported functions.
+
 2010-07-20  Gavin Peters  <gavinp at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in
index f14756c..4dd4ee7 100644
--- a/WebCore/WebCore.exp.in
+++ b/WebCore/WebCore.exp.in
@@ -138,7 +138,6 @@ __ZN7WebCore10MouseEventC1ERKNS_12AtomicStringEbbN3WTF10PassRefPtrINS_9DOMWindow
 __ZN7WebCore10ScrollView20setCanHaveScrollbarsEb
 __ZN7WebCore10StringImpl14createCFStringEv
 __ZN7WebCore10StringImplcvP8NSStringEv
-__ZN7WebCore20SpaceSplitStringData12createVectorEv
 __ZN7WebCore10deleteFileERKNS_6StringE
 __ZN7WebCore10handCursorEv
 __ZN7WebCore10setCookiesEPNS_8DocumentERKNS_4KURLERKNS_6StringE
@@ -283,8 +282,8 @@ __ZN7WebCore13AXObjectCache21gAccessibilityEnabledE
 __ZN7WebCore13AXObjectCache42gAccessibilityEnhancedUserInterfaceEnabledE
 __ZN7WebCore13HitTestResultC1ERKS0_
 __ZN7WebCore13HitTestResultD1Ev
-__ZN7WebCore13IdentifierRep3getEi
 __ZN7WebCore13IdentifierRep3getEPKc
+__ZN7WebCore13IdentifierRep3getEi
 __ZN7WebCore13KeyboardEventC1ERKNS_12AtomicStringEbbPNS_9DOMWindowERKNS_6StringEjbbbbb
 __ZN7WebCore13TypingCommand39insertParagraphSeparatorInQuotedContentEPNS_8DocumentE
 __ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
@@ -371,8 +370,10 @@ __ZN7WebCore16LegacyWebArchive6createEPNS_4NodeE
 __ZN7WebCore16LegacyWebArchive6createEPNS_5FrameE
 __ZN7WebCore16LegacyWebArchive6createEPNS_5RangeE
 __ZN7WebCore16LegacyWebArchive6createEv
+__ZN7WebCore16MIMETypeRegistry23getMIMETypeForExtensionERKNS_6StringE
 __ZN7WebCore16MIMETypeRegistry24isSupportedImageMIMETypeERKNS_6StringE
 __ZN7WebCore16MIMETypeRegistry26getSupportedImageMIMETypesEv
+__ZN7WebCore16MIMETypeRegistry27isSupportedNonImageMIMETypeERKNS_6StringE
 __ZN7WebCore16MIMETypeRegistry29getSupportedNonImageMIMETypesEv
 __ZN7WebCore16MIMETypeRegistry32isSupportedImageResourceMIMETypeERKNS_6StringE
 __ZN7WebCore16NavigationActionC1ERKNS_4KURLENS_13FrameLoadTypeEb
@@ -431,8 +432,8 @@ __ZN7WebCore19applicationIsSafariEv
 __ZN7WebCore20RenderEmbeddedObject30setShowsCrashedPluginIndicatorEv
 __ZN7WebCore20ResourceResponseBase24setExpectedContentLengthEx
 __ZN7WebCore20ResourceResponseBaseC2Ev
+__ZN7WebCore20SpaceSplitStringData12createVectorEv
 __ZN7WebCore20protocolIsJavaScriptERKNS_6StringE
-__ZN7WebCore21markerTextForListItemEPNS_7ElementE
 __ZN7WebCore21PlatformKeyboardEvent24disambiguateKeyDownEventENS0_4TypeEb
 __ZN7WebCore21PlatformKeyboardEventC1EP7NSEvent
 __ZN7WebCore21SVGDocumentExtensions21sampleAnimationAtTimeERKNS_6StringEPNS_14SVGSMILElementEd
@@ -444,6 +445,7 @@ __ZN7WebCore21WindowsLatin1EncodingEv
 __ZN7WebCore21findEventWithKeyStateEPNS_5EventE
 __ZN7WebCore21isBackForwardLoadTypeENS_13FrameLoadTypeE
 __ZN7WebCore21mainThreadNormalWorldEv
+__ZN7WebCore21markerTextForListItemEPNS_7ElementE
 __ZN7WebCore21reportThreadViolationEPKcNS_20ThreadViolationRoundE
 __ZN7WebCore21setPlatformStrategiesEPNS_18PlatformStrategiesE
 __ZN7WebCore22ScriptExecutionContext26canSuspendActiveDOMObjectsEv
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index acaf999..d15e241 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-20  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Brady Eidson.
+
+        Patch for https://bugs.webkit.org/show_bug.cgi?id=42719
+        Make Acid2 pass in WebKit2
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::objectContentType): Check for supported image mimetypes
+        before falling back to plugins.
+
 2010-07-20  Adam Roben  <aroben at apple.com>
 
         Remove WebKit2.sln
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index 1d1f33c..76c05c6 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -827,12 +827,20 @@ PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize&,
     return 0;
 }
 
-ObjectContentType WebFrameLoaderClient::objectContentType(const KURL& url, const String& mimeType)
+ObjectContentType WebFrameLoaderClient::objectContentType(const KURL& url, const String& mimeTypeIn)
 {
-    if (mimeType.isEmpty()) {
-        // FIXME: Try to find the MIME type based on the extension of the URL.
-        return ObjectContentNone;
-    }
+    // FIXME: This should be merged with WebCore::FrameLoader::defaultObjectContentType when the plugin code
+    // is consolidated.
+
+    String mimeType = mimeTypeIn;
+    if (mimeType.isEmpty())
+        mimeType = MIMETypeRegistry::getMIMETypeForExtension(url.path().substring(url.path().reverseFind('.') + 1));
+
+    if (mimeType.isEmpty())
+        return ObjectContentFrame;
+
+    if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
+        return WebCore::ObjectContentImage;
 
     if (WebPage* webPage = m_frame->page()) {
         if (PluginData* pluginData = webPage->corePage()->pluginData()) {
@@ -841,10 +849,9 @@ ObjectContentType WebFrameLoaderClient::objectContentType(const KURL& url, const
         }
     }
 
-    if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
-        return ObjectContentImage;
+    if (MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType))
+        return ObjectContentFrame;
 
-    notImplemented();
     return ObjectContentNone;
 }
 

-- 
WebKit Debian packaging