Title: [125778] trunk
- Revision
- 125778
- Author
- [email protected]
- Date
- 2012-08-16 07:54:54 -0700 (Thu, 16 Aug 2012)
Log Message
Source/WebKit/blackberry: [BlackBerry] Suppress non DRT JS Console output.
https://bugs.webkit.org/show_bug.cgi?id=94058
Patch by Rob Buis <[email protected]> on 2012-08-16
Reviewed by Yong Li.
Reviewed internally by Ming Xie.
Some actual test results show JS Console showing up twice, for
instance traversal/moz-bug559526.html. Only print the DRT specific
Console message.
* WebCoreSupport/ChromeClientBlackBerry.cpp:
(WebCore::ChromeClientBlackBerry::addMessageToConsole):
Tools: [BlackBerry] Update format of JS console message to keep consistent with other ports.
https://bugs.webkit.org/show_bug.cgi?id=94058
Patch by Xiaobo Wang <[email protected]> on 2012-08-16
Reviewed by Yong Li.
Reviewed internally by George Staikos.
1. Remove line number if it's zero.
2. Print only file name for "file://" URL.
* DumpRenderTree/blackberry/DumpRenderTree.cpp:
(BlackBerry::WebKit::DumpRenderTree::addMessageToConsole):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (125777 => 125778)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-08-16 14:27:50 UTC (rev 125777)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-08-16 14:54:54 UTC (rev 125778)
@@ -1,3 +1,18 @@
+2012-08-16 Rob Buis <[email protected]>
+
+ [BlackBerry] Suppress non DRT JS Console output.
+ https://bugs.webkit.org/show_bug.cgi?id=94058
+
+ Reviewed by Yong Li.
+ Reviewed internally by Ming Xie.
+
+ Some actual test results show JS Console showing up twice, for
+ instance traversal/moz-bug559526.html. Only print the DRT specific
+ Console message.
+
+ * WebCoreSupport/ChromeClientBlackBerry.cpp:
+ (WebCore::ChromeClientBlackBerry::addMessageToConsole):
+
2012-08-16 Arvid Nilsson <[email protected]>
[BlackBerry] WebGL and Canvas fail to display after being restored from page cache
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp (125777 => 125778)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp 2012-08-16 14:27:50 UTC (rev 125777)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp 2012-08-16 14:54:54 UTC (rev 125778)
@@ -91,8 +91,10 @@
void ChromeClientBlackBerry::addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, unsigned int lineNumber, const String& sourceID)
{
#if !defined(PUBLIC_BUILD) || !PUBLIC_BUILD
- if (m_webPagePrivate->m_dumpRenderTree)
+ if (m_webPagePrivate->m_dumpRenderTree) {
m_webPagePrivate->m_dumpRenderTree->addMessageToConsole(message, lineNumber, sourceID);
+ return;
+ }
#endif
m_webPagePrivate->m_client->addMessageToConsole(message.characters(), message.length(), sourceID.characters(), sourceID.length(), lineNumber);
Modified: trunk/Tools/ChangeLog (125777 => 125778)
--- trunk/Tools/ChangeLog 2012-08-16 14:27:50 UTC (rev 125777)
+++ trunk/Tools/ChangeLog 2012-08-16 14:54:54 UTC (rev 125778)
@@ -1,3 +1,17 @@
+2012-08-16 Xiaobo Wang <[email protected]>
+
+ [BlackBerry] Update format of JS console message to keep consistent with other ports.
+ https://bugs.webkit.org/show_bug.cgi?id=94058
+
+ Reviewed by Yong Li.
+ Reviewed internally by George Staikos.
+
+ 1. Remove line number if it's zero.
+ 2. Print only file name for "file://" URL.
+
+ * DumpRenderTree/blackberry/DumpRenderTree.cpp:
+ (BlackBerry::WebKit::DumpRenderTree::addMessageToConsole):
+
2012-08-16 Simon Hausmann <[email protected]>
[Qt] Make DRT results more reliable on X11
Modified: trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp (125777 => 125778)
--- trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp 2012-08-16 14:27:50 UTC (rev 125777)
+++ trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp 2012-08-16 14:54:54 UTC (rev 125778)
@@ -643,7 +643,23 @@
// ChromeClient delegates.
void DumpRenderTree::addMessageToConsole(const String& message, unsigned int lineNumber, const String& sourceID)
{
- printf("CONSOLE MESSAGE: line %d: %s\n", lineNumber, message.utf8().data());
+ printf("CONSOLE MESSAGE: ");
+ if (lineNumber)
+ printf("line %d: ", lineNumber);
+ String newMessage = message;
+ int pos = message.find("file://");
+ if (pos >= 0) {
+ newMessage = message.substring(0, pos);
+ String remaining = message.substring(pos);
+ String fileName;
+ int indexFile = remaining.reverseFind('/') + 1;
+ if (indexFile > 0 && indexFile < remaining.length())
+ fileName = remaining.substring(indexFile);
+ else
+ fileName = "file:";
+ newMessage.append(fileName);
+ }
+ printf("%s\n", newMessage.utf8().data());
}
void DumpRenderTree::runJavaScriptAlert(const String& message)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
