[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[ddkilzer at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 48297651c5d898499f25cc654d28ea30b8fba562
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 4 22:07:17 2011 +0000

    <http://webkit.org/b/51890> Move ResourceLoadPriority.h into WebCore/platform/network
    
    Reviewed by Antti Koivisto.
    
    This is needed to prevent a WebCore/platform policy violation in
    my next patch.
    
    * WebCore.gypi: Updated for moved header.
    * WebCore.pro: Ditto.
    * WebCore.vcproj/WebCore.vcproj: Ditto.
    * WebCore.xcodeproj/project.pbxproj: Ditto.
    * platform/network/ResourceLoadPriority.h: Renamed from WebCore/loader/ResourceLoadPriority.h.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75006 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dbecfa6..1a18a94 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-04  David Kilzer  <ddkilzer at apple.com>
+
+        <http://webkit.org/b/51890> Move ResourceLoadPriority.h into WebCore/platform/network
+
+        Reviewed by Antti Koivisto.
+
+        This is needed to prevent a WebCore/platform policy violation in
+        my next patch.
+
+        * WebCore.gypi: Updated for moved header.
+        * WebCore.pro: Ditto.
+        * WebCore.vcproj/WebCore.vcproj: Ditto.
+        * WebCore.xcodeproj/project.pbxproj: Ditto.
+        * platform/network/ResourceLoadPriority.h: Renamed from WebCore/loader/ResourceLoadPriority.h.
+
 2011-01-04  Brady Eidson  <beidson at apple.com>
 
         Reviewed by a spell checker.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 70d3bdf..b9a8ef2 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -2160,7 +2160,6 @@
             'loader/ResourceLoader.h',
             'loader/ResourceLoadNotifier.cpp',
             'loader/ResourceLoadNotifier.h',
-            'loader/ResourceLoadPriority.h',
             'loader/ResourceLoadScheduler.cpp',
             'loader/ResourceLoadScheduler.h',
             'loader/SinkDocument.cpp',
@@ -3207,6 +3206,7 @@
             'platform/network/ResourceHandleClient.h',
             'platform/network/ResourceHandleInternal.h',
             'platform/network/ResourceLoadInfo.h',
+            'platform/network/ResourceLoadPriority.h',
             'platform/network/ResourceLoadTiming.h',
             'platform/network/ResourceRequestBase.cpp',
             'platform/network/ResourceRequestBase.h',
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index c614898..3052011 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1987,7 +1987,6 @@ HEADERS += \
     loader/PlaceholderDocument.h \
     loader/ProgressTracker.h \
     loader/ResourceLoader.h \
-    loader/ResourceLoadPriority.h \
     loader/SubresourceLoader.h \
     loader/TextResourceDecoder.h \
     loader/ThreadableLoader.h \
@@ -2176,6 +2175,7 @@ HEADERS += \
     platform/network/ResourceErrorBase.h \
     platform/network/ResourceHandle.h \
     platform/network/ResourceLoadInfo.h \
+    platform/network/ResourceLoadPriority.h \
     platform/network/ResourceLoadTiming.h \
     platform/network/ResourceRequestBase.h \
     platform/network/ResourceResponseBase.h \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index a59dcf6..b7bc883 100755
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -24725,10 +24725,6 @@
 		<Filter
 			Name="loader"
 			>
-            <File
-				RelativePath="..\loader\ResourceLoadPriority.h"
-				>
-			</File>
 			<File
 				RelativePath="..\loader\ResourceLoadScheduler.h"
 				>
@@ -29065,6 +29061,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\platform\network\ResourceLoadPriority.h"
+					>
+				</File>
+				<File
 					RelativePath="..\platform\network\ResourceLoadTiming.h"
 					>
 				</File>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 9781ea1..3e20f18 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -13644,6 +13644,7 @@
 				514C76650CE923A1007EF3CD /* ResourceHandleClient.h */,
 				514C76660CE923A1007EF3CD /* ResourceHandleInternal.h */,
 				492863981253B8FC00F792D6 /* ResourceLoadInfo.h */,
+				E4295FA312B0614E00D1ACE0 /* ResourceLoadPriority.h */,
 				8A81BF8411DCFD9000DA2B98 /* ResourceLoadTiming.h */,
 				514C76670CE923A1007EF3CD /* ResourceRequestBase.cpp */,
 				514C76680CE923A1007EF3CD /* ResourceRequestBase.h */,
@@ -17934,7 +17935,6 @@
 				656D37270ADBA5DE00A4554D /* ResourceLoader.h */,
 				973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */,
 				973E325510883B7C005BC493 /* ResourceLoadNotifier.h */,
-				E4295FA312B0614E00D1ACE0 /* ResourceLoadPriority.h */,
 				D0CE58F6125E4CC200F3F199 /* ResourceLoadScheduler.cpp */,
 				D0CE58F7125E4CC200F3F199 /* ResourceLoadScheduler.h */,
 				51327D5F11A33A2B004F9D65 /* SinkDocument.cpp */,
diff --git a/WebCore/loader/ResourceLoadPriority.h b/WebCore/platform/network/ResourceLoadPriority.h
similarity index 100%
rename from WebCore/loader/ResourceLoadPriority.h
rename to WebCore/platform/network/ResourceLoadPriority.h

-- 
WebKit Debian packaging