Diff
Modified: trunk/Source/WebKit2/ChangeLog (117699 => 117700)
--- trunk/Source/WebKit2/ChangeLog 2012-05-19 22:51:21 UTC (rev 117699)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-19 22:58:04 UTC (rev 117700)
@@ -18,7 +18,28 @@
Reviewed by Jon Honeycutt.
+ Fix more build errors.
+
* UIProcess/API/mac/WKView.mm:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit):
+ * UIProcess/WebPageProxy.h:
+ (WebPageProxy):
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit):
+ * WebProcess/WebPage/WebPage.h:
+ (WebPage):
+ * WebProcess/WebPage/WebPage.messages.in:
+
+2012-05-19 Andy Estes <[email protected]>
+
+ Fix build errors found when disabling ENABLE_DRAG_SUPPORT
+ https://bugs.webkit.org/show_bug.cgi?id=86947
+
+ Reviewed by Jon Honeycutt.
+
+ * UIProcess/API/mac/WKView.mm:
(createSandboxExtensionsForFileUpload):
(-[WKView performDragOperation:]):
* WebProcess/WebCoreSupport/WebDragClient.cpp:
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (117699 => 117700)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-05-19 22:51:21 UTC (rev 117699)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-05-19 22:58:04 UTC (rev 117700)
@@ -1598,6 +1598,7 @@
return resultRect;
}
+#if ENABLE(DRAG_SUPPORT)
- (void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation
{
NSPoint windowImageLoc = [[self window] convertScreenToBase:aPoint];
@@ -1623,7 +1624,6 @@
return static_cast<DragApplicationFlags>(flags);
}
-#if ENABLE(DRAG_SUPPORT)
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)draggingInfo
{
IntPoint client([self convertPoint:[draggingInfo draggingLocation] fromView:nil]);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (117699 => 117700)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-05-19 22:51:21 UTC (rev 117699)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-05-19 22:58:04 UTC (rev 117700)
@@ -891,6 +891,7 @@
}
#endif
+#if ENABLE(DRAG_SUPPORT)
void WebPageProxy::dragEntered(DragData* dragData, const String& dragStorageName)
{
SandboxExtension::Handle sandboxExtensionHandle;
@@ -957,6 +958,7 @@
return;
process()->send(Messages::WebPage::DragEnded(clientPosition, globalPosition, operation), m_pageID);
}
+#endif // ENABLE(DRAG_SUPPORT)
void WebPageProxy::handleMouseEvent(const NativeWebMouseEvent& event)
{
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (117699 => 117700)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2012-05-19 22:51:21 UTC (rev 117699)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2012-05-19 22:58:04 UTC (rev 117700)
@@ -58,8 +58,6 @@
#include "WebPopupMenuProxy.h"
#include "WebResourceLoadClient.h"
#include "WebUIClient.h"
-#include <WebCore/DragActions.h>
-#include <WebCore/DragSession.h>
#include <WebCore/HitTestResult.h>
#include <WebCore/Page.h>
#include <WebCore/PlatformScreen.h>
@@ -73,6 +71,12 @@
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
+
+#if ENABLE(DRAG_SUPPORT)
+#include <WebCore/DragActions.h>
+#include <WebCore/DragSession.h>
+#endif
+
#if PLATFORM(EFL)
#include <Evas.h>
#endif
@@ -514,6 +518,7 @@
void backForwardRemovedItem(uint64_t itemID);
+#if ENABLE(DRAG_SUPPORT)
// Drag and drop support.
void dragEntered(WebCore::DragData*, const String& dragStorageName = String());
void dragUpdated(WebCore::DragData*, const String& dragStorageName = String());
@@ -533,6 +538,8 @@
#if PLATFORM(QT) || PLATFORM(GTK)
void startDrag(const WebCore::DragData&, const ShareableBitmap::Handle& dragImage);
#endif
+#endif
+
void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, OwnPtr<CoreIPC::ArgumentEncoder>&);
@@ -570,8 +577,10 @@
const String& urlAtProcessExit() const { return m_urlAtProcessExit; }
WebFrameProxy::LoadState loadStateAtProcessExit() const { return m_loadStateAtProcessExit; }
+#if ENABLE(DRAG_SUPPORT)
WebCore::DragSession dragSession() const { return m_currentDragSession; }
void resetDragOperation() { m_currentDragSession = WebCore::DragSession(); }
+#endif
void preferencesDidChange();
@@ -1056,7 +1065,10 @@
unsigned m_pendingLearnOrIgnoreWordMessageCount;
bool m_mainFrameHasCustomRepresentation;
+
+#if ENABLE(DRAG_SUPPORT)
WebCore::DragSession m_currentDragSession;
+#endif
String m_pendingAPIRequestURL;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (117699 => 117700)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2012-05-19 22:51:21 UTC (rev 117699)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2012-05-19 22:58:04 UTC (rev 117700)
@@ -230,6 +230,7 @@
IgnoreWord(WTF::String word);
# Drag and drop messages
+#if ENABLE(DRAG_SUPPORT)
DidPerformDragControllerAction(WebCore::DragSession dragSession)
#if PLATFORM(MAC)
SetDragImage(WebCore::IntPoint clientPosition, WebKit::ShareableBitmap::Handle dragImage, bool linkDrag)
@@ -241,6 +242,7 @@
#if PLATFORM(QT) || PLATFORM(GTK)
StartDrag(WebCore::DragData dragData, WebKit::ShareableBitmap::Handle dragImage)
#endif
+#endif
#if PLATFORM(MAC)
# Dictionary support.
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (117699 => 117700)
--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2012-05-19 22:51:21 UTC (rev 117699)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2012-05-19 22:58:04 UTC (rev 117700)
@@ -294,6 +294,7 @@
return result;
}
+#if ENABLE(DRAG_SUPPORT)
void WebPageProxy::setDragImage(const WebCore::IntPoint& clientPosition, const ShareableBitmap::Handle& dragImageHandle, bool isLinkDrag)
{
RefPtr<ShareableBitmap> dragImage = ShareableBitmap::create(dragImageHandle);
@@ -316,6 +317,7 @@
}
m_pageClient->setPromisedData(pasteboardName, imageBuffer, filename, extension, title, url, visibleURL, archiveBuffer);
}
+#endif
void WebPageProxy::performDictionaryLookupAtLocation(const WebCore::FloatPoint& point)
{
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (117699 => 117700)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2012-05-19 22:51:21 UTC (rev 117699)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2012-05-19 22:58:04 UTC (rev 117700)
@@ -454,6 +454,8 @@
void replaceSelectionWithText(WebCore::Frame*, const String&);
void clearSelection();
+
+#if ENABLE(DRAG_SUPPORT)
#if PLATFORM(WIN)
void performDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, const WebCore::DragDataMap&, uint32_t flags);
#elif PLATFORM(QT) || PLATFORM(GTK)
@@ -465,6 +467,7 @@
void willPerformLoadDragDestinationAction();
void mayPerformUploadDragDestinationAction();
+#endif // ENABLE(DRAG_SUPPORT)
void beginPrinting(uint64_t frameID, const PrintInfo&);
void endPrinting();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (117699 => 117700)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2012-05-19 22:51:21 UTC (rev 117699)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2012-05-19 22:58:04 UTC (rev 117700)
@@ -140,6 +140,7 @@
HideFindUI()
CountStringMatches(WTF::String string, uint32_t findOptions, unsigned maxMatchCount)
+#if ENABLE(DRAG_SUPPORT)
# Drag and drop.
#if PLATFORM(WIN)
PerformDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, HashMap<UINT,Vector<String>> dataMap, uint32_t flags)
@@ -151,6 +152,7 @@
PerformDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, WTF::String dragStorageName, uint32_t flags, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::SandboxExtension::HandleArray sandboxExtensionsForUpload)
#endif
DragEnded(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t operation)
+#endif
# Popup menu.
DidChangeSelectedIndexForActivePopupMenu(int32_t newIndex);
