return scrollbar->mouseDown(mev.event());
}
-#ifdef MANUAL_MERGE_REQUIRED
#if ENABLE(TOUCH_EVENTS) // Android
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)
}
}
-#endif // MANUAL_MERGE_REQUIRED
}
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*);
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)
#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();
m_localStorage = StorageNamespace::localStorageNamespace(page->settings()->localStorageDatabasePath());
}
-#endif // MANUAL_MERGE_REQUIRED
return m_localStorage.get();
}
#endif
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;
}
#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;
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
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);
// 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);
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);
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);
m_openDatabaseSet.remove(database);
}
-#endif // MANUAL_MERGE_REQUIRED
void DatabaseThread::scheduleTask(PassRefPtr<DatabaseTask> task)
{
m_queue.append(task);
#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"
#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"
#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>
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);