summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/wx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/wx')
-rw-r--r--Source/WebKit/wx/ChangeLog77
-rw-r--r--Source/WebKit/wx/WebFrame.cpp8
-rw-r--r--Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp3
-rw-r--r--Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h3
-rw-r--r--Source/WebKit/wx/WebView.cpp3
-rw-r--r--Source/WebKit/wx/bindings/python/webview.i1
6 files changed, 88 insertions, 7 deletions
diff --git a/Source/WebKit/wx/ChangeLog b/Source/WebKit/wx/ChangeLog
index 3e385b1..980fa8a 100644
--- a/Source/WebKit/wx/ChangeLog
+++ b/Source/WebKit/wx/ChangeLog
@@ -1,3 +1,80 @@
+2011-03-25 Andy Estes <aestes@apple.com>
+
+ Reviewed by Adele Peterson.
+
+ REGRESSION (r70748): latest nightly builds kills AC_QuickTime.js
+ https://bugs.webkit.org/show_bug.cgi?id=49016
+
+ Update objectContentType() implementation to handle the
+ shouldPreferPlugInsForImages flag.
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::objectContentType):
+ * WebKitSupport/FrameLoaderClientWx.h:
+
+2011-03-24 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fix, remove old call and replace it with correct one.
+
+ * WebView.cpp:
+ (wxWebView::Create):
+
+2011-03-24 Sheriff Bot <webkit.review.bot@gmail.com>
+
+ Unreviewed, rolling out r81916 and r81917.
+ http://trac.webkit.org/changeset/81916
+ http://trac.webkit.org/changeset/81917
+ https://bugs.webkit.org/show_bug.cgi?id=57071
+
+ broke a test on platforms that do not have QuickTime installed
+ (Requested by estes on #webkit).
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::objectContentType):
+ * WebKitSupport/FrameLoaderClientWx.h:
+
+2011-03-24 Andy Estes <aestes@apple.com>
+
+ Reviewed by Darin Adler.
+
+ REGRESSION (r70748): latest nightly builds kills AC_QuickTime.js
+ https://bugs.webkit.org/show_bug.cgi?id=49016
+
+ Update objectContentType() implementation to handle the
+ shouldPreferPlugInsForImages flag.
+
+ * WebKitSupport/FrameLoaderClientWx.cpp:
+ (WebCore::FrameLoaderClientWx::objectContentType):
+ * WebKitSupport/FrameLoaderClientWx.h:
+
+2011-03-21 Chang Shu <cshu@webkit.org>
+
+ Reviewed by Alexey Proskuryakov.
+
+ REGRESSION (r79953): Can't type in MS Outlook 2011
+ https://bugs.webkit.org/show_bug.cgi?id=56665
+
+ r79953 removed the WebView level editablity which is persistent no matter whether
+ underlying document itself is changed and editability gets lost. The resolution is to
+ set this WebView editable value to WebCore. This avoids the callback from WebCore to
+ WebKit which was the main goal in r79953 to improve performance.
+
+ * WebFrame.cpp:
+ (wxWebFrame::MakeEditable):
+ (wxWebFrame::IsEditable):
+
+2011-03-15 Kevin Ollivier <kevino@theolliviers.com>
+
+ Reviewed by Darin Adler.
+
+ Introduce WTF_USE_EXPORT_MACROS, which will allow us to put shared library import/export
+ info into the headers rather than in export symbol definition files, but disable it on
+ all platforms initially so we can deal with port build issues one port at a time.
+
+ https://bugs.webkit.org/show_bug.cgi?id=27551
+
+ * bindings/python/webview.i:
+
2011-03-07 Sam Weinig <sam@webkit.org>
Reviewed by Anders Carlsson.
diff --git a/Source/WebKit/wx/WebFrame.cpp b/Source/WebKit/wx/WebFrame.cpp
index e32d300..86bf660 100644
--- a/Source/WebKit/wx/WebFrame.cpp
+++ b/Source/WebKit/wx/WebFrame.cpp
@@ -402,14 +402,14 @@ void wxWebFrame::ResetTextSize()
void wxWebFrame::MakeEditable(bool enable)
{
- if (enable != IsEditable() && m_impl->frame && m_impl->frame->document())
- m_impl->frame->document()->setDesignMode(enable ? WebCore::Document::on : WebCore::Document::off);
+ if (enable != IsEditable() && m_impl->frame && m_impl->frame->page())
+ m_impl->frame->page()->setEditable(enable);
}
bool wxWebFrame::IsEditable() const
{
- if (m_impl->frame && m_impl->frame->document())
- return m_impl->frame->document()->inDesignMode();
+ if (m_impl->frame && m_impl->frame->page())
+ return m_impl->frame->page()->isEditable();
return false;
}
diff --git a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
index 68e1e70..afc255c 100644
--- a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
+++ b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com>
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
*
* All rights reserved.
*
@@ -870,7 +871,7 @@ void FrameLoaderClientWx::transferLoadingResourceFromPage(unsigned long, Documen
{
}
-ObjectContentType FrameLoaderClientWx::objectContentType(const KURL& url, const String& mimeType)
+ObjectContentType FrameLoaderClientWx::objectContentType(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages)
{
notImplemented();
return ObjectContentType();
diff --git a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
index 8f1e69e..254f95c 100644
--- a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
+++ b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com>
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
*
* All rights reserved.
*
@@ -217,7 +218,7 @@ namespace WebCore {
virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues);
- virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType);
+ virtual ObjectContentType objectContentType(const KURL&, const String& mimeType, bool shouldPreferPlugInsForImages);
virtual String overrideMediaType() const;
virtual void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld*);
diff --git a/Source/WebKit/wx/WebView.cpp b/Source/WebKit/wx/WebView.cpp
index 3215b7a..dab3225 100644
--- a/Source/WebKit/wx/WebView.cpp
+++ b/Source/WebKit/wx/WebView.cpp
@@ -71,6 +71,7 @@
#include "ScriptController.h"
#include "JSDOMBinding.h"
+#include <runtime/initializeThreading.h>
#include <runtime/JSValue.h>
#include <runtime/UString.h>
#include <wtf/text/CString.h>
@@ -358,7 +359,7 @@ bool wxWebView::Create(wxWindow* parent, int id, const wxPoint& position,
if (!wxWindow::Create(parent, id, position, size, style, name))
return false;
- WTF::initializeThreading();
+ JSC::initializeThreading();
WTF::initializeMainThread();
// This is necessary because we are using SharedTimerWin.cpp on Windows,
diff --git a/Source/WebKit/wx/bindings/python/webview.i b/Source/WebKit/wx/bindings/python/webview.i
index f1621b0..118aed1 100644
--- a/Source/WebKit/wx/bindings/python/webview.i
+++ b/Source/WebKit/wx/bindings/python/webview.i
@@ -49,6 +49,7 @@
#include "WebDOMNodeList.h"
#include "WebDOMObject.h"
#include "WebDOMRange.h"
+#include "WebDOMWebKitAnimationList.h"
#ifndef __WXMSW__
PyObject* createDOMNodeSubtype(WebDOMNode* ptr, bool setThisOwn, bool isValueObject)
generated by cgit v1.1 at 2024-06-24 12:51:18 +0000