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

[caseq at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit c46a2d2af3e7f9c716dc4f83a33a78bc5beaa589
Author: caseq at chromium.org <caseq at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 08:59:53 2010 +0000

    2010-10-04  Andrey Kosyakov  <caseq at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: [Chromium][Extension API] provide tab id of inspected tab in extension API
            https://bugs.webkit.org/show_bug.cgi?id=47080
    
            * inspector/front-end/ExtensionServer.js: Added support for platform-specific extensions API.
            (WebInspector.ExtensionServer.prototype._buildExtensionAPIInjectedScript):
    
    2010-10-04  Andrey Kosyakov  <caseq at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: [Chromium][Extension API] provide tab id of inspected tab in extension API
            https://bugs.webkit.org/show_bug.cgi?id=47080
    
            * src/js/DevTools.js: Added a way for extension to get tabId of inspected window.
            (WebInspector.platformExtensionAPI):
            (WebInspector.buildPlatformExtensionAPI):
            (WebInspector.setInspectedTabId):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69098 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 80532dd..dabd22f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-04  Andrey Kosyakov  <caseq at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: [Chromium][Extension API] provide tab id of inspected tab in extension API
+        https://bugs.webkit.org/show_bug.cgi?id=47080
+
+        * inspector/front-end/ExtensionServer.js: Added support for platform-specific extensions API.
+        (WebInspector.ExtensionServer.prototype._buildExtensionAPIInjectedScript):
+
 2010-10-05  Sanjeev Radhakrishnan  <sanjeevr at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/inspector/front-end/ExtensionServer.js b/WebCore/inspector/front-end/ExtensionServer.js
index c8a95a0..72d9a89 100644
--- a/WebCore/inspector/front-end/ExtensionServer.js
+++ b/WebCore/inspector/front-end/ExtensionServer.js
@@ -335,12 +335,13 @@ WebInspector.ExtensionServer.prototype = {
              if (typeof propValue === "number")
                  resourceTypes[propName] = WebInspector.Resource.Type.toString(propValue);
         }
-
+        var platformAPI = WebInspector.buildPlatformExtensionAPI ? WebInspector.buildPlatformExtensionAPI() : "";
         return "(function(){ " +
             "var private = {};" +
             "(" + WebInspector.commonExtensionSymbols.toString() + ")(private);" +
             "(" + WebInspector.injectedExtensionAPI.toString() + ").apply(this, arguments);" +
             "webInspector.resources.Types = " + JSON.stringify(resourceTypes) + ";" +
+            platformAPI +
             "})";
     },
 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index c9eab93..64d21fb 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-04  Andrey Kosyakov  <caseq at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: [Chromium][Extension API] provide tab id of inspected tab in extension API
+        https://bugs.webkit.org/show_bug.cgi?id=47080
+
+        * src/js/DevTools.js: Added a way for extension to get tabId of inspected window.
+        (WebInspector.platformExtensionAPI):
+        (WebInspector.buildPlatformExtensionAPI):
+        (WebInspector.setInspectedTabId):
+
 2010-10-04  Tony Gentilcore  <tonyg at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/js/DevTools.js b/WebKit/chromium/src/js/DevTools.js
index a66e174..4c23057 100644
--- a/WebKit/chromium/src/js/DevTools.js
+++ b/WebKit/chromium/src/js/DevTools.js
@@ -162,3 +162,25 @@ WebInspector.resetToolbarColors = function()
 
 }
 
+////////////////////////////////////////////////////////
+// Platform-specific WebInspector extensions support. //
+////////////////////////////////////////////////////////
+
+WebInspector.platformExtensionAPI = function(tabId)
+{
+    function getTabId()
+    {
+        return tabId;
+    }
+    webInspector.inspectedWindow.__proto__.__defineGetter__("tabId", getTabId);
+}
+
+WebInspector.buildPlatformExtensionAPI = function()
+{
+    return "(" + WebInspector.platformExtensionAPI + ")(" + WebInspector._inspectedTabId + ");";
+}
+
+WebInspector.setInspectedTabId = function(tabId)
+{
+    WebInspector._inspectedTabId = tabId;
+}

-- 
WebKit Debian packaging