Diff
Modified: trunk/Source/WebCore/ChangeLog (117694 => 117695)
--- trunk/Source/WebCore/ChangeLog 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebCore/ChangeLog 2012-05-19 19:29:36 UTC (rev 117695)
@@ -1,3 +1,15 @@
+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.
+
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::passMouseMoveEventToSubframe):
+ * platform/mac/ClipboardMac.mm:
+ (WebCore):
+
2012-05-19 Joe Thomas <[email protected]>
The order of CSS properties is wrong in background shorthand
Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (117694 => 117695)
--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2012-05-19 19:29:36 UTC (rev 117695)
@@ -634,9 +634,12 @@
if (frameHasPlatformWidget(m_frame))
return passSubframeEventToSubframe(mev, subframe, hoveredNode);
+#if ENABLE(DRAG_SUPPORT)
// WebKit2 code path.
if (m_mouseDownMayStartDrag && !m_mouseDownWasInSubframe)
return false;
+#endif
+
subframe->eventHandler()->handleMouseMoveEvent(mev.event(), hoveredNode);
return true;
}
Modified: trunk/Source/WebCore/platform/mac/ClipboardMac.mm (117694 => 117695)
--- trunk/Source/WebCore/platform/mac/ClipboardMac.mm 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebCore/platform/mac/ClipboardMac.mm 2012-05-19 19:29:36 UTC (rev 117695)
@@ -46,10 +46,12 @@
namespace WebCore {
+#if ENABLE(DRAG_SUPPORT)
PassRefPtr<Clipboard> Clipboard::create(ClipboardAccessPolicy policy, DragData* dragData, Frame* frame)
{
return ClipboardMac::create(DragAndDrop, dragData->pasteboardName(), policy, dragData->containsFiles() ? ClipboardMac::DragAndDropFiles : ClipboardMac::DragAndDropData, frame);
}
+#endif
ClipboardMac::ClipboardMac(ClipboardType clipboardType, const String& pasteboardName, ClipboardAccessPolicy policy, ClipboardContents clipboardContents, Frame *frame)
: Clipboard(policy, clipboardType)
Modified: trunk/Source/WebKit/mac/ChangeLog (117694 => 117695)
--- trunk/Source/WebKit/mac/ChangeLog 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-05-19 19:29:36 UTC (rev 117695)
@@ -1,3 +1,25 @@
+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.
+
+ * WebCoreSupport/WebDragClient.h:
+ * WebCoreSupport/WebDragClient.mm:
+ * WebView/WebFrame.mm:
+ * WebView/WebFrameInternal.h:
+ * WebView/WebFrameView.mm:
+ (-[WebFrameView _setDocumentView:]):
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView acceptsFirstMouse:]):
+ (-[WebHTMLView shouldDelayWindowOrderingForEvent:]):
+ (matchesExtensionOrEquivalent):
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView moveDragCaretToPoint:]):
+ (-[WebView removeDragCaret]):
+
2012-04-27 Filip Pizlo <[email protected]>
DFG should have control flow graph simplification
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.h (117694 => 117695)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.h 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.h 2012-05-19 19:29:36 UTC (rev 117695)
@@ -23,6 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if ENABLE(DRAG_SUPPORT)
+
#import <WebCore/DragClient.h>
@class WebView;
@@ -40,3 +42,5 @@
private:
WebView* m_webView;
};
+
+#endif // ENABLE(DRAG_SUPPORT)
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm (117694 => 117695)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm 2012-05-19 19:29:36 UTC (rev 117695)
@@ -25,6 +25,8 @@
#import "WebDragClient.h"
+#if ENABLE(DRAG_SUPPORT)
+
#import "WebArchive.h"
#import "WebDOMOperations.h"
#import "WebFrame.h"
@@ -134,3 +136,5 @@
{
delete this;
}
+
+#endif // ENABLE(DRAG_SUPPORT)
Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (117694 => 117695)
--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2012-05-19 19:29:36 UTC (rev 117695)
@@ -797,6 +797,7 @@
_private->coreFrame->editor()->computeAndSetTypingStyle(core(style)->copy().get(), undoAction);
}
+#if ENABLE(DRAG_SUPPORT)
- (void)_dragSourceEndedAt:(NSPoint)windowLoc operation:(NSDragOperation)operation
{
if (!_private->coreFrame)
@@ -809,6 +810,7 @@
LeftButton, PlatformEvent::MouseMoved, 0, false, false, false, false, currentTime());
_private->coreFrame->eventHandler()->dragSourceEndedAt(event, (DragOperation)operation);
}
+#endif
- (BOOL)_canProvideDocumentSource
{
Modified: trunk/Source/WebKit/mac/WebView/WebFrameInternal.h (117694 => 117695)
--- trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2012-05-19 19:29:36 UTC (rev 117695)
@@ -155,7 +155,9 @@
- (DOMCSSStyleDeclaration *)_typingStyle;
- (void)_setTypingStyle:(DOMCSSStyleDeclaration *)style withUndoAction:(WebCore::EditAction)undoAction;
+#if ENABLE(DRAG_SUPPORT)
- (void)_dragSourceEndedAt:(NSPoint)windowLoc operation:(NSDragOperation)operation;
+#endif
- (BOOL)_canProvideDocumentSource;
- (BOOL)_canSaveAsWebArchive;
Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.mm (117694 => 117695)
--- trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2012-05-19 19:29:36 UTC (rev 117695)
@@ -131,7 +131,10 @@
- (void)_setDocumentView:(NSView <WebDocumentView> *)view
{
WebDynamicScrollBarsView *sv = [self _scrollView];
+
+#if ENABLE(DRAG_SUPPORT)
core([self _webView])->dragController()->setDidInitiateDrag(false);
+#endif
[sv setSuppressLayout:YES];
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (117694 => 117695)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2012-05-19 19:29:36 UTC (rev 117695)
@@ -2285,15 +2285,6 @@
@end
-static bool matchesExtensionOrEquivalent(NSString *filename, NSString *extension)
-{
- NSString *extensionAsSuffix = [@"." stringByAppendingString:extension];
- return [filename _webkit_hasCaseInsensitiveSuffix:extensionAsSuffix]
- || ([extension _webkit_isCaseInsensitiveEqualToString:@"jpeg"]
- && [filename _webkit_hasCaseInsensitiveSuffix:@".jpg"]);
-}
-
-
@implementation WebHTMLView
+ (void)initialize
@@ -3526,8 +3517,10 @@
coreFrame->eventHandler()->setActivationEventNumber([event eventNumber]);
[hitHTMLView _setMouseDownEvent:event];
if ([hitHTMLView _isSelectionEvent:event]) {
+#if ENABLE(DRAG_SUPPORT)
if (Page* page = coreFrame->page())
result = coreFrame->eventHandler()->eventMayStartDrag(PlatformEventFactory::createPlatformMouseEvent(event, page->chrome()->platformPageClient()));
+#endif
} else if ([hitHTMLView _isScrollBarEvent:event])
result = true;
[hitHTMLView _setMouseDownEvent:nil];
@@ -3549,12 +3542,14 @@
if (hitHTMLView) {
bool result = false;
if ([hitHTMLView _isSelectionEvent:event]) {
+ [hitHTMLView _setMouseDownEvent:event];
+#if ENABLE(DRAG_SUPPORT)
if (Frame* coreFrame = core([hitHTMLView _frame])) {
- [hitHTMLView _setMouseDownEvent:event];
if (Page* page = coreFrame->page())
result = coreFrame->eventHandler()->eventMayStartDrag(PlatformEventFactory::createPlatformMouseEvent(event, page->chrome()->platformPageClient()));
- [hitHTMLView _setMouseDownEvent:nil];
}
+#endif
+ [hitHTMLView _setMouseDownEvent:nil];
}
return result;
}
@@ -3598,6 +3593,7 @@
_private->handlingMouseDownEvent = NO;
}
+#if ENABLE(DRAG_SUPPORT)
- (void)dragImage:(NSImage *)dragImage
at:(NSPoint)at
offset:(NSSize)offset
@@ -3674,6 +3670,14 @@
[self mouseUp:fakeEvent]; // This will also update the mouseover state.
}
+static bool matchesExtensionOrEquivalent(NSString *filename, NSString *extension)
+{
+ NSString *extensionAsSuffix = [@"." stringByAppendingString:extension];
+ return [filename _webkit_hasCaseInsensitiveSuffix:extensionAsSuffix]
+ || ([extension _webkit_isCaseInsensitiveEqualToString:@"jpeg"]
+ && [filename _webkit_hasCaseInsensitiveSuffix:@".jpg"]);
+}
+
- (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination
{
NSFileWrapper *wrapper = nil;
@@ -3731,6 +3735,7 @@
return [NSArray arrayWithObject:[path lastPathComponent]];
}
+#endif
- (void)mouseUp:(NSEvent *)event
{
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (117694 => 117695)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2012-05-19 19:29:36 UTC (rev 117695)
@@ -746,7 +746,9 @@
pageClients.chromeClient = new WebChromeClient(self);
pageClients.contextMenuClient = new WebContextMenuClient(self);
pageClients.editorClient = new WebEditorClient(self);
+#if ENABLE(DRAG_SUPPORT)
pageClients.dragClient = new WebDragClient(self);
+#endif
pageClients.inspectorClient = new WebInspectorClient(self);
pageClients.alternativeTextClient = new WebAlternativeTextClient(self);
_private->page = new Page(pageClients);
@@ -1955,12 +1957,14 @@
types:types];
}
+#if ENABLE(DRAG_SUPPORT)
- (void)_setInitiatedDrag:(BOOL)initiatedDrag
{
if (!_private->page)
return;
_private->page->dragController()->setDidInitiateDrag(initiatedDrag);
}
+#endif
#if ENABLE(DASHBOARD_SUPPORT)
@@ -4015,6 +4019,7 @@
return [self _elementAtWindowPoint:[self convertPoint:point toView:nil]];
}
+#if ENABLE(DRAG_SUPPORT)
// The following 2 internal NSView methods are called on the drag destination to make scrolling while dragging work.
// Scrolling while dragging will only work if the drag destination is in a scroll view. The WebView is the drag destination.
// When dragging to a WebView, the document subview should scroll, but it doesn't because it is not the drag destination.
@@ -4097,6 +4102,7 @@
return self;
return hitView;
}
+#endif
- (BOOL)acceptsFirstResponder
{
@@ -4257,14 +4263,18 @@
- (void)moveDragCaretToPoint:(NSPoint)point
{
+#if ENABLE(DRAG_SUPPORT)
if (Page* page = core(self))
page->dragController()->placeDragCaret(IntPoint([self convertPoint:point toView:nil]));
+#endif
}
- (void)removeDragCaret
{
+#if ENABLE(DRAG_SUPPORT)
if (Page* page = core(self))
page->dragController()->dragEnded();
+#endif
}
- (void)setMainFrameURL:(NSString *)URLString
Modified: trunk/Source/WebKit2/ChangeLog (117694 => 117695)
--- trunk/Source/WebKit2/ChangeLog 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-19 19:29:36 UTC (rev 117695)
@@ -1,5 +1,25 @@
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:
+ * WebProcess/WebCoreSupport/WebDragClient.h:
+ * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit):
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::shouldDelayWindowOrderingEvent):
+ (WebKit::WebPage::acceptsFirstMouse):
+
+2012-05-19 Andy Estes <[email protected]>
+
Plug-in process should only be enabled if Netscape plug-in API is enabled
https://bugs.webkit.org/show_bug.cgi?id=86945
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (117694 => 117695)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-05-19 19:29:36 UTC (rev 117695)
@@ -1623,6 +1623,7 @@
return static_cast<DragApplicationFlags>(flags);
}
+#if ENABLE(DRAG_SUPPORT)
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)draggingInfo
{
IntPoint client([self convertPoint:[draggingInfo draggingLocation] fromView:nil]);
@@ -1699,7 +1700,7 @@
NSArray *types = [pasteboard types];
if (![types containsObject:NSFilenamesPboardType])
return;
-
+
NSArray *files = [pasteboard propertyListForType:NSFilenamesPboardType];
handles.allocate([files count]);
for (unsigned i = 0; i < [files count]; i++) {
@@ -1724,7 +1725,7 @@
SandboxExtension::HandleArray sandboxExtensionForUpload;
createSandboxExtensionsForFileUpload([draggingInfo draggingPasteboard], sandboxExtensionForUpload);
-
+
_data->_page->performDrag(&dragData, [[draggingInfo draggingPasteboard] name], sandboxExtensionHandle, sandboxExtensionForUpload);
return YES;
@@ -1739,6 +1740,7 @@
return self;
return nil;
}
+#endif // ENABLE(DRAG_SUPPORT)
- (BOOL)_windowResizeMouseLocationIsInVisibleScrollerThumb:(NSPoint)loc
{
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp (117694 => 117695)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp 2012-05-19 19:29:36 UTC (rev 117695)
@@ -26,6 +26,8 @@
#include "config.h"
#include "WebDragClient.h"
+#if ENABLE(DRAG_SUPPORT)
+
#include "WebPage.h"
using namespace WebCore;
@@ -66,3 +68,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(DRAG_SUPPORT)
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h (117694 => 117695)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h 2012-05-19 19:29:36 UTC (rev 117695)
@@ -26,6 +26,8 @@
#ifndef WebDragClient_h
#define WebDragClient_h
+#if ENABLE(DRAG_SUPPORT)
+
#include <WebCore/DragClient.h>
namespace WebKit {
@@ -58,4 +60,6 @@
} // namespace WebKit
+#endif // ENABLE(DRAG_SUPPORT)
+
#endif // WebDragClient_h
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (117694 => 117695)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2012-05-19 19:29:36 UTC (rev 117695)
@@ -26,6 +26,8 @@
#import "config.h"
#import "WebDragClient.h"
+#if ENABLE(DRAG_SUPPORT)
+
#import "PasteboardTypes.h"
#import "ShareableBitmap.h"
#import "WebCoreArgumentCoders.h"
@@ -145,3 +147,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(DRAG_SUPPORT)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (117694 => 117695)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-05-19 19:29:36 UTC (rev 117695)
@@ -240,7 +240,9 @@
pageClients.contextMenuClient = new WebContextMenuClient(this);
#endif
pageClients.editorClient = new WebEditorClient(this);
+#if ENABLE(DRAG_SUPPORT)
pageClients.dragClient = new WebDragClient(this);
+#endif
pageClients.backForwardClient = WebBackForwardListProxy::create(this);
#if ENABLE(INSPECTOR)
pageClients.inspectorClient = new WebInspectorClient(this);
@@ -2100,6 +2102,8 @@
}
#endif
+#if ENABLE(DRAG_SUPPORT)
+
#if PLATFORM(WIN)
void WebPage::performDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, const WebCore::DragDataMap& dataMap, uint32_t flags)
{
@@ -2252,6 +2256,8 @@
m_pendingDropExtensionsForFileUpload[i]->consumePermanently();
m_pendingDropExtensionsForFileUpload.clear();
}
+
+#endif // ENABLE(DRAG_SUPPORT)
WebUndoStep* WebPage::webUndoStep(uint64_t stepID)
{
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (117694 => 117695)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2012-05-19 18:25:34 UTC (rev 117694)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2012-05-19 19:29:36 UTC (rev 117695)
@@ -710,9 +710,11 @@
if (!frame)
return;
+#if ENABLE(DRAG_SUPPORT)
HitTestResult hitResult = frame->eventHandler()->hitTestResultAtPoint(frame->view()->windowToContents(event.position()), true);
if (hitResult.isSelected())
result = frame->eventHandler()->eventMayStartDrag(platform(event));
+#endif
}
void WebPage::acceptsFirstMouse(int eventNumber, const WebKit::WebMouseEvent& event, bool& result)
@@ -724,9 +726,11 @@
HitTestResult hitResult = frame->eventHandler()->hitTestResultAtPoint(frame->view()->windowToContents(event.position()), true);
frame->eventHandler()->setActivationEventNumber(eventNumber);
+#if ENABLE(DRAG_SUPPORT)
if (hitResult.isSelected())
result = frame->eventHandler()->eventMayStartDrag(platform(event));
- else
+ else
+#endif
result = !!hitResult.scrollbar();
}
