[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
sfalken at apple.com
sfalken at apple.com
Wed Dec 22 16:07:34 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0fc6b2a49daf2d7c865581c50b1cc3eb4ed83602
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 18 20:42:44 2010 +0000
WebCore: [chromium] REGRESSION(72141): Chromium fails acid3 on windows and linux
https://bugs.webkit.org/show_bug.cgi?id=49638
Patch by James Robinson <jamesr at chromium.org> on 2010-11-18
Reviewed by Darin Fisher.
Avoid clamping zero text size to 12pt in FontPlatformData::setupPaint() in FontPlatformDataLinux.cpp
Set all metrics to 0 if the font size is specified as zero in SimpleFontDataChromiumWin.cpp, just
like Safari Win did in r72270.
Test: fast/text/font-size-zero.html
* platform/graphics/chromium/FontPlatformDataLinux.cpp:
(WebCore::FontPlatformData::setupPaint):
* platform/graphics/chromium/SimpleFontDataChromiumWin.cpp:
(WebCore::SimpleFontData::platformInit):
WebKit/win: Debug_Internal Windows configuration is unnecessary, should be removed
https://bugs.webkit.org/show_bug.cgi?id=49753
Reviewed by Adam Roben.
* WebKitPrefix.h:
WebKit2: Keep the web process alive if there are active downloads
https://bugs.webkit.org/show_bug.cgi?id=49755
Patch by Anders Carlsson <andersca at apple.com> on 2010-11-18
Reviewed by Sam Weinig.
Make sure that Download objects are destroyed when the download finishes or fails.
Don't close the web process if there are live Download objects.
* UIProcess/Downloads/DownloadProxy.cpp:
(WebKit::DownloadProxy::didFail):
Add stub.
* UIProcess/Downloads/DownloadProxy.h:
* UIProcess/Downloads/DownloadProxy.messages.in:
Add DidFail message.
* WebProcess/Downloads/Download.cpp:
(WebKit::Download::didFinish):
Call DownloadManager::downloadFinished.
(WebKit::Download::didFail):
Send DidFail message and call DownloadManager::downloadFinished.
* WebProcess/Downloads/Download.h:
(WebKit::Download::destinationID):
Call downloadID().
(WebKit::Download::downloadID):
Return the download ID.
* WebProcess/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::downloadFinished):
Delete the Download object and call WebProcess::shutdownIfPossible.
* WebProcess/Downloads/DownloadManager.h:
(WebKit::DownloadManager::isDownloading):
Return whether the download manager has any active downloads.
* WebProcess/Downloads/mac/DownloadMac.mm:
(-[WKDownloadAsDelegate download:didFailWithError:]):
Call Download::didFail.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::removeWebPage):
Call shutdownIfPossible.
(WebKit::WebProcess::shutdownIfPossible):
New function. Don't shutdown if there are live pages or active downloads.
* WebProcess/WebProcess.h:
WebKitLibraries: Debug_Internal Windows configuration is unnecessary, should be removed
https://bugs.webkit.org/show_bug.cgi?id=49753
Reviewed by Adam Roben.
* win/tools/vsprops/debug.vsprops:
* win/tools/vsprops/debug_internal.vsprops:
WebKitTools: update-webkit-support-libs should fall back to existing
WebKitSupportLibrary version if there is no internet connectivity
https://bugs.webkit.org/show_bug.cgi?id=49503
Patch by Daniel Bates <dbates at rim.com> on 2010-11-18
Reviewed by Adam Roben.
Fall back to existing support libraries (if present) when there is
no internet connection.
Currently, update-webkit-support-libs dies with an "out-of-date"
error when there is no internet connection because it cannot
retrieve versioning information from developer.apple.com. Because
update-webkit-support-libs fails, build-webkit fails. Instead,
if there is no internet connection and the support libraries are
present then we should warn the user and exit() with success so
that build-webkit can work without an internet connection.
* Scripts/update-webkit-support-libs:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72327 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b8e9a32..8448527 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -35,6 +35,15 @@
Reviewed by Adam Roben.
+ Debug_Internal Windows configuration is unnecessary, should be removed
+ https://bugs.webkit.org/show_bug.cgi?id=49753
+
+ * WebCorePrefix.h:
+
+2010-11-18 Steve Falkenburg <sfalken at apple.com>
+
+ Reviewed by Adam Roben.
+
Clean up vcproj errors
https://bugs.webkit.org/show_bug.cgi?id=49741
diff --git a/WebCore/WebCorePrefix.h b/WebCore/WebCorePrefix.h
index f763bb3..f72e739 100644
--- a/WebCore/WebCorePrefix.h
+++ b/WebCore/WebCorePrefix.h
@@ -156,3 +156,4 @@
#undef try
#undef catch
#endif
+
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index c77234c..2ddf939 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-18 Steve Falkenburg <sfalken at apple.com>
+
+ Reviewed by Adam Roben.
+
+ Debug_Internal Windows configuration is unnecessary, should be removed
+ https://bugs.webkit.org/show_bug.cgi?id=49753
+
+ * WebKitPrefix.h:
+
2010-11-17 Steve Falkenburg <sfalken at apple.com>
Reviewed by Adam Roben.
diff --git a/WebKit/win/WebKitPrefix.h b/WebKit/win/WebKitPrefix.h
index 3086f0b..2ff6baf 100644
--- a/WebKit/win/WebKitPrefix.h
+++ b/WebKit/win/WebKitPrefix.h
@@ -49,4 +49,3 @@
#include <CoreFoundation/CoreFoundation.h>
#include <WebKit/WebKit.h>
-
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 2e3861c..115e372 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -55,6 +55,16 @@
Reviewed by Adam Roben.
+ Debug_Internal Windows configuration is unnecessary, should be removed
+ https://bugs.webkit.org/show_bug.cgi?id=49753
+
+ * UIProcess/Launcher/win/ProcessLauncherWin.cpp:
+ * WebKit2Prefix.h:
+
+2010-11-18 Steve Falkenburg <sfalken at apple.com>
+
+ Reviewed by Adam Roben.
+
Clean up vcproj errors
https://bugs.webkit.org/show_bug.cgi?id=49741
diff --git a/WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp b/WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp
index f12e492..7165a18 100644
--- a/WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp
+++ b/WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp
@@ -30,7 +30,7 @@
#include <shlwapi.h>
#include <wtf/text/WTFString.h>
-#if !defined(NDEBUG) && (!defined(DEBUG_INTERNAL) || defined(DEBUG_ALL))
+#ifdef DEBUG_ALL
const LPCWSTR webProcessName = L"WebKit2WebProcess_debug.exe";
#else
const LPCWSTR webProcessName = L"WebKit2WebProcess.exe";
diff --git a/WebKit2/WebKit2Prefix.h b/WebKit2/WebKit2Prefix.h
index 463121c..bdfc181 100644
--- a/WebKit2/WebKit2Prefix.h
+++ b/WebKit2/WebKit2Prefix.h
@@ -109,3 +109,4 @@ static const type& name() \
#endif
#endif /* defined(WIN32) || defined(_WIN32) */
+
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index bfd54bc..14e3e2e 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-18 Steve Falkenburg <sfalken at apple.com>
+
+ Reviewed by Adam Roben.
+
+ Debug_Internal Windows configuration is unnecessary, should be removed
+ https://bugs.webkit.org/show_bug.cgi?id=49753
+
+ * win/tools/vsprops/debug.vsprops:
+ * win/tools/vsprops/debug_internal.vsprops:
+
2010-11-17 Steve Falkenburg <sfalken at apple.com>
Rubber-stamped by Adam Roben.
diff --git a/WebKitLibraries/win/tools/vsprops/debug.vsprops b/WebKitLibraries/win/tools/vsprops/debug.vsprops
index 9ab8f20..6845d8a 100644
--- a/WebKitLibraries/win/tools/vsprops/debug.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/debug.vsprops
@@ -20,7 +20,7 @@
/>
<UserMacro
Name="WebKitConfigSuffix"
- Value="_debug"
+ Value=""
PerformEnvironmentSet="true"
/>
<UserMacro
diff --git a/WebKitLibraries/win/tools/vsprops/debug_internal.vsprops b/WebKitLibraries/win/tools/vsprops/debug_internal.vsprops
index d0c61c1..6ec9523 100644
--- a/WebKitLibraries/win/tools/vsprops/debug_internal.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/debug_internal.vsprops
@@ -4,22 +4,4 @@
Version="8.00"
Name="debug_internal"
>
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="DEBUG_INTERNAL"
- />
- <UserMacro
- Name="WebKitConfigSuffix"
- Value=""
- PerformEnvironmentSet="true"
- />
- <UserMacro
- Name="LibraryConfigSuffix"
- Value=""
- PerformEnvironmentSet="true"
- />
- <UserMacro
- Name="WebKitDLLConfigSuffix"
- Value=""
- />
</VisualStudioPropertySheet>
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5e4c374..f410596 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -23,6 +23,18 @@
Reviewed by Adam Roben.
+ Debug_Internal Windows configuration is unnecessary, should be removed
+ https://bugs.webkit.org/show_bug.cgi?id=49753
+
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ * MiniBrowser/win/stdafx.h:
+ * TestWebKitAPI/win/PlatformUtilitiesWin.cpp:
+ * WebKitTestRunner/win/TestControllerWin.cpp:
+
+2010-11-18 Steve Falkenburg <sfalken at apple.com>
+
+ Reviewed by Adam Roben.
+
Clean up vcproj errors
https://bugs.webkit.org/show_bug.cgi?id=49741
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index aca17fb..6e30bfa 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -66,7 +66,7 @@
using namespace std;
-#if !defined(NDEBUG) && (!defined(DEBUG_INTERNAL) || defined(DEBUG_ALL))
+#ifdef DEBUG_ALL
const LPWSTR TestPluginDir = L"TestNetscapePlugin_Debug";
#else
const LPWSTR TestPluginDir = L"TestNetscapePlugin";
diff --git a/WebKitTools/MiniBrowser/win/stdafx.h b/WebKitTools/MiniBrowser/win/stdafx.h
index c5a35f9..0522a17 100644
--- a/WebKitTools/MiniBrowser/win/stdafx.h
+++ b/WebKitTools/MiniBrowser/win/stdafx.h
@@ -28,3 +28,4 @@
#include <tchar.h>
#include <windows.h>
+
diff --git a/WebKitTools/TestWebKitAPI/win/PlatformUtilitiesWin.cpp b/WebKitTools/TestWebKitAPI/win/PlatformUtilitiesWin.cpp
index 17d8dad..6efc9ea 100644
--- a/WebKitTools/TestWebKitAPI/win/PlatformUtilitiesWin.cpp
+++ b/WebKitTools/TestWebKitAPI/win/PlatformUtilitiesWin.cpp
@@ -32,7 +32,7 @@
namespace TestWebKitAPI {
namespace Util {
-#if !defined(NDEBUG) && (!defined(DEBUG_INTERNAL) || defined(DEBUG_ALL))
+#ifdef DEBUG_ALL
const char* injectedBundleDLL = "\\InjectedBundle_debug.dll";
#else
const char* injectedBundleDLL = "\\InjectedBundle.dll";
diff --git a/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp b/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp
index 89e29fd..e562ada 100644
--- a/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp
+++ b/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp
@@ -38,7 +38,7 @@ using namespace std;
namespace WTR {
-#if !defined(NDEBUG) && (!defined(DEBUG_INTERNAL) || defined(DEBUG_ALL))
+#ifdef DEBUG_ALL
const LPWSTR testPluginDirectoryName = L"TestNetscapePlugin_Debug";
const char* injectedBundleDLL = "\\InjectedBundle_debug.dll";
#else
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list