Changeset 96339 in webkit

Timestamp:

Sep 29, 2011 10:35:41 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Dragging a selection does not produce a drag image
​https://bugs.webkit.org/show_bug.cgi?id=69064

Patch by Martin Robinson <​mrobinson@igalia.com> on 2011-09-29
Reviewed by Andreas Kling.

Moved Chromium's generic implementation of Frame::nodeImage and
Frame::dragImageForSeletion to Frame.cpp and simply excluded via
#ifdefs platforms that do not have their own implementation. Removed
all empty implementations of these functions and Qt's which was
functionally identical.

No new tests. Drag-and-drop drag image functionality changes
are incredibly difficult to test in a non-manual way.

• CMakeListsEfl.txt: Delist FrameEfl.cpp.
• GNUmakefile.list.am: Delist FrameGtk.cpp.
• WebCore.gypi: Delist removed Frame*.cpp.
• WebCore.pro: Delist FrameQt.cpp.
• page/Frame.cpp: Moved FrameChromium implementation here.

(WebCore::ScopedFramePaintingState::ScopedFramePaintingState):
(WebCore::ScopedFramePaintingState::~ScopedFramePaintingState):
(WebCore::Frame::nodeImage):
(WebCore::Frame::dragImageForSelection):

• page/chromium/FrameChromium.cpp: Removed.
• page/efl/FrameEfl.cpp: Removed.
• page/gtk/FrameGtk.cpp: Removed.
• page/qt/FrameQt.cpp: Removed.
• page/wx/FrameWx.cpp: Removed.
• platform/gtk/ClipboardGtk.cpp:

(WebCore::ClipboardGtk::createDragImage): Call nodeImage to get
the drag image for a node.

Location:

trunk/Source/WebCore

Files:

• CMakeListsEfl.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (1 diff)
• WebCore.gypi (modified) (3 diffs)
• WebCore.pro (modified) (1 diff)
• page/Frame.cpp (modified) (3 diffs)
• page/chromium/FrameChromium.cpp (deleted)
• page/efl/FrameEfl.cpp (deleted)
• page/gtk/FrameGtk.cpp (deleted)
• page/qt/FrameQt.cpp (deleted)
• page/wx/FrameWx.cpp (deleted)
• platform/gtk/ClipboardGtk.cpp (modified) (1 diff)

trunk/Source/WebCore/CMakeListsEfl.txt

@@ -21 +21 @@
   page/efl/DragControllerEfl.cpp
   page/efl/EventHandlerEfl.cpp
-  page/efl/FrameEfl.cpp
   platform/Cursor.cpp
   platform/efl/ClipboardEfl.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-29  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Dragging a selection does not produce a drag image
+        https://bugs.webkit.org/show_bug.cgi?id=69064
+
+        Reviewed by Andreas Kling.
+
+        Moved Chromium's generic implementation of Frame::nodeImage and
+        Frame::dragImageForSeletion to Frame.cpp and simply excluded via
+        #ifdefs platforms that do not have their own implementation. Removed
+        all empty implementations of these functions and Qt's which was
+        functionally identical.
+
+        No new tests. Drag-and-drop drag image functionality changes
+        are incredibly difficult to test in a non-manual way.
+
+        * CMakeListsEfl.txt: Delist FrameEfl.cpp.
+        * GNUmakefile.list.am: Delist FrameGtk.cpp.
+        * WebCore.gypi: Delist removed Frame*.cpp.
+        * WebCore.pro: Delist FrameQt.cpp.
+        * page/Frame.cpp: Moved FrameChromium implementation here.
+        (WebCore::ScopedFramePaintingState::ScopedFramePaintingState):
+        (WebCore::ScopedFramePaintingState::~ScopedFramePaintingState):
+        (WebCore::Frame::nodeImage):
+        (WebCore::Frame::dragImageForSelection):
+        * page/chromium/FrameChromium.cpp: Removed.
+        * page/efl/FrameEfl.cpp: Removed.
+        * page/gtk/FrameGtk.cpp: Removed.
+        * page/qt/FrameQt.cpp: Removed.
+        * page/wx/FrameWx.cpp: Removed.
+        * platform/gtk/ClipboardGtk.cpp:
+        (WebCore::ClipboardGtk::createDragImage): Call nodeImage to get
+        the drag image for a node.
+
 2011-09-29  Noel Gordon  <noel.gordon@gmail.com>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -3955 +3955 @@
         Source/WebCore/page/gtk/DragControllerGtk.cpp \
         Source/WebCore/page/gtk/EventHandlerGtk.cpp \
-        Source/WebCore/page/gtk/FrameGtk.cpp \
         Source/WebCore/platform/cairo/WidgetBackingStore.h \
         Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp \

trunk/Source/WebCore/WebCore.gypi

@@ -2968 +2968 @@
             'page/chromium/DragControllerChromium.cpp',
             'page/chromium/EventHandlerChromium.cpp',
-            'page/chromium/FrameChromium.cpp',
             'page/efl/DragControllerEfl.cpp',
             'page/efl/EventHandlerEfl.cpp',
