[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[barraclough at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 3222ddec353e39c70971a6ba79bfa02e4d0ebdbf
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 19 06:20:18 2010 +0000

    Build fix - as per DRT-mac, always enabled developer extras,
    in win/qt/gtk DRT.
    
    This is necessary to enable rich exception messages to be generated
    following https://bugs.webkit.org/show_bug.cgi?id=49708.
    
    * DumpRenderTree/gtk/DumpRenderTree.cpp:
    (shouldEnableDeveloperExtras):
    * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
    (WebCore::shouldEnableDeveloperExtras):
    * DumpRenderTree/win/DumpRenderTree.cpp:
    (shouldEnableDeveloperExtras):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72366 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ef60fdd..3532c92 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-18  Gavin Barraclough  <barraclough at apple.com>
+
+        Build fix - as per DRT-mac, always enabled developer extras,
+        in win/qt/gtk DRT.
+
+        This is necessary to enable rich exception messages to be generated
+        following https://bugs.webkit.org/show_bug.cgi?id=49708.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (shouldEnableDeveloperExtras):
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::shouldEnableDeveloperExtras):
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (shouldEnableDeveloperExtras):
+
 2010-11-18  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r72357.
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 5aa61e3..bcb5d6b 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -111,7 +111,7 @@ static bool shouldOpenWebInspector(const string& pathOrURL)
 
 static bool shouldEnableDeveloperExtras(const string& pathOrURL)
 {
-    return shouldOpenWebInspector(pathOrURL) || pathOrURL.find("inspector-enabled/") != string::npos;
+    return true;
 }
 
 void dumpFrameScrollPosition(WebKitWebFrame* frame)
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index eadcc43..0982a6f 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -576,7 +576,7 @@ static bool isWebInspectorTest(const QUrl& url)
 
 static bool shouldEnableDeveloperExtras(const QUrl& url)
 {
-    return isWebInspectorTest(url) || url.path().contains("inspector-enabled/");
+    return true;
 }
 
 void DumpRenderTree::open(const QUrl& url)
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index 6e30bfa..3e6e191 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -763,7 +763,7 @@ static bool shouldOpenWebInspector(const char* pathOrURL)
 
 static bool shouldEnableDeveloperExtras(const char* pathOrURL)
 {
-    return shouldOpenWebInspector(pathOrURL) || strstr(pathOrURL, "/inspector-enabled/") || strstr(pathOrURL, "\\inspector-enabled\\");
+    return true;
 }
 
 static void resetDefaultsToConsistentValues(IWebPreferences* preferences)

-- 
WebKit Debian packaging