- Revision
- 160953
- Author
- [email protected]
- Date
- 2013-12-20 18:15:19 -0800 (Fri, 20 Dec 2013)
Log Message
Unreviewed, rolling out r160941.
http://trac.webkit.org/changeset/160941
https://bugs.webkit.org/show_bug.cgi?id=126095
Doesn't handle subpixel layout being disabled (Requested by
smfr on #webkit).
* gdb/webkit.py:
(JSCJSStringPrinter.to_string):
(add_pretty_printers):
* lldb/lldb_webkit.py:
(WTFMediaTime_SummaryProvider):
(WTFStringProvider.to_string):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (160952 => 160953)
--- trunk/Tools/ChangeLog 2013-12-21 02:11:49 UTC (rev 160952)
+++ trunk/Tools/ChangeLog 2013-12-21 02:15:19 UTC (rev 160953)
@@ -1,3 +1,19 @@
+2013-12-20 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r160941.
+ http://trac.webkit.org/changeset/160941
+ https://bugs.webkit.org/show_bug.cgi?id=126095
+
+ Doesn't handle subpixel layout being disabled (Requested by
+ smfr on #webkit).
+
+ * gdb/webkit.py:
+ (JSCJSStringPrinter.to_string):
+ (add_pretty_printers):
+ * lldb/lldb_webkit.py:
+ (WTFMediaTime_SummaryProvider):
+ (WTFStringProvider.to_string):
+
2013-12-20 Bem Jones-Bey <[email protected]>
Pretty print LayoutUnit, LayoutPoint, and LayoutSize in gdb and lldb
Modified: trunk/Tools/gdb/webkit.py (160952 => 160953)
--- trunk/Tools/gdb/webkit.py 2013-12-21 02:11:49 UTC (rev 160952)
+++ trunk/Tools/gdb/webkit.py 2013-12-21 02:15:19 UTC (rev 160953)
@@ -166,33 +166,6 @@
return WTFStringPrinter(self.val['m_value']).to_string()
-class WebCoreLayoutUnitPrinter:
- "Print a WebCore::LayoutUnit"
- def __init__(self, val):
- self.val = val
-
- def to_string(self):
- return "%gpx" % (self.val['m_value'] / 64.0)
-
-
-class WebCoreLayoutSizePrinter:
- "Print a WebCore::LayoutSize"
- def __init__(self, val):
- self.val = val
-
- def to_string(self):
- return 'LayoutSize(%s, %s)' % (WebCoreLayoutUnitPrinter(self.val['m_width']).to_string(), WebCoreLayoutUnitPrinter(self.val['m_height']).to_string())
-
-
-class WebCoreLayoutPointPrinter:
- "Print a WebCore::LayoutPoint"
- def __init__(self, val):
- self.val = val
-
- def to_string(self):
- return 'LayoutPoint(%s, %s)' % (WebCoreLayoutUnitPrinter(self.val['m_x']).to_string(), WebCoreLayoutUnitPrinter(self.val['m_y']).to_string())
-
-
class WebCoreQualifiedNamePrinter(StringPrinter):
"Print a WebCore::QualifiedName"
@@ -298,9 +271,6 @@
(re.compile("^WTF::CString$"), WTFCStringPrinter),
(re.compile("^WTF::String$"), WTFStringPrinter),
(re.compile("^WTF::StringImpl$"), WTFStringImplPrinter),
- (re.compile("^WebCore::LayoutUnit$"), WebCoreLayoutUnitPrinter),
- (re.compile("^WebCore::LayoutPoint$"), WebCoreLayoutPointPrinter),
- (re.compile("^WebCore::LayoutSize$"), WebCoreLayoutSizePrinter),
(re.compile("^WebCore::QualifiedName$"), WebCoreQualifiedNamePrinter),
(re.compile("^JSC::Identifier$"), JSCIdentifierPrinter),
(re.compile("^JSC::JSString$"), JSCJSStringPrinter),
Modified: trunk/Tools/lldb/lldb_webkit.py (160952 => 160953)
--- trunk/Tools/lldb/lldb_webkit.py 2013-12-21 02:11:49 UTC (rev 160952)
+++ trunk/Tools/lldb/lldb_webkit.py 2013-12-21 02:15:19 UTC (rev 160953)
@@ -41,9 +41,6 @@
debugger.HandleCommand('type summary add --expand -F lldb_webkit.WTFMediaTime_SummaryProvider WTF::MediaTime')
debugger.HandleCommand('type synthetic add -x "WTF::Vector<.+>$" --python-class lldb_webkit.WTFVectorProvider')
debugger.HandleCommand('type synthetic add -x "WTF::HashTable<.+>$" --python-class lldb_webkit.WTFHashTableProvider')
- debugger.HandleCommand('type summary add -F lldb_webkit.WebCoreLayoutUnit_SummaryProvider WebCore::LayoutUnit')
- debugger.HandleCommand('type summary add -F lldb_webkit.WebCoreLayoutSize_SummaryProvider WebCore::LayoutSize')
- debugger.HandleCommand('type summary add -F lldb_webkit.WebCoreLayoutPoint_SummaryProvider WebCore::LayoutPoint')
def WTFString_SummaryProvider(valobj, dict):
provider = WTFStringProvider(valobj, dict)
@@ -82,20 +79,6 @@
return "{ %d/%d, %f }" % (provider.timeValue(), provider.timeScale(), float(provider.timeValue()) / provider.timeScale())
-def WebCoreLayoutUnit_SummaryProvider(valobj, dict):
- provider = WebCoreLayoutUnitProvider(valobj, dict)
- return "{ %s }" % provider.to_string()
-
-
-def WebCoreLayoutSize_SummaryProvider(valobj, dict):
- provider = WebCoreLayoutSizeProvider(valobj, dict)
- return "{ width = %s, height = %s }" % (provider.get_width(), provider.get_height())
-
-
-def WebCoreLayoutPoint_SummaryProvider(valobj, dict):
- provider = WebCoreLayoutPointProvider(valobj, dict)
- return "{ x = %s, y = %s }" % (provider.get_x(), provider.get_y())
-
# FIXME: Provide support for the following types:
# def WTFVector_SummaryProvider(valobj, dict):
# def WTFCString_SummaryProvider(valobj, dict):
@@ -201,39 +184,6 @@
return impl.to_string()
-class WebCoreLayoutUnitProvider:
- "Print a WebCore::LayoutUnit"
- def __init__(self, valobj, dict):
- self.valobj = valobj
-
- def to_string(self):
- return "%gpx" % (self.valobj.GetChildMemberWithName('m_value').GetValueAsUnsigned(0) / 64.0)
-
-
-class WebCoreLayoutSizeProvider:
- "Print a WebCore::LayoutSize"
- def __init__(self, valobj, dict):
- self.valobj = valobj
-
- def get_width(self):
- return WebCoreLayoutUnitProvider(self.valobj.GetChildMemberWithName('m_width'), dict).to_string()
-
- def get_height(self):
- return WebCoreLayoutUnitProvider(self.valobj.GetChildMemberWithName('m_height'), dict).to_string()
-
-
-class WebCoreLayoutPointProvider:
- "Print a WebCore::LayoutPoint"
- def __init__(self, valobj, dict):
- self.valobj = valobj
-
- def get_x(self):
- return WebCoreLayoutUnitProvider(self.valobj.GetChildMemberWithName('m_x'), dict).to_string()
-
- def get_y(self):
- return WebCoreLayoutUnitProvider(self.valobj.GetChildMemberWithName('m_y'), dict).to_string()
-
-
class WTFVectorProvider:
def __init__(self, valobj, internal_dict):
self.valobj = valobj
