Log Message
2011-06-10 Sheriff Bot <[email protected]> Unreviewed, rolling out r88530. http://trac.webkit.org/changeset/88530 https://bugs.webkit.org/show_bug.cgi?id=62440
qt build was broken (Requested by loislo on #webkit).
* inspector/report-protocol-errors-expected.txt:
* inspector/report-protocol-errors.html:
2011-06-10 Sheriff Bot <[email protected]>
Unreviewed, rolling out r88530.
http://trac.webkit.org/changeset/88530
https://bugs.webkit.org/show_bug.cgi?id=62440
qt build was broken (Requested by loislo on #webkit).
* inspector/InspectorValues.cpp:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (88530 => 88531)
--- trunk/LayoutTests/ChangeLog 2011-06-10 08:33:11 UTC (rev 88530)
+++ trunk/LayoutTests/ChangeLog 2011-06-10 08:41:55 UTC (rev 88531)
@@ -1,3 +1,14 @@
+2011-06-10 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r88530.
+ http://trac.webkit.org/changeset/88530
+ https://bugs.webkit.org/show_bug.cgi?id=62440
+
+ qt build was broken (Requested by loislo on #webkit).
+
+ * inspector/report-protocol-errors-expected.txt:
+ * inspector/report-protocol-errors.html:
+
2011-06-09 Ilya Tikhonovsky <[email protected]>
Reviewed by Yury Semikhatsky.
Modified: trunk/LayoutTests/inspector/report-protocol-errors-expected.txt (88530 => 88531)
--- trunk/LayoutTests/inspector/report-protocol-errors-expected.txt 2011-06-10 08:33:11 UTC (rev 88530)
+++ trunk/LayoutTests/inspector/report-protocol-errors-expected.txt 2011-06-10 08:41:55 UTC (rev 88531)
@@ -101,94 +101,4 @@
}
id : 7
}
-{
- error : {
- code : -32601
- message : "Method not found."
- data : [
- "Invalid method name was received. 'Page.test' wasn't found."
- ]
- }
- id : 8
-}
-{
- error : {
- code : -32601
- message : "Method not found."
- data : [
- "Invalid method name was received. 'Page.test' wasn't found."
- ]
- }
- id : 9
-}
-{
- error : {
- code : -32601
- message : "Method not found."
- data : [
- "Invalid method name was received. 'Page.test' wasn't found."
- ]
- }
- id : 10
-}
-{
- error : {
- code : -32601
- message : "Method not found."
- data : [
- "Invalid method name was received. 'Page.test' wasn't found."
- ]
- }
- id : 11
-}
-{
- error : {
- code : -32601
- message : "Method not found."
- data : [
- "Invalid method name was received. 'Page.test' wasn't found."
- ]
- }
- id : 12
-}
-{
- error : {
- code : -32601
- message : "Method not found."
- data : [
- "Invalid method name was received. 'Page.test' wasn't found."
- ]
- }
- id : 13
-}
-{
- error : {
- code : -32601
- message : "Method not found."
- data : [
- "Invalid method name was received. 'Page.test' wasn't found."
- ]
- }
- id : 14
-}
-{
- error : {
- code : -32601
- message : "Method not found."
- data : [
- "Invalid method name was received. 'Page.test' wasn't found."
- ]
- }
- id : 15
-}
-{
- error : {
- code : -32601
- message : "Method not found."
- data : [
- "Invalid method name was received. 'Page.test' wasn't found."
- ]
- }
- id : 16
-}
Modified: trunk/LayoutTests/inspector/report-protocol-errors.html (88530 => 88531)
--- trunk/LayoutTests/inspector/report-protocol-errors.html 2011-06-10 08:33:11 UTC (rev 88530)
+++ trunk/LayoutTests/inspector/report-protocol-errors.html 2011-06-10 08:41:55 UTC (rev 88531)
@@ -16,15 +16,6 @@
'{"id":5,"method":"Page.getResourceContent","params":[]}',
'{"id":6,"method":"Page.getResourceContent","params":{}}',
'{"id":7,"method":"Page.getResourceContent","params":{"frameId":"not a number"}}',
- '{"id":8,"method":"Page.test"}',
- '{"id":9,"method":"Page.test" }',
- '{"id":10,"method": "Page.test" }',
- '{"id":11,"method" : "Page.test" }',
- '{"id":12, "method" : "Page.test" }',
- '{"id": 13, "method" : "Page.test" }',
- '{"id" : 14, "method" : "Page.test" }',
- '{ "id" : 15, "method" : "Page.test" }',
- '{ "id"\n :\r 16,\t "method"\f :\v "Page.test" }',
];
var numberOfReports = 0;
Modified: trunk/Source/WebCore/ChangeLog (88530 => 88531)
--- trunk/Source/WebCore/ChangeLog 2011-06-10 08:33:11 UTC (rev 88530)
+++ trunk/Source/WebCore/ChangeLog 2011-06-10 08:41:55 UTC (rev 88531)
@@ -1,3 +1,13 @@
+2011-06-10 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r88530.
+ http://trac.webkit.org/changeset/88530
+ https://bugs.webkit.org/show_bug.cgi?id=62440
+
+ qt build was broken (Requested by loislo on #webkit).
+
+ * inspector/InspectorValues.cpp:
+
2011-06-09 Ilya Tikhonovsky <[email protected]>
Reviewed by Yury Semikhatsky.
Modified: trunk/Source/WebCore/inspector/InspectorValues.cpp (88530 => 88531)
--- trunk/Source/WebCore/inspector/InspectorValues.cpp 2011-06-10 08:33:11 UTC (rev 88530)
+++ trunk/Source/WebCore/inspector/InspectorValues.cpp 2011-06-10 08:41:55 UTC (rev 88531)
@@ -186,16 +186,11 @@
return false;
}
-Token parseToken(const UChar* start, const UChar* end, const UChar** tokenStart, const UChar** tokenEnd)
+Token parseToken(const UChar* start, const UChar* end, const UChar** tokenEnd)
{
- while (start < end && u_isspace(*start))
- ++start;
-
if (start == end)
return INVALID_TOKEN;
- *tokenStart = start;
-
switch (*start) {
case 'n':
if (parseConstToken(start, end, tokenEnd, nullString))
@@ -335,9 +330,8 @@
return 0;
RefPtr<InspectorValue> result;
- const UChar* tokenStart;
const UChar* tokenEnd;
- Token token = parseToken(start, end, &tokenStart, &tokenEnd);
+ Token token = parseToken(start, end, &tokenEnd);
switch (token) {
case INVALID_TOKEN:
return 0;
@@ -352,7 +346,7 @@
break;
case NUMBER: {
bool ok;
- double value = charactersToDouble(tokenStart, tokenEnd - tokenStart, &ok);
+ double value = charactersToDouble(start, tokenEnd - start, &ok);
if (!ok)
return 0;
result = InspectorBasicValue::create(value);
@@ -360,7 +354,7 @@
}
case STRING: {
String value;
- bool ok = decodeString(tokenStart + 1, tokenEnd - 1, &value);
+ bool ok = decodeString(start + 1, tokenEnd - 1, &value);
if (!ok)
return 0;
result = InspectorString::create(value);
@@ -369,7 +363,7 @@
case ARRAY_BEGIN: {
RefPtr<InspectorArray> array = InspectorArray::create();
start = tokenEnd;
- token = parseToken(start, end, &tokenStart, &tokenEnd);
+ token = parseToken(start, end, &tokenEnd);
while (token != ARRAY_END) {
RefPtr<InspectorValue> arrayNode = buildValue(start, end, &tokenEnd, depth + 1);
if (!arrayNode)
@@ -378,10 +372,10 @@
// After a list value, we expect a comma or the end of the list.
start = tokenEnd;
- token = parseToken(start, end, &tokenStart, &tokenEnd);
+ token = parseToken(start, end, &tokenEnd);
if (token == LIST_SEPARATOR) {
start = tokenEnd;
- token = parseToken(start, end, &tokenStart, &tokenEnd);
+ token = parseToken(start, end, &tokenEnd);
if (token == ARRAY_END)
return 0;
} else if (token != ARRAY_END) {
@@ -397,16 +391,16 @@
case OBJECT_BEGIN: {
RefPtr<InspectorObject> object = InspectorObject::create();
start = tokenEnd;
- token = parseToken(start, end, &tokenStart, &tokenEnd);
+ token = parseToken(start, end, &tokenEnd);
while (token != OBJECT_END) {
if (token != STRING)
return 0;
String key;
- if (!decodeString(tokenStart + 1, tokenEnd - 1, &key))
+ if (!decodeString(start + 1, tokenEnd - 1, &key))
return 0;
start = tokenEnd;
- token = parseToken(start, end, &tokenStart, &tokenEnd);
+ token = parseToken(start, end, &tokenEnd);
if (token != OBJECT_PAIR_SEPARATOR)
return 0;
start = tokenEnd;
@@ -419,10 +413,10 @@
// After a key/value pair, we expect a comma or the end of the
// object.
- token = parseToken(start, end, &tokenStart, &tokenEnd);
+ token = parseToken(start, end, &tokenEnd);
if (token == LIST_SEPARATOR) {
start = tokenEnd;
- token = parseToken(start, end, &tokenStart, &tokenEnd);
+ token = parseToken(start, end, &tokenEnd);
if (token == OBJECT_END)
return 0;
} else if (token != OBJECT_END) {
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