-            'page/efl/FrameEfl.cpp',
             'page/gtk/DragControllerGtk.cpp',
             'page/gtk/EventHandlerGtk.cpp',
-            'page/gtk/FrameGtk.cpp',
             'page/mac/ChromeMac.mm',
             'page/mac/DragControllerMac.mm',
@@ -2982 +2979 @@
             'page/qt/DragControllerQt.cpp',
             'page/qt/EventHandlerQt.cpp',
-            'page/qt/FrameQt.cpp',
             'page/win/DragControllerWin.cpp',
             'page/win/EventHandlerWin.cpp',
@@ -2992 +2988 @@
             'page/wx/DragControllerWx.cpp',
             'page/wx/EventHandlerWx.cpp',
-            'page/wx/FrameWx.cpp',
             'platform/Arena.cpp',
             'platform/Arena.h',

trunk/Source/WebCore/WebCore.pro

@@ -2583 +2583 @@
     page/qt/DragControllerQt.cpp \
     page/qt/EventHandlerQt.cpp \
-    page/qt/FrameQt.cpp \
     platform/graphics/qt/TransformationMatrixQt.cpp \
     platform/graphics/qt/ColorQt.cpp \

trunk/Source/WebCore/page/Frame.cpp

@@ -10 +10 @@
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
+ * Copyright (C) 2008 Google Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -59 +60 @@
 #include "HTMLTableCellElement.h"
 #include "HitTestResult.h"
+#include "ImageBuffer.h"
 #include "InspectorInstrumentation.h"
 #include "Logging.h"
@@ -1059 +1061 @@
 }
 
+#if !PLATFORM(MAC) && !PLATFORM(WIN) && !PLATFORM(WX)
+struct ScopedFramePaintingState {
+    ScopedFramePaintingState(Frame* theFrame, RenderObject* theRenderer)
+        : frame(theFrame)
+        , renderer(theRenderer)
+        , paintBehavior(frame->view()->paintBehavior())
+        , backgroundColor(frame->view()->baseBackgroundColor())
+    {
+    }
+
+    ~ScopedFramePaintingState()
+    {
+        if (renderer)
+            renderer->updateDragState(false);
+        frame->view()->setPaintBehavior(paintBehavior);
+        frame->view()->setBaseBackgroundColor(backgroundColor);
+        frame->view()->setNodeToDraw(0);
+    }
+
+    Frame* frame;
+    RenderObject* renderer;
+    PaintBehavior paintBehavior;
+    Color backgroundColor;
+};
+
+DragImageRef Frame::nodeImage(Node* node)
+{
+    RenderObject* renderer = node->renderer();
+    if (!renderer)
+        return 0;
+
+    const ScopedFramePaintingState state(this, renderer);
+
+    renderer->updateDragState(true);
+    m_view->setPaintBehavior(state.paintBehavior | PaintBehaviorFlattenCompositingLayers);
+
+    // When generating the drag image for an element, ignore the document background.
+    m_view->setBaseBackgroundColor(colorWithOverrideAlpha(Color::white, 1.0));
+    m_doc->updateLayout();
+    m_view->setNodeToDraw(node); // Enable special sub-tree drawing mode.
+
+    IntRect topLevelRect;
+    IntRect paintingRect = renderer->paintingRootRect(topLevelRect);
+
+    OwnPtr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size()));
+    if (!buffer)
+        return 0;
+    buffer->context()->translate(-paintingRect.x(), -paintingRect.y());
+    buffer->context()->clip(FloatRect(0, 0, paintingRect.maxX(), paintingRect.maxY()));
+
+    m_view->paintContents(buffer->context(), paintingRect);
+
+    RefPtr<Image> image = buffer->copyImage();
+    return createDragImageFromImage(image.get());
+}
+
+DragImageRef Frame::dragImageForSelection()
+{
+    if (!selection()->isRange())
+        return 0;
+
+    const ScopedFramePaintingState state(this, 0);
+    m_view->setPaintBehavior(PaintBehaviorSelectionOnly);
+    m_doc->updateLayout();
+
+    IntRect paintingRect = enclosingIntRect(selection()->bounds());
+
+    OwnPtr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size()));
+    if (!buffer)
+        return 0;
+    buffer->context()->translate(-paintingRect.x(), -paintingRect.y());
+    buffer->context()->clip(FloatRect(0, 0, paintingRect.maxX(), paintingRect.maxY()));
+
+    m_view->paintContents(buffer->context(), paintingRect);
+
+    RefPtr<Image> image = buffer->copyImage();
+    return createDragImageFromImage(image.get());
+}
+
+#endif
+
 } // namespace WebCore

trunk/Source/WebCore/platform/gtk/ClipboardGtk.cpp

@@ -260 +260 @@
 {
     location = m_dragLoc;
-    if (!m_dragImage)
-        return 0;
-
-    return createDragImageFromImage(m_dragImage->image());
+
+    if (m_dragImage)
+        return createDragImageFromImage(m_dragImage->image());
+    if (m_dragImageElement && m_frame)
+        return m_frame->nodeImage(m_dragImageElement.get());
+
+    return 0; // We do not have enough information to create a drag image, use the default icon.
 }