summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/bindings')
-rw-r--r--WebCore/bindings/js/ScriptController.h3
-rw-r--r--WebCore/bindings/v8/DerivedSourcesAllInOne.cpp6
-rw-r--r--WebCore/bindings/v8/ScriptController.h3
-rw-r--r--WebCore/bindings/v8/V8Index.cpp3
-rw-r--r--WebCore/bindings/v8/V8Index.h9
-rw-r--r--WebCore/bindings/v8/V8Proxy.cpp12
-rw-r--r--WebCore/bindings/v8/V8WorkerContextEventListener.cpp3
-rw-r--r--WebCore/bindings/v8/WorkerContextExecutionProxy.cpp4
8 files changed, 3 insertions, 40 deletions
diff --git a/WebCore/bindings/js/ScriptController.h b/WebCore/bindings/js/ScriptController.h
index 60b18d9..f2a497d 100644
--- a/WebCore/bindings/js/ScriptController.h
+++ b/WebCore/bindings/js/ScriptController.h
@@ -90,8 +90,6 @@ public:
m_windowShells.remove(world);
}
-<<<<<<< HEAD:WebCore/bindings/js/ScriptController.h
-=======
ScriptValue executeScript(const ScriptSourceCode&);
ScriptValue executeScript(const String& script, bool forceUserGesture = false);
ScriptValue executeScriptInIsolatedWorld(unsigned worldID, const String& script, bool forceUserGesture = false);
@@ -100,7 +98,6 @@ public:
// Returns true if argument is a JavaScript URL.
bool executeIfJavaScriptURL(const KURL&, bool userGesture = false, bool replaceDocument = true);
->>>>>>> webkit.org at r50258.:WebCore/bindings/js/ScriptController.h
// This function must be called from the main thread. It is safe to call it repeatedly.
// Darwin is an exception to this rule: it is OK to call this function from any thread, even reentrantly.
static void initializeThreading();
diff --git a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
index 4aeee0c..d8f2bae 100644
--- a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
+++ b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
@@ -254,10 +254,7 @@
#if ENABLE(SHARED_WORKERS)
#include "bindings/V8SharedWorker.cpp"
-<<<<<<< HEAD:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
-=======
#include "bindings/V8SharedWorkerContext.cpp"
->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
#endif
#if ENABLE(SVG)
@@ -386,7 +383,6 @@
#if ENABLE(INSPECTOR)
#include "bindings/V8InspectorBackend.cpp"
#endif
-<<<<<<< HEAD:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
#if PLATFORM(ANDROID)
// TODO: Upstream NOTIFICATIONS guard.
@@ -395,5 +391,3 @@
#include "bindings/V8NotificationCenter.cpp"
#endif
#endif
-=======
->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
diff --git a/WebCore/bindings/v8/ScriptController.h b/WebCore/bindings/v8/ScriptController.h
index c17650a..a958ead 100644
--- a/WebCore/bindings/v8/ScriptController.h
+++ b/WebCore/bindings/v8/ScriptController.h
@@ -60,15 +60,12 @@ namespace WebCore {
// or this accessor should be made JSProxy*
V8Proxy* proxy() { return m_proxy.get(); }
-<<<<<<< HEAD:WebCore/bindings/v8/ScriptController.h
-=======
ScriptValue executeScript(const ScriptSourceCode&);
ScriptValue executeScript(const String& script, bool forceUserGesture = false);
// Returns true if argument is a JavaScript URL.
bool executeIfJavaScriptURL(const KURL&, bool userGesture = false, bool replaceDocument = true);
->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/ScriptController.h
// This function must be called from the main thread. It is safe to call it repeatedly.
static void initializeThreading();
diff --git a/WebCore/bindings/v8/V8Index.cpp b/WebCore/bindings/v8/V8Index.cpp
index 89a9f71..514b851 100644
--- a/WebCore/bindings/v8/V8Index.cpp
+++ b/WebCore/bindings/v8/V8Index.cpp
@@ -435,7 +435,6 @@
#include "V8InspectorBackend.h"
#endif
-<<<<<<< HEAD:WebCore/bindings/v8/V8Index.cpp
#if PLATFORM(ANDROID)
// TODO: Upstream these guards to webkit.org
#if ENABLE(GEOLOCATION)
@@ -454,8 +453,6 @@
#include "V8VoidCallback.h"
#endif // PLATFORM(ANDROID)
-=======
->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/V8Index.cpp
namespace WebCore {
FunctionTemplateFactory V8ClassIndex::GetFactory(V8WrapperType type)
diff --git a/WebCore/bindings/v8/V8Index.h b/WebCore/bindings/v8/V8Index.h
index ee64125..5478181 100644
--- a/WebCore/bindings/v8/V8Index.h
+++ b/WebCore/bindings/v8/V8Index.h
@@ -491,7 +491,6 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
#define DOM_OBJECT_INSPECTOR_TYPES(V)
#endif
-<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h
#if ENABLE(GEOLOCATION)
#define DOM_OBJECT_GEOLOCATION_TYPES(V) \
V(COORDINATES, Coordinates) \
@@ -523,8 +522,6 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
#if PLATFORM(ANDROID)
// This block is modified, but is not Android-specific.
-=======
->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/V8Index.h
#define DOM_OBJECT_TYPES(V) \
DOM_OBJECT_TYPES_1(V) \
DOM_OBJECT_TYPES_2(V) \
@@ -534,17 +531,11 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
DOM_OBJECT_3D_CANVAS_TYPES(V) \
DOM_OBJECT_XPATH_TYPES(V) \
DOM_OBJECT_XSLT_TYPES(V) \
-<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h
DOM_OBJECT_GEOLOCATION_TYPES(V) \
DOM_OBJECT_TOUCH_EVENT_TYPES(V) \
DOM_OBJECT_VOIDCALLBACK_TYPES(V) \
-=======
->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/V8Index.h
DOM_OBJECT_INSPECTOR_TYPES(V)
-<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h
#endif
-=======
->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/V8Index.h
#if ENABLE(SVG)
// SVG_OBJECT_TYPES are svg non-node, non-pod types.
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index c78d009..d6f5b9f 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -809,12 +809,8 @@ void V8Proxy::clearForClose()
{
resetIsolatedWorlds();
-<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp
- if (!context().IsEmpty()) {
- LOCK_V8;
-=======
if (!m_context.IsEmpty()) {
->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/V8Proxy.cpp
+ LOCK_V8;
v8::HandleScope handleScope;
clearDocumentWrapper();
@@ -827,12 +823,8 @@ void V8Proxy::clearForNavigation()
disconnectEventListeners();
resetIsolatedWorlds();
-<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp
- if (!context().IsEmpty()) {
- LOCK_V8;
-=======
if (!m_context.IsEmpty()) {
->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/V8Proxy.cpp
+ LOCK_V8;
v8::HandleScope handle;
clearDocumentWrapper();
diff --git a/WebCore/bindings/v8/V8WorkerContextEventListener.cpp b/WebCore/bindings/v8/V8WorkerContextEventListener.cpp
index 79911ae..3800e04 100644
--- a/WebCore/bindings/v8/V8WorkerContextEventListener.cpp
+++ b/WebCore/bindings/v8/V8WorkerContextEventListener.cpp
@@ -36,11 +36,8 @@
#include "Event.h"
#include "V8Binding.h"
-<<<<<<< HEAD:WebCore/bindings/v8/V8WorkerContextEventListener.cpp
#include "V8Utilities.h"
-=======
#include "WorkerContext.h"
->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/V8WorkerContextEventListener.cpp
#include "WorkerContextExecutionProxy.h"
namespace WebCore {
diff --git a/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp b/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
index 128f486..b93619b 100644
--- a/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
+++ b/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
@@ -128,18 +128,16 @@ void WorkerContextExecutionProxy::initV8IfNeeded()
v8::V8::IgnoreOutOfMemoryException();
v8::V8::SetFatalErrorHandler(reportFatalErrorInV8);
-<<<<<<< HEAD:WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
#if PLATFORM(ANDROID)
const int workerThreadPreemptionIntervalMs = 5;
v8::Locker::StartPreemption(workerThreadPreemptionIntervalMs);
#endif
-=======
+
v8::ResourceConstraints resource_constraints;
uint32_t here;
resource_constraints.set_stack_limit(&here - kWorkerMaxStackSize / sizeof(uint32_t*));
v8::SetResourceConstraints(&resource_constraints);
->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
v8Initialized = true;
}
generated by cgit v1.1 at 2025-08-17 22:36:20 +0000