summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--WebCore/page/EventHandler.cpp3
-rw-r--r--WebCore/page/Frame.h51
-rw-r--r--WebCore/page/Geolocation.cpp11
-rw-r--r--WebCore/page/PageGroup.cpp10
-rw-r--r--WebCore/page/android/EventHandlerAndroid.cpp4
-rw-r--r--WebCore/plugins/PluginDatabase.h6
-rw-r--r--WebCore/plugins/PluginView.cpp12
-rw-r--r--WebCore/plugins/PluginView.h3
-rw-r--r--WebCore/storage/DatabaseThread.cpp19
-rw-r--r--WebCore/storage/LocalStorageTask.cpp7
-rw-r--r--WebCore/storage/LocalStorageThread.cpp7
-rw-r--r--WebCore/storage/Storage.h6
-rw-r--r--WebCore/storage/Storage.idl5
13 files changed, 2 insertions, 142 deletions
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp
index 624f530..41e859f 100644
--- a/WebCore/page/EventHandler.cpp
+++ b/WebCore/page/EventHandler.cpp
@@ -2459,7 +2459,6 @@ bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults&
return scrollbar->mouseDown(mev.event());
}
-#ifdef MANUAL_MERGE_REQUIRED
#if ENABLE(TOUCH_EVENTS) // Android
bool EventHandler::handleTouchEvent(const PlatformTouchEvent& e)
{
@@ -2568,7 +2567,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& e)
}
#endif
-#else // MANUAL_MERGE_REQUIRED
// If scrollbar (under mouse) is different from last, send a mouse exited. Set
// last to scrollbar if setLast is true; else set last to 0.
void EventHandler::updateLastScrollbarUnderMouse(Scrollbar* scrollbar, bool setLast)
@@ -2581,5 +2579,4 @@ void EventHandler::updateLastScrollbarUnderMouse(Scrollbar* scrollbar, bool setL
}
}
-#endif // MANUAL_MERGE_REQUIRED
}
diff --git a/WebCore/page/Frame.h b/WebCore/page/Frame.h
index 1b55612..652269a 100644
--- a/WebCore/page/Frame.h
+++ b/WebCore/page/Frame.h
@@ -154,58 +154,7 @@ namespace WebCore {
static void cancelAllKeepAlive();
#endif
-#ifdef MANUAL_MERGE_REQUIRED
-class Frame : public RefCounted<Frame> {
-public:
- static PassRefPtr<Frame> create(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* client)
- {
- return adoptRef(new Frame(page, ownerElement, client));
- }
- void setView(PassRefPtr<FrameView>);
- ~Frame();
-
- void init();
-
- Page* page() const;
- HTMLFrameOwnerElement* ownerElement() const;
-
- void pageDestroyed();
- void disconnectOwnerElement();
-
- Document* document() const;
- FrameView* view() const;
-
- void setDOMWindow(DOMWindow*);
- DOMWindow* domWindow() const;
- void clearFormerDOMWindow(DOMWindow*);
-
- Editor* editor() const;
- EventHandler* eventHandler() const;
- FrameLoader* loader() const;
- SelectionController* selection() const;
- FrameTree* tree() const;
- AnimationController* animation() const;
- ScriptController* script();
-
- RenderView* contentRenderer() const; // root renderer for the document contained in this frame
- RenderPart* ownerRenderer() const; // renderer for the element that contains this frame
-
- bool isDisconnected() const;
- void setIsDisconnected(bool);
- bool excludeFromTextSearch() const;
- void setExcludeFromTextSearch(bool);
-
- void createView(const IntSize&, const Color&, bool, const IntSize &, bool,
- ScrollbarMode = ScrollbarAuto, ScrollbarMode = ScrollbarAuto);
-
-
-private:
- Frame(Page*, HTMLFrameOwnerElement*, FrameLoaderClient*);
-
-// === undecided, would like to consider moving to another class
-#else // MANUAL_MERGE_REQUIRED
void setDocument(PassRefPtr<Document>);
-#endif // MANUAL_MERGE_REQUIRED
void clearTimers();
static void clearTimers(FrameView*, Document*);
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index 875da43..5337bcc 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -198,18 +198,7 @@ void Geolocation::sendPositionToWatchers(Geoposition* position)
Vector<RefPtr<GeoNotifier> > copy;
copyValuesToVector(m_watchers, copy);
-#ifdef MANUAL_MERGE_REQUIRED
- Vector<RefPtr<GeoNotifier> >::const_iterator end = copy.end();
- for (Vector<RefPtr<GeoNotifier> >::const_iterator it = copy.begin(); it != end; ++it) {
- RefPtr<GeoNotifier> notifier = *it;
- ASSERT(notifier->m_successCallback);
-
- notifier->m_timer.stop();
- notifier->m_successCallback->handleEvent(position);
- }
-#else // MANUAL_MERGE_REQUIRED
sendPosition(copy, position);
-#endif // MANUAL_MERGE_REQUIRED
}
void Geolocation::startTimer(Vector<RefPtr<GeoNotifier> >& notifiers)
diff --git a/WebCore/page/PageGroup.cpp b/WebCore/page/PageGroup.cpp
index c23cb86..5155be1 100644
--- a/WebCore/page/PageGroup.cpp
+++ b/WebCore/page/PageGroup.cpp
@@ -182,15 +182,6 @@ void PageGroup::setShouldTrackVisitedLinks(bool shouldTrack)
#if ENABLE(DOM_STORAGE)
StorageNamespace* PageGroup::localStorage()
{
-#ifdef MANUAL_MERGE_REQUIRED
- if (!m_localStorage) {
- // Need a page in this page group to query the settings for the local storage database path.
- Page* page = *m_pages.begin();
- ASSERT(page);
- m_localStorage = LocalStorage::localStorage(page->settings()->localStorageDatabasePath());
- }
-
-#else // MANUAL_MERGE_REQUIRED
if (!m_localStorage) {
// Need a page in this page group to query the settings for the local storage database path.
Page* page = *m_pages.begin();
@@ -198,7 +189,6 @@ StorageNamespace* PageGroup::localStorage()
m_localStorage = StorageNamespace::localStorageNamespace(page->settings()->localStorageDatabasePath());
}
-#endif // MANUAL_MERGE_REQUIRED
return m_localStorage.get();
}
#endif
diff --git a/WebCore/page/android/EventHandlerAndroid.cpp b/WebCore/page/android/EventHandlerAndroid.cpp
index b52ca22..ddbcdf0 100644
--- a/WebCore/page/android/EventHandlerAndroid.cpp
+++ b/WebCore/page/android/EventHandlerAndroid.cpp
@@ -39,13 +39,9 @@
namespace WebCore {
-#ifdef MANUAL_MERGE_REQUIRED
-bool EventHandler::tabsToAllControls(KeyboardEvent* ) const
-#else // MANUAL_MERGE_REQUIRED
unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::AltKey;
bool EventHandler::tabsToAllControls(KeyboardEvent*) const
-#endif // MANUAL_MERGE_REQUIRED
{
return true;
}
diff --git a/WebCore/plugins/PluginDatabase.h b/WebCore/plugins/PluginDatabase.h
index 55aaec8..e5e4d4f 100644
--- a/WebCore/plugins/PluginDatabase.h
+++ b/WebCore/plugins/PluginDatabase.h
@@ -86,12 +86,9 @@ namespace WebCore {
#endif
private:
-#ifdef MANUAL_MERGE_REQUIRED
#ifndef ANDROID_PLUGINS
void setPluginDirectories(const Vector<String>& directories) { m_pluginDirectories = directories; }
#endif
-#else // MANUAL_MERGE_REQUIRED
-#endif // MANUAL_MERGE_REQUIRED
void getPluginPathsInDirectories(HashSet<String>&) const;
void getDeletedPlugins(PluginSet&) const;
@@ -106,16 +103,13 @@ namespace WebCore {
PluginSet m_plugins;
HashMap<String, RefPtr<PluginPackage> > m_pluginsByPath;
HashMap<String, time_t> m_pluginPathsWithTimes;
-#ifdef MANUAL_MERGE_REQUIRED
#if defined(ANDROID_PLUGINS)
// Need access to setPluginDirectories() to change the default
// path after startup.
friend class ::android::WebSettings;
#endif
-#else // MANUAL_MERGE_REQUIRED
HashMap<String, RefPtr<PluginPackage> > m_preferredPlugins;
-#endif // MANUAL_MERGE_REQUIRED
};
} // namespace WebCore
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index 2f5473c..3819eb9 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -185,13 +185,9 @@ bool PluginView::start()
NPError npErr;
{
PluginView::setCurrentPluginView(this);
-#ifdef MANUAL_MERGE_REQUIRED
#if USE(JSC)
- JSC::JSLock::DropAllLocks dropAllLocks(false);
-#endif
-#else // MANUAL_MERGE_REQUIRED
JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
-#endif // MANUAL_MERGE_REQUIRED
+#endif
setCallingPlugin(true);
npErr = m_plugin->pluginFuncs()->newp((NPMIMEType)m_mimeType.utf8().data(), m_instance, m_mode, m_paramCount, m_paramNames, m_paramValues, NULL);
setCallingPlugin(false);
@@ -390,13 +386,9 @@ void PluginView::performRequest(PluginRequest* request)
// FIXME: <rdar://problem/4807469> This should be sent when the document has finished loading
if (request->sendNotification()) {
PluginView::setCurrentPluginView(this);
-#ifdef MANUAL_MERGE_REQUIRED
#if USE(JSC)
- JSC::JSLock::DropAllLocks dropAllLocks(false);
-#endif
-#else // MANUAL_MERGE_REQUIRED
JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
-#endif // MANUAL_MERGE_REQUIRED
+#endif
setCallingPlugin(true);
m_plugin->pluginFuncs()->urlnotify(m_instance, requestURL.string().utf8().data(), NPRES_DONE, request->notifyData());
setCallingPlugin(false);
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index 45bd867..5c39535 100644
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -218,16 +218,13 @@ namespace WebCore {
static bool isCallingPlugin();
-#ifdef MANUAL_MERGE_REQUIRED
#ifdef ANDROID_PLUGINS
Frame* getParentFrame() const { return m_parentFrame; }
Element* getElement() const { return m_element; }
#endif
-#else // MANUAL_MERGE_REQUIRED
bool start();
-#endif // MANUAL_MERGE_REQUIRED
private:
PluginView(Frame* parentFrame, const IntSize&, PluginPackage*, Element*, const KURL&, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually);
diff --git a/WebCore/storage/DatabaseThread.cpp b/WebCore/storage/DatabaseThread.cpp
index 2bfc60e..b6c9b5d 100644
--- a/WebCore/storage/DatabaseThread.cpp
+++ b/WebCore/storage/DatabaseThread.cpp
@@ -119,24 +119,6 @@ void* DatabaseThread::databaseThread()
return 0;
}
-#ifdef MANUAL_MERGE_REQUIRED
-void DatabaseThread::recordDatabaseOpen(Database* database)
-{
- ASSERT(currentThread() == m_threadID);
- ASSERT(database);
- ASSERT(!m_openDatabaseSet.contains(database));
- m_openDatabaseSet.add(database);
-}
-
-void DatabaseThread::recordDatabaseClosed(Database* database)
-{
- ASSERT(currentThread() == m_threadID);
- ASSERT(database);
- ASSERT(m_queue.killed() || m_openDatabaseSet.contains(database));
- m_openDatabaseSet.remove(database);
-}
-
-#else // MANUAL_MERGE_REQUIRED
void DatabaseThread::recordDatabaseOpen(Database* database)
{
ASSERT(currentThread() == m_threadID);
@@ -153,7 +135,6 @@ void DatabaseThread::recordDatabaseClosed(Database* database)
m_openDatabaseSet.remove(database);
}
-#endif // MANUAL_MERGE_REQUIRED
void DatabaseThread::scheduleTask(PassRefPtr<DatabaseTask> task)
{
m_queue.append(task);
diff --git a/WebCore/storage/LocalStorageTask.cpp b/WebCore/storage/LocalStorageTask.cpp
index 9f33f55..f5d4890 100644
--- a/WebCore/storage/LocalStorageTask.cpp
+++ b/WebCore/storage/LocalStorageTask.cpp
@@ -26,15 +26,8 @@
#include "config.h"
#include "LocalStorageTask.h"
-#ifdef MANUAL_MERGE_REQUIRED
#if ENABLE(DOM_STORAGE)
-#include "LocalStorage.h"
-#include "LocalStorageArea.h"
-#else // MANUAL_MERGE_REQUIRED
-#if ENABLE(DOM_STORAGE)
-
-#endif // MANUAL_MERGE_REQUIRED
#include "LocalStorageThread.h"
#include "StorageAreaSync.h"
diff --git a/WebCore/storage/LocalStorageThread.cpp b/WebCore/storage/LocalStorageThread.cpp
index 73125c5..2da5934 100644
--- a/WebCore/storage/LocalStorageThread.cpp
+++ b/WebCore/storage/LocalStorageThread.cpp
@@ -26,15 +26,8 @@
#include "config.h"
#include "LocalStorageThread.h"
-#ifdef MANUAL_MERGE_REQUIRED
#if ENABLE(DOM_STORAGE)
-#include "LocalStorage.h"
-#include "LocalStorageArea.h"
-#else // MANUAL_MERGE_REQUIRED
-#if ENABLE(DOM_STORAGE)
-
-#endif // MANUAL_MERGE_REQUIRED
#include "LocalStorageTask.h"
#include "StorageAreaSync.h"
diff --git a/WebCore/storage/Storage.h b/WebCore/storage/Storage.h
index d262804..d68e9bc 100644
--- a/WebCore/storage/Storage.h
+++ b/WebCore/storage/Storage.h
@@ -26,14 +26,8 @@
#ifndef Storage_h
#define Storage_h
-#ifdef MANUAL_MERGE_REQUIRED
#if ENABLE(DOM_STORAGE)
-#include "StorageArea.h"
-#else // MANUAL_MERGE_REQUIRED
-#if ENABLE(DOM_STORAGE)
-#endif // MANUAL_MERGE_REQUIRED
-
#include <wtf/Forward.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
diff --git a/WebCore/storage/Storage.idl b/WebCore/storage/Storage.idl
index 9c84502..7127efd 100644
--- a/WebCore/storage/Storage.idl
+++ b/WebCore/storage/Storage.idl
@@ -30,13 +30,8 @@ module storage {
HasNameGetter,
CustomDeleteProperty,
CustomGetPropertyNames,
-#ifdef MANUAL_MERGE_REQUIRED
- CustomPutFunction,
- Conditional=DOM_STORAGE
-#else // MANUAL_MERGE_REQUIRED
DelegatingPutFunction,
Conditional=DOM_STORAGE
-#endif // MANUAL_MERGE_REQUIRED
] Storage {
readonly attribute [DontEnum] unsigned long length;
[DontEnum, ConvertNullStringTo=Null] DOMString key(in unsigned long index);
generated by cgit v1.1 at 2024-09-10 01:11:11 +0000