Diff
Modified: trunk/Source/WebCore/ChangeLog (161401 => 161402)
--- trunk/Source/WebCore/ChangeLog 2014-01-07 05:15:07 UTC (rev 161401)
+++ trunk/Source/WebCore/ChangeLog 2014-01-07 05:19:38 UTC (rev 161402)
@@ -1,3 +1,22 @@
+2014-01-06 Seokju Kwon <[email protected]>
+
+ Web Inspector: Remove canOverrideDeviceMetrics and setDeviceMetricsOverride from protocol
+ https://bugs.webkit.org/show_bug.cgi?id=126149
+
+ Reviewed by Joseph Pecoraro.
+
+ No new tests, No changes in behavior.
+
+ These are not used anywhere in WebInspectorUI.
+ So, it removes unused Protocols and APIs.
+
+ * inspector/InspectorClient.h:
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::InspectorPageAgent):
+ (WebCore::InspectorPageAgent::disable):
+ * inspector/InspectorPageAgent.h:
+ * inspector/protocol/Page.json:
+
2014-01-06 Gyuyoung Kim <[email protected]>
Add toHTMLTableSectionElement() functions, and use it
Modified: trunk/Source/WebCore/inspector/InspectorClient.h (161401 => 161402)
--- trunk/Source/WebCore/inspector/InspectorClient.h 2014-01-07 05:15:07 UTC (rev 161401)
+++ trunk/Source/WebCore/inspector/InspectorClient.h 2014-01-07 05:19:38 UTC (rev 161402)
@@ -61,8 +61,6 @@
virtual void clearBrowserCookies() { }
virtual bool canMonitorMainThread() { return false; }
- virtual bool canOverrideDeviceMetrics() { return false; }
-
virtual void overrideDeviceMetrics(int /*width*/, int /*height*/, float /*fontScaleFactor*/, bool /*fitWindow*/)
{
// FIXME: Platforms may want to implement this (see https://bugs.webkit.org/show_bug.cgi?id=82886).
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (161401 => 161402)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-01-07 05:15:07 UTC (rev 161401)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-01-07 05:19:38 UTC (rev 161402)
@@ -362,8 +362,6 @@
, m_lastScriptIdentifier(0)
, m_screenWidthOverride(0)
, m_screenHeightOverride(0)
- , m_fontScaleFactorOverride(1)
- , m_fitWindowOverride(false)
, m_enabled(false)
, m_isFirstLayoutAfterOnLoad(false)
, m_originalScriptExecutionDisabled(false)
@@ -413,15 +411,9 @@
setEmulatedMedia(0, "");
setContinuousPaintingEnabled(0, false);
- if (!deviceMetricsChanged(0, 0, 1, false))
- return;
-
// When disabling the agent, reset the override values if necessary.
- updateViewMetrics(0, 0, 1, false);
m_screenWidthOverride = 0;
m_screenHeightOverride = 0;
- m_fontScaleFactorOverride = 1;
- m_fitWindowOverride = false;
}
void InspectorPageAgent::addScriptToEvaluateOnLoad(ErrorString*, const String& source, String* identifier)
@@ -692,46 +684,6 @@
DOMPatchSupport::patchDocument(document, html);
}
-void InspectorPageAgent::canOverrideDeviceMetrics(ErrorString*, bool* result)
-{
- *result = m_client->canOverrideDeviceMetrics();
-}
-
-void InspectorPageAgent::setDeviceMetricsOverride(ErrorString* errorString, int width, int height, double fontScaleFactor, bool fitWindow)
-{
- const static long maxDimension = 10000000;
-
- if (width < 0 || height < 0 || width > maxDimension || height > maxDimension) {
- *errorString = makeString("Width and height values must be positive, not greater than ", String::number(maxDimension));
- return;
- }
-
- if (!width ^ !height) {
- *errorString = "Both width and height must be either zero or non-zero at once";
- return;
- }
-
- if (fontScaleFactor <= 0) {
- *errorString = "fontScaleFactor must be positive";
- return;
- }
-
- if (!deviceMetricsChanged(width, height, fontScaleFactor, fitWindow))
- return;
-
- m_screenWidthOverride = width;
- m_screenHeightOverride = height;
- m_fontScaleFactorOverride = fontScaleFactor;
- m_fitWindowOverride = fitWindow;
-
- updateViewMetrics(width, height, fontScaleFactor, fitWindow);
-}
-
-bool InspectorPageAgent::deviceMetricsChanged(int width, int height, double fontScaleFactor, bool fitWindow)
-{
- return width != m_screenWidthOverride || height != m_screenHeightOverride || fontScaleFactor != m_fontScaleFactorOverride || fitWindow != m_fitWindowOverride;
-}
-
void InspectorPageAgent::setShowPaintRects(ErrorString*, bool show)
{
m_showPaintRects = show;
@@ -1094,16 +1046,6 @@
return result;
}
-void InspectorPageAgent::updateViewMetrics(int width, int height, double fontScaleFactor, bool fitWindow)
-{
- m_client->overrideDeviceMetrics(width, height, static_cast<float>(fontScaleFactor), fitWindow);
-
- Document* document = mainFrame()->document();
- if (document)
- document->styleResolverChanged(RecalcStyleImmediately);
- InspectorInstrumentation::mediaQueryResultChanged(document);
-}
-
#if ENABLE(TOUCH_EVENTS)
void InspectorPageAgent::updateTouchEventEmulationInPage(bool enabled)
{
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (161401 => 161402)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2014-01-07 05:15:07 UTC (rev 161401)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2014-01-07 05:19:38 UTC (rev 161402)
@@ -112,8 +112,6 @@
virtual void searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>>&);
virtual void searchInResources(ErrorString*, const String&, const bool* caseSensitive, const bool* isRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::SearchResult>>&);
virtual void setDocumentContent(ErrorString*, const String& frameId, const String& html);
- virtual void canOverrideDeviceMetrics(ErrorString*, bool*);
- virtual void setDeviceMetricsOverride(ErrorString*, int width, int height, double fontScaleFactor, bool fitWindow);
virtual void setShowPaintRects(ErrorString*, bool show);
virtual void canShowDebugBorders(ErrorString*, bool*);
virtual void setShowDebugBorders(ErrorString*, bool show);
@@ -185,8 +183,6 @@
private:
InspectorPageAgent(InstrumentingAgents*, Page*, InspectorAgent*, InjectedScriptManager*, InspectorClient*, InspectorOverlay*);
- bool deviceMetricsChanged(int width, int height, double fontScaleFactor, bool fitWindow);
- void updateViewMetrics(int, int, double, bool);
#if ENABLE(TOUCH_EVENTS)
void updateTouchEventEmulationInPage(bool);
#endif
@@ -213,8 +209,6 @@
HashMap<DocumentLoader*, String> m_loaderToIdentifier;
int m_screenWidthOverride;
int m_screenHeightOverride;
- double m_fontScaleFactorOverride;
- bool m_fitWindowOverride;
bool m_enabled;
bool m_isFirstLayoutAfterOnLoad;
bool m_originalScriptExecutionDisabled;
Modified: trunk/Source/WebCore/inspector/protocol/Page.json (161401 => 161402)
--- trunk/Source/WebCore/inspector/protocol/Page.json 2014-01-07 05:15:07 UTC (rev 161401)
+++ trunk/Source/WebCore/inspector/protocol/Page.json 2014-01-07 05:19:38 UTC (rev 161402)
@@ -192,23 +192,6 @@
]
},
{
- "name": "canOverrideDeviceMetrics",
- "description": "Checks whether <code>setDeviceMetricsOverride</code> can be invoked.",
- "returns": [
- { "name": "result", "type": "boolean", "description": "If true, <code>setDeviceMetricsOverride</code> can safely be invoked on the agent." }
- ]
- },
- {
- "name": "setDeviceMetricsOverride",
- "description": "Overrides the values of device screen dimensions (window.screen.width, window.screen.height, window.innerWidth, window.innerHeight, and \"device-width\"/\"device-height\"-related CSS media query results) and the font scale factor.",
- "parameters": [
- { "name": "width", "type": "integer", "description": "Overriding width value in pixels (minimum 0, maximum 10000000). 0 disables the override." },
- { "name": "height", "type": "integer", "description": "Overriding height value in pixels (minimum 0, maximum 10000000). 0 disables the override." },
- { "name": "fontScaleFactor", "type": "number", "description": "Overriding font scale factor value (must be positive). 1 disables the override." },
- { "name": "fitWindow", "type": "boolean", "description": "Whether a view that exceeds the available browser window area should be scaled down to fit." }
- ]
- },
- {
"name": "setShowPaintRects",
"description": "Requests that backend shows paint rectangles",
"parameters": [
Modified: trunk/Source/WebInspectorUI/ChangeLog (161401 => 161402)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-01-07 05:15:07 UTC (rev 161401)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-01-07 05:19:38 UTC (rev 161402)
@@ -1,5 +1,18 @@
2014-01-06 Seokju Kwon <[email protected]>
+ Web Inspector: Remove canOverrideDeviceMetrics and setDeviceMetricsOverride from protocol
+ https://bugs.webkit.org/show_bug.cgi?id=126149
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/InspectorWebBackendCommands.js: Remove unused codes.
+ * UserInterface/Legacy/6.0/InspectorWebBackendCommands.js: Ditto.
+ * UserInterface/Legacy/7.0/InspectorWebBackendCommands.js: Ditto.
+ * Versions/Inspector-iOS-6.0.json: Ditto.
+ * Versions/Inspector-iOS-7.0.json: Ditto.
+
+2014-01-06 Seokju Kwon <[email protected]>
+
Web Inspector: Remove support for FileSystem in Frontend.
https://bugs.webkit.org/show_bug.cgi?id=126369
Modified: trunk/Source/WebInspectorUI/UserInterface/InspectorWebBackendCommands.js (161401 => 161402)
--- trunk/Source/WebInspectorUI/UserInterface/InspectorWebBackendCommands.js 2014-01-07 05:15:07 UTC (rev 161401)
+++ trunk/Source/WebInspectorUI/UserInterface/InspectorWebBackendCommands.js 2014-01-07 05:19:38 UTC (rev 161402)
@@ -260,8 +260,6 @@
InspectorBackend.registerCommand("Page.searchInResource", [{"name": "frameId", "type": "string", "optional": false}, {"name": "url", "type": "string", "optional": false}, {"name": "query", "type": "string", "optional": false}, {"name": "caseSensitive", "type": "boolean", "optional": true}, {"name": "isRegex", "type": "boolean", "optional": true}], ["result"]);
InspectorBackend.registerCommand("Page.searchInResources", [{"name": "text", "type": "string", "optional": false}, {"name": "caseSensitive", "type": "boolean", "optional": true}, {"name": "isRegex", "type": "boolean", "optional": true}], ["result"]);
InspectorBackend.registerCommand("Page.setDocumentContent", [{"name": "frameId", "type": "string", "optional": false}, {"name": "html", "type": "string", "optional": false}], []);
-InspectorBackend.registerCommand("Page.canOverrideDeviceMetrics", [], ["result"]);
-InspectorBackend.registerCommand("Page.setDeviceMetricsOverride", [{"name": "width", "type": "number", "optional": false}, {"name": "height", "type": "number", "optional": false}, {"name": "fontScaleFactor", "type": "number", "optional": false}, {"name": "fitWindow", "type": "boolean", "optional": false}], []);
InspectorBackend.registerCommand("Page.setShowPaintRects", [{"name": "result", "type": "boolean", "optional": false}], []);
InspectorBackend.registerCommand("Page.canShowDebugBorders", [], ["show"]);
InspectorBackend.registerCommand("Page.setShowDebugBorders", [{"name": "show", "type": "boolean", "optional": false}], []);
Modified: trunk/Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorWebBackendCommands.js (161401 => 161402)
--- trunk/Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorWebBackendCommands.js 2014-01-07 05:15:07 UTC (rev 161401)
+++ trunk/Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorWebBackendCommands.js 2014-01-07 05:19:38 UTC (rev 161402)
@@ -39,8 +39,6 @@
InspectorBackend.registerCommand("Page.searchInResource", [{"name": "frameId", "type": "string", "optional": false}, {"name": "url", "type": "string", "optional": false}, {"name": "query", "type": "string", "optional": false}, {"name": "caseSensitive", "type": "boolean", "optional": true}, {"name": "isRegex", "type": "boolean", "optional": true}], ["result"]);
InspectorBackend.registerCommand("Page.searchInResources", [{"name": "text", "type": "string", "optional": false}, {"name": "caseSensitive", "type": "boolean", "optional": true}, {"name": "isRegex", "type": "boolean", "optional": true}], ["result"]);
InspectorBackend.registerCommand("Page.setDocumentContent", [{"name": "frameId", "type": "string", "optional": false}, {"name": "html", "type": "string", "optional": false}], []);
-InspectorBackend.registerCommand("Page.canOverrideDeviceMetrics", [], ["result"]);
-InspectorBackend.registerCommand("Page.setDeviceMetricsOverride", [{"name": "width", "type": "number", "optional": false}, {"name": "height", "type": "number", "optional": false}, {"name": "fontScaleFactor", "type": "number", "optional": false}, {"name": "fitWindow", "type": "boolean", "optional": false}], []);
InspectorBackend.registerCommand("Page.setShowPaintRects", [{"name": "result", "type": "boolean", "optional": false}], []);
InspectorBackend.registerCommand("Page.getScriptExecutionStatus", [], ["result"]);
InspectorBackend.registerCommand("Page.setScriptExecutionDisabled", [{"name": "value", "type": "boolean", "optional": false}], []);
Modified: trunk/Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorWebBackendCommands.js (161401 => 161402)
--- trunk/Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorWebBackendCommands.js 2014-01-07 05:15:07 UTC (rev 161401)
+++ trunk/Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorWebBackendCommands.js 2014-01-07 05:19:38 UTC (rev 161402)
@@ -46,8 +46,6 @@
InspectorBackend.registerCommand("Page.searchInResource", [{"name": "frameId", "type": "string", "optional": false}, {"name": "url", "type": "string", "optional": false}, {"name": "query", "type": "string", "optional": false}, {"name": "caseSensitive", "type": "boolean", "optional": true}, {"name": "isRegex", "type": "boolean", "optional": true}], ["result"]);
InspectorBackend.registerCommand("Page.searchInResources", [{"name": "text", "type": "string", "optional": false}, {"name": "caseSensitive", "type": "boolean", "optional": true}, {"name": "isRegex", "type": "boolean", "optional": true}], ["result"]);
InspectorBackend.registerCommand("Page.setDocumentContent", [{"name": "frameId", "type": "string", "optional": false}, {"name": "html", "type": "string", "optional": false}], []);
-InspectorBackend.registerCommand("Page.canOverrideDeviceMetrics", [], ["result"]);
-InspectorBackend.registerCommand("Page.setDeviceMetricsOverride", [{"name": "width", "type": "number", "optional": false}, {"name": "height", "type": "number", "optional": false}, {"name": "fontScaleFactor", "type": "number", "optional": false}, {"name": "fitWindow", "type": "boolean", "optional": false}], []);
InspectorBackend.registerCommand("Page.setShowPaintRects", [{"name": "result", "type": "boolean", "optional": false}], []);
InspectorBackend.registerCommand("Page.canShowDebugBorders", [], ["show"]);
InspectorBackend.registerCommand("Page.setShowDebugBorders", [{"name": "show", "type": "boolean", "optional": false}], []);
Modified: trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json (161401 => 161402)
--- trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json 2014-01-07 05:15:07 UTC (rev 161401)
+++ trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json 2014-01-07 05:19:38 UTC (rev 161402)
@@ -310,25 +310,6 @@
"hidden": true
},
{
- "name": "canOverrideDeviceMetrics",
- "description": "Checks whether <code>setDeviceMetricsOverride</code> can be invoked.",
- "returns": [
- { "name": "result", "type": "boolean", "description": "If true, <code>setDeviceMetricsOverride</code> can safely be invoked on the agent." }
- ],
- "hidden": true
- },
- {
- "name": "setDeviceMetricsOverride",
- "description": "Overrides the values of device screen dimensions (window.screen.width, window.screen.height, window.innerWidth, window.innerHeight, and \"device-width\"/\"device-height\"-related CSS media query results) and the font scale factor.",
- "parameters": [
- { "name": "width", "type": "integer", "description": "Overriding width value in pixels (minimum 0, maximum 10000000). 0 disables the override." },
- { "name": "height", "type": "integer", "description": "Overriding height value in pixels (minimum 0, maximum 10000000). 0 disables the override." },
- { "name": "fontScaleFactor", "type": "number", "description": "Overriding font scale factor value (must be positive). 1 disables the override." },
- { "name": "fitWindow", "type": "boolean", "description": "Whether a view that exceeds the available browser window area should be scaled down to fit." }
- ],
- "hidden": true
- },
- {
"name": "setShowPaintRects",
"description": "Requests that backend shows paint rectangles",
"parameters": [
Modified: trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json (161401 => 161402)
--- trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json 2014-01-07 05:15:07 UTC (rev 161401)
+++ trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json 2014-01-07 05:19:38 UTC (rev 161402)
@@ -263,23 +263,6 @@
]
},
{
- "name": "canOverrideDeviceMetrics",
- "description": "Checks whether <code>setDeviceMetricsOverride</code> can be invoked.",
- "returns": [
- { "name": "result", "type": "boolean", "description": "If true, <code>setDeviceMetricsOverride</code> can safely be invoked on the agent." }
- ]
- },
- {
- "name": "setDeviceMetricsOverride",
- "description": "Overrides the values of device screen dimensions (window.screen.width, window.screen.height, window.innerWidth, window.innerHeight, and \"device-width\"/\"device-height\"-related CSS media query results) and the font scale factor.",
- "parameters": [
- { "name": "width", "type": "integer", "description": "Overriding width value in pixels (minimum 0, maximum 10000000). 0 disables the override." },
- { "name": "height", "type": "integer", "description": "Overriding height value in pixels (minimum 0, maximum 10000000). 0 disables the override." },
- { "name": "fontScaleFactor", "type": "number", "description": "Overriding font scale factor value (must be positive). 1 disables the override." },
- { "name": "fitWindow", "type": "boolean", "description": "Whether a view that exceeds the available browser window area should be scaled down to fit." }
- ]
- },
- {
"name": "setShowPaintRects",
"description": "Requests that backend shows paint rectangles",
"parameters": [
Modified: trunk/Source/WebKit/blackberry/ChangeLog (161401 => 161402)
--- trunk/Source/WebKit/blackberry/ChangeLog 2014-01-07 05:15:07 UTC (rev 161401)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2014-01-07 05:19:38 UTC (rev 161402)
@@ -1,3 +1,13 @@
+2014-01-06 Seokju Kwon <[email protected]>
+
+ Web Inspector: Remove canOverrideDeviceMetrics and setDeviceMetricsOverride from protocol
+ https://bugs.webkit.org/show_bug.cgi?id=126149
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebCoreSupport/InspectorClientBlackBerry.cpp: Remove dead codes.
+ * WebCoreSupport/InspectorClientBlackBerry.h: Ditto.
+
2014-01-02 Gavin Barraclough <[email protected]>
Merge didMoveOnscreen / page visibility to isVisible
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp (161401 => 161402)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp 2014-01-07 05:15:07 UTC (rev 161401)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.cpp 2014-01-07 05:19:38 UTC (rev 161402)
@@ -86,11 +86,6 @@
m_webPagePrivate->m_client->clearCookies();
}
-bool InspectorClientBlackBerry::canOverrideDeviceMetrics()
-{
- return true;
-}
-
void InspectorClientBlackBerry::overrideDeviceMetrics(int width, int height, float fontScaleFactor, bool)
{
// Note: when width and height = 0, and fontScaleFactor = 1, this is the signal for restoring to default size.
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h (161401 => 161402)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h 2014-01-07 05:15:07 UTC (rev 161401)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/InspectorClientBlackBerry.h 2014-01-07 05:19:38 UTC (rev 161402)
@@ -55,7 +55,6 @@
virtual bool canClearBrowserCookies() { return true; }
virtual void paintInspectorOverlay(WebCore::GraphicsContext&);
- virtual bool canOverrideDeviceMetrics();
virtual void overrideDeviceMetrics(int, int, float, bool);
virtual bool supportsFrameInstrumentation();
