From e7913fbdd6f145fe1644c90c22aa73cb733c9e17 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Mon, 16 May 2011 15:19:42 +0100
Subject: Merge WebKit at r75993: Fix conflicts.

StyleElement.cpp
Do not undo cherry pick of http://trac.webkit.org/changeset/80787
Conflict due to intermediate change
http://trac.webkit.org/changeset/75338

SliderThumbElement.cpp
Conflict due to Android TOUCH_EVENTS addition and
http://trac.webkit.org/changeset/75749

DOMWindow.cpp
Conflict due to clearDomStorage and
http://trac.webkit.org/changeset/75739

Page.cpp
Conflict due to Android APPLICATION_INSTALLED addition and
http://trac.webkit.org/changeset/75604

DragData.h
See http://trac.webkit.org/changeset/75523

RenderBox.cpp
Conflict due to PLATFORM_ANDROID addition and
http://trac.webkit.org/changeset/75837

.gitignore - keep ours

RenderSVGSolidColor.cpp
This file moved, so copy over our edits.

Change-Id: Ieeb1f0056987d718e3522cc7cd8097a90fc642fb
---
 Source/WebCore/page/DOMWindow.cpp | 15 ---------------
 Source/WebCore/page/Page.cpp      |  7 -------
 2 files changed, 22 deletions(-)

(limited to 'Source/WebCore/page')

diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp
index 99c8fcd..9c29071 100644
--- a/Source/WebCore/page/DOMWindow.cpp
+++ b/Source/WebCore/page/DOMWindow.cpp
@@ -1612,19 +1612,6 @@ EventTargetData* DOMWindow::ensureEventTargetData()
     return &m_eventTargetData;
 }
 
-<<<<<<< HEAD
-#if ENABLE(BLOB)
-String DOMWindow::createObjectURL(Blob* blob)
-{
-    return scriptExecutionContext()->createPublicBlobURL(blob).string();
-}
-
-void DOMWindow::revokeObjectURL(const String& blobURLString)
-{
-    scriptExecutionContext()->revokePublicBlobURL(KURL(KURL(), blobURLString));
-}
-#endif
-
 #if ENABLE(DOM_STORAGE) && defined(ANDROID)
 void DOMWindow::clearDOMStorage()
 {
@@ -1638,8 +1625,6 @@ void DOMWindow::clearDOMStorage()
 }
 #endif
 
-=======
->>>>>>> WebKit.org @ r75993
 void DOMWindow::setLocation(const String& urlString, DOMWindow* activeWindow, DOMWindow* firstWindow, SetLocationLocking locking)
 {
     Frame* activeFrame = activeWindow->frame();
diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
index b864aa2..c4d5ca4 100644
--- a/Source/WebCore/page/Page.cpp
+++ b/Source/WebCore/page/Page.cpp
@@ -95,17 +95,10 @@
 #include "GeolocationController.h"
 #endif
 
-<<<<<<< HEAD
-#if ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS)
-#include "InspectorApplicationCacheAgent.h"
-#endif
-
 #if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
 #include "PackageNotifier.h"
 #endif
 
-=======
->>>>>>> WebKit.org @ r75993
 namespace WebCore {
 
 static HashSet<Page*>* allPages;
-- 
cgit v1.1