Changeset 144949 in webkit
- Timestamp:
- Mar 6, 2013 10:55:52 AM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 34 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r144948 r144949 1 2013-03-06 Dmitry Zvorygin <zvorygin@chromium.org> 2 3 Introduce new message sources for logging. 4 https://bugs.webkit.org/show_bug.cgi?id=110968 5 6 Reviewed by Pavel Feldman. 7 8 Added SecurityMessageSource, RenderingMessageSource, StorageMessageSource, AppCacheMessageSource, CSSMessageSource. 9 Changed some logging lines to contain more descriptive message source. 10 11 * Modules/webdatabase/DatabaseBase.cpp: 12 (WebCore::DatabaseBase::logErrorMessage): 13 * Modules/webdatabase/DatabaseManager.cpp: 14 (WebCore::DatabaseManager::logErrorMessage): 15 * Modules/websockets/WebSocketChannel.cpp: 16 (WebCore::WebSocketChannel::fail): 17 * bindings/ScriptControllerBase.cpp: 18 (WebCore::ScriptController::canExecuteScripts): 19 * css/MediaList.cpp: 20 (WebCore::addResolutionWarningMessageToConsole): 21 * dom/Document.cpp: 22 (WebCore::Document::processHttpEquiv): 23 * dom/ScriptElement.cpp: 24 (WebCore::ScriptElement::executeScript): 25 (WebCore::ScriptElement::notifyFinished): 26 * dom/ViewportArguments.cpp: 27 (WebCore::reportViewportWarning): 28 * html/HTMLFormControlElement.cpp: 29 (WebCore::shouldAutofocus): 30 * html/HTMLFormElement.cpp: 31 (WebCore::HTMLFormElement::validateInteractively): 32 * html/HTMLIFrameElement.cpp: 33 (WebCore::HTMLIFrameElement::parseAttribute): 34 * html/canvas/CanvasRenderingContext2D.cpp: 35 (WebCore::CanvasRenderingContext2D::getImageData): 36 * html/canvas/WebGLRenderingContext.cpp: 37 (WebCore): 38 (WebCore::WebGLRenderingContext::printWarningToConsole): 39 * html/parser/XSSAuditor.cpp: 40 (WebCore::XSSAuditor::init): 41 * html/parser/XSSAuditorDelegate.cpp: 42 (WebCore::XSSAuditorDelegate::didBlockScript): 43 * inspector/ConsoleMessage.cpp: 44 (WebCore::messageSourceValue): 45 * inspector/Inspector.json: 46 * loader/FrameLoader.cpp: 47 (WebCore::FrameLoader::submitForm): 48 (WebCore::FrameLoader::reportLocalLoadFailed): 49 (WebCore::createWindow): 50 * loader/ImageLoader.cpp: 51 (WebCore::ImageLoader::notifyFinished): 52 * loader/MainResourceLoader.cpp: 53 (WebCore::MainResourceLoader::responseReceived): 54 * loader/MixedContentChecker.cpp: 55 (WebCore::MixedContentChecker::logWarning): 56 * loader/TextTrackLoader.cpp: 57 (WebCore::TextTrackLoader::corsPolicyPreventedLoad): 58 * loader/appcache/ApplicationCacheGroup.cpp: 59 (WebCore::ApplicationCacheGroup::abort): 60 * loader/cache/CachedResourceLoader.cpp: 61 (WebCore::CachedResourceLoader::printAccessDeniedMessage): 62 * page/Console.cpp: 63 (WebCore::printMessageSourceAndLevelPrefix): 64 * page/ConsoleTypes.h: 65 * page/ContentSecurityPolicy.cpp: 66 (WebCore::ContentSecurityPolicy::logToConsole): 67 * page/DOMWindow.cpp: 68 (WebCore::DOMWindow::dispatchMessageEventWithOriginCheck): 69 * page/PointerLockController.cpp: 70 (WebCore::PointerLockController::requestPointerLock): 71 * svg/SVGDocumentExtensions.cpp: 72 (WebCore::reportMessage): 73 1 74 2013-03-06 Florin Malita <fmalita@chromium.org> 2 75 -
trunk/Source/WebCore/Modules/webdatabase/DatabaseBase.cpp
r141928 r144949 47 47 void DatabaseBase::logErrorMessage(const String& message) 48 48 { 49 m_scriptExecutionContext->addConsoleMessage( OtherMessageSource, ErrorMessageLevel, message);49 m_scriptExecutionContext->addConsoleMessage(StorageMessageSource, ErrorMessageLevel, message); 50 50 } 51 51 -
trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp
r144006 r144949 431 431 void DatabaseManager::logErrorMessage(ScriptExecutionContext* context, const String& message) 432 432 { 433 context->addConsoleMessage( OtherMessageSource, ErrorMessageLevel, message);433 context->addConsoleMessage(StorageMessageSource, ErrorMessageLevel, message); 434 434 } 435 435 -
trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp
r144607 r144949 196 196 if (m_document) { 197 197 InspectorInstrumentation::didReceiveWebSocketFrameError(m_document, m_identifier, reason); 198 m_document->addConsoleMessage( JSMessageSource, ErrorMessageLevel, "WebSocket connection to '" + m_handshake->url().elidedString() + "' failed: " + reason);198 m_document->addConsoleMessage(NetworkMessageSource, ErrorMessageLevel, "WebSocket connection to '" + m_handshake->url().elidedString() + "' failed: " + reason); 199 199 } 200 200 -
trunk/Source/WebCore/bindings/ScriptControllerBase.cpp
r144607 r144949 43 43 // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists. 44 44 if (reason == AboutToExecuteScript) 45 m_frame->document()->addConsoleMessage( HTMLMessageSource, ErrorMessageLevel, "Blocked script execution in '" + m_frame->document()->url().elidedString() + "' because the document's frame is sandboxed and the 'allow-scripts' permission is not set.");45 m_frame->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Blocked script execution in '" + m_frame->document()->url().elidedString() + "' because the document's frame is sandboxed and the 'allow-scripts' permission is not set."); 46 46 return false; 47 47 } -
trunk/Source/WebCore/css/MediaList.cpp
r144064 r144949 327 327 message.append(serializedExpression); 328 328 329 document->addConsoleMessage( HTMLMessageSource, DebugMessageLevel, message);329 document->addConsoleMessage(CSSMessageSource, DebugMessageLevel, message); 330 330 } 331 331 -
trunk/Source/WebCore/dom/Document.cpp
r144741 r144949 2875 2875 frameLoader->stopAllLoaders(); 2876 2876 frame->navigationScheduler()->scheduleLocationChange(securityOrigin(), blankURL(), String()); 2877 addConsoleMessage( JSMessageSource, ErrorMessageLevel, message, requestIdentifier);2877 addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, message, requestIdentifier); 2878 2878 } 2879 2879 } -
trunk/Source/WebCore/dom/ScriptElement.cpp
r144607 r144949 297 297 #if ENABLE(NOSNIFF) 298 298 if (m_isExternalScript && m_cachedScript && !m_cachedScript->mimeTypeAllowedByNosniff()) { 299 m_element->document()->addConsoleMessage( JSMessageSource, ErrorMessageLevel, "Refused to execute script from '" + m_cachedScript->url().elidedString() + "' because its MIME type ('" + m_cachedScript->mimeType() + "') is not executable, and strict MIME type checking is enabled.");299 m_element->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Refused to execute script from '" + m_cachedScript->url().elidedString() + "' because its MIME type ('" + m_cachedScript->mimeType() + "') is not executable, and strict MIME type checking is enabled."); 300 300 return; 301 301 } -
trunk/Source/WebCore/dom/ViewportArguments.cpp
r139275 r144949 450 450 451 451 // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists. 452 document->addConsoleMessage( HTMLMessageSource, viewportErrorMessageLevel(errorCode), message);452 document->addConsoleMessage(RenderingMessageSource, viewportErrorMessageLevel(errorCode), message); 453 453 } 454 454 -
trunk/Source/WebCore/html/HTMLFormControlElement.cpp
r143089 r144949 181 181 if (element->document()->isSandboxed(SandboxAutomaticFeatures)) { 182 182 // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists. 183 element->document()->addConsoleMessage( HTMLMessageSource, ErrorMessageLevel, "Blocked autofocusing on a form control because the form's frame is sandboxed and the 'allow-scripts' permission is not set.");183 element->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Blocked autofocusing on a form control because the form's frame is sandboxed and the 'allow-scripts' permission is not set."); 184 184 return false; 185 185 } -
trunk/Source/WebCore/html/HTMLFormElement.cpp
r141816 r144949 262 262 String message("An invalid form control with name='%name' is not focusable."); 263 263 message.replace("%name", unhandledAssociatedElement->name()); 264 document()->addConsoleMessage( HTMLMessageSource, ErrorMessageLevel, message);264 document()->addConsoleMessage(RenderingMessageSource, ErrorMessageLevel, message); 265 265 } 266 266 } -
trunk/Source/WebCore/html/HTMLIFrameElement.cpp
r143843 r144949 91 91 setSandboxFlags(value.isNull() ? SandboxNone : SecurityContext::parseSandboxPolicy(value, invalidTokens)); 92 92 if (!invalidTokens.isNull()) 93 document()->addConsoleMessage( HTMLMessageSource, ErrorMessageLevel, "Error while parsing the 'sandbox' attribute: " + invalidTokens);93 document()->addConsoleMessage(OtherMessageSource, ErrorMessageLevel, "Error while parsing the 'sandbox' attribute: " + invalidTokens); 94 94 } else if (name == seamlessAttr) { 95 95 // If we're adding or removing the seamless attribute, we need to force the content document to recalculate its StyleResolver. -
trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
r143885 r144949 1868 1868 if (!canvas()->originClean()) { 1869 1869 DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Unable to get image data from canvas because the canvas has been tainted by cross-origin data."))); 1870 canvas()->document()->addConsoleMessage( JSMessageSource, ErrorMessageLevel, consoleMessage);1870 canvas()->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, consoleMessage); 1871 1871 ec = SECURITY_ERR; 1872 1872 return 0; -
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
r144728 r144949 5484 5484 if (!document) 5485 5485 return; 5486 document->addConsoleMessage( HTMLMessageSource, WarningMessageLevel, message);5486 document->addConsoleMessage(RenderingMessageSource, WarningMessageLevel, message); 5487 5487 } 5488 5488 -
trunk/Source/WebCore/html/parser/XSSAuditor.cpp
r144683 r144949 290 290 } 291 291 if (xssProtectionHeader == ContentSecurityPolicy::ReflectedXSSInvalid) 292 document->addConsoleMessage( JSMessageSource, ErrorMessageLevel, "Error parsing header X-XSS-Protection: " + headerValue + ": " + errorDetails + " at character position " + String::format("%u", errorPosition) + ". The default protections will be applied.");292 document->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Error parsing header X-XSS-Protection: " + headerValue + ": " + errorDetails + " at character position " + String::format("%u", errorPosition) + ". The default protections will be applied."); 293 293 294 294 m_xssProtection = combineXSSProtectionHeaderAndCSP(xssProtectionHeader, document->contentSecurityPolicy()->reflectedXSSDisposition()); -
trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp
r144568 r144949 62 62 // FIXME: Consider using a more helpful console message. 63 63 DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Refused to execute a JavaScript script. Source code of script found within request.\n"))); 64 m_document->addConsoleMessage( JSMessageSource, ErrorMessageLevel, consoleMessage);64 m_document->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, consoleMessage); 65 65 66 66 if (xssInfo.m_didBlockEntirePage) … … 85 85 86 86 if (xssInfo.m_didBlockEntirePage) { 87 m_document->addConsoleMessage( JSMessageSource, ErrorMessageLevel, String("Entire page will be blocked."));87 m_document->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, String("Entire page will be blocked.")); 88 88 m_document->frame()->navigationScheduler()->scheduleLocationChange(m_document->securityOrigin(), String("data:text/html,<p></p>"), blankURL()); 89 89 } -
trunk/Source/WebCore/inspector/ConsoleMessage.cpp
r144064 r144949 138 138 { 139 139 switch (source) { 140 case HTMLMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Html;141 140 case XMLMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Xml; 142 141 case JSMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Javascript; 143 142 case NetworkMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Network; 144 143 case ConsoleAPIMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Console_api; 144 case StorageMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Storage; 145 case AppCacheMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Appcache; 146 case RenderingMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Rendering; 147 case CSSMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Css; 148 case SecurityMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Security; 145 149 case OtherMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Other; 146 150 } -
trunk/Source/WebCore/inspector/Inspector.json
r144824 r144949 769 769 "description": "Console message.", 770 770 "properties": [ 771 { "name": "source", "type": "string", "enum": [" html", "wml", "xml", "javascript", "network", "console-api", "other"], "description": "Message source." },772 { "name": "level", "type": "string", "enum": [" tip", "log", "warning", "error", "debug"], "description": "Message severity." },771 { "name": "source", "type": "string", "enum": ["xml", "javascript", "network", "console-api", "storage", "appcache", "rendering", "css", "security", "other"], "description": "Message source." }, 772 { "name": "level", "type": "string", "enum": ["log", "warning", "error", "debug"], "description": "Message severity." }, 773 773 { "name": "text", "type": "string", "description": "Message text." }, 774 774 { "name": "type", "type": "string", "optional": true, "enum": ["log", "dir", "dirxml", "table", "trace", "clear", "startGroup", "startGroupCollapsed", "endGroup", "assert", "timing", "profile", "profileEnd"], "description": "Console message type." }, -
trunk/Source/WebCore/loader/FrameLoader.cpp
r144805 r144949 341 341 if (isDocumentSandboxed(m_frame, SandboxForms)) { 342 342 // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists. 343 m_frame->document()->addConsoleMessage( HTMLMessageSource, ErrorMessageLevel, "Blocked form submission to '" + submission->action().elidedString() + "' because the form's frame is sandboxed and the 'allow-forms' permission is not set.");343 m_frame->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Blocked form submission to '" + submission->action().elidedString() + "' because the form's frame is sandboxed and the 'allow-forms' permission is not set."); 344 344 return; 345 345 } … … 1415 1415 return; 1416 1416 1417 frame->document()->addConsoleMessage( JSMessageSource, ErrorMessageLevel, "Not allowed to load local resource: " + url);1417 frame->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Not allowed to load local resource: " + url); 1418 1418 } 1419 1419 … … 3368 3368 if (isDocumentSandboxed(openerFrame, SandboxPopups)) { 3369 3369 // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists. 3370 openerFrame->document()->addConsoleMessage( HTMLMessageSource, ErrorMessageLevel, "Blocked opening '" + request.resourceRequest().url().elidedString() + "' in a new window because the request was made in a sandboxed frame whose 'allow-popups' permission is not set.");3370 openerFrame->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Blocked opening '" + request.resourceRequest().url().elidedString() + "' in a new window because the request was made in a sandboxed frame whose 'allow-popups' permission is not set."); 3371 3371 return 0; 3372 3372 } -
trunk/Source/WebCore/loader/ImageLoader.cpp
r144825 r144949 296 296 297 297 DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Cross-origin image load denied by Cross-Origin Resource Sharing policy."))); 298 m_element->document()->addConsoleMessage( JSMessageSource, ErrorMessageLevel, consoleMessage);298 m_element->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, consoleMessage); 299 299 300 300 ASSERT(!m_hasPendingLoadEvent); -
trunk/Source/WebCore/loader/MainResourceLoader.cpp
r144607 r144949 412 412 InspectorInstrumentation::continueAfterXFrameOptionsDenied(m_documentLoader->frame(), documentLoader(), identifier(), r); 413 413 String message = "Refused to display '" + r.url().elidedString() + "' in a frame because it set 'X-Frame-Options' to '" + content + "'."; 414 m_documentLoader->frame()->document()->addConsoleMessage( JSMessageSource, ErrorMessageLevel, message, identifier());414 m_documentLoader->frame()->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, message, identifier()); 415 415 416 416 cancel(); -
trunk/Source/WebCore/loader/MixedContentChecker.cpp
r144607 r144949 97 97 { 98 98 String message = makeString((allowed ? "" : "[blocked] "), "The page at ", m_frame->document()->url().elidedString(), " ", action, " insecure content from ", target.elidedString(), ".\n"); 99 m_frame->document()->addConsoleMessage( HTMLMessageSource, WarningMessageLevel, message);99 m_frame->document()->addConsoleMessage(SecurityMessageSource, WarningMessageLevel, message); 100 100 } 101 101 -
trunk/Source/WebCore/loader/TextTrackLoader.cpp
r144565 r144949 119 119 DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Cross-origin text track load denied by Cross-Origin Resource Sharing policy."))); 120 120 Document* document = static_cast<Document*>(m_scriptExecutionContext); 121 document->addConsoleMessage( JSMessageSource, ErrorMessageLevel, consoleMessage);121 document->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, consoleMessage); 122 122 m_state = Failed; 123 123 } -
trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp
r144607 r144949 476 476 return; 477 477 478 frame->document()->addConsoleMessage( OtherMessageSource, DebugMessageLevel, "Application Cache download process was aborted.");478 frame->document()->addConsoleMessage(NetworkMessageSource, DebugMessageLevel, "Application Cache download process was aborted."); 479 479 cacheUpdateFailed(); 480 480 } -
trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp
r144607 r144949 663 663 message = "Unsafe attempt to load URL " + url.elidedString() + " from frame with URL " + m_document->url().elidedString() + ". Domains, protocols and ports must match.\n"; 664 664 665 frame()->document()->addConsoleMessage( OtherMessageSource, ErrorMessageLevel, message);665 frame()->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, message); 666 666 } 667 667 -
trunk/Source/WebCore/page/Console.cpp
r144064 r144949 89 89 const char* sourceString; 90 90 switch (source) { 91 case HTMLMessageSource:92 sourceString = "HTML";93 break;94 91 case XMLMessageSource: 95 92 sourceString = "XML"; … … 103 100 case ConsoleAPIMessageSource: 104 101 sourceString = "CONSOLEAPI"; 102 break; 103 case StorageMessageSource: 104 sourceString = "STORAGE"; 105 break; 106 case AppCacheMessageSource: 107 sourceString = "APPCACHE"; 108 break; 109 case RenderingMessageSource: 110 sourceString = "RENDERING"; 111 break; 112 case CSSMessageSource: 113 sourceString = "CSS"; 114 break; 115 case SecurityMessageSource: 116 sourceString = "SECURITY"; 105 117 break; 106 118 case OtherMessageSource: -
trunk/Source/WebCore/page/ConsoleTypes.h
r144064 r144949 30 30 31 31 enum MessageSource { 32 HTMLMessageSource,33 32 XMLMessageSource, 34 33 JSMessageSource, 35 34 NetworkMessageSource, 36 35 ConsoleAPIMessageSource, 36 StorageMessageSource, 37 AppCacheMessageSource, 38 RenderingMessageSource, 39 CSSMessageSource, 40 SecurityMessageSource, 37 41 OtherMessageSource, 38 42 }; -
trunk/Source/WebCore/page/ContentSecurityPolicy.cpp
r144607 r144949 1816 1816 void ContentSecurityPolicy::logToConsole(const String& message, const String& contextURL, const WTF::OrdinalNumber& contextLine, ScriptState* state) const 1817 1817 { 1818 m_scriptExecutionContext->addConsoleMessage( JSMessageSource, ErrorMessageLevel, message, contextURL, contextLine.oneBasedInt(), state);1818 m_scriptExecutionContext->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, message, contextURL, contextLine.oneBasedInt(), state); 1819 1819 } 1820 1820 -
trunk/Source/WebCore/page/DOMWindow.cpp
r144360 r144949 885 885 String message = "Unable to post message to " + intendedTargetOrigin->toString() + 886 886 ". Recipient has origin " + document()->securityOrigin()->toString() + ".\n"; 887 console()->addMessage( JSMessageSource, ErrorMessageLevel, message, stackTrace);887 console()->addMessage(SecurityMessageSource, ErrorMessageLevel, message, stackTrace); 888 888 return; 889 889 } -
trunk/Source/WebCore/page/PointerLockController.cpp
r144568 r144949 57 57 if (target->document()->isSandboxed(SandboxPointerLock)) { 58 58 // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists. 59 target->document()->addConsoleMessage( JSMessageSource, ErrorMessageLevel, "Blocked pointer lock on an element because the element's frame is sandboxed and the 'allow-pointer-lock' permission is not set.");59 target->document()->addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, "Blocked pointer lock on an element because the element's frame is sandboxed and the 'allow-pointer-lock' permission is not set."); 60 60 enqueueEvent(eventNames().webkitpointerlockerrorEvent, target); 61 61 return; -
trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp
r138823 r144949 136 136 { 137 137 if (document->frame()) 138 document->addConsoleMessage( JSMessageSource, level, message);138 document->addConsoleMessage(RenderingMessageSource, level, message); 139 139 } 140 140 -
trunk/Source/WebKit/mac/ChangeLog
r144911 r144949 1 2013-03-06 Dmitry Zvorygin <zvorygin@chromium.org> 2 3 Introduce new message sources for logging. 4 https://bugs.webkit.org/show_bug.cgi?id=110968 5 6 Reviewed by Pavel Feldman. 7 8 * WebCoreSupport/WebChromeClient.mm: 9 * WebView/WebUIDelegatePrivate.h: 10 1 11 2013-03-05 Kent Tamura <tkent@chromium.org> 2 12 -
trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
r144795 r144949 91 91 #endif 92 92 93 NSString *WebConsoleMessageHTMLMessageSource = @"HTMLMessageSource";94 93 NSString *WebConsoleMessageXMLMessageSource = @"XMLMessageSource"; 95 94 NSString *WebConsoleMessageJSMessageSource = @"JSMessageSource"; 96 95 NSString *WebConsoleMessageNetworkMessageSource = @"NetworkMessageSource"; 97 96 NSString *WebConsoleMessageConsoleAPIMessageSource = @"ConsoleAPIMessageSource"; 97 NSString *WebConsoleMessageStorageMessageSource = @"StorageMessageSource"; 98 NSString *WebConsoleMessageAppCacheMessageSource = @"AppCacheMessageSource"; 99 NSString *WebConsoleMessageRenderingMessageSource = @"RenderingMessageSource"; 100 NSString *WebConsoleMessageCSSMessageSource = @"CSSMessageSource"; 101 NSString *WebConsoleMessageSecurityMessageSource = @"SecurityMessageSource"; 98 102 NSString *WebConsoleMessageOtherMessageSource = @"OtherMessageSource"; 99 103 … … 330 334 { 331 335 switch (source) { 332 case HTMLMessageSource:333 return WebConsoleMessageHTMLMessageSource;334 336 case XMLMessageSource: 335 337 return WebConsoleMessageXMLMessageSource; … … 340 342 case ConsoleAPIMessageSource: 341 343 return WebConsoleMessageConsoleAPIMessageSource; 344 case StorageMessageSource: 345 return WebConsoleMessageStorageMessageSource; 346 case AppCacheMessageSource: 347 return WebConsoleMessageAppCacheMessageSource; 348 case RenderingMessageSource: 349 return WebConsoleMessageRenderingMessageSource; 350 case CSSMessageSource: 351 return WebConsoleMessageCSSMessageSource; 352 case SecurityMessageSource: 353 return WebConsoleMessageSecurityMessageSource; 342 354 case OtherMessageSource: 343 355 return WebConsoleMessageOtherMessageSource; -
trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h
r144064 r144949 105 105 106 106 // Message Sources. 107 extern NSString *WebConsoleMessageHTMLMessageSource;108 107 extern NSString *WebConsoleMessageXMLMessageSource; 109 108 extern NSString *WebConsoleMessageJSMessageSource; 110 109 extern NSString *WebConsoleMessageNetworkMessageSource; 111 110 extern NSString *WebConsoleMessageConsoleAPIMessageSource; 111 extern NSString *WebConsoleMessageStorageMessageSource; 112 extern NSString *WebConsoleMessageAppCacheMessageSource; 113 extern NSString *WebConsoleMessageRenderingMessageSource; 114 extern NSString *WebConsoleMessageCSSMessageSource; 115 extern NSString *WebConsoleMessageSecurityMessageSource; 112 116 extern NSString *WebConsoleMessageOtherMessageSource; 113 117 … … 144 148 @param webView The WebView sending the delegate method. 145 149 @param message A dictionary representation of the console message. 146 @param source Where the message came from. See WebConsoleMessage HTMLMessageSource and other source types.150 @param source Where the message came from. See WebConsoleMessageXMLMessageSource and other source types. 147 151 @discussion The dictionary contains the following keys: 148 152 … … 156 160 <dt>MessageSource</dt> 157 161 <dd> 158 Where the message came from. HTML,XML, JavaScript, CSS, etc.159 See WebConsoleMessage HTMLMessageSource and similar constants.162 Where the message came from. XML, JavaScript, CSS, etc. 163 See WebConsoleMessageXMLMessageSource and similar constants. 160 164 </dd> 161 165 <dt>MessageLevel</dt>
Note: See TracChangeset
for help on using the changeset viewer.