summaryrefslogtreecommitdiffstats
path: root/WebKit/chromium/src
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/chromium/src')
-rw-r--r--WebKit/chromium/src/ChromeClientImpl.cpp21
-rw-r--r--WebKit/chromium/src/ChromeClientImpl.h3
-rw-r--r--WebKit/chromium/src/ChromiumBridge.cpp2
-rw-r--r--WebKit/chromium/src/EditorClientImpl.cpp3
-rw-r--r--WebKit/chromium/src/EditorClientImpl.h1
-rw-r--r--WebKit/chromium/src/LocalizedStrings.cpp32
-rw-r--r--WebKit/chromium/src/WebDevToolsAgentImpl.cpp11
-rw-r--r--WebKit/chromium/src/WebDevToolsAgentImpl.h1
-rw-r--r--WebKit/chromium/src/WebSettingsImpl.cpp25
-rw-r--r--WebKit/chromium/src/WebSettingsImpl.h5
-rw-r--r--WebKit/chromium/src/WebViewImpl.cpp18
-rw-r--r--WebKit/chromium/src/js/DevTools.js1
12 files changed, 31 insertions, 92 deletions
diff --git a/WebKit/chromium/src/ChromeClientImpl.cpp b/WebKit/chromium/src/ChromeClientImpl.cpp
index 7b67ede..c43a0b0 100644
--- a/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -61,7 +61,6 @@
#include "ScriptController.h"
#include "SearchPopupMenuChromium.h"
#include "SecurityOrigin.h"
-#include "Settings.h"
#if USE(V8)
#include "V8Proxy.h"
#endif
@@ -808,25 +807,9 @@ void ChromeClientImpl::scheduleCompositingLayerSync()
m_webView->setRootLayerNeedsDisplay();
}
-ChromeClient::CompositingTriggerFlags ChromeClientImpl::allowedCompositingTriggers() const
+bool ChromeClientImpl::allowsAcceleratedCompositing() const
{
- if (!m_webView->allowsAcceleratedCompositing())
- return 0;
-
- CompositingTriggerFlags flags = 0;
- Settings* settings = m_webView->page()->settings();
- if (settings->acceleratedCompositingFor3DTransformsEnabled())
- flags |= ThreeDTransformTrigger;
- if (settings->acceleratedCompositingForVideoEnabled())
- flags |= VideoTrigger;
- if (settings->acceleratedCompositingForPluginsEnabled())
- flags |= PluginTrigger;
- if (settings->acceleratedCompositingForAnimationEnabled())
- flags |= AnimationTrigger;
- if (settings->acceleratedCompositingForCanvasEnabled())
- flags |= CanvasTrigger;
-
- return flags;
+ return m_webView->allowsAcceleratedCompositing();
}
#endif
diff --git a/WebKit/chromium/src/ChromeClientImpl.h b/WebKit/chromium/src/ChromeClientImpl.h
index b024bc0..87c1653 100644
--- a/WebKit/chromium/src/ChromeClientImpl.h
+++ b/WebKit/chromium/src/ChromeClientImpl.h
@@ -152,7 +152,8 @@ public:
// to do an eager layout before the drawing.
virtual void scheduleCompositingLayerSync();
- virtual CompositingTriggerFlags allowedCompositingTriggers() const;
+ // Returns true if accelerated compositing is supported.
+ virtual bool allowsAcceleratedCompositing() const;
#endif
virtual bool supportsFullscreenForNode(const WebCore::Node*);
diff --git a/WebKit/chromium/src/ChromiumBridge.cpp b/WebKit/chromium/src/ChromiumBridge.cpp
index e7a1305..4ac3f6f 100644
--- a/WebKit/chromium/src/ChromiumBridge.cpp
+++ b/WebKit/chromium/src/ChromiumBridge.cpp
@@ -134,7 +134,7 @@ static WebCookieJar* getCookieJar(const Document* document)
WebFrameImpl* frameImpl = WebFrameImpl::fromFrame(document->frame());
if (!frameImpl || !frameImpl->client())
return 0;
- WebCookieJar* cookieJar = frameImpl->client()->cookieJar(frameImpl);
+ WebCookieJar* cookieJar = frameImpl->client()->cookieJar();
if (!cookieJar)
cookieJar = webKitClient()->cookieJar();
return cookieJar;
diff --git a/WebKit/chromium/src/EditorClientImpl.cpp b/WebKit/chromium/src/EditorClientImpl.cpp
index 6f1739f..bc1d206 100644
--- a/WebKit/chromium/src/EditorClientImpl.cpp
+++ b/WebKit/chromium/src/EditorClientImpl.cpp
@@ -929,8 +929,7 @@ bool EditorClientImpl::spellingUIIsShowing()
return false;
}
-void EditorClientImpl::getGuessesForWord(const String& word,
- const String& context,
+void EditorClientImpl::getGuessesForWord(const String&,
WTF::Vector<String>& guesses)
{
notImplemented();
diff --git a/WebKit/chromium/src/EditorClientImpl.h b/WebKit/chromium/src/EditorClientImpl.h
index a194399..b05a592 100644
--- a/WebKit/chromium/src/EditorClientImpl.h
+++ b/WebKit/chromium/src/EditorClientImpl.h
@@ -107,7 +107,6 @@ public:
virtual void showSpellingUI(bool show);
virtual bool spellingUIIsShowing();
virtual void getGuessesForWord(const WTF::String& word,
- const WTF::String& context,
WTF::Vector<WTF::String>& guesses);
virtual void willSetInputMethodState();
virtual void setInputMethodState(bool enabled);
diff --git a/WebKit/chromium/src/LocalizedStrings.cpp b/WebKit/chromium/src/LocalizedStrings.cpp
index ab14009..e7b39d5 100644
--- a/WebKit/chromium/src/LocalizedStrings.cpp
+++ b/WebKit/chromium/src/LocalizedStrings.cpp
@@ -43,7 +43,6 @@
#include <wtf/text/WTFString.h>
using WebKit::WebLocalizedString;
-using WebKit::WebString;
namespace WebCore {
@@ -52,14 +51,9 @@ static String query(WebLocalizedString::Name name)
return WebKit::webKitClient()->queryLocalizedString(name);
}
-static String query(WebLocalizedString::Name name, const WebString& parameter)
+static String query(WebLocalizedString::Name name, int numericValue)
{
- return WebKit::webKitClient()->queryLocalizedString(name, parameter);
-}
-
-static String query(WebLocalizedString::Name name, const WebString& parameter1, const WebString& parameter2)
-{
- return WebKit::webKitClient()->queryLocalizedString(name, parameter1, parameter2);
+ return WebKit::webKitClient()->queryLocalizedString(name, numericValue);
}
String searchableIndexIntroduction()
@@ -197,7 +191,7 @@ String crashedPluginText()
String multipleFileUploadText(unsigned numberOfFiles)
{
- return query(WebLocalizedString::MultipleFileUploadText, String::number(numberOfFiles));
+ return query(WebLocalizedString::MultipleFileUploadText, numberOfFiles);
}
// Used in FTPDirectoryDocument.cpp
@@ -356,24 +350,28 @@ String validationMessagePatternMismatchText()
return query(WebLocalizedString::ValidationPatternMismatch);
}
-String validationMessageTooLongText(int valueLength, int maxLength)
+String validationMessageTooLongText(int, int)
{
- return query(WebLocalizedString::ValidationTooLong, String::number(valueLength), String::number(maxLength));
+ // FIXME: pass the arguments.
+ return query(WebLocalizedString::ValidationTooLong);
}
-String validationMessageRangeUnderflowText(const String& minimum)
+String validationMessageRangeUnderflowText(const String&)
{
- return query(WebLocalizedString::ValidationRangeUnderflow, minimum);
+ // FIXME: pass the arguments.
+ return query(WebLocalizedString::ValidationRangeUnderflow);
}
-String validationMessageRangeOverflowText(const String& maximum)
+String validationMessageRangeOverflowText(const String&)
{
- return query(WebLocalizedString::ValidationRangeOverflow, maximum);
+ // FIXME: pass the arguments.
+ return query(WebLocalizedString::ValidationRangeOverflow);
}
-String validationMessageStepMismatchText(const String& base, const String& step)
+String validationMessageStepMismatchText(const String&, const String&)
{
- return query(WebLocalizedString::ValidationStepMismatch, base, step);
+ // FIXME: pass the arguments.
+ return query(WebLocalizedString::ValidationStepMismatch);
}
} // namespace WebCore
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index 9f4ce87..880adb4 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -33,7 +33,6 @@
#include "DebuggerAgentImpl.h"
#include "DebuggerAgentManager.h"
-#include "ExceptionCode.h"
#include "InjectedScriptHost.h"
#include "InspectorBackendDispatcher.h"
#include "InspectorController.h"
@@ -45,7 +44,6 @@
#include "ResourceResponse.h"
#include "ScriptDebugServer.h"
#include "V8Binding.h"
-#include "V8Node.h"
#include "V8Proxy.h"
#include "V8Utilities.h"
#include "WebDataSource.h"
@@ -76,7 +74,6 @@ using WebCore::ResourceRequest;
using WebCore::ResourceResponse;
using WTF::String;
using WebCore::V8DOMWrapper;
-using WebCore::V8Node;
using WebCore::V8Proxy;
namespace WebKit {
@@ -246,14 +243,6 @@ void WebDevToolsAgentImpl::inspectElementAt(const WebPoint& point)
m_webViewImpl->inspectElementAt(point);
}
-void WebDevToolsAgentImpl::inspectNode(v8::Handle<v8::Value> node)
-{
- if (!V8Node::HasInstance(node))
- V8Proxy::setDOMException(WebCore::TYPE_MISMATCH_ERR);
- else
- inspectorController()->inspect(V8Node::toNative(v8::Handle<v8::Object>::Cast(node)));
-}
-
void WebDevToolsAgentImpl::setRuntimeProperty(const WebString& name, const WebString& value)
{
if (name == kApuAgentFeatureName)
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.h b/WebKit/chromium/src/WebDevToolsAgentImpl.h
index 487cf0c..feb4bdd 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.h
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.h
@@ -75,7 +75,6 @@ public:
virtual void didNavigate();
virtual void dispatchOnInspectorBackend(const WebString& message);
virtual void inspectElementAt(const WebPoint& point);
- virtual void inspectNode(v8::Handle<v8::Value> node);
virtual void evaluateInWebInspector(long callId, const WebString& script);
virtual void setRuntimeProperty(const WebString& name, const WebString& value);
virtual void setTimelineProfilingEnabled(bool enable);
diff --git a/WebKit/chromium/src/WebSettingsImpl.cpp b/WebKit/chromium/src/WebSettingsImpl.cpp
index e60562c..1bea259 100644
--- a/WebKit/chromium/src/WebSettingsImpl.cpp
+++ b/WebKit/chromium/src/WebSettingsImpl.cpp
@@ -284,31 +284,6 @@ void WebSettingsImpl::setAcceleratedCompositingEnabled(bool enabled)
m_settings->setAcceleratedCompositingEnabled(enabled);
}
-void WebSettingsImpl::setAcceleratedCompositingFor3DTransformsEnabled(bool enabled)
-{
- m_settings->setAcceleratedCompositingFor3DTransformsEnabled(enabled);
-}
-
-void WebSettingsImpl::setAcceleratedCompositingForVideoEnabled(bool enabled)
-{
- m_settings->setAcceleratedCompositingForVideoEnabled(enabled);
-}
-
-void WebSettingsImpl::setAcceleratedCompositingForPluginsEnabled(bool enabled)
-{
- m_settings->setAcceleratedCompositingForPluginsEnabled(enabled);
-}
-
-void WebSettingsImpl::setAcceleratedCompositingForCanvasEnabled(bool enabled)
-{
- m_settings->setAcceleratedCompositingForCanvasEnabled(enabled);
-}
-
-void WebSettingsImpl::setAcceleratedCompositingForAnimationEnabled(bool enabled)
-{
- m_settings->setAcceleratedCompositingForAnimationEnabled(enabled);
-}
-
void WebSettingsImpl::setAccelerated2dCanvasEnabled(bool enabled)
{
m_settings->setAccelerated2dCanvasEnabled(enabled);
diff --git a/WebKit/chromium/src/WebSettingsImpl.h b/WebKit/chromium/src/WebSettingsImpl.h
index ffdc8d3..081188f 100644
--- a/WebKit/chromium/src/WebSettingsImpl.h
+++ b/WebKit/chromium/src/WebSettingsImpl.h
@@ -88,11 +88,6 @@ public:
virtual void setShowDebugBorders(bool);
virtual void setEditingBehavior(EditingBehavior);
virtual void setAcceleratedCompositingEnabled(bool);
- virtual void setAcceleratedCompositingFor3DTransformsEnabled(bool);
- virtual void setAcceleratedCompositingForVideoEnabled(bool);
- virtual void setAcceleratedCompositingForPluginsEnabled(bool);
- virtual void setAcceleratedCompositingForCanvasEnabled(bool);
- virtual void setAcceleratedCompositingForAnimationEnabled(bool);
virtual void setAccelerated2dCanvasEnabled(bool);
virtual void setMemoryInfoEnabled(bool);
virtual void setHyperlinkAuditingEnabled(bool);
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index e44c374..c6f227e 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -2272,15 +2272,17 @@ bool WebViewImpl::allowsAcceleratedCompositing()
void WebViewImpl::setRootGraphicsLayer(WebCore::PlatformLayer* layer)
{
+ bool wasActive = m_isAcceleratedCompositingActive;
setIsAcceleratedCompositingActive(layer ? true : false);
if (m_layerRenderer)
m_layerRenderer->setRootLayer(layer);
-
- IntRect damagedRect(0, 0, m_size.width, m_size.height);
- if (m_isAcceleratedCompositingActive)
- invalidateRootLayerRect(damagedRect);
- else
- m_client->didInvalidateRect(damagedRect);
+ if (wasActive != m_isAcceleratedCompositingActive) {
+ IntRect damagedRect(0, 0, m_size.width, m_size.height);
+ if (m_isAcceleratedCompositingActive)
+ invalidateRootLayerRect(damagedRect);
+ else
+ m_client->didInvalidateRect(damagedRect);
+ }
}
void WebViewImpl::setRootLayerNeedsDisplay()
@@ -2379,8 +2381,7 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
if (!active) {
m_isAcceleratedCompositingActive = false;
- if (m_layerRenderer)
- m_layerRenderer->finish(); // finish all GL rendering before we hide the window?
+ m_layerRenderer->finish(); // finish all GL rendering before we hide the window?
m_client->didActivateAcceleratedCompositing(false);
return;
}
@@ -2517,6 +2518,7 @@ void WebViewImpl::reallocateRenderer()
m_layerRenderer = layerRenderer;
// Enable or disable accelerated compositing and request a refresh.
+ m_isAcceleratedCompositingActive = false;
setRootGraphicsLayer(m_layerRenderer ? m_layerRenderer->rootLayer() : 0);
}
#endif
diff --git a/WebKit/chromium/src/js/DevTools.js b/WebKit/chromium/src/js/DevTools.js
index 5bb150c..11ebc1f 100644
--- a/WebKit/chromium/src/js/DevTools.js
+++ b/WebKit/chromium/src/js/DevTools.js
@@ -48,7 +48,6 @@ var context = {}; // Used by WebCore's inspector routines.
Preferences.nativeInstrumentationEnabled = true;
Preferences.fileSystemEnabled = false;
Preferences.showTimingTab = true;
- Preferences.showCookiesTab = true;
})();
var devtools = devtools || {};
generated by cgit v1.1 at 2025-08-16 06:20:31 +0000