summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/bindings/v8/NPV8Object.h3
-rw-r--r--WebCore/bindings/v8/V8DOMWrapper.cpp3
-rw-r--r--WebCore/dom/Document.cpp5
-rw-r--r--WebCore/dom/Document.idl4
-rw-r--r--WebCore/dom/Element.idl4
-rw-r--r--WebCore/dom/TouchList.h6
-rw-r--r--WebCore/history/CachedFrame.cpp3
-rw-r--r--WebCore/page/EventHandler.cpp6
-rw-r--r--WebCore/page/EventHandler.h4
-rw-r--r--WebCore/platform/graphics/GraphicsContext.cpp6
-rw-r--r--WebCore/platform/network/ResourceRequestBase.cpp4
-rw-r--r--WebCore/plugins/PluginView.cpp9
12 files changed, 3 insertions, 54 deletions
diff --git a/WebCore/bindings/v8/NPV8Object.h b/WebCore/bindings/v8/NPV8Object.h
index 911987a..b9b376e 100644
--- a/WebCore/bindings/v8/NPV8Object.h
+++ b/WebCore/bindings/v8/NPV8Object.h
@@ -30,10 +30,7 @@
#ifndef NPV8Object_h
#define NPV8Object_h
-<<<<<<< HEAD
-=======
#include "V8Index.h"
->>>>>>> webkit.org at r54127
#if PLATFORM(CHROMIUM)
// FIXME: Chromium uses a different npruntime.h, which is in
// the Chromium source repository under third_party/npapi/bindings.
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp
index 01ae6ae..a24742d 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.cpp
+++ b/WebCore/bindings/v8/V8DOMWrapper.cpp
@@ -32,10 +32,7 @@
#include "V8DOMWrapper.h"
#include "CSSMutableStyleDeclaration.h"
-<<<<<<< HEAD
-=======
#include "DOMDataStore.h"
->>>>>>> webkit.org at r54127
#include "DOMObjectsInclude.h"
#include "DocumentLoader.h"
#include "FrameLoaderClient.h"
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 3953157..79beb0c 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -171,7 +171,6 @@
#include "SVGStyleElement.h"
#endif
-<<<<<<< HEAD
#if PLATFORM(ANDROID)
// FIXME: We shouldn't be including this from WebCore!
#include "WebViewCore.h"
@@ -191,10 +190,6 @@
#endif
#if ENABLE(TOUCH_EVENTS)
-#include "ChromeClient.h"
-=======
-#if ENABLE(TOUCH_EVENTS)
->>>>>>> webkit.org at r54127
#include "TouchEvent.h"
#endif
diff --git a/WebCore/dom/Document.idl b/WebCore/dom/Document.idl
index 2b17a13..26ed7fd 100644
--- a/WebCore/dom/Document.idl
+++ b/WebCore/dom/Document.idl
@@ -311,10 +311,6 @@ module core {
attribute [DontEnum] EventListener ontouchmove;
attribute [DontEnum] EventListener ontouchend;
attribute [DontEnum] EventListener ontouchcancel;
-<<<<<<< HEAD
-#endif
-=======
->>>>>>> webkit.org at r54127
#endif
#endif
};
diff --git a/WebCore/dom/Element.idl b/WebCore/dom/Element.idl
index c9b6260..e565bc0 100644
--- a/WebCore/dom/Element.idl
+++ b/WebCore/dom/Element.idl
@@ -200,10 +200,6 @@ module core {
attribute [DontEnum] EventListener ontouchmove;
attribute [DontEnum] EventListener ontouchend;
attribute [DontEnum] EventListener ontouchcancel;
-<<<<<<< HEAD
-#endif
-=======
->>>>>>> webkit.org at r54127
#endif
#endif
};
diff --git a/WebCore/dom/TouchList.h b/WebCore/dom/TouchList.h
index a578e4c..61350b0 100644
--- a/WebCore/dom/TouchList.h
+++ b/WebCore/dom/TouchList.h
@@ -28,15 +28,9 @@
#if ENABLE(TOUCH_EVENTS)
-<<<<<<< HEAD
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-#include "Touch.h"
-=======
#include "Touch.h"
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
->>>>>>> webkit.org at r54127
namespace WebCore {
diff --git a/WebCore/history/CachedFrame.cpp b/WebCore/history/CachedFrame.cpp
index 3d2399f..a027b62 100644
--- a/WebCore/history/CachedFrame.cpp
+++ b/WebCore/history/CachedFrame.cpp
@@ -43,10 +43,7 @@
#endif
#if ENABLE(TOUCH_EVENTS)
-<<<<<<< HEAD
-=======
#include "Chrome.h"
->>>>>>> webkit.org at r54127
#include "ChromeClient.h"
#include "Page.h"
#endif
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp
index d68dccf..8a008dc 100644
--- a/WebCore/page/EventHandler.cpp
+++ b/WebCore/page/EventHandler.cpp
@@ -81,13 +81,10 @@
#include "TouchEvent.h"
#endif
-<<<<<<< HEAD
#if defined(ANDROID_PLUGINS)
#include "WebViewCore.h"
#endif
-=======
->>>>>>> webkit.org at r54127
namespace WebCore {
using namespace HTMLNames;
@@ -2609,7 +2606,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
m_firstTouchPagePos = pagePoint;
}
-<<<<<<< HEAD
// ANDROID
// The touch event should act on m_touchEventTarget, not target
// TODO: Upstream this fix to webkit.org
@@ -2617,8 +2613,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
point.screenPos().x(), point.screenPos().y(),
adjustedPageX, adjustedPageY);
-=======
->>>>>>> webkit.org at r54127
if (point.state() == PlatformTouchPoint::TouchReleased)
releasedTouches->append(touch);
else if (point.state() == PlatformTouchPoint::TouchCancelled)
diff --git a/WebCore/page/EventHandler.h b/WebCore/page/EventHandler.h
index 83f2de8..f267ef5 100644
--- a/WebCore/page/EventHandler.h
+++ b/WebCore/page/EventHandler.h
@@ -425,10 +425,6 @@ private:
IntPoint m_firstTouchScreenPos;
IntPoint m_firstTouchPagePos;
#endif
-<<<<<<< HEAD
-
-=======
->>>>>>> webkit.org at r54127
};
} // namespace WebCore
diff --git a/WebCore/platform/graphics/GraphicsContext.cpp b/WebCore/platform/graphics/GraphicsContext.cpp
index eac8bcd..0105c53 100644
--- a/WebCore/platform/graphics/GraphicsContext.cpp
+++ b/WebCore/platform/graphics/GraphicsContext.cpp
@@ -506,11 +506,7 @@ void GraphicsContext::setPlatformTextDrawingMode(int mode)
}
#endif
-<<<<<<< HEAD
-#if !PLATFORM(QT) && !PLATFORM(CAIRO) && !(PLATFORM(SKIA) && !PLATFORM(ANDROID)) && !PLATFORM(HAIKU)
-=======
-#if !PLATFORM(QT) && !PLATFORM(CAIRO) && !PLATFORM(SKIA) && !PLATFORM(HAIKU) && !PLATFORM(OPENVG)
->>>>>>> webkit.org at r54127
+#if !PLATFORM(QT) && !PLATFORM(CAIRO) && !(PLATFORM(SKIA) && !PLATFORM(ANDROID)) && !PLATFORM(HAIKU) && !PLATFORM(OPENVG)
void GraphicsContext::setPlatformStrokeStyle(const StrokeStyle&)
{
}
diff --git a/WebCore/platform/network/ResourceRequestBase.cpp b/WebCore/platform/network/ResourceRequestBase.cpp
index adf635c..0a68972 100644
--- a/WebCore/platform/network/ResourceRequestBase.cpp
+++ b/WebCore/platform/network/ResourceRequestBase.cpp
@@ -390,11 +390,7 @@ void ResourceRequestBase::updateResourceRequest() const
m_resourceRequestUpdated = true;
}
-<<<<<<< HEAD
-#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(ANDROID)
-=======
#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(ANDROID) && !PLATFORM(QT)
->>>>>>> webkit.org at r54127
unsigned initializeMaximumHTTPConnectionCountPerHost()
{
// This is used by the loader to control the number of issued parallel load requests.
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index b0dca80..d763219 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -62,20 +62,19 @@
#include "RenderObject.h"
#include "npruntime_impl.h"
#include "Settings.h"
-<<<<<<< HEAD
#include <wtf/ASCIICType.h>
#if defined(ANDROID_PLUGINS)
#include "TouchEvent.h"
#endif
+// ANDROID
+// TODO: Upstream to webkit.org
#if USE(JSC)
#include "JSDOMWindow.h"
#include "JSDOMBinding.h"
#include "c_instance.h"
#include "runtime_root.h"
-=======
->>>>>>> webkit.org at r54127
#include <runtime/JSLock.h>
#include <runtime/JSValue.h>
@@ -162,7 +161,6 @@ void PluginView::handleEvent(Event* event)
handleMouseEvent(static_cast<MouseEvent*>(event));
else if (event->isKeyboardEvent())
handleKeyboardEvent(static_cast<KeyboardEvent*>(event));
-<<<<<<< HEAD
#if defined(ANDROID_PLUGINS)
else if (event->isTouchEvent())
handleTouchEvent(static_cast<TouchEvent*>(event));
@@ -171,10 +169,7 @@ void PluginView::handleEvent(Event* event)
else if (event->type() == eventNames().DOMFocusInEvent)
handleFocusEvent(true);
#endif
-#if defined(Q_WS_X11) && ENABLE(NETSCAPE_PLUGIN_API)
-=======
#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
->>>>>>> webkit.org at r54127
else if (event->type() == eventNames().DOMFocusOutEvent)
handleFocusOutEvent();
else if (event->type() == eventNames().DOMFocusInEvent)
generated by cgit v1.1 at 2025-05-12 19:09:42 +0000