Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (210041 => 210042)
--- trunk/Source/_javascript_Core/ChangeLog 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,3 +1,25 @@
+2016-12-20 Brent Fulgham <[email protected]>
+
+ Address some style problems found by static analysis
+ https://bugs.webkit.org/show_bug.cgi?id=165975
+
+ Reviewed by Alex Christensen.
+
+ Correct the const-correctness of functions that are implemented using stricter
+ const declarations.
+
+ * inspector/agents/InspectorDebuggerAgent.h:
+ * inspector/agents/InspectorHeapAgent.cpp:
+ * inspector/agents/InspectorHeapAgent.h:
+ * inspector/agents/InspectorRuntimeAgent.h:
+ * inspector/agents/InspectorScriptProfilerAgent.cpp:
+ * inspector/agents/InspectorScriptProfilerAgent.h:
+ * inspector/scripts/codegen/cpp_generator.py:
+ (cpp_type_for_unchecked_formal_in_parameter): Update to match const declarations of
+ implementation files.
+ * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
+ Rebaselined results for "const Ptr* const" syntax.
+
2016-12-20 JF Bastien <[email protected]>
WebAssembly: construct 32-bit encodedJSValue properly
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.h (210041 => 210042)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.h 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.h 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010, 2013, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2013, 2015-2016 Apple Inc. All rights reserved.
* Copyright (C) 2010, 2011 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,12 +67,12 @@
void disable(ErrorString&) final;
void setAsyncStackTraceDepth(ErrorString&, int depth) final;
void setBreakpointsActive(ErrorString&, bool active) final;
- void setBreakpointByUrl(ErrorString&, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const Inspector::InspectorObject* options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>>& locations) final;
+ void setBreakpointByUrl(ErrorString&, int lineNumber, const String* const optionalURL, const String* const optionalURLRegex, const int* const optionalColumnNumber, const Inspector::InspectorObject* options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>>& locations) final;
void setBreakpoint(ErrorString&, const Inspector::InspectorObject& location, const Inspector::InspectorObject* options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Debugger::Location>& actualLocation) final;
void removeBreakpoint(ErrorString&, const String& breakpointIdentifier) final;
void continueUntilNextRunLoop(ErrorString&) final;
void continueToLocation(ErrorString&, const InspectorObject& location) final;
- void searchInContent(ErrorString&, const String& scriptID, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>&) final;
+ void searchInContent(ErrorString&, const String& scriptID, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>&) final;
void getScriptSource(ErrorString&, const String& scriptID, String* scriptSource) final;
void getFunctionDetails(ErrorString&, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>&) final;
void pause(ErrorString&) final;
@@ -82,8 +82,8 @@
void stepOut(ErrorString&) final;
void setPauseOnExceptions(ErrorString&, const String& pauseState) final;
void setPauseOnAssertions(ErrorString&, bool enabled) final;
- void evaluateOnCallFrame(ErrorString&, const String& callFrameId, const String& _expression_, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, const bool* saveResult, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown, Inspector::Protocol::OptOutput<int>* savedResultIndex) final;
- void setOverlayMessage(ErrorString&, const String*) override;
+ void evaluateOnCallFrame(ErrorString&, const String& callFrameId, const String& _expression_, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* const generatePreview, const bool* const saveResult, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown, Inspector::Protocol::OptOutput<int>* savedResultIndex) final;
+ void setOverlayMessage(ErrorString&, const String* const) override;
bool isPaused() const;
bool breakpointsActive() const;
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp (210041 => 210042)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -285,7 +285,7 @@
objectPreview = injectedScript.previewValue(cell);
}
-void InspectorHeapAgent::getRemoteObject(ErrorString& errorString, int heapObjectId, const String* optionalObjectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result)
+void InspectorHeapAgent::getRemoteObject(ErrorString& errorString, int heapObjectId, const String* const optionalObjectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result)
{
// Prevent the cell from getting collected as we look it up.
VM& vm = m_environment.vm();
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h (210041 => 210042)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -56,7 +56,7 @@
void startTracking(ErrorString&) final;
void stopTracking(ErrorString&) final;
void getPreview(ErrorString&, int heapObjectId, Inspector::Protocol::OptOutput<String>* resultString, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>& functionDetails, RefPtr<Inspector::Protocol::Runtime::ObjectPreview>& objectPreview) final;
- void getRemoteObject(ErrorString&, int heapObjectId, const String* optionalObjectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result) final;
+ void getRemoteObject(ErrorString&, int heapObjectId, const String* const optionalObjectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result) final;
// HeapObserver
void willGarbageCollect() override;
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.h (210041 => 210042)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.h 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorRuntimeAgent.h 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 2015-2016 Apple Inc. All rights reserved.
* Copyright (C) 2011 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,13 +59,13 @@
void enable(ErrorString&) override { m_enabled = true; }
void disable(ErrorString&) override { m_enabled = false; }
void parse(ErrorString&, const String& _expression_, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>&) final;
- void evaluate(ErrorString&, const String& _expression_, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* returnByValue, const bool* generatePreview, const bool* saveResult, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown, Inspector::Protocol::OptOutput<int>* savedResultIndex) final;
- void callFunctionOn(ErrorString&, const String& objectId, const String& _expression_, const Inspector::InspectorArray* optionalArguments, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) final;
+ void evaluate(ErrorString&, const String& _expression_, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const int* const executionContextId, const bool* const returnByValue, const bool* const generatePreview, const bool* const saveResult, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown, Inspector::Protocol::OptOutput<int>* savedResultIndex) final;
+ void callFunctionOn(ErrorString&, const String& objectId, const String& _expression_, const Inspector::InspectorArray* optionalArguments, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* const generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) final;
void releaseObject(ErrorString&, const ErrorString& objectId) final;
- void getProperties(ErrorString&, const String& objectId, const bool* ownProperties, const bool* generatePreview, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) final;
- void getDisplayableProperties(ErrorString&, const String& objectId, const bool* generatePreview, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) final;
- void getCollectionEntries(ErrorString&, const String& objectId, const String* objectGroup, const int* startIndex, const int* numberToFetch, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::CollectionEntry>>& entries) final;
- void saveResult(ErrorString&, const Inspector::InspectorObject& callArgument, const int* executionContextId, Inspector::Protocol::OptOutput<int>* savedResultIndex) final;
+ void getProperties(ErrorString&, const String& objectId, const bool* const ownProperties, const bool* const generatePreview, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) final;
+ void getDisplayableProperties(ErrorString&, const String& objectId, const bool* const generatePreview, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) final;
+ void getCollectionEntries(ErrorString&, const String& objectId, const String* const objectGroup, const int* const startIndex, const int* const numberToFetch, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::CollectionEntry>>& entries) final;
+ void saveResult(ErrorString&, const Inspector::InspectorObject& callArgument, const int* const executionContextId, Inspector::Protocol::OptOutput<int>* savedResultIndex) final;
void releaseObjectGroup(ErrorString&, const String& objectGroup) final;
void getRuntimeTypesForVariablesAtOffsets(ErrorString&, const Inspector::InspectorArray& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>&) override;
void enableTypeProfiler(ErrorString&) override;
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorScriptProfilerAgent.cpp (210041 => 210042)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorScriptProfilerAgent.cpp 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorScriptProfilerAgent.cpp 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -66,7 +66,7 @@
}
}
-void InspectorScriptProfilerAgent::startTracking(ErrorString&, const bool* includeSamples)
+void InspectorScriptProfilerAgent::startTracking(ErrorString&, const bool* const includeSamples)
{
if (m_tracking)
return;
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorScriptProfilerAgent.h (210041 => 210042)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorScriptProfilerAgent.h 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorScriptProfilerAgent.h 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -49,7 +49,7 @@
void willDestroyFrontendAndBackend(DisconnectReason) override;
// ScriptProfilerBackendDispatcherHandler
- void startTracking(ErrorString&, const bool* includeSamples) override;
+ void startTracking(ErrorString&, const bool* const includeSamples) override;
void stopTracking(ErrorString&) override;
void programmaticCaptureStarted();
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/cpp_generator.py (210041 => 210042)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/cpp_generator.py 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/cpp_generator.py 2016-12-20 23:32:58 UTC (rev 210042)
@@ -139,7 +139,7 @@
if isinstance(_type, PrimitiveType):
cpp_name = CppGenerator.cpp_name_for_primitive_type(_type)
if parameter.is_optional:
- return 'const %s*' % cpp_name
+ return 'const %s* const' % cpp_name
elif _type.raw_name() in ['string']:
return 'const %s&' % cpp_name
else:
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (210041 => 210042)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-12-20 23:32:58 UTC (rev 210042)
@@ -89,7 +89,7 @@
class AlternateDatabaseBackendDispatcher : public AlternateBackendDispatcher {
public:
virtual ~AlternateDatabaseBackendDispatcher() { }
- virtual void executeAllOptionalParameters(long callId, const Inspector::InspectorArray* in_columnNames, const String* in_notes, const double* in_timestamp, const Inspector::InspectorObject* in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const Inspector::InspectorObject* in_sqlError, const String* in_screenColor, const Inspector::InspectorArray* in_alternateColors, const String* in_printColor) = 0;
+ virtual void executeAllOptionalParameters(long callId, const Inspector::InspectorArray* in_columnNames, const String* const in_notes, const double* const in_timestamp, const Inspector::InspectorObject* in_values, const Inspector::InspectorValue* const in_payload, const int* const in_databaseId, const Inspector::InspectorObject* in_sqlError, const String* const in_screenColor, const Inspector::InspectorArray* in_alternateColors, const String* const in_printColor) = 0;
virtual void executeNoOptionalParameters(long callId, const Inspector::InspectorArray& in_columnNames, const String& in_notes, double in_timestamp, const Inspector::InspectorObject& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const Inspector::InspectorObject& in_sqlError, const String& in_screenColor, const Inspector::InspectorArray& in_alternateColors, const String& in_printColor) = 0;
};
@@ -152,7 +152,7 @@
Yellow = 5,
Black = 6,
}; // enum class PrintColor
- virtual void executeAllOptionalParameters(ErrorString&, const Inspector::InspectorArray* opt_in_columnNames, const String* opt_in_notes, const double* opt_in_timestamp, const Inspector::InspectorObject* opt_in_values, const Inspector::InspectorValue* opt_in_payload, const int* opt_in_databaseId, const Inspector::InspectorObject* opt_in_sqlError, const String* opt_in_screenColor, const Inspector::InspectorArray* opt_in_alternateColors, const String* opt_in_printColor, RefPtr<Inspector::Protocol::Array<String>>& opt_out_columnNames, Inspector::Protocol::OptOutput<String>* opt_out_notes, Inspector::Protocol::OptOutput<double>* opt_out_timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* opt_out_values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* opt_out_payload, Inspector::Protocol::OptOutput<int>* opt_out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& opt_out
_sqlError, Inspector::Protocol::Database::PrimaryColors* opt_out_screenColor, RefPtr<Inspector::Protocol::Database::ColorList>& opt_out_alternateColors, DatabaseBackendDispatcherHandler::PrintColor* opt_out_printColor) = 0;
+ virtual void executeAllOptionalParameters(ErrorString&, const Inspector::InspectorArray* opt_in_columnNames, const String* const opt_in_notes, const double* const opt_in_timestamp, const Inspector::InspectorObject* opt_in_values, const Inspector::InspectorValue* const opt_in_payload, const int* const opt_in_databaseId, const Inspector::InspectorObject* opt_in_sqlError, const String* const opt_in_screenColor, const Inspector::InspectorArray* opt_in_alternateColors, const String* const opt_in_printColor, RefPtr<Inspector::Protocol::Array<String>>& opt_out_columnNames, Inspector::Protocol::OptOutput<String>* opt_out_notes, Inspector::Protocol::OptOutput<double>* opt_out_timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* opt_out_values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* opt_out_payload, Inspector::Protocol::OptOutput<int>* opt_out_databaseId, RefPtr<Inspector::Protoco
l::Database::Error>& opt_out_sqlError, Inspector::Protocol::Database::PrimaryColors* opt_out_screenColor, RefPtr<Inspector::Protocol::Database::ColorList>& opt_out_alternateColors, DatabaseBackendDispatcherHandler::PrintColor* opt_out_printColor) = 0;
virtual void executeNoOptionalParameters(ErrorString&, const Inspector::InspectorArray& in_columnNames, const String& in_notes, double in_timestamp, const Inspector::InspectorObject& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const Inspector::InspectorObject& in_sqlError, const String& in_screenColor, const Inspector::InspectorArray& in_alternateColors, const String& in_printColor, RefPtr<Inspector::Protocol::Array<String>>& out_columnNames, String* out_notes, double* out_timestamp, Inspector::InspectorObject* out_values, Inspector::InspectorValue* out_payload, int* out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& out_sqlError, Inspector::Protocol::Database::PrimaryColors* out_screenColor, RefPtr<Inspector::Protocol::Database::ColorList>& out_alternateColors, DatabaseBackendDispatcherHandler::PrintColor* out_printColor) = 0;
protected:
virtual ~DatabaseBackendDispatcherHandler();
@@ -763,7 +763,7 @@
class ObjCInspectorDatabaseBackendDispatcher final : public AlternateDatabaseBackendDispatcher {
public:
ObjCInspectorDatabaseBackendDispatcher(id<TestProtocolDatabaseDomainHandler> handler) { m_delegate = handler; }
- virtual void executeAllOptionalParameters(long requestId, const Inspector::InspectorArray* in_columnNames, const String* in_notes, const double* in_timestamp, const Inspector::InspectorObject* in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const Inspector::InspectorObject* in_sqlError, const String* in_screenColor, const Inspector::InspectorArray* in_alternateColors, const String* in_printColor) override;
+ virtual void executeAllOptionalParameters(long requestId, const Inspector::InspectorArray* in_columnNames, const String* const in_notes, const double* const in_timestamp, const Inspector::InspectorObject* in_values, const Inspector::InspectorValue* const in_payload, const int* const in_databaseId, const Inspector::InspectorObject* in_sqlError, const String* const in_screenColor, const Inspector::InspectorArray* in_alternateColors, const String* const in_printColor) override;
virtual void executeNoOptionalParameters(long requestId, const Inspector::InspectorArray& in_columnNames, const String& in_notes, double in_timestamp, const Inspector::InspectorObject& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const Inspector::InspectorObject& in_sqlError, const String& in_screenColor, const Inspector::InspectorArray& in_alternateColors, const String& in_printColor) override;
private:
RetainPtr<id<TestProtocolDatabaseDomainHandler>> m_delegate;
@@ -942,7 +942,7 @@
namespace Inspector {
-void ObjCInspectorDatabaseBackendDispatcher::executeAllOptionalParameters(long requestId, const Inspector::InspectorArray* in_columnNames, const String* in_notes, const double* in_timestamp, const Inspector::InspectorObject* in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const Inspector::InspectorObject* in_sqlError, const String* in_screenColor, const Inspector::InspectorArray* in_alternateColors, const String* in_printColor)
+void ObjCInspectorDatabaseBackendDispatcher::executeAllOptionalParameters(long requestId, const Inspector::InspectorArray* in_columnNames, const String* const in_notes, const double* const in_timestamp, const Inspector::InspectorObject* in_values, const Inspector::InspectorValue* const in_payload, const int* const in_databaseId, const Inspector::InspectorObject* in_sqlError, const String* const in_screenColor, const Inspector::InspectorArray* in_alternateColors, const String* const in_printColor)
{
id errorCallback = ^(NSString *error) {
backendDispatcher()->reportProtocolError(requestId, BackendDispatcher::ServerError, error);
Modified: trunk/Source/WebCore/ChangeLog (210041 => 210042)
--- trunk/Source/WebCore/ChangeLog 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/WebCore/ChangeLog 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,3 +1,29 @@
+2016-12-20 Brent Fulgham <[email protected]>
+
+ Address some style problems found by static analysis
+ https://bugs.webkit.org/show_bug.cgi?id=165975
+
+ Reviewed by Alex Christensen.
+
+ Correct the const-correctness of functions that are implemented using stricter
+ const declarations.
+
+ Avoid passing large ANGLE data structures through the ANGLEWebKitBridge methods.
+
+ * inspector/InspectorCSSAgent.h: Declare the method overrides properly to match
+ the stricter const declarations in the implementation files.
+ * inspector/InspectorDOMAgent.h: Ditto.
+ * inspector/InspectorPageAgent.h: Ditto.
+ * inspector/InspectorTimelineAgent.h: Ditto.
+ * inspector/PageDebuggerAgent.h: Ditto.
+ * platform/graphics/ANGLEWebKitBridge.cpp:
+ (WebCore::ANGLEWebKitBridge::setResources): Pass by const reference.
+ * platform/graphics/ANGLEWebKitBridge.h:
+ (WebCore::ANGLEWebKitBridge::getResources): Return a const reference.
+ * platform/mediastream/RealtimeMediaSource.cpp:
+ (WebCore::RealtimeMediaSource::selectSettings): Use a lambda that takes
+ a const reference, rather than copying the maps while searching.
+
2016-12-20 Sam Weinig <[email protected]>
[WebIDL] Remove custom binding for WorkerGlobalScope::importScripts
Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.h (210041 => 210042)
--- trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2010 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -107,7 +107,7 @@
void getComputedStyleForNode(ErrorString&, int nodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>>&) override;
void getInlineStylesForNode(ErrorString&, int nodeId, RefPtr<Inspector::Protocol::CSS::CSSStyle>& inlineStyle, RefPtr<Inspector::Protocol::CSS::CSSStyle>& attributes) override;
- void getMatchedStylesForNode(ErrorString&, int nodeId, const bool* includePseudo, const bool* includeInherited, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>>& matchedCSSRules, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::PseudoIdMatches>>& pseudoIdMatches, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>>& inheritedEntries) override;
+ void getMatchedStylesForNode(ErrorString&, int nodeId, const bool* const includePseudo, const bool* const includeInherited, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>>& matchedCSSRules, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::PseudoIdMatches>>&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>>& inheritedEntries) override;
void getAllStyleSheets(ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>>& styleSheetInfos) override;
void getStyleSheet(ErrorString&, const String& styleSheetId, RefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody>& result) override;
void getStyleSheetText(ErrorString&, const String& styleSheetId, String* result) override;
Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.h (210041 => 210042)
--- trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2009, 2015-2016 Apple Inc. All rights reserved.
* Copyright (C) 2011 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -116,9 +116,9 @@
void querySelector(ErrorString&, int nodeId, const String& selectors, int* elementId) override;
void querySelectorAll(ErrorString&, int nodeId, const String& selectors, RefPtr<Inspector::Protocol::Array<int>>& result) override;
void getDocument(ErrorString&, RefPtr<Inspector::Protocol::DOM::Node>& root) override;
- void requestChildNodes(ErrorString&, int nodeId, const int* depth) override;
+ void requestChildNodes(ErrorString&, int nodeId, const int* const depth) override;
void setAttributeValue(ErrorString&, int elementId, const String& name, const String& value) override;
- void setAttributesAsText(ErrorString&, int elementId, const String& text, const String* name) override;
+ void setAttributesAsText(ErrorString&, int elementId, const String& text, const String* const name) override;
void removeAttribute(ErrorString&, int elementId, const String& name) override;
void removeNode(ErrorString&, int nodeId) override;
void setNodeName(ErrorString&, int nodeId, const String& name, int* newId) override;
@@ -125,12 +125,12 @@
void getOuterHTML(ErrorString&, int nodeId, WTF::String* outerHTML) override;
void setOuterHTML(ErrorString&, int nodeId, const String& outerHTML) override;
void setNodeValue(ErrorString&, int nodeId, const String& value) override;
- void getEventListenersForNode(ErrorString&, int nodeId, const WTF::String* objectGroup, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::EventListener>>& listenersArray) override;
+ void getEventListenersForNode(ErrorString&, int nodeId, const WTF::String* const objectGroup, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::EventListener>>& listenersArray) override;
void getAccessibilityPropertiesForNode(ErrorString&, int nodeId, RefPtr<Inspector::Protocol::DOM::AccessibilityProperties>& axProperties) override;
void performSearch(ErrorString&, const String& whitespaceTrimmedQuery, const Inspector::InspectorArray* nodeIds, String* searchId, int* resultCount) override;
void getSearchResults(ErrorString&, const String& searchId, int fromIndex, int toIndex, RefPtr<Inspector::Protocol::Array<int>>&) override;
void discardSearchResults(ErrorString&, const String& searchId) override;
- void resolveNode(ErrorString&, int nodeId, const String* objectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result) override;
+ void resolveNode(ErrorString&, int nodeId, const String* const objectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result) override;
void getAttributes(ErrorString&, int nodeId, RefPtr<Inspector::Protocol::Array<String>>& result) override;
void setInspectModeEnabled(ErrorString&, bool enabled, const Inspector::InspectorObject* highlightConfig) override;
void requestNode(ErrorString&, const String& objectId, int* nodeId) override;
@@ -138,13 +138,13 @@
void pushNodeByBackendIdToFrontend(ErrorString&, BackendNodeId, int* nodeId) override;
void releaseBackendNodeIds(ErrorString&, const String& nodeGroup) override;
void hideHighlight(ErrorString&) override;
- void highlightRect(ErrorString&, int x, int y, int width, int height, const Inspector::InspectorObject* color, const Inspector::InspectorObject* outlineColor, const bool* usePageCoordinates) override;
- void highlightQuad(ErrorString&, const Inspector::InspectorArray& quad, const Inspector::InspectorObject* color, const Inspector::InspectorObject* outlineColor, const bool* usePageCoordinates) override;
- void highlightSelector(ErrorString&, const Inspector::InspectorObject& highlightConfig, const String& selectorString, const String* frameId) override;
- void highlightNode(ErrorString&, const Inspector::InspectorObject& highlightConfig, const int* nodeId, const String* objectId) override;
+ void highlightRect(ErrorString&, int x, int y, int width, int height, const Inspector::InspectorObject* color, const Inspector::InspectorObject* outlineColor, const bool* const usePageCoordinates) override;
+ void highlightQuad(ErrorString&, const Inspector::InspectorArray& quad, const Inspector::InspectorObject* color, const Inspector::InspectorObject* outlineColor, const bool* const usePageCoordinates) override;
+ void highlightSelector(ErrorString&, const Inspector::InspectorObject& highlightConfig, const String& selectorString, const String* const frameId) override;
+ void highlightNode(ErrorString&, const Inspector::InspectorObject& highlightConfig, const int* const nodeId, const String* const objectId) override;
void highlightFrame(ErrorString&, const String& frameId, const Inspector::InspectorObject* color, const Inspector::InspectorObject* outlineColor) override;
- void moveTo(ErrorString&, int nodeId, int targetNodeId, const int* anchorNodeId, int* newNodeId) override;
+ void moveTo(ErrorString&, int nodeId, int targetNodeId, const int* const anchorNodeId, int* newNodeId) override;
void undo(ErrorString&) override;
void redo(ErrorString&) override;
void markUndoableState(ErrorString&) override;
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (210041 => 210042)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -93,14 +93,14 @@
void disable(ErrorString&) override;
void addScriptToEvaluateOnLoad(ErrorString&, const String& source, String* result) override;
void removeScriptToEvaluateOnLoad(ErrorString&, const String& identifier) override;
- void reload(ErrorString&, const bool* optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad) override;
+ void reload(ErrorString&, const bool* const optionalIgnoreCache, const String* const optionalScriptToEvaluateOnLoad) override;
void navigate(ErrorString&, const String& url) override;
void getCookies(ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>>& cookies) override;
void deleteCookie(ErrorString&, const String& cookieName, const String& url) override;
void getResourceTree(ErrorString&, RefPtr<Inspector::Protocol::Page::FrameResourceTree>&) override;
void getResourceContent(ErrorString&, const String& frameId, const String& url, String* content, bool* base64Encoded) override;
- void searchInResource(ErrorString&, const String& frameId, const String& url, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, const String* optionalRequestId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>&) override;
- void searchInResources(ErrorString&, const String&, const bool* caseSensitive, const bool* isRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>>&) override;
+ void searchInResource(ErrorString&, const String& frameId, const String& url, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, const String* const optionalRequestId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>&) override;
+ void searchInResources(ErrorString&, const String&, const bool* const caseSensitive, const bool* const isRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>>&) override;
void setShowPaintRects(ErrorString&, bool show) override;
void setEmulatedMedia(ErrorString&, const String&) override;
void getCompositingBordersVisible(ErrorString&, bool* out_param) override;
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (210041 => 210042)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2012 Google Inc. All rights reserved.
* Copyright (C) 2014 University of Washington.
-* Copyright (C) 2015 Apple Inc. All rights reserved.
+* Copyright (C) 2015-2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -98,7 +98,7 @@
void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) final;
void willDestroyFrontendAndBackend(Inspector::DisconnectReason) final;
- void start(ErrorString&, const int* maxCallStackDepth = nullptr) final;
+ void start(ErrorString&, const int* const maxCallStackDepth = nullptr) final;
void stop(ErrorString&) final;
void setAutoCaptureEnabled(ErrorString&, bool) final;
void setInstruments(ErrorString&, const Inspector::InspectorArray&) final;
Modified: trunk/Source/WebCore/inspector/PageDebuggerAgent.h (210041 => 210042)
--- trunk/Source/WebCore/inspector/PageDebuggerAgent.h 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/WebCore/inspector/PageDebuggerAgent.h 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -65,7 +65,7 @@
void breakpointActionLog(JSC::ExecState&, const String&) override;
Inspector::InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
- void setOverlayMessage(ErrorString&, const String*) final;
+ void setOverlayMessage(ErrorString&, const String* const) final;
Page& m_page;
Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp (210041 => 210042)
--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -152,7 +152,7 @@
builtCompilers = false;
}
-void ANGLEWebKitBridge::setResources(ShBuiltInResources resources)
+void ANGLEWebKitBridge::setResources(const ShBuiltInResources& resources)
{
// Resources are (possibly) changing - cleanup compilers if we had them already
cleanupCompilers();
Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h (210041 => 210042)
--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -63,8 +63,8 @@
ANGLEWebKitBridge(ShShaderOutput = SH_GLSL_COMPATIBILITY_OUTPUT, ShShaderSpec = SH_WEBGL_SPEC);
~ANGLEWebKitBridge();
- ShBuiltInResources getResources() { return m_resources; }
- void setResources(ShBuiltInResources);
+ const ShBuiltInResources& getResources() { return m_resources; }
+ void setResources(const ShBuiltInResources&);
bool compileShaderSource(const char* shaderSource, ANGLEShaderType, String& translatedShaderSource, String& shaderValidationLog, Vector<std::pair<ANGLEShaderSymbolType, sh::ShaderVariable>>& symbols, int extraCompileOptions = 0);
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (210041 => 210042)
--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2016-12-20 23:32:58 UTC (rev 210042)
@@ -554,7 +554,7 @@
// 6. Select one settings dictionary from candidates, and return it as the result of the SelectSettings() algorithm.
// The UA should use the one with the smallest fitness distance, as calculated in step 3.
if (!std::isinf(minimumDistance)) {
- supportedConstraints.removeAllMatching([&](std::pair<double, MediaTrackConstraintSetMap> pair) -> bool {
+ supportedConstraints.removeAllMatching([&](const std::pair<double, MediaTrackConstraintSetMap>& pair) -> bool {
return pair.first > minimumDistance;
});
Modified: trunk/Source/WebKit2/ChangeLog (210041 => 210042)
--- trunk/Source/WebKit2/ChangeLog 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,3 +1,17 @@
+2016-12-20 Brent Fulgham <[email protected]>
+
+ Address some style problems found by static analysis
+ https://bugs.webkit.org/show_bug.cgi?id=165975
+
+ Reviewed by Alex Christensen.
+
+ Avoid passing large ANGLE data structures through the ANGLEWebKitBridge methods.
+
+ * Shared/WebBackForwardListItem.cpp:
+ (WebKit::WebBackForwardListItem::create):
+ (WebKit::WebBackForwardListItem::WebBackForwardListItem):
+ * Shared/WebBackForwardListItem.h:
+
2016-12-20 Simon Fraser <[email protected]>
[iOS WK2] Switching or closing a tab leads to all-white tab content if the status bar is double height
Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp (210041 => 210042)
--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2011, 2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,12 +32,12 @@
static uint64_t highestItemID = 0;
-PassRefPtr<WebBackForwardListItem> WebBackForwardListItem::create(BackForwardListItemState backForwardListItemState, uint64_t pageID)
+Ref<WebBackForwardListItem> WebBackForwardListItem::create(BackForwardListItemState&& backForwardListItemState, uint64_t pageID)
{
- return adoptRef(new WebBackForwardListItem(WTFMove(backForwardListItemState), pageID));
+ return adoptRef(*new WebBackForwardListItem(WTFMove(backForwardListItemState), pageID));
}
-WebBackForwardListItem::WebBackForwardListItem(BackForwardListItemState backForwardListItemState, uint64_t pageID)
+WebBackForwardListItem::WebBackForwardListItem(BackForwardListItemState&& backForwardListItemState, uint64_t pageID)
: m_itemState(WTFMove(backForwardListItemState))
, m_pageID(pageID)
{
Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.h (210041 => 210042)
--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2016-12-20 23:32:28 UTC (rev 210041)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2016-12-20 23:32:58 UTC (rev 210042)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2011, 2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -44,7 +44,7 @@
class WebBackForwardListItem : public API::ObjectImpl<API::Object::Type::BackForwardListItem> {
public:
- static PassRefPtr<WebBackForwardListItem> create(BackForwardListItemState, uint64_t pageID);
+ static Ref<WebBackForwardListItem> create(BackForwardListItemState&&, uint64_t pageID);
virtual ~WebBackForwardListItem();
uint64_t itemID() const { return m_itemState.identifier; }
@@ -67,7 +67,7 @@
static uint64_t highestUsedItemID();
private:
- explicit WebBackForwardListItem(BackForwardListItemState, uint64_t pageID);
+ explicit WebBackForwardListItem(BackForwardListItemState&&, uint64_t pageID);
BackForwardListItemState m_itemState;
uint64_t m_pageID;