2006-08-03 Mark Rowe <opendarwin.org@bdash.net.nz>
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Aug 2006 15:36:13 +0000 (15:36 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Aug 2006 15:36:13 +0000 (15:36 +0000)
        Reviewed by Darin.

        Bug 10224: [Drosera] Drosera icon should be set on DroseraLauncher so it appears in nightly builds
        http://bugzilla.opendarwin.org/show_bug.cgi?id=10224

        * Drosera/Drosera.xcodeproj/project.pbxproj:
        * Drosera/LauncherInfo.plist:

2006-08-03  Mitz Pettel  <opendarwin.org@mitzpettel.com>

        - fix ASSERTION FAILURE: draggingDocumentView == nil in -[WebViewPrivate dealloc]
          when a test performs an unsuccessful drag and drop operation.

        * DumpRenderTree/EventSendingController.m:
        (-[EventSendingController mouseUp]): Added a call to -draggingExited: if the
        drag operation for the mouse release is NSDragOperationNone.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15769 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/ChangeLog
WebKitTools/Drosera/Drosera.xcodeproj/project.pbxproj
WebKitTools/Drosera/LauncherInfo.plist
WebKitTools/DumpRenderTree/EventSendingController.m

index 91bfda47d09bbb0a5033cff7077a2de88ee09b54..65d05eb375dfeff7fc5eb7499b286c3e0d67ab64 100644 (file)
@@ -1,3 +1,22 @@
+2006-08-03  Mark Rowe  <opendarwin.org@bdash.net.nz>
+
+        Reviewed by Darin.
+
+        Bug 10224: [Drosera] Drosera icon should be set on DroseraLauncher so it appears in nightly builds
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10224
+
+        * Drosera/Drosera.xcodeproj/project.pbxproj:
+        * Drosera/LauncherInfo.plist:
+
+2006-08-03  Mitz Pettel  <opendarwin.org@mitzpettel.com>
+
+        - fix ASSERTION FAILURE: draggingDocumentView == nil in -[WebViewPrivate dealloc]
+          when a test performs an unsuccessful drag and drop operation.
+
+        * DumpRenderTree/EventSendingController.m:
+        (-[EventSendingController mouseUp]): Added a call to -draggingExited: if the
+        drag operation for the mouse release is NSDragOperationNone.
+
 2006-08-02  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Darin.
index 6af2b75fccb5eb0f61682f96858e4c4c27edff42..2349c6a7494f55b1d10c3e2d81c81adaf53ccdf2 100644 (file)
@@ -52,6 +52,7 @@
                1CD8D5690A49041C00E5677B /* launcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD8D5680A49041C00E5677B /* launcher.m */; };
                1CD8D56C0A49043E00E5677B /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; };
                1CD8D5A60A49102900E5677B /* Drosera.app in Resources */ = {isa = PBXBuildFile; fileRef = 8D15AC370486D014006FF6A4 /* Drosera.app */; };
+               5D2C827F0A816BA700C193FD /* Drosera.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1C3487970A81208400101C5C /* Drosera.icns */; };
                8D15AC2D0486D014006FF6A4 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2A37F4B6FDCFA73011CA2CEA /* MainMenu.nib */; };
                8D15AC2E0486D014006FF6A4 /* Debugger.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2A37F4B4FDCFA73011CA2CEA /* Debugger.nib */; };
                8D15AC310486D014006FF6A4 /* DebuggerDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A37F4ACFDCFA73011CA2CEA /* DebuggerDocument.m */; settings = {ATTRIBUTES = (); }; };
                2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
                32DBCF750370BD2300C91783 /* Drosera.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Drosera.pch; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                8D15AC360486D014006FF6A4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
-               8D15AC370486D014006FF6A4 /* Drosera.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Drosera.app; sourceTree = BUILT_PRODUCTS_DIR; };
+               8D15AC370486D014006FF6A4 /* Drosera.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Drosera.app; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               5D2C827F0A816BA700C193FD /* Drosera.icns in Resources */,
                                1CD8D5A60A49102900E5677B /* Drosera.app in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
index a95881a3e08606ea23245c3f93ad56aad9960640..12c4472a3bb2a78a84dbe6753e382567a0e5fe77 100644 (file)
@@ -6,6 +6,8 @@
        <string>English</string>
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
+       <key>CFBundleIconFile</key>
+       <string>Drosera</string>
        <key>CFBundleIdentifier</key>
        <string>org.webkit.drosera.launcher</string>
        <key>CFBundleInfoDictionaryVersion</key>
index 9cec6d6defcf4afd05920ee89534e41d1aeeed6f..80e50ff1918fd6266cd4ad69a50dbda0380d72cd 100644 (file)
@@ -176,6 +176,8 @@ NSArray *webkitDomEventNames;
             
             if (dragOperation != NSDragOperationNone)
                 [webView performDragOperation:draggingInfo];
+            else
+                [webView draggingExited:draggingInfo];
             [[draggingInfo draggingSource] draggedImage:[draggingInfo draggedImage] endedAt:lastMousePosition operation:dragOperation];
             [draggingInfo release];
             draggingInfo = nil;