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

[darin at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 195dea26219afd4897c87051b5540fa05b7784a5
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 5 18:44:05 2010 +0000

    2010-11-05  Darin Fisher  <darin at chromium.org>
    
            Reviewed by Nate Chapin.
    
            Replace deprecated TargetIsSub{Frame,Resource} with TargetIsSub{frame,resource}.
            https://bugs.webkit.org/show_bug.cgi?id=49074
    
            * public/WebURLRequest.h:
            * src/FrameLoaderClientImpl.cpp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71440 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 3ed5f39..6517839 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-05  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by Nate Chapin.
+
+        Replace deprecated TargetIsSub{Frame,Resource} with TargetIsSub{frame,resource}.
+        https://bugs.webkit.org/show_bug.cgi?id=49074
+
+        * public/WebURLRequest.h:
+        * src/FrameLoaderClientImpl.cpp:
+
 2010-11-05  Charlie Reis  <creis at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebURLRequest.h b/WebKit/chromium/public/WebURLRequest.h
index e64ce80..c800452 100644
--- a/WebKit/chromium/public/WebURLRequest.h
+++ b/WebKit/chromium/public/WebURLRequest.h
@@ -58,9 +58,7 @@ public:
 
     enum TargetType {
         TargetIsMainFrame = 0,
-        TargetIsSubFrame = 1,   // Temporary for backward compatibility.
         TargetIsSubframe = 1,
-        TargetIsSubResource = 2,  // Temporary for backward comptibility.
         TargetIsSubresource = 2,
         TargetIsStyleSheet = 3,
         TargetIsScript = 4,
diff --git a/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
index af5b684..ef28981 100644
--- a/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+++ b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -288,7 +288,7 @@ void FrameLoaderClientImpl::assignIdentifierToInitialRequest(
 // this includes images and xmlhttp requests.  It is important to note that a
 // subresource is NOT limited to stuff loaded through the frame's subresource
 // loader. Synchronous xmlhttp requests for example, do not go through the
-// subresource loader, but we still label them as TargetIsSubResource.
+// subresource loader, but we still label them as TargetIsSubresource.
 //
 // The important edge cases to consider when modifying this function are
 // how synchronous resource loads are treated during load/unload threshold.

-- 
WebKit Debian packaging