summaryrefslogtreecommitdiff
path: root/Source/WebKit/mac
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/mac')
-rw-r--r--Source/WebKit/mac/Carbon/HIWebView.mm5
-rw-r--r--Source/WebKit/mac/ChangeLog87
-rw-r--r--Source/WebKit/mac/Plugins/WebNetscapePluginView.mm2
-rw-r--r--Source/WebKit/mac/Plugins/WebPluginContainerCheck.mm6
-rw-r--r--Source/WebKit/mac/Plugins/WebPluginController.mm8
-rw-r--r--Source/WebKit/mac/WebCoreSupport/WebCachedFramePlatformData.h1
-rw-r--r--Source/WebKit/mac/WebCoreSupport/WebDeviceOrientationClient.mm1
-rw-r--r--Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm1
-rw-r--r--Source/WebKit/mac/WebView/WebFrame.mm15
-rw-r--r--Source/WebKit/mac/WebView/WebHTMLView.mm1
-rw-r--r--Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm1
-rw-r--r--Source/WebKit/mac/WebView/WebPolicyDelegate.mm4
-rw-r--r--Source/WebKit/mac/WebView/WebView.mm6
13 files changed, 107 insertions, 31 deletions
diff --git a/Source/WebKit/mac/Carbon/HIWebView.mm b/Source/WebKit/mac/Carbon/HIWebView.mm
index 284dcea16..9235d11dd 100644
--- a/Source/WebKit/mac/Carbon/HIWebView.mm
+++ b/Source/WebKit/mac/Carbon/HIWebView.mm
@@ -36,7 +36,7 @@
#import "WebHTMLViewInternal.h"
#import "WebKit.h"
#import <WebKitSystemInterface.h>
-#import <objc/objc-runtime.h>
+#import <wtf/ObjcRuntimeExtras.h>
@interface NSWindow (AppKitSecretsHIWebViewKnows)
- (void)_removeWindowRef;
@@ -1166,8 +1166,7 @@ UpdateCommandStatus( HIWebView* inView, const HICommand* inCommand )
// Can't use -performSelector:withObject: here because the method we're calling returns BOOL, while
// -performSelector:withObject:'s return value is assumed to be an id.
- BOOL (*validationFunction)(id, SEL, id) = (BOOL (*)(id, SEL, id))objc_msgSend;
- if (validationFunction(resp, @selector(validateUserInterfaceItem:), proxy))
+ if (wtfObjcMsgSend<BOOL>(resp, @selector(validateUserInterfaceItem:), proxy))
EnableMenuItem( inCommand->menu.menuRef, inCommand->menu.menuItemIndex );
else
DisableMenuItem( inCommand->menu.menuRef, inCommand->menu.menuItemIndex );
diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index a1eafcd63..50e12ae99 100644
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,90 @@
+2012-11-28 Beth Dakin <bdakin@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=102970
+ [WK1] REGRESSION (r129545): Main frame doesn't rubberband unless
+ WebFrameLoadDelegate implements -webView:didFirstLayoutInFrame:
+
+ Reviewed by Sam Weinig.
+
+ We should always register for DidFirstLayout in WK1 since we do work
+ at that time besides just calling the delegate function.
+ * WebView/WebView.mm:
+ (-[WebView _cacheFrameLoadDelegateImplementations]):
+
+2012-11-27 Michael Saboff <msaboff@apple.com>
+
+ TextIterator unnecessarily converts 8 bit strings to 16 bits
+ https://bugs.webkit.org/show_bug.cgi?id=103295
+
+ Reviewed by Brent Fulgham.
+
+ Updated _stringForRange to use plainText() instead of removed plainTextToMallocAllocatedBuffer().
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame _stringForRange:]):
+
+2012-11-27 James Simonsen <simonjam@chromium.org>
+
+ Consolidate FrameLoader::load() into one function taking a FrameLoadRequest
+ https://bugs.webkit.org/show_bug.cgi?id=102151
+
+ Reviewed by Adam Barth.
+
+ * Plugins/WebPluginController.mm:
+ * WebView/WebFrame.mm:
+ (-[WebFrame loadRequest:]):
+ (-[WebFrame _loadData:MIMEType:textEncodingName:baseURL:unreachableURL:]):
+
+2012-11-27 Pratik Solanki <psolanki@apple.com>
+
+ objc/objc-runtime.h does not exist on all PLATFORM(MAC)
+ https://bugs.webkit.org/show_bug.cgi?id=101780
+
+ Reviewed by Brent Fulgham.
+
+ Clean up header includes so we don't include objc/objc-runtime.h.
+
+ * Carbon/HIWebView.mm:
+ (UpdateCommandStatus): Use wtfObjcMsgSend template instead of objc_msgSend.
+ * Plugins/WebNetscapePluginView.mm:
+ * Plugins/WebPluginContainerCheck.mm:
+ (-[WebPluginContainerCheck _continueWithPolicy:]): Use wtfObjcMsgSend template instead of objc_msgSend.
+ * Plugins/WebPluginController.mm:
+ * WebCoreSupport/WebCachedFramePlatformData.h:
+ * WebCoreSupport/WebDeviceOrientationClient.mm:
+ * WebView/WebDelegateImplementationCaching.mm:
+ * WebView/WebHTMLView.mm:
+ * WebView/WebPDFDocumentExtras.mm:
+ * WebView/WebPolicyDelegate.mm:
+ (-[WebPolicyDecisionListener _usePolicy:]): Use wtfObjcMsgSend template instead of objc_msgSend.
+ * WebView/WebView.mm:
+
+2012-11-27 Sheriff Bot <webkit.review.bot@gmail.com>
+
+ Unreviewed, rolling out r135786.
+ http://trac.webkit.org/changeset/135786
+ https://bugs.webkit.org/show_bug.cgi?id=103379
+
+ It made 3 plugin tests timeout on several platforms (Requested
+ by Ossy on #webkit).
+
+ * Plugins/WebPluginController.mm:
+ * WebView/WebFrame.mm:
+ (-[WebFrame loadRequest:]):
+ (-[WebFrame _loadData:MIMEType:textEncodingName:baseURL:unreachableURL:]):
+
+2012-11-26 James Simonsen <simonjam@chromium.org>
+
+ Consolidate FrameLoader::load() into one function taking a FrameLoadRequest
+ https://bugs.webkit.org/show_bug.cgi?id=102151
+
+ Reviewed by Adam Barth.
+
+ * Plugins/WebPluginController.mm:
+ * WebView/WebFrame.mm:
+ (-[WebFrame loadRequest:]):
+ (-[WebFrame _loadData:MIMEType:textEncodingName:baseURL:unreachableURL:]):
+
2012-11-23 Alexis Menard <alexis@webkit.org>
[CSS3 Backgrounds and Borders] Implement new CSS3 background-position parsing.
diff --git a/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm b/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm
index 6a1eb640a..1e1bd385b 100644
--- a/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm
+++ b/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm
@@ -77,7 +77,7 @@
#import <WebCore/npruntime_impl.h>
#import <WebKit/DOMPrivate.h>
#import <WebKit/WebUIDelegate.h>
-#import <objc/objc-runtime.h>
+#import <objc/runtime.h>
#import <runtime/InitializeThreading.h>
#import <runtime/JSLock.h>
#import <wtf/Assertions.h>
diff --git a/Source/WebKit/mac/Plugins/WebPluginContainerCheck.mm b/Source/WebKit/mac/Plugins/WebPluginContainerCheck.mm
index 30368a879..67c93d2ae 100644
--- a/Source/WebKit/mac/Plugins/WebPluginContainerCheck.mm
+++ b/Source/WebKit/mac/Plugins/WebPluginContainerCheck.mm
@@ -42,7 +42,7 @@
#import <WebCore/FrameLoaderTypes.h>
#import <WebCore/SecurityOrigin.h>
#import <wtf/Assertions.h>
-#import <objc/objc-runtime.h>
+#import <wtf/ObjcRuntimeExtras.h>
using namespace WebCore;
@@ -87,9 +87,9 @@ using namespace WebCore;
- (void)_continueWithPolicy:(PolicyAction)policy
{
if (_contextInfo)
- ((void (*)(id, SEL, BOOL, id))objc_msgSend)(_resultObject, _resultSelector, (policy == PolicyUse), _contextInfo);
+ wtfObjcMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyUse), _contextInfo);
else
- ((void (*)(id, SEL, BOOL))objc_msgSend)(_resultObject, _resultSelector, (policy == PolicyUse));
+ wtfObjcMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyUse));
// this will call indirectly call cancel
[_controller _webPluginContainerCancelCheckIfAllowedToLoadRequest:self];
diff --git a/Source/WebKit/mac/Plugins/WebPluginController.mm b/Source/WebKit/mac/Plugins/WebPluginController.mm
index 3ff109086..4c007e3db 100644
--- a/Source/WebKit/mac/Plugins/WebPluginController.mm
+++ b/Source/WebKit/mac/Plugins/WebPluginController.mm
@@ -50,6 +50,7 @@
#import <Foundation/NSURLRequest.h>
#import <WebCore/DocumentLoader.h>
#import <WebCore/Frame.h>
+#import <WebCore/FrameLoadRequest.h>
#import <WebCore/FrameLoader.h>
#import <WebCore/HTMLMediaElement.h>
#import <WebCore/HTMLNames.h>
@@ -57,7 +58,7 @@
#import <WebCore/ResourceRequest.h>
#import <WebCore/ScriptController.h>
#import <WebCore/WebCoreURLResponse.h>
-#import <objc/objc-runtime.h>
+#import <objc/runtime.h>
#import <runtime/JSLock.h>
#import <wtf/text/WTFString.h>
@@ -401,7 +402,10 @@ static void cancelOutstandingCheck(const void *item, void *context)
LOG_ERROR("could not load URL %@", [request URL]);
return;
}
- core(frame)->loader()->load(request, target, false);
+ FrameLoadRequest frameRequest(core(frame), request);
+ frameRequest.setFrameName(target);
+ frameRequest.setShouldCheckNewWindowPolicy(true);
+ core(frame)->loader()->load(frameRequest);
}
}
diff --git a/Source/WebKit/mac/WebCoreSupport/WebCachedFramePlatformData.h b/Source/WebKit/mac/WebCoreSupport/WebCachedFramePlatformData.h
index 9bdb51560..f7481b828 100644
--- a/Source/WebKit/mac/WebCoreSupport/WebCachedFramePlatformData.h
+++ b/Source/WebKit/mac/WebCoreSupport/WebCachedFramePlatformData.h
@@ -26,7 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <objc/objc-runtime.h>
#import <WebCore/CachedFramePlatformData.h>
#import <wtf/ObjcRuntimeExtras.h>
#import <wtf/RetainPtr.h>
diff --git a/Source/WebKit/mac/WebCoreSupport/WebDeviceOrientationClient.mm b/Source/WebKit/mac/WebCoreSupport/WebDeviceOrientationClient.mm
index 669c0c288..511cc10ea 100644
--- a/Source/WebKit/mac/WebCoreSupport/WebDeviceOrientationClient.mm
+++ b/Source/WebKit/mac/WebCoreSupport/WebDeviceOrientationClient.mm
@@ -28,7 +28,6 @@
#import "WebDeviceOrientationInternal.h"
#import "WebDeviceOrientationProvider.h"
#import "WebViewInternal.h"
-#import <objc/objc-runtime.h>
#import <wtf/ObjcRuntimeExtras.h>
using namespace WebCore;
diff --git a/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm b/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm
index aac4cbfb0..6246a1d19 100644
--- a/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm
+++ b/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm
@@ -32,7 +32,6 @@
#import "WebKitLogging.h"
#import "WebView.h"
#import "WebViewData.h"
-#import <objc/objc-runtime.h>
#import <wtf/ObjcRuntimeExtras.h>
@implementation WebView (WebDelegateImplementationCaching)
diff --git a/Source/WebKit/mac/WebView/WebFrame.mm b/Source/WebKit/mac/WebView/WebFrame.mm
index f91ffd8e5..89b9b8171 100644
--- a/Source/WebKit/mac/WebView/WebFrame.mm
+++ b/Source/WebKit/mac/WebView/WebFrame.mm
@@ -67,6 +67,7 @@
#import <WebCore/EventHandler.h>
#import <WebCore/EventNames.h>
#import <WebCore/Frame.h>
+#import <WebCore/FrameLoadRequest.h>
#import <WebCore/FrameLoader.h>
#import <WebCore/FrameLoaderStateMachine.h>
#import <WebCore/FrameTree.h>
@@ -497,15 +498,7 @@ static inline WebDataSource *dataSource(DocumentLoader* loader)
- (NSString *)_stringForRange:(DOMRange *)range
{
- // This will give a system malloc'd buffer that can be turned directly into an NSString
- unsigned length;
- UChar* buf = plainTextToMallocAllocatedBuffer(core(range), length, true);
-
- if (!buf)
- return [NSString string];
-
- // Transfer buffer ownership to NSString
- return [[[NSString alloc] initWithCharactersNoCopy:buf length:length freeWhenDone:YES] autorelease];
+ return plainText(core(range), TextIteratorDefaultBehavior, true);
}
- (BOOL)_shouldFlattenCompositingLayers:(CGContextRef)context
@@ -1369,7 +1362,7 @@ static bool needsMicrosoftMessengerDOMDocumentWorkaround()
if (!resourceRequest.url().isValid() && !resourceRequest.url().isEmpty())
resourceRequest.setURL([NSURL URLWithString:[@"file:" stringByAppendingString:[[request URL] absoluteString]]]);
- coreFrame->loader()->load(resourceRequest, false);
+ coreFrame->loader()->load(FrameLoadRequest(coreFrame, resourceRequest));
}
static NSURL *createUniqueWebDataURL()
@@ -1400,7 +1393,7 @@ static NSURL *createUniqueWebDataURL()
SubstituteData substituteData(WebCore::SharedBuffer::wrapNSData(data), MIMEType, encodingName, [unreachableURL absoluteURL], responseURL);
- _private->coreFrame->loader()->load(request, substituteData, false);
+ _private->coreFrame->loader()->load(FrameLoadRequest(_private->coreFrame, request, substituteData));
}
diff --git a/Source/WebKit/mac/WebView/WebHTMLView.mm b/Source/WebKit/mac/WebView/WebHTMLView.mm
index 8f12e5bf0..9f759ad05 100644
--- a/Source/WebKit/mac/WebView/WebHTMLView.mm
+++ b/Source/WebKit/mac/WebView/WebHTMLView.mm
@@ -125,7 +125,6 @@
#import <WebKitSystemInterface.h>
#import <dlfcn.h>
#import <limits>
-#import <objc/objc-runtime.h>
#import <runtime/InitializeThreading.h>
#import <wtf/MainThread.h>
#import <wtf/ObjcRuntimeExtras.h>
diff --git a/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm b/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm
index 592edf75b..2cfd9b63c 100644
--- a/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm
+++ b/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm
@@ -29,7 +29,6 @@
#import <wtf/Vector.h>
#import <wtf/RetainPtr.h>
#import <PDFKit/PDFDocument.h>
-#import <objc/objc-runtime.h>
#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
@interface PDFDocument (Internal)
diff --git a/Source/WebKit/mac/WebView/WebPolicyDelegate.mm b/Source/WebKit/mac/WebView/WebPolicyDelegate.mm
index f2df74429..409db69a3 100644
--- a/Source/WebKit/mac/WebView/WebPolicyDelegate.mm
+++ b/Source/WebKit/mac/WebView/WebPolicyDelegate.mm
@@ -29,7 +29,7 @@
#import "WebPolicyDelegatePrivate.h"
#import <WebCore/FrameLoaderTypes.h>
-#import <objc/objc-runtime.h>
+#import <wtf/ObjcRuntimeExtras.h>
using namespace WebCore;
@@ -91,7 +91,7 @@ NSString *WebActionOriginalURLKey = @"WebActionOriginalURLKey";
- (void)_usePolicy:(PolicyAction)policy
{
if (_private->target)
- ((void (*)(id, SEL, PolicyAction))objc_msgSend)(_private->target, _private->action, policy);
+ wtfObjcMsgSend<void>(_private->target, _private->action, policy);
}
- (void)_invalidate
diff --git a/Source/WebKit/mac/WebView/WebView.mm b/Source/WebKit/mac/WebView/WebView.mm
index fb444b4c1..1b17c67e4 100644
--- a/Source/WebKit/mac/WebView/WebView.mm
+++ b/Source/WebKit/mac/WebView/WebView.mm
@@ -181,7 +181,7 @@
#import <WebKitSystemInterface.h>
#import <mach-o/dyld.h>
#import <objc/objc-auto.h>
-#import <objc/objc-runtime.h>
+#import <objc/runtime.h>
#import <runtime/ArrayPrototype.h>
#import <runtime/DateInstance.h>
#import <runtime/InitializeThreading.h>
@@ -1686,9 +1686,7 @@ static inline IMP getMethod(id o, SEL s)
// for backwards compatibility.
Page* page = core(self);
if (page) {
- unsigned milestones = 0;
- if (cache->didFirstLayoutInFrameFunc)
- milestones |= DidFirstLayout;
+ unsigned milestones = DidFirstLayout;
if (cache->didFirstVisuallyNonEmptyLayoutInFrameFunc)
milestones |= DidFirstVisuallyNonEmptyLayout;
page->addLayoutMilestones(static_cast<LayoutMilestones>(milestones));
View Lorry Controller Status