Title: [108336] trunk/Source/WebCore
- Revision
- 108336
- Author
- [email protected]
- Date
- 2012-02-21 04:00:48 -0800 (Tue, 21 Feb 2012)
Log Message
Not reviewed: fixing poor merge in r108332.
* inspector/front-end/StylesSidebarPane.js:
(WebInspector.StylePropertiesSection.prototype._handleSelectorClick):
* inspector/front-end/externs.js:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108335 => 108336)
--- trunk/Source/WebCore/ChangeLog 2012-02-21 11:47:55 UTC (rev 108335)
+++ trunk/Source/WebCore/ChangeLog 2012-02-21 12:00:48 UTC (rev 108336)
@@ -1,3 +1,11 @@
+2012-02-21 'Pavel Feldman' <[email protected]>
+
+ Not reviewed: fixing poor merge in r108332.
+
+ * inspector/front-end/StylesSidebarPane.js:
+ (WebInspector.StylePropertiesSection.prototype._handleSelectorClick):
+ * inspector/front-end/externs.js:
+
2012-02-21 Alexander Pavlov <[email protected]>
Web Inspector: [Styles] Rule source URL tooltip should show line number
Modified: trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js (108335 => 108336)
--- trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js 2012-02-21 11:47:55 UTC (rev 108335)
+++ trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js 2012-02-21 12:00:48 UTC (rev 108336)
@@ -1219,11 +1219,6 @@
_handleSelectorClick: function(event)
{
- event.stopPropagation();
- },
-
- _handleSelectorClick: function(event)
- {
this._startEditingOnMouseEvent();
event.stopPropagation();
event.preventDefault();
Modified: trunk/Source/WebCore/inspector/front-end/externs.js (108335 => 108336)
--- trunk/Source/WebCore/inspector/front-end/externs.js 2012-02-21 11:47:55 UTC (rev 108335)
+++ trunk/Source/WebCore/inspector/front-end/externs.js 2012-02-21 12:00:48 UTC (rev 108336)
@@ -191,3 +191,6 @@
WebInspector.inspectedPageDomain;
WebInspector.isCompactMode = function() { return false; }
+
+WebInspector.SourceJavaScriptTokenizer = {}
+WebInspector.SourceJavaScriptTokenizer.Keywords = {}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
