[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tony at chromium.org
tony at chromium.org
Wed Dec 22 13:55:57 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit cbccff9cf83da2b70f3ab121df411eda21268459
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 29 22:53:31 2010 +0000
2010-09-29 Tony Chang <tony at chromium.org>
Reviewed by James Robinson.
[chromium] enable -Werror for DRT and webkit_unit_tests on Linux
https://bugs.webkit.org/show_bug.cgi?id=46829
* WebKit.gyp:
* tests/ArenaTestHelpers.h:
(WebCore::ArenaTestHelpers::TrackedAllocator::free):
* tests/IDBKeyPathTest.cpp:
(WebCore::checkKeyPath):
2010-09-29 Tony Chang <tony at chromium.org>
Reviewed by James Robinson.
[chromium] enable -Werror for DRT and webkit_unit_tests on Linux
https://bugs.webkit.org/show_bug.cgi?id=46829
* DumpRenderTree/chromium/DRTDevToolsClient.cpp:
(DRTDevToolsClient::DRTDevToolsClient):
* DumpRenderTree/chromium/TestShell.cpp:
(TestShell::TestShell):
* DumpRenderTree/chromium/WebViewHost.cpp:
(WebViewHost::postAccessibilityNotification):
(WebViewHost::WebViewHost):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68700 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index f7f16d3..2d67832 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -2,6 +2,19 @@
Reviewed by James Robinson.
+ [chromium] enable -Werror for DRT and webkit_unit_tests on Linux
+ https://bugs.webkit.org/show_bug.cgi?id=46829
+
+ * WebKit.gyp:
+ * tests/ArenaTestHelpers.h:
+ (WebCore::ArenaTestHelpers::TrackedAllocator::free):
+ * tests/IDBKeyPathTest.cpp:
+ (WebCore::checkKeyPath):
+
+2010-09-29 Tony Chang <tony at chromium.org>
+
+ Reviewed by James Robinson.
+
[chromium] enable -Werror on chromium linux webkit
https://bugs.webkit.org/show_bug.cgi?id=46821
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index af59c32..6db5d01 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -776,6 +776,10 @@
'include_dirs': [
'public/gtk',
],
+ 'variables': {
+ # FIXME: Enable warnings on other platforms.
+ 'chromium_code': 1,
+ },
}],
],
}],
@@ -925,6 +929,10 @@
'<(INTERMEDIATE_DIR)/repack/DumpRenderTree.pak',
]
}],
+ 'variables': {
+ # FIXME: Enable warnings on other platforms.
+ 'chromium_code': 1,
+ },
},{ # OS!="linux" and OS!="freebsd" and OS!="openbsd" and OS!="solaris"
'sources/': [
['exclude', '(Gtk|Linux)\\.cpp$']
diff --git a/WebKit/chromium/tests/ArenaTestHelpers.h b/WebKit/chromium/tests/ArenaTestHelpers.h
index 87f827d..70936e5 100644
--- a/WebKit/chromium/tests/ArenaTestHelpers.h
+++ b/WebKit/chromium/tests/ArenaTestHelpers.h
@@ -28,6 +28,7 @@
#include "PODArena.h"
#include <gtest/gtest.h>
+#include <wtf/NotFound.h>
#include <wtf/Vector.h>
namespace WebCore {
@@ -52,7 +53,7 @@ public:
virtual void free(void* ptr)
{
size_t slot = m_allocatedRegions.find(ptr);
- ASSERT_GE(slot, 0);
+ ASSERT_NE(slot, notFound);
m_allocatedRegions.remove(slot);
PODArena::FastMallocAllocator::free(ptr);
}
diff --git a/WebKit/chromium/tests/IDBKeyPathTest.cpp b/WebKit/chromium/tests/IDBKeyPathTest.cpp
index ac10f4f..6c378d6 100644
--- a/WebKit/chromium/tests/IDBKeyPathTest.cpp
+++ b/WebKit/chromium/tests/IDBKeyPathTest.cpp
@@ -58,7 +58,7 @@ void checkKeyPath(const String& keyPath, const Vector<IDBKeyPathElement>& expect
if (error != IDBKeyPathParseErrorNone)
return;
ASSERT_EQ(expected.size(), idbKeyPathElements.size());
- for (int i = 0; i < expected.size(); ++i) {
+ for (size_t i = 0; i < expected.size(); ++i) {
ASSERT_TRUE(expected[i].type == idbKeyPathElements[i].type) << i;
if (expected[i].type == IDBKeyPathElement::IsIndexed)
ASSERT_EQ(expected[i].index, idbKeyPathElements[i].index) << i;
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index fb6dc73..533ca3c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-29 Tony Chang <tony at chromium.org>
+
+ Reviewed by James Robinson.
+
+ [chromium] enable -Werror for DRT and webkit_unit_tests on Linux
+ https://bugs.webkit.org/show_bug.cgi?id=46829
+
+ * DumpRenderTree/chromium/DRTDevToolsClient.cpp:
+ (DRTDevToolsClient::DRTDevToolsClient):
+ * DumpRenderTree/chromium/TestShell.cpp:
+ (TestShell::TestShell):
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (WebViewHost::postAccessibilityNotification):
+ (WebViewHost::WebViewHost):
+
2010-09-29 Chris Fleizach <cfleizach at apple.com>
Reviewed by Darin Adler.
diff --git a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsClient.cpp b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsClient.cpp
index a53f0db..19d6743 100644
--- a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsClient.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsClient.cpp
@@ -45,8 +45,8 @@
using namespace WebKit;
DRTDevToolsClient::DRTDevToolsClient(DRTDevToolsAgent* agent, WebView* webView)
- : m_drtDevToolsAgent(agent)
- , m_webView(webView)
+ : m_webView(webView)
+ , m_drtDevToolsAgent(agent)
{
m_webDevToolsFrontend.set(WebDevToolsFrontend::create(m_webView,
this,
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
index 1a99b7d..8c7f9df 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
@@ -82,9 +82,9 @@ TestShell::TestShell(bool testShellMode)
, m_testIsPreparing(false)
, m_focusedWidget(0)
, m_testShellMode(testShellMode)
+ , m_devTools(0)
, m_allowExternalPages(false)
, m_accelerated2dCanvasEnabled(false)
- , m_devTools(0)
{
WebRuntimeFeatures::enableGeolocation(true);
WebRuntimeFeatures::enableIndexedDatabase(true);
diff --git a/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp b/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
index 9a086e4..b7fdab9 100644
--- a/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
@@ -541,6 +541,8 @@ void WebViewHost::postAccessibilityNotification(const WebAccessibilityObject& ob
case WebAccessibilityNotificationRowExpanded:
printf("RowExpanded");
break;
+ default:
+ break;
}
WebKit::WebNode node = obj.node();
@@ -1041,10 +1043,11 @@ WebViewHost::WebViewHost(TestShell* shell)
, m_policyDelegateIsPermissive(false)
, m_policyDelegateShouldNotifyDone(false)
, m_shell(shell)
+ , m_webWidget(0)
, m_topLoadingFrame(0)
- , m_hasWindow(false)
, m_pageId(-1)
, m_lastPageIdUpdated(-1)
+ , m_hasWindow(false)
, m_smartInsertDeleteEnabled(true)
#if OS(WINDOWS)
, m_selectTrailingWhitespaceEnabled(true)
@@ -1054,7 +1057,6 @@ WebViewHost::WebViewHost(TestShell* shell)
, m_blocksRedirects(false)
, m_requestReturnNull(false)
, m_isPainting(false)
- , m_webWidget(0)
{
m_navigationController.set(new TestNavigationController(this));
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list