diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-07-15 12:22:47 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-07-20 16:57:23 +0100 |
| commit | 29a61d852e0ccad2dbbc64aadf491685cae3ca7d (patch) | |
| tree | c5baf6755603e451239bb547cb055ba5998a5c5e /WebCore/page | |
| parent | e458d70a0d18538346f41b503114c9ebe6b2ce12 (diff) | |
| download | external_webkit-29a61d852e0ccad2dbbc64aadf491685cae3ca7d.zip external_webkit-29a61d852e0ccad2dbbc64aadf491685cae3ca7d.tar.gz external_webkit-29a61d852e0ccad2dbbc64aadf491685cae3ca7d.tar.bz2 | |
Merge Webkit at r63173 : Fix conflicts.
Android.v8bindings.mk: IDBBindingUtilities caused by http://trac.webkit.org/changeset/63064
CSSCompitedStyleDeclaration.cpp conflict caused by http://trac.webkit.org/changeset/63038
'Computed style is not implemented for padding-start, padding-end, margin-start, margin-end'
HTMLDocumentParser.cpp conflict caused by http://trac.webkit.org/changeset/63165
'HTML5 Parser: document.write after onload blows away document'
Navigator.h conflict caused by http://trac.webkit.org/changeset/62577
Page.cpp caused by http://trac.webkit.org/changeset/62502
ResourceHandleAndroid.cpp by http://trac.webkit.org/changeset/62736
HTMLLinkElement.* by the upstreaming of link prefetching at http://trac.webkit.org/changeset/63032
Change-Id: I5b9d3eef87cd525a9fc7d862676a41fc4122cba0
Diffstat (limited to 'WebCore/page')
| -rw-r--r-- | WebCore/page/Navigator.h | 7 | ||||
| -rw-r--r-- | WebCore/page/Page.cpp | 13 |
2 files changed, 5 insertions, 15 deletions
diff --git a/WebCore/page/Navigator.h b/WebCore/page/Navigator.h index 3380c9c..b40bed4 100644 --- a/WebCore/page/Navigator.h +++ b/WebCore/page/Navigator.h @@ -33,17 +33,12 @@ namespace WebCore { class Frame; class Geolocation; class PluginData; -<<<<<<< HEAD - class PluginArray; + class String; #if PLATFORM(ANDROID) class ApplicationInstalledCallback; class Connection; #endif -======= - class String; ->>>>>>> webkit.org at r63173 - class Navigator : public NavigatorBase, public RefCounted<Navigator> { public: static PassRefPtr<Navigator> create(Frame* frame) { return adoptRef(new Navigator(frame)); } diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp index 5d023f5..ee99c43 100644 --- a/WebCore/page/Page.cpp +++ b/WebCore/page/Page.cpp @@ -85,13 +85,12 @@ #include "GeolocationController.h" #endif -<<<<<<< HEAD -#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) -#include "PackageNotifier.h" -======= #if ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS) #include "InspectorApplicationCacheAgent.h" ->>>>>>> webkit.org at r63173 +#endif + +#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) +#include "PackageNotifier.h" #endif namespace WebCore { @@ -126,7 +125,6 @@ static void networkStateChanged() frames[i]->document()->dispatchWindowEvent(Event::create(eventName, false, false)); } -<<<<<<< HEAD #if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) static void onPackageResultAvailable() { @@ -138,10 +136,7 @@ static void onPackageResultAvailable() } #endif -Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, EditorClient* editorClient, DragClient* dragClient, InspectorClient* inspectorClient, PluginHalterClient* pluginHalterClient, GeolocationControllerClient* geolocationControllerClient, DeviceOrientationClient* deviceOrientationClient) -======= Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, EditorClient* editorClient, DragClient* dragClient, InspectorClient* inspectorClient, PluginHalterClient* pluginHalterClient, GeolocationControllerClient* geolocationControllerClient, DeviceOrientationClient* deviceOrientationClient, BackForwardControllerClient* backForwardControllerClient) ->>>>>>> webkit.org at r63173 : m_chrome(new Chrome(this, chromeClient)) , m_dragCaretController(new SelectionController(0, true)) #if ENABLE(DRAG_SUPPORT) |