[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
japhet at chromium.org
japhet at chromium.org
Wed Dec 22 18:37:27 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b4014d69247fa0ec749b05f337439a6d90f5fea5
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 14 20:31:14 2010 +0000
2010-12-14 Nate Chapin <japhet at chromium.org>
Unreviewed, fix mac and qt builds.
Missed a couple of references to loader.h and
improperly added CachedResourceRequest.h to
WebCore.xcodeproj.
* WebCore.xcodeproj/project.pbxproj:
* platform/android/TemporaryLinkStubs.cpp:
* platform/qt/TemporaryLinkStubsQt.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74050 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d6eef62..0a157fb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,17 @@
2010-12-14 Nate Chapin <japhet at chromium.org>
+ Unreviewed, fix mac and qt builds.
+
+ Missed a couple of references to loader.h and
+ improperly added CachedResourceRequest.h to
+ WebCore.xcodeproj.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/android/TemporaryLinkStubs.cpp:
+ * platform/qt/TemporaryLinkStubsQt.cpp:
+
+2010-12-14 Nate Chapin <japhet at chromium.org>
+
Reviewed by Adam Barth.
Rename Loader to CachedResourceRequest.
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index f1bc94e..ec335ef 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -5346,7 +5346,7 @@
D0CE58F8125E4CC200F3F199 /* ResourceLoadScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0CE58F6125E4CC200F3F199 /* ResourceLoadScheduler.cpp */; };
D0CE58F9125E4CC200F3F199 /* ResourceLoadScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = D0CE58F7125E4CC200F3F199 /* ResourceLoadScheduler.h */; settings = {ATTRIBUTES = (Private, ); }; };
D0D141B212B2BF5200E39620 /* CachedResourceRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0D141B012B2BF5200E39620 /* CachedResourceRequest.cpp */; };
- D0D141B312B2BF5200E39620 /* CachedResourceRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = D0D141B112B2BF5200E39620 /* CachedResourceRequest.h */; };
+ D0D141B312B2BF5200E39620 /* CachedResourceRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = D0D141B112B2BF5200E39620 /* CachedResourceRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
D0FF2A5D11F8C45A007E74E0 /* PingLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0FF2A5B11F8C45A007E74E0 /* PingLoader.cpp */; };
D0FF2A5E11F8C45A007E74E0 /* PingLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = D0FF2A5C11F8C45A007E74E0 /* PingLoader.h */; };
D23CA55D0AB0EAAE005108A5 /* JSRangeException.h in Headers */ = {isa = PBXBuildFile; fileRef = D23CA55C0AB0EAAE005108A5 /* JSRangeException.h */; };
diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp
index a88ab47..1c4233a 100644
--- a/WebCore/platform/android/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/android/TemporaryLinkStubs.cpp
@@ -75,7 +75,6 @@
#include "ScrollbarTheme.h"
#include "SmartReplace.h"
#include "Widget.h"
-#include "loader.h"
#include <stdio.h>
#include <stdlib.h>
#include <wtf/text/CString.h>
diff --git a/WebCore/platform/qt/TemporaryLinkStubsQt.cpp b/WebCore/platform/qt/TemporaryLinkStubsQt.cpp
index d7b5104..a46b82c 100644
--- a/WebCore/platform/qt/TemporaryLinkStubsQt.cpp
+++ b/WebCore/platform/qt/TemporaryLinkStubsQt.cpp
@@ -62,7 +62,6 @@
#include "SystemTime.h"
#include "TextBoundaries.h"
#include "Widget.h"
-#include "loader.h"
#include <float.h>
#include <stdio.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list