summaryrefslogtreecommitdiffstats
path: root/WebKit/chromium
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/chromium')
-rw-r--r--WebKit/chromium/ChangeLog202
-rw-r--r--WebKit/chromium/DEPS15
-rw-r--r--WebKit/chromium/public/WebDevToolsAgent.h11
-rw-r--r--WebKit/chromium/public/WebFrameClient.h2
-rw-r--r--WebKit/chromium/public/WebKitClient.h6
-rw-r--r--WebKit/chromium/public/WebSettings.h5
-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
18 files changed, 46 insertions, 318 deletions
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index bbcdcbd..6443cb1 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,205 +1,3 @@
-2010-12-01 Jia Pu <jpu@apple.com>
-
- Reviewed by Darin Adler.
-
- Support multiple correction candidates panel for misspelled word on Mac OS X.
- https://bugs.webkit.org/show_bug.cgi?id=50137
- <rdar://problem/8568059>
-
- Adopted new function signature defined in base class.
-
- * src/EditorClientImpl.cpp:
- (WebKit::EditorClientImpl::getGuessesForWord):
- * src/EditorClientImpl.h:
-
-2010-12-01 Alexey Marinichev <amarinichev@chromium.org>
-
- Reviewed by James Robinson.
-
- [chromium] renderer does not realize hardware compositing is disabled and crashes
- https://bugs.webkit.org/show_bug.cgi?id=50264
-
- * src/WebViewImpl.cpp:
- (WebKit::WebViewImpl::setRootGraphicsLayer): repaint always
- (WebKit::WebViewImpl::setIsAcceleratedCompositingActive): null check
- (WebKit::WebViewImpl::reallocateRenderer):
-
-2010-11-30 Vangelis Kokkevis <vangelis@chromium.org>
-
- Reviewed by Darin Fisher.
-
- Get the value of the accelerated compositing triggers from the Settings
- class. This allows setting the triggers via command line flags.
- https://bugs.webkit.org/show_bug.cgi?id=50301
-
- * public/WebSettings.h:
- * src/ChromeClientImpl.cpp:
- (WebKit::ChromeClientImpl::allowedCompositingTriggers):
- * src/WebSettingsImpl.cpp:
- (WebKit::WebSettingsImpl::setAcceleratedCompositingFor3DTransformsEnabled):
- (WebKit::WebSettingsImpl::setAcceleratedCompositingForVideoEnabled):
- (WebKit::WebSettingsImpl::setAcceleratedCompositingForPluginsEnabled):
- (WebKit::WebSettingsImpl::setAcceleratedCompositingForCanvasEnabled):
- (WebKit::WebSettingsImpl::setAcceleratedCompositingForAnimationEnabled):
- * src/WebSettingsImpl.h:
-
-2010-12-01 Tony Chang <tony@chromium.org>
-
- Unreviewed, rolling chromium deps to r67811.
-
- * DEPS:
-
-2010-12-01 Andrey Kosyakov <caseq@chromium.org>
-
- Reviewed by Pavel Feldman.
-
- Web Inspector: disable cookies tab in network resource view by default, enable for chromium
- https://bugs.webkit.org/show_bug.cgi?id=50249
-
- * src/js/DevTools.js:
-
-2010-11-30 Ojan Vafai <ojan@chromium.org>
-
- Revert r72876. It caused a ~30% perf regression in chromium's bloat-http test
- https://bugs.webkit.org/show_bug.cgi?id=50288
-
- 2010-11-29 Adam Barth <abarth@webkit.org (:abarth) (r)>
- Reviewed by Darin Adler.
- Introduce the notion of a "display-isolated" URL scheme for use by Chrome-internal URLs
- https://bugs.webkit.org/show_bug.cgi?id=50182
- A display-isolated URL can only be displayed (e.g., put in an iframe,
- hyperlinked to) by documents from that scheme. In a sense, this is a
- generalization of some of the protections we give file URLs, but
- instead of lumping them all together into one "local" bucket, this
- patch creates a separate bucket for each scheme.
- For a while, I tried using a separate bucket for each origin. That
- would have played nicely with what Blob URLs are trying to do, but some
- "chrome" URL pages rely on being able to display other chrome URL
- pages, even in different origins. For example, the New Tab Page shows
- thumbnails from the "thumbnail" host.
- This patch also removes a bunch of unused code. I've also propagated
- the "deprecated" status of deprecatedCanDisplay to
- deprecatedShouldTreatURLAsLocal because that method has no other
- callers and is really asking for uppercase/lowercase bugs. I dream of
- someday removing these functions.
- 2010-11-29 Adam Barth <abarth@webkit.org (:abarth) (r)>
- Reviewed by Darin Adler.
- Introduce the notion of a "display-isolated" URL scheme for use by Chrome-internal URLs
- https://bugs.webkit.org/show_bug.cgi?id=50182
- This patch adds a Chromium API for registering schemes as
- display-isolated. In a subsequent patch, I'll change the "chrome"
- scheme in Chrome to be display isolated instead of local. That will
- prevent file URLs from linking to chrome URLs.
-
- * public/WebSecurityPolicy.h:
- * src/WebSecurityPolicy.cpp:
-
-2010-11-30 James Robinson <jamesr@chromium.org>
-
- Reviewed by Dimitri Glazkov.
-
- [chromium] Update yasm entry in DEPS to match downstream
- https://bugs.webkit.org/show_bug.cgi?id=50274
-
- http://src.chromium.org/viewvc/chrome?view=rev&revision=67540 changed the downstream DEPS rule
- for yasm to pull unconditionally rather than pulling in each deps_os. This changes the WebKit
- chromium DEPS to match.
-
- * DEPS:
-
-2010-11-29 Vangelis Kokkevis <vangelis@chromium.org>
-
- Reviewed by Simon Fraser.
-
- Provide more fine grained control to ports over when to turn on accelerated
- compositing.
- https://bugs.webkit.org/show_bug.cgi?id=49998
-
- As part of this change, the old hasAcceleratedCompositing method on the ChromeClient
- has now been replaced by allowedCompositingTriggers which returns a bitfield of
- all the features which can trigger the compositor.
-
- * src/ChromeClientImpl.cpp:
- (WebKit::ChromeClientImpl::allowedCompositingTriggers):
- * src/ChromeClientImpl.h:
-
-2010-11-30 Jochen Eisinger <jochen@chromium.org>
-
- Reviewed by Darin Fisher.
-
- [chromium] pass webframe to web frame client's cookieJar
- https://bugs.webkit.org/show_bug.cgi?id=50148
-
- * public/WebFrameClient.h:
- (WebKit::WebFrameClient::cookieJar):
- * src/ChromiumBridge.cpp:
- (WebCore::getCookieJar):
-
-2010-11-30 Jochen Eisinger <jochen@chromium.org>
-
- Unreviewed. Roll chromium 67532:67541.
-
- * DEPS:
-
-2010-11-29 Adam Barth <abarth@webkit.org>
-
- Reviewed by Darin Adler.
-
- Introduce the notion of a "display-isolated" URL scheme for use by Chrome-internal URLs
- https://bugs.webkit.org/show_bug.cgi?id=50182
-
- This patch adds a Chromium API for registering schemes as
- display-isolated. In a subsequent patch, I'll change the "chrome"
- scheme in Chrome to be display isolated instead of local. That will
- prevent file URLs from linking to chrome URLs.
-
- * public/WebSecurityPolicy.h:
- * src/WebSecurityPolicy.cpp:
- (WebKit::WebSecurityPolicy::registerURLSchemeAsDisplayIsolated):
-
-2010-11-29 Kent Tamura <tkent@chromium.org>
-
- Reviewed by Darin Fisher.
-
- [Chromium] Add substitution parameters to WebKitClient::queryLocalizedString()
- https://bugs.webkit.org/show_bug.cgi?id=50053
-
- * public/WebKitClient.h:
- (WebKit::WebKitClient::queryLocalizedString): Add overload functions with
- substitution string parameters, and remove the integer parameter overload.
- * src/LocalizedStrings.cpp:
- (WebCore::query): Add string parameter overloads, and remove the integer parameter overload.
- (WebCore::multipleFileUploadText): Call the string parameter query().
- (WebCore::validationMessageTooLongText): Pass the parameters to query().
- (WebCore::validationMessageRangeUnderflowText): ditto.
- (WebCore::validationMessageRangeOverflowText): ditto.
- (WebCore::validationMessageStepMismatchText): ditto.
-
-2010-11-29 Dimitri Glazkov <dglazkov@chromium.org>
-
- Remove Build directory that was erroneously added in r72103.
-
- * Build: Removed.
-
-2010-11-29 Andrey Kosyakov <caseq@chromium.org>
-
- Reviewed by Darin Fisher.
-
- Web Inspector: [Chromium] Expose extension API to select a node in WebInspector
- Added WebDevToolsAgent::inspect()
- https://bugs.webkit.org/show_bug.cgi?id=49727
-
- * public/WebDevToolsAgent.h:
- * src/WebDevToolsAgentImpl.cpp:
- (WebKit::WebDevToolsAgentImpl::inspectNode):
- * src/WebDevToolsAgentImpl.h:
-
-2010-11-29 Dimitri Glazkov <dglazkov@chromium.org>
-
- [Chromium] Remove python_24 dependency, because it is no longer necessary.
-
- * DEPS: Removed python_24 dependency.
-
2010-11-29 Bernhard Bauer <bauerb@chromium.org>
Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index ad0ad75..32c01f0 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '67811'
+ 'chromium_rev': '67532'
}
deps = {
@@ -109,20 +109,20 @@ deps = {
Var('chromium_svn')+'/tools/generate_stubs@'+Var('chromium_rev'),
# other third party
+ 'third_party':
+ Var('chromium_svn')+'/third_party@'+Var('chromium_rev'),
'third_party/icu':
From('chromium_deps', 'src/third_party/icu'),
'third_party/ots':
From('chromium_deps', 'src/third_party/ots'),
- 'third_party/yasm/source/patched-yasm':
- From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'),
- 'third_party':
- Var('chromium_svn')+'/third_party@'+Var('chromium_rev'),
}
deps_os = {
'win': {
'third_party/cygwin':
From('chromium_deps', 'src/third_party/cygwin'),
+ 'third_party/python_24':
+ From('chromium_deps', 'src/third_party/python_24'),
'third_party/ffmpeg/binaries/chromium/win/ia32':
From('chromium_deps', 'src/third_party/ffmpeg/binaries/chromium/win/ia32'),
'third_party/lighttpd':
@@ -131,6 +131,9 @@ deps_os = {
From('chromium_deps', 'src/third_party/nss'),
},
'mac': {
+ # needed by ffmpeg
+ 'third_party/yasm/source/patched-yasm':
+ From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'),
'third_party/nss':
From('chromium_deps', 'src/third_party/nss'),
},
@@ -138,6 +141,8 @@ deps_os = {
# Linux, actually.
'tools/xdisplaycheck':
Var('chromium_svn')+'/tools/xdisplaycheck@'+Var('chromium_rev'),
+ 'third_party/yasm/source/patched-yasm':
+ From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'),
'third_party/openssl':
From('chromium_deps', 'src/third_party/openssl'),
},
diff --git a/WebKit/chromium/public/WebDevToolsAgent.h b/WebKit/chromium/public/WebDevToolsAgent.h
index d6a7bcd..6b4d237 100644
--- a/WebKit/chromium/public/WebDevToolsAgent.h
+++ b/WebKit/chromium/public/WebDevToolsAgent.h
@@ -33,13 +33,6 @@
#include "WebCommon.h"
-#if WEBKIT_USING_V8
-namespace v8 {
-class Value;
-template <class T> class Handle;
-}
-#endif
-
namespace WebKit {
class WebDevToolsAgentClient;
class WebDevToolsMessageTransport;
@@ -65,9 +58,7 @@ public:
virtual void dispatchOnInspectorBackend(const WebString& message) = 0;
virtual void inspectElementAt(const WebPoint&) = 0;
-#if WEBKIT_USING_V8
- virtual void inspectNode(v8::Handle<v8::Value>) = 0;
-#endif
+
virtual void setRuntimeProperty(const WebString& name, const WebString& value) = 0;
// Exposed for LayoutTestController.
diff --git a/WebKit/chromium/public/WebFrameClient.h b/WebKit/chromium/public/WebFrameClient.h
index 1c6fd04..9063350 100644
--- a/WebKit/chromium/public/WebFrameClient.h
+++ b/WebKit/chromium/public/WebFrameClient.h
@@ -86,7 +86,7 @@ public:
// A frame specific cookie jar. May return null, in which case
// WebKitClient::cookieJar() will be called to access cookies.
- virtual WebCookieJar* cookieJar(WebFrame*) { return 0; }
+ virtual WebCookieJar* cookieJar() { return 0; }
// General notifications -----------------------------------------------
diff --git a/WebKit/chromium/public/WebKitClient.h b/WebKit/chromium/public/WebKitClient.h
index 0c4020f..8832add 100644
--- a/WebKit/chromium/public/WebKitClient.h
+++ b/WebKit/chromium/public/WebKitClient.h
@@ -226,10 +226,10 @@ public:
// Returns true on success.
virtual bool decodeAudioFileData(WebAudioBus* destinationBus, const char* audioFileData, size_t dataSize, double sampleRate) { return false; }
- // Returns a localized string resource (with substitution parameters).
+ // Returns a localized string resource (with an optional numeric
+ // parameter value).
virtual WebString queryLocalizedString(WebLocalizedString::Name) { return WebString(); }
- virtual WebString queryLocalizedString(WebLocalizedString::Name, const WebString& parameter) { return WebString(); }
- virtual WebString queryLocalizedString(WebLocalizedString::Name, const WebString& parameter1, const WebString& parameter2) { return WebString(); }
+ virtual WebString queryLocalizedString(WebLocalizedString::Name, int numericValue) { return WebString(); }
// Sandbox ------------------------------------------------------------
diff --git a/WebKit/chromium/public/WebSettings.h b/WebKit/chromium/public/WebSettings.h
index 0467c96..fa21551 100644
--- a/WebKit/chromium/public/WebSettings.h
+++ b/WebKit/chromium/public/WebSettings.h
@@ -93,11 +93,6 @@ public:
virtual void setShowDebugBorders(bool) = 0;
virtual void setEditingBehavior(EditingBehavior) = 0;
virtual void setAcceleratedCompositingEnabled(bool) = 0;
- virtual void setAcceleratedCompositingFor3DTransformsEnabled(bool) = 0;
- virtual void setAcceleratedCompositingForVideoEnabled(bool) = 0;
- virtual void setAcceleratedCompositingForCanvasEnabled(bool) = 0;
- virtual void setAcceleratedCompositingForPluginsEnabled(bool) = 0;
- virtual void setAcceleratedCompositingForAnimationEnabled(bool) = 0;
virtual void setAccelerated2dCanvasEnabled(bool) = 0;
virtual void setMemoryInfoEnabled(bool) = 0;
virtual void setHyperlinkAuditingEnabled(bool) = 0;
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-15 16:31:56 +0000