summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS2
-rw-r--r--webkit/build/V8Bindings/V8Bindings.vcproj60
-rw-r--r--webkit/build/WebCore/WebCore.vcproj32
-rw-r--r--webkit/glue/inspector_client_impl.cc3
-rw-r--r--webkit/port/bindings/v8/JSDOMBinding.h3
-rw-r--r--webkit/port/bindings/v8/ScriptController.cpp2
-rw-r--r--webkit/port/bindings/v8/ScriptController.h4
-rw-r--r--webkit/port/bindings/v8/v8_custom.h10
-rw-r--r--webkit/webkit.gyp17
9 files changed, 118 insertions, 15 deletions
diff --git a/DEPS b/DEPS
index 81353b1..6d080ae 100644
--- a/DEPS
+++ b/DEPS
@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@214",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@13964",
+ "/trunk/deps/third_party/WebKit@ 13974",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@13472",
diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj
index 174897c..6b110f0 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -1520,51 +1520,51 @@
>
</File>
<File
- RelativePath="$(IntDir)\DerivedSources\V8SQLError.cpp"
+ RelativePath="$(IntDir)\DerivedSources\V8RGBColor.cpp"
>
</File>
<File
- RelativePath="$(IntDir)\DerivedSources\V8SQLError.h"
+ RelativePath="$(IntDir)\DerivedSources\V8RGBColor.h"
>
</File>
<File
- RelativePath="$(IntDir)\DerivedSources\V8SQLResultSet.cpp"
+ RelativePath="$(IntDir)\DerivedSources\V8Screen.cpp"
>
</File>
<File
- RelativePath="$(IntDir)\DerivedSources\V8SQLResultSet.h"
+ RelativePath="$(IntDir)\DerivedSources\V8Screen.h"
>
</File>
<File
- RelativePath="$(IntDir)\DerivedSources\V8SQLResultSetRowList.cpp"
+ RelativePath="$(IntDir)\DerivedSources\V8SQLError.cpp"
>
</File>
<File
- RelativePath="$(IntDir)\DerivedSources\V8SQLResultSetRowList.h"
+ RelativePath="$(IntDir)\DerivedSources\V8SQLError.h"
>
</File>
<File
- RelativePath="$(IntDir)\DerivedSources\V8SQLTransaction.cpp"
+ RelativePath="$(IntDir)\DerivedSources\V8SQLResultSet.cpp"
>
</File>
<File
- RelativePath="$(IntDir)\DerivedSources\V8SQLTransaction.h"
+ RelativePath="$(IntDir)\DerivedSources\V8SQLResultSet.h"
>
</File>
<File
- RelativePath="$(IntDir)\DerivedSources\V8RGBColor.cpp"
+ RelativePath="$(IntDir)\DerivedSources\V8SQLResultSetRowList.cpp"
>
</File>
<File
- RelativePath="$(IntDir)\DerivedSources\V8RGBColor.h"
+ RelativePath="$(IntDir)\DerivedSources\V8SQLResultSetRowList.h"
>
</File>
<File
- RelativePath="$(IntDir)\DerivedSources\V8Screen.cpp"
+ RelativePath="$(IntDir)\DerivedSources\V8SQLTransaction.cpp"
>
</File>
<File
- RelativePath="$(IntDir)\DerivedSources\V8Screen.h"
+ RelativePath="$(IntDir)\DerivedSources\V8SQLTransaction.h"
>
</File>
<File
@@ -2913,6 +2913,14 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\ScriptFunctionCall.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\ScriptFunctionCall.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\ScriptInstance.cpp"
>
</File>
@@ -2921,10 +2929,38 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\ScriptObject.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\ScriptObject.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\ScriptObjectQuarantine.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\ScriptObjectQuarantine.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\ScriptScope.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\ScriptScope.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\ScriptSourceCode.h"
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\ScriptState.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\ScriptState.h"
>
</File>
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 5da7bea..8c3d0f2 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -125,6 +125,30 @@
Name="inspector"
>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\ConsoleMessage.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\ConsoleMessage.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorDatabaseResource.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorDatabaseResource.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorDOMStorageResource.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorDOMStorageResource.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorController.cpp"
>
</File>
@@ -132,6 +156,14 @@
RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorController.h"
>
</File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorResource.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorResource.h"
+ >
+ </File>
</Filter>
<Filter
Name="page"
diff --git a/webkit/glue/inspector_client_impl.cc b/webkit/glue/inspector_client_impl.cc
index d2130dd..ae6a57e 100644
--- a/webkit/glue/inspector_client_impl.cc
+++ b/webkit/glue/inspector_client_impl.cc
@@ -145,7 +145,8 @@ static void invalidateNodeBoundingRect(WebViewImpl* web_view) {
// In order to do so, we'd have to take scrolling into account.
const WebSize& size = web_view->size();
WebRect damaged_rect(0, 0, size.width, size.height);
- web_view->GetDelegate()->DidInvalidateRect(web_view, damaged_rect);
+ if (web_view->GetDelegate())
+ web_view->GetDelegate()->DidInvalidateRect(web_view, damaged_rect);
}
void WebInspectorClient::highlight(Node* node) {
diff --git a/webkit/port/bindings/v8/JSDOMBinding.h b/webkit/port/bindings/v8/JSDOMBinding.h
index 8ed5602..350dc94 100644
--- a/webkit/port/bindings/v8/JSDOMBinding.h
+++ b/webkit/port/bindings/v8/JSDOMBinding.h
@@ -34,10 +34,11 @@
#ifndef JSDOMBinding_h
#define JSDOMBinding_h
+#include "ScriptState.h"
+
namespace WebCore {
class Node;
class Document;
- class ScriptState;
void updateDOMNodeDocument(Node*, Document* oldDocument,
Document* newDocument);
diff --git a/webkit/port/bindings/v8/ScriptController.cpp b/webkit/port/bindings/v8/ScriptController.cpp
index 0f5c2ed..4bb0b69 100644
--- a/webkit/port/bindings/v8/ScriptController.cpp
+++ b/webkit/port/bindings/v8/ScriptController.cpp
@@ -43,6 +43,7 @@
#include "npruntime_priv.h"
#include "NPV8Object.h"
#include "ScriptSourceCode.h"
+#include "ScriptState.h"
#include "Widget.h"
#include "v8_proxy.h"
@@ -104,6 +105,7 @@ ScriptController::ScriptController(Frame* frame)
, m_sourceURL(0)
, m_processingTimerCallback(false)
, m_paused(false)
+ , m_scriptState(new ScriptState(frame))
, m_proxy(new V8Proxy(frame))
#if ENABLE(NETSCAPE_PLUGIN_API)
, m_windowScriptNPObject(0)
diff --git a/webkit/port/bindings/v8/ScriptController.h b/webkit/port/bindings/v8/ScriptController.h
index 84bd3bf..b72b7c6 100644
--- a/webkit/port/bindings/v8/ScriptController.h
+++ b/webkit/port/bindings/v8/ScriptController.h
@@ -129,6 +129,7 @@ class Frame;
class HTMLPlugInElement;
class Node;
class ScriptSourceCode;
+class ScriptState;
class String;
class Widget;
@@ -167,6 +168,8 @@ public:
// with what JSC does as well.
ScriptController* windowShell() { return this; }
+ ScriptState* state() const { return m_scriptState.get(); }
+
void disposeJSResult(JSResult result);
void collectGarbage();
@@ -246,6 +249,7 @@ private:
bool m_processingTimerCallback;
bool m_paused;
+ OwnPtr<ScriptState> m_scriptState;
OwnPtr<V8Proxy> m_proxy;
typedef HashMap<void*, NPObject*> PluginObjectMap;
diff --git a/webkit/port/bindings/v8/v8_custom.h b/webkit/port/bindings/v8/v8_custom.h
index e8a0bad..49f7c75 100644
--- a/webkit/port/bindings/v8/v8_custom.h
+++ b/webkit/port/bindings/v8/v8_custom.h
@@ -432,6 +432,16 @@ DECLARE_CALLBACK(TreeWalkerNextSibling)
DECLARE_CALLBACK(TreeWalkerPreviousSibling)
// Custom implementation of InspectorController functions
+DECLARE_CALLBACK(InspectorControllerProfiles)
+DECLARE_CALLBACK(InspectorControllerHighlightDOMNode)
+DECLARE_CALLBACK(InspectorControllerAddResourceSourceToFrame)
+DECLARE_CALLBACK(InspectorControllerGetResourceDocumentNode)
+DECLARE_CALLBACK(InspectorControllerAddSourceToFrame)
+DECLARE_CALLBACK(InspectorControllerSearch)
+DECLARE_CALLBACK(InspectorControllerSetting)
+DECLARE_CALLBACK(InspectorControllerInspectedWindow)
+DECLARE_CALLBACK(InspectorControllerSetSetting)
+DECLARE_CALLBACK(InspectorControllerCurrentCallFrame)
DECLARE_CALLBACK(InspectorControllerDebuggerEnabled)
DECLARE_CALLBACK(InspectorControllerPauseOnExceptions)
DECLARE_CALLBACK(InspectorControllerProfilerEnabled)
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 123ce36..f075bfd 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1046,10 +1046,19 @@
'../third_party/WebKit/WebCore/bindings/v8/ScriptCallFrame.h',
'../third_party/WebKit/WebCore/bindings/v8/ScriptCallStack.cpp',
'../third_party/WebKit/WebCore/bindings/v8/ScriptCallStack.h',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptFunctionCall.cpp',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptFunctionCall.h',
'../third_party/WebKit/WebCore/bindings/v8/ScriptInstance.cpp',
'../third_party/WebKit/WebCore/bindings/v8/ScriptInstance.h',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptObject.cpp',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptObject.h',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptObjectQuarantine.cpp',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptObjectQuarantine.h',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptScope.cpp',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptScope.h',
'../third_party/WebKit/WebCore/bindings/v8/ScriptSourceCode.h',
'../third_party/WebKit/WebCore/bindings/v8/ScriptState.h',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptState.cpp',
'../third_party/WebKit/WebCore/bindings/v8/ScriptString.h',
'../third_party/WebKit/WebCore/bindings/v8/ScriptValue.cpp',
'../third_party/WebKit/WebCore/bindings/v8/ScriptValue.h',
@@ -1737,8 +1746,16 @@
'../third_party/WebKit/WebCore/html/TimeRanges.h',
'../third_party/WebKit/WebCore/html/VoidCallback.h',
'../third_party/WebKit/WebCore/inspector/InspectorClient.h',
+ '../third_party/WebKit/WebCore/inspector/ConsoleMessage.cpp',
+ '../third_party/WebKit/WebCore/inspector/ConsoleMessage.h',
'../third_party/WebKit/WebCore/inspector/InspectorController.cpp',
'../third_party/WebKit/WebCore/inspector/InspectorController.h',
+ '../third_party/WebKit/WebCore/inspector/InspectorDatabaseResource.cpp',
+ '../third_party/WebKit/WebCore/inspector/InspectorDatabaseResource.h',
+ '../third_party/WebKit/WebCore/inspector/InspectorDOMStorageResource.cpp',
+ '../third_party/WebKit/WebCore/inspector/InspectorDOMStorageResource.h',
+ '../third_party/WebKit/WebCore/inspector/InspectorResource.cpp',
+ '../third_party/WebKit/WebCore/inspector/InspectorResource.h',
'../third_party/WebKit/WebCore/inspector/JavaScriptCallFrame.cpp',
'../third_party/WebKit/WebCore/inspector/JavaScriptCallFrame.h',
'../third_party/WebKit/WebCore/inspector/JavaScriptDebugListener.h',
generated by cgit v1.1 at 2025-01-07 06:59:35 +0000