[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ajwong at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 31200338360f583227dac7cfd3e32a1eb3e007f1
Author: ajwong at chromium.org <ajwong at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 8 19:16:01 2009 +0000

    Not reviewed: Chromium build fix.
    
    r51859 changed the case for some of the ResourceRequest::TargetType
    enums.
    
    * src/FrameLoaderClientImpl.cpp:
    (WebKit::determineTargetTypeFromLoader):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51868 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 4d78607..41c9b85 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-08  Albert J. Wong  <ajwong at chromium.org>
+
+        Not reviewed: Chromium build fix.
+
+        r51859 changed the case for some of the ResourceRequest::TargetType
+        enums.
+
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::determineTargetTypeFromLoader):
+
 2009-12-07  Zhe Su  <suzhe at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
index 74189b8..24b086f 100644
--- a/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+++ b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -247,9 +247,9 @@ static ResourceRequest::TargetType determineTargetTypeFromLoader(DocumentLoader*
     if (loader == loader->frameLoader()->provisionalDocumentLoader()) {
         if (loader->frameLoader()->isLoadingMainFrame())
             return ResourceRequest::TargetIsMainFrame;
-        return ResourceRequest::TargetIsSubFrame;
+        return ResourceRequest::TargetIsSubframe;
     }
-    return ResourceRequest::TargetIsSubResource;
+    return ResourceRequest::TargetIsSubresource;
 }
 
 void FrameLoaderClientImpl::dispatchWillSendRequest(

-- 
WebKit Debian packaging