Title: [138150] trunk/Source/WebCore
- Revision
- 138150
- Author
- ca...@chromium.org
- Date
- 2012-12-19 05:56:38 -0800 (Wed, 19 Dec 2012)
Log Message
Web Inspector: scripts to evaluate on load are not removed from inspector state when Page agent is disabled
https://bugs.webkit.org/show_bug.cgi?id=105422
Reviewed by Alexander Pavlov.
- reset scripts to evaluate on load when InspectorPageAgent is disabled.
- added InspectorState::remove();
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::disable):
* inspector/InspectorState.cpp:
(WebCore::InspectorState::remove):
(WebCore):
* inspector/InspectorState.h:
(InspectorState):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (138149 => 138150)
--- trunk/Source/WebCore/ChangeLog 2012-12-19 13:45:15 UTC (rev 138149)
+++ trunk/Source/WebCore/ChangeLog 2012-12-19 13:56:38 UTC (rev 138150)
@@ -1,3 +1,21 @@
+2012-12-19 Andrey Kosyakov <ca...@chromium.org>
+
+ Web Inspector: scripts to evaluate on load are not removed from inspector state when Page agent is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=105422
+
+ Reviewed by Alexander Pavlov.
+
+ - reset scripts to evaluate on load when InspectorPageAgent is disabled.
+ - added InspectorState::remove();
+
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::disable):
+ * inspector/InspectorState.cpp:
+ (WebCore::InspectorState::remove):
+ (WebCore):
+ * inspector/InspectorState.h:
+ (InspectorState):
+
2012-12-19 Kunihiko Sakamoto <ksakam...@chromium.org>
INPUT_MULTIPLE_FIELDS_UI: Make year field readonly if min and max have the same year
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (138149 => 138150)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2012-12-19 13:45:15 UTC (rev 138149)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2012-12-19 13:56:38 UTC (rev 138150)
@@ -407,6 +407,7 @@
m_state->setLong(PageAgentState::pageAgentScreenHeightOverride, 0);
m_state->setDouble(PageAgentState::pageAgentFontScaleFactorOverride, 1);
m_state->setBoolean(PageAgentState::pageAgentFitWindow, false);
+ m_state->remove(PageAgentState::pageAgentScriptsToEvaluateOnLoad);
updateViewMetrics(0, 0, 1, false);
}
Modified: trunk/Source/WebCore/inspector/InspectorState.cpp (138149 => 138150)
--- trunk/Source/WebCore/inspector/InspectorState.cpp 2012-12-19 13:45:15 UTC (rev 138149)
+++ trunk/Source/WebCore/inspector/InspectorState.cpp 2012-12-19 13:56:38 UTC (rev 138150)
@@ -75,6 +75,11 @@
updateCookie();
}
+void InspectorState::remove(const String& propertyName)
+{
+ m_properties->remove(propertyName);
+}
+
bool InspectorState::getBoolean(const String& propertyName)
{
InspectorObject::iterator it = m_properties->find(propertyName);
Modified: trunk/Source/WebCore/inspector/InspectorState.h (138149 => 138150)
--- trunk/Source/WebCore/inspector/InspectorState.h 2012-12-19 13:45:15 UTC (rev 138149)
+++ trunk/Source/WebCore/inspector/InspectorState.h 2012-12-19 13:56:38 UTC (rev 138150)
@@ -65,6 +65,7 @@
void setDouble(const String& propertyName, double value) { setValue(propertyName, InspectorBasicValue::create(value)); }
void setObject(const String& propertyName, PassRefPtr<InspectorObject> value) { setValue(propertyName, value); }
+ void remove(const String&);
private:
void updateCookie();
void setValue(const String& propertyName, PassRefPtr<InspectorValue>);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
