[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
mrowe at apple.com
mrowe at apple.com
Sun Feb 20 23:36:34 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit d82db12f348b8b8f1f532b6f428ceb100a8f3feb
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 22 01:46:39 2011 +0000
Fix the WebKit2 build with clang.
Reviewed by Sam Weinig.
* Scripts/webkit2/messages.py: Add some more structs to the list.
* UIProcess/DrawingAreaProxy.h: Forward-declare UpdateInfo as a class.
* UIProcess/TextChecker.h: Forward-declare TextCheckerState as a struct.
* UIProcess/WebPageProxy.h: Forward-declare ContextMenuState as a struct.
* UIProcess/mac/TextCheckerMac.mm: Fix the type of the string constants so that they can be passed to
functions expecting NSString* without generating warnings.
* WebProcess/WebPage/DrawingArea.h: Forward-declare WebPageCreationParameters as a struct.
* WebProcess/WebPage/DrawingAreaImpl.h: Forward-declare UpdateInfo as a class.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::getResourceDataFromFrame): Add parens around the assignment in the condition of
the if statement to suppress a warning.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76417 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index e83c4ed..b9389fa 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,21 @@
+2011-01-21 Mark Rowe <mrowe at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Fix the WebKit2 build with clang.
+
+ * Scripts/webkit2/messages.py: Add some more structs to the list.
+ * UIProcess/DrawingAreaProxy.h: Forward-declare UpdateInfo as a class.
+ * UIProcess/TextChecker.h: Forward-declare TextCheckerState as a struct.
+ * UIProcess/WebPageProxy.h: Forward-declare ContextMenuState as a struct.
+ * UIProcess/mac/TextCheckerMac.mm: Fix the type of the string constants so that they can be passed to
+ functions expecting NSString* without generating warnings.
+ * WebProcess/WebPage/DrawingArea.h: Forward-declare WebPageCreationParameters as a struct.
+ * WebProcess/WebPage/DrawingAreaImpl.h: Forward-declare UpdateInfo as a class.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::getResourceDataFromFrame): Add parens around the assignment in the condition of
+ the if statement to suppress a warning.
+
2011-01-21 Brian Weinstein <bweinstein at apple.com>
Reviewed by Adam Roben.
diff --git a/Source/WebKit2/Scripts/webkit2/messages.py b/Source/WebKit2/Scripts/webkit2/messages.py
index 8fc0eaa..60f1277 100644
--- a/Source/WebKit2/Scripts/webkit2/messages.py
+++ b/Source/WebKit2/Scripts/webkit2/messages.py
@@ -255,9 +255,13 @@ def struct_or_class(namespace, type):
'WebCore::PrintInfo',
'WebCore::ViewportArguments',
'WebCore::WindowFeatures',
+ 'WebKit::ContextMenuState',
'WebKit::DrawingAreaInfo',
'WebKit::PlatformPopupMenuData',
'WebKit::PluginProcessCreationParameters',
+ 'WebKit::PrintInfo',
+ 'WebKit::SelectionState',
+ 'WebKit::TextCheckerState',
'WebKit::WebNavigationDataStore',
'WebKit::WebOpenPanelParameters::Data',
'WebKit::WebPageCreationParameters',
diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxy.h b/Source/WebKit2/UIProcess/DrawingAreaProxy.h
index 3eb24da..c0bb71b 100644
--- a/Source/WebKit2/UIProcess/DrawingAreaProxy.h
+++ b/Source/WebKit2/UIProcess/DrawingAreaProxy.h
@@ -35,9 +35,9 @@ class QPainter;
namespace WebKit {
+class UpdateInfo;
class WebPageProxy;
-struct UpdateInfo;
-
+
#if PLATFORM(MAC)
typedef CGContextRef PlatformDrawingContext;
#elif PLATFORM(WIN)
diff --git a/Source/WebKit2/UIProcess/TextChecker.h b/Source/WebKit2/UIProcess/TextChecker.h
index 7415da3..fc347fe 100644
--- a/Source/WebKit2/UIProcess/TextChecker.h
+++ b/Source/WebKit2/UIProcess/TextChecker.h
@@ -30,7 +30,7 @@
namespace WebKit {
-class TextCheckerState;
+struct TextCheckerState;
class TextChecker {
public:
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.h b/Source/WebKit2/UIProcess/WebPageProxy.h
index dc43e19..7a176ac 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.h
+++ b/Source/WebKit2/UIProcess/WebPageProxy.h
@@ -81,13 +81,11 @@ namespace WebCore {
namespace WebKit {
-class ContextMenuState;
class DrawingAreaProxy;
class NativeWebKeyboardEvent;
class PageClient;
class PlatformCertificateInfo;
class StringPairVector;
-class WebOpenPanelResultListenerProxy;
class WebBackForwardList;
class WebBackForwardListItem;
class WebContextMenuProxy;
@@ -95,11 +93,13 @@ class WebData;
class WebEditCommandProxy;
class WebKeyboardEvent;
class WebMouseEvent;
+class WebOpenPanelResultListenerProxy;
class WebPageGroup;
class WebPopupMenuProxy;
class WebProcessProxy;
class WebURLRequest;
class WebWheelEvent;
+struct ContextMenuState;
struct PlatformPopupMenuData;
struct PrintInfo;
struct WebPageCreationParameters;
diff --git a/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm b/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm
index c89011e..6c671f0 100644
--- a/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm
+++ b/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm
@@ -32,14 +32,14 @@
#import <AppKit/NSTextChecker.h>
#endif
-static const NSString * const WebAutomaticSpellingCorrectionEnabled = @"WebAutomaticSpellingCorrectionEnabled";
-static const NSString * const WebContinuousSpellCheckingEnabled = @"WebContinuousSpellCheckingEnabled";
-static const NSString * const WebGrammarCheckingEnabled = @"WebGrammarCheckingEnabled";
-static const NSString * const WebSmartInsertDeleteEnabled = @"WebSmartInsertDeleteEnabled";
-static const NSString * const WebAutomaticQuoteSubstitutionEnabled = @"WebAutomaticQuoteSubstitutionEnabled";
-static const NSString * const WebAutomaticDashSubstitutionEnabled = @"WebAutomaticDashSubstitutionEnabled";
-static const NSString * const WebAutomaticLinkDetectionEnabled = @"WebAutomaticLinkDetectionEnabled";
-static const NSString * const WebAutomaticTextReplacementEnabled = @"WebAutomaticTextReplacementEnabled";
+static NSString* const WebAutomaticSpellingCorrectionEnabled = @"WebAutomaticSpellingCorrectionEnabled";
+static NSString* const WebContinuousSpellCheckingEnabled = @"WebContinuousSpellCheckingEnabled";
+static NSString* const WebGrammarCheckingEnabled = @"WebGrammarCheckingEnabled";
+static NSString* const WebSmartInsertDeleteEnabled = @"WebSmartInsertDeleteEnabled";
+static NSString* const WebAutomaticQuoteSubstitutionEnabled = @"WebAutomaticQuoteSubstitutionEnabled";
+static NSString* const WebAutomaticDashSubstitutionEnabled = @"WebAutomaticDashSubstitutionEnabled";
+static NSString* const WebAutomaticLinkDetectionEnabled = @"WebAutomaticLinkDetectionEnabled";
+static NSString* const WebAutomaticTextReplacementEnabled = @"WebAutomaticTextReplacementEnabled";
using namespace WebCore;
diff --git a/Source/WebKit2/WebProcess/WebPage/DrawingArea.h b/Source/WebKit2/WebProcess/WebPage/DrawingArea.h
index 713994d..2ddd07c 100644
--- a/Source/WebKit2/WebProcess/WebPage/DrawingArea.h
+++ b/Source/WebKit2/WebProcess/WebPage/DrawingArea.h
@@ -40,7 +40,7 @@ namespace WebCore {
namespace WebKit {
class WebPage;
-class WebPageCreationParameters;
+struct WebPageCreationParameters;
class DrawingArea : public RefCounted<DrawingArea> {
public:
diff --git a/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h b/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h
index e008adc..1212f83 100644
--- a/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h
+++ b/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h
@@ -32,7 +32,7 @@
namespace WebKit {
-struct UpdateInfo;
+class UpdateInfo;
class DrawingAreaImpl : public DrawingArea {
public:
diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
index af236e9..c0302cd 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -1161,7 +1161,7 @@ void WebPage::getResourceDataFromFrame(uint64_t frameID, const String& resourceU
if (WebFrame* frame = WebProcess::shared().webFrame(frameID)) {
if (DocumentLoader* loader = frame->coreFrame()->loader()->documentLoader()) {
if (RefPtr<ArchiveResource> subresource = loader->subresource(KURL(KURL(), resourceURL))) {
- if (buffer = subresource->data())
+ if ((buffer = subresource->data()))
dataReference = CoreIPC::DataReference(reinterpret_cast<const uint8_t*>(buffer->data()), buffer->size());
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list