Changeset 57064 in webkit


Ignore:
Timestamp:
Apr 4, 2010 11:30:04 PM (14 years ago)
Author:
pfeldman@chromium.org
Message:

2010-04-04 Pavel Feldman <pfeldman@chromium.org>

Not reviewed. Rolling out chromium changes r57028 and r57032
for breaking chromium layout tests.

  • WebCore.gyp/WebCore.gyp:
  • WebCore.gypi:
  • platform/chromium/DragImageChromium.cpp: Added. (WebCore::dragImageSize): (WebCore::deleteDragImage): (WebCore::scaleDragImage): (WebCore::dissolveDragImageToFraction): (WebCore::createDragImageFromImage): (WebCore::createDragImageIconForCachedImage):
  • platform/chromium/DragImageChromiumMac.cpp: Removed.
  • platform/chromium/DragImageChromiumSkia.cpp: Removed.
  • platform/chromium/DragImageRef.h:


WebKit/chromium:

  • public/WebViewClient.h: (WebKit::WebViewClient::startDragging):
  • src/DragClientImpl.cpp: (WebKit::DragClientImpl::startDrag):
  • src/WebViewImpl.cpp: (WebKit::WebViewImpl::startDragging):
  • src/WebViewImpl.h:
Location:
trunk
Files:
1 deleted
9 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r57061 r57064  
     12010-04-04  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Not reviewed. Rolling out chromium changes r57028 and r57032
     4        for breaking chromium layout tests.
     5
     6        * WebCore.gyp/WebCore.gyp:
     7        * WebCore.gypi:
     8        * platform/chromium/DragImageChromium.cpp: Added.
     9        (WebCore::dragImageSize):
     10        (WebCore::deleteDragImage):
     11        (WebCore::scaleDragImage):
     12        (WebCore::dissolveDragImageToFraction):
     13        (WebCore::createDragImageFromImage):
     14        (WebCore::createDragImageIconForCachedImage):
     15        * platform/chromium/DragImageChromiumMac.cpp: Removed.
     16        * platform/chromium/DragImageChromiumSkia.cpp: Removed.
     17        * platform/chromium/DragImageRef.h:
     18
    1192010-03-29  Antonio Gomes  <tonikitoo@webkit.org>
    220
  • trunk/WebCore/WebCore.gyp/WebCore.gyp

    r57028 r57064  
    10651065            '../platform/image-decoders/xbm/XBMImageDecoder.cpp',
    10661066            '../platform/image-decoders/xbm/XBMImageDecoder.h',
    1067 
    1068             # Again, Skia is not used on Mac.
    1069             '../platform/chromium/DragImageChromiumSkia.cpp',
    10701067          ],
    10711068          'direct_dependent_settings': {
  • trunk/WebCore/WebCore.gypi

    r57045 r57064  
    19521952            'platform/chromium/DragDataChromium.cpp',
    19531953            'platform/chromium/DragDataRef.h',
    1954             'platform/chromium/DragImageChromiumMac.cpp',
    1955             'platform/chromium/DragImageChromiumSkia.cpp',
     1954            'platform/chromium/DragImageChromium.cpp',
    19561955            'platform/chromium/DragImageRef.h',
    19571956            'platform/chromium/FileChooserChromium.cpp',
  • trunk/WebCore/platform/chromium/DragImageChromium.cpp

    • Property svn:eol-style set to LF
    r57063 r57064  
    11/*
    2  * Copyright (c) 2010, Google Inc. All rights reserved.
     2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    5252    return 0;
    5353}
    54 
     54   
    5555DragImageRef dissolveDragImageToFraction(DragImageRef image, float)
    5656{
     
    5858    return image;
    5959}
    60 
     60       
    6161DragImageRef createDragImageFromImage(Image* img)
    62 {
     62{   
    6363    notImplemented();
    6464    return 0;
    6565}
    66 
     66   
    6767DragImageRef createDragImageIconForCachedImage(CachedImage*)
    6868{
    6969    notImplemented();
    70     return 0;
     70    return 0;     
    7171}
    72 
     72   
    7373} // namespace WebCore
  • trunk/WebCore/platform/chromium/DragImageRef.h

    r57028 r57064  
    3030#define DragImageRef_h
    3131
    32 class SkBitmap;
    33 
    3432namespace WebCore {
    3533
    36 #if OS(DARWIN)
    37 // FIXME: not implemented.
    38 typedef void* DragImageRef;
    39 #else
    40 typedef SkBitmap* DragImageRef;
    41 #endif
     34    // FIXME: Need to support image drag-n-drop.  For now, we just allow things
     35    // to compile by defining this dummy type.
     36    typedef void* DragImageRef;
    4237
    4338} // namespace WebCore
  • trunk/WebKit/chromium/ChangeLog

    r57046 r57064  
     12010-04-04  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Not reviewed. Rolling out chromium changes r57028 and r57032
     4        for breaking chromium layout tests.
     5
     6        * public/WebViewClient.h:
     7        (WebKit::WebViewClient::startDragging):
     8        * src/DragClientImpl.cpp:
     9        (WebKit::DragClientImpl::startDrag):
     10        * src/WebViewImpl.cpp:
     11        (WebKit::WebViewImpl::startDragging):
     12        * src/WebViewImpl.h:
     13
    1142010-04-03  Darin Fisher  <darin@chromium.org>
    215
  • trunk/WebKit/chromium/public/WebViewClient.h

    r57028 r57064  
    4949class WebFrame;
    5050class WebGeolocationService;
    51 class WebImage;
    5251class WebNode;
    5352class WebNotificationPresenter;
     
    226225    // Called when a drag-n-drop operation should begin.
    227226    virtual void startDragging(
    228         const WebDragData&, WebDragOperationsMask, const WebImage&, const WebPoint&) { }
     227        const WebPoint& from, const WebDragData&, WebDragOperationsMask) { }
    229228
    230229    // Called to determine if drag-n-drop operations may initiate a page
  • trunk/WebKit/chromium/src/DragClientImpl.cpp

    r57028 r57064  
    3131#include "config.h"
    3232#include "DragClientImpl.h"
    33 #include "DragImageRef.h"
     33
    3434#include "ChromiumDataObject.h"
    3535#include "ClipboardChromium.h"
    3636#include "Frame.h"
    37 #include "NativeImageSkia.h"
    38 #include "WebCommon.h"
    3937#include "WebDragData.h"
    40 #include "WebImage.h"
    4138#include "WebViewClient.h"
    4239#include "WebViewImpl.h"
     
    8582    DragOperation dragOperationMask = clipboard->sourceOperation();
    8683
    87     IntSize offsetSize(eventPos - dragImageOrigin);
    88     WebPoint offsetPoint(offsetSize.width(), offsetSize.height());
    89 #if WEBKIT_USING_SKIA
    9084    m_webView->startDragging(
    91         dragData, static_cast<WebDragOperationsMask>(dragOperationMask),
    92         WebImage(*dragImage), offsetPoint);
    93 #else
    94     // FIXME: When DragImageRef is implemented for CG, we can probably just remove
    95     // this #if fork. For now, pass an empty image.
    96     m_webView->startDragging(
    97         dragData, static_cast<WebDragOperationsMask>(dragOperationMask),
    98         WebImage(), WebPoint());
    99 #endif
     85        eventPos, dragData, static_cast<WebDragOperationsMask>(dragOperationMask));
    10086}
    10187
  • trunk/WebKit/chromium/src/WebViewImpl.cpp

    r57028 r57064  
    8888#include "WebDragData.h"
    8989#include "WebFrameImpl.h"
    90 #include "WebImage.h"
    9190#include "WebInputEvent.h"
    9291#include "WebInputEventConversion.h"
     
    19341933}
    19351934
    1936 void WebViewImpl::startDragging(const WebDragData& dragData,
    1937                                 WebDragOperationsMask mask,
    1938                                 const WebImage& dragImage,
    1939                                 const WebPoint& dragImageOffset)
     1935void WebViewImpl::startDragging(const WebPoint& eventPos,
     1936                                const WebDragData& dragData,
     1937                                WebDragOperationsMask mask)
    19401938{
    19411939    if (!m_client)
     
    19431941    ASSERT(!m_doingDragAndDrop);
    19441942    m_doingDragAndDrop = true;
    1945     m_client->startDragging(dragData, mask, dragImage, dragImageOffset);
     1943    m_client->startDragging(eventPos, dragData, mask);
    19461944}
    19471945
  • trunk/WebKit/chromium/src/WebViewImpl.h

    r57028 r57064  
    7575class WebDevToolsAgentPrivate;
    7676class WebFrameImpl;
    77 class WebImage;
    7877class WebKeyboardEvent;
    7978class WebMouseEvent;
     
    276275    // Start a system drag and drop operation.
    277276    void startDragging(
     277        const WebPoint& eventPos,
    278278        const WebDragData& dragData,
    279         WebDragOperationsMask mask,
    280         const WebImage& dragImage,
    281         const WebPoint& dragImageOffset);
     279        WebDragOperationsMask dragSourceOperationMask);
    282280
    283281    void suggestionsPopupDidHide()
Note: See TracChangeset for help on using the changeset viewer.