[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[mjs at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit f6818ed3dd437f669bec997e1982f67ba4f71b5e
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 23:33:57 2010 +0000

    2010-01-07  Maciej Stachowiak  <mjs at apple.com>
    
            Reviewed by Simon Fraser.
    
            REGRESSION (r48075): Clicking and dragging in a widget's text field doesn't create a selection; drags widget instead ( Translation, Weather, Ski Report )
            https://bugs.webkit.org/show_bug.cgi?id=33348
            <rdar://problem/7310616>
    
            * WebView/WebView.mm:
            (-[WebView _preferencesChangedNotification:]): We only want to
            handle file: URLs for the user stylesheet now, so special-case the
            DashboardClient's funky user stylesheet URL by mapping it to the
            equivalent file URL.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52953 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index ffadb7d..39fadf7 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-07  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        REGRESSION (r48075): Clicking and dragging in a widget's text field doesn't create a selection; drags widget instead ( Translation, Weather, Ski Report )
+        https://bugs.webkit.org/show_bug.cgi?id=33348
+        <rdar://problem/7310616>
+        
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChangedNotification:]): We only want to
+        handle file: URLs for the user stylesheet now, so special-case the
+        DashboardClient's funky user stylesheet URL by mapping it to the
+        equivalent file URL.
+
 2010-01-07  Kevin Decker  <kdecker at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index f8b72b7..f2e816f 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -1301,6 +1301,8 @@ static bool fastDocumentTeardownEnabled()
     settings->setApplicationChromeMode([preferences applicationChromeModeEnabled]);
     if ([preferences userStyleSheetEnabled]) {
         NSString* location = [[preferences userStyleSheetLocation] _web_originalDataAsString];
+        if ([location isEqualToString:@"apple-dashboard://stylesheet"])
+            location = @"file:///System/Library/PrivateFrameworks/DashboardClient.framework/Resources/widget.css";
         settings->setUserStyleSheetLocation([NSURL URLWithString:(location ? location : @"")]);
     } else
         settings->setUserStyleSheetLocation([NSURL URLWithString:@""]);

-- 
WebKit Debian packaging