[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
dbates at webkit.org
dbates at webkit.org
Fri Jan 21 14:45:14 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 192a76c15945605c47d94031c010df8372c2487a
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 29 00:59:23 2010 +0000
2010-12-28 Daniel Bates <dbates at rim.com>
Reviewed by Sam Weinig.
Substitute // MARK: for compiler-specific #pragma mark
https://bugs.webkit.org/show_bug.cgi?id=51657
For consistency, we should substitute "// MARK:" for compiler-
specific "#pragma mark" in the source files for the Mac port.
* History/WebHistory.mm:
* Plugins/WebBaseNetscapePluginView.mm:
* Plugins/WebNetscapePluginView.mm:
* WebCoreSupport/WebInspectorClient.mm:
* WebCoreSupport/WebSecurityOrigin.mm:
* WebView/WebPDFView.mm:
* WebView/WebVideoFullscreenController.mm:
* WebView/WebVideoFullscreenHUDWindowController.mm:
2010-12-28 Daniel Bates <dbates at rim.com>
Reviewed by Sam Weinig.
Substitute // MARK: for compiler-specific #pragma mark
https://bugs.webkit.org/show_bug.cgi?id=51657
Fix compilation warnings about "#pragma mark" on GTK+ bots by
substituting "// MARK:" for "#pragma mark", which provides
analogous code-bookmarking functionality under Xcode.
* platform/graphics/cg/PathCG.cpp:
* platform/graphics/mac/WebLayer.mm:
2010-12-28 Daniel Bates <dbates at rim.com>
Reviewed by Sam Weinig.
Substitute // MARK: for compiler-specific #pragma mark
https://bugs.webkit.org/show_bug.cgi?id=51657
Fix future compilation warnings about "#pragma mark" on GTK+ bots by
substituting "// MARK:" for "#pragma mark", which provides
analogous code-bookmarking functionality under Xcode.
Also, for consistency, we should substitute "// MARK:" for compiler-
specific "#pragma mark" in the source files for the Mac port.
* DumpRenderTree/AccessibilityTextMarker.cpp:
* DumpRenderTree/cf/WebArchiveDumpSupport.h:
* DumpRenderTree/mac/AccessibilityTextMarkerMac.mm:
* DumpRenderTree/mac/ObjCController.m:
* MiniBrowser/mac/AppDelegate.m:
* MiniBrowser/mac/BrowserWindowController.m:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74733 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 7c14d94..b3a6d02 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,24 @@
+2010-12-28 Daniel Bates <dbates at rim.com>
+
+ Reviewed by Sam Weinig.
+
+ Substitute // MARK: for compiler-specific #pragma mark
+ https://bugs.webkit.org/show_bug.cgi?id=51657
+
+ Fix future compilation warnings about "#pragma mark" on GTK+ bots by
+ substituting "// MARK:" for "#pragma mark", which provides
+ analogous code-bookmarking functionality under Xcode.
+
+ Also, for consistency, we should substitute "// MARK:" for compiler-
+ specific "#pragma mark" in the source files for the Mac port.
+
+ * DumpRenderTree/AccessibilityTextMarker.cpp:
+ * DumpRenderTree/cf/WebArchiveDumpSupport.h:
+ * DumpRenderTree/mac/AccessibilityTextMarkerMac.mm:
+ * DumpRenderTree/mac/ObjCController.m:
+ * MiniBrowser/mac/AppDelegate.m:
+ * MiniBrowser/mac/BrowserWindowController.m:
+
2010-12-28 Xan Lopez <xlopez at igalia.com>
Reviewed by Eric Seidel.
diff --git a/Tools/DumpRenderTree/AccessibilityTextMarker.cpp b/Tools/DumpRenderTree/AccessibilityTextMarker.cpp
index d84ee80..1250497 100644
--- a/Tools/DumpRenderTree/AccessibilityTextMarker.cpp
+++ b/Tools/DumpRenderTree/AccessibilityTextMarker.cpp
@@ -29,7 +29,7 @@
#include "AccessibilityUIElement.h"
#include <JavaScriptCore/JSRetainPtr.h>
-#pragma mark AccessibilityTextMarker
+// MARK: AccessibilityTextMarker
// Callback methods
@@ -81,7 +81,7 @@ JSClassRef AccessibilityTextMarker::getJSClass()
return accessibilityTextMarkerClass;
}
-#pragma mark AccessibilityTextMarkerRange
+// MARK: AccessibilityTextMarkerRange
// Callback methods
diff --git a/Tools/DumpRenderTree/cf/WebArchiveDumpSupport.h b/Tools/DumpRenderTree/cf/WebArchiveDumpSupport.h
index 08d9c45..00c5818 100644
--- a/Tools/DumpRenderTree/cf/WebArchiveDumpSupport.h
+++ b/Tools/DumpRenderTree/cf/WebArchiveDumpSupport.h
@@ -32,8 +32,8 @@ typedef struct _CFURLResponse* CFURLResponseRef;
CFStringRef createXMLStringFromWebArchiveData(CFDataRef webArchiveData);
-#pragma mark -
-#pragma mark Platform-specific methods
+// MARK: -
+// MARK: Platform-specific methods
CFURLResponseRef createCFURLResponseFromResponseData(CFDataRef responseData);
CFArrayRef supportedNonImageMIMETypes();
diff --git a/Tools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm b/Tools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm
index 9170ab6..18ddb85 100644
--- a/Tools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm
+++ b/Tools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm
@@ -28,7 +28,7 @@
#import "AccessibilityTextMarker.h"
#import "DumpRenderTree.h"
-#pragma mark AccessibilityTextMarker
+// MARK: AccessibilityTextMarker
AccessibilityTextMarker::AccessibilityTextMarker(PlatformTextMarker marker)
: m_textMarker(marker)
@@ -54,7 +54,7 @@ PlatformTextMarker AccessibilityTextMarker::platformTextMarker() const
return m_textMarker.get();
}
-#pragma mark AccessibilityTextMarkerRange
+// MARK: AccessibilityTextMarkerRange
AccessibilityTextMarkerRange::AccessibilityTextMarkerRange(PlatformTextMarkerRange markerRange)
: m_textMarkerRange(markerRange)
diff --git a/Tools/DumpRenderTree/mac/ObjCController.m b/Tools/DumpRenderTree/mac/ObjCController.m
index f1d1c10..ba866f8 100644
--- a/Tools/DumpRenderTree/mac/ObjCController.m
+++ b/Tools/DumpRenderTree/mac/ObjCController.m
@@ -270,8 +270,8 @@ static void* runJavaScriptThread(void* arg)
return nil;
}
-#pragma mark -
-#pragma mark Testing Objective-C DOM HTML Bindings
+// MARK: -
+// MARK: Testing Objective-C DOM HTML Bindings
- (void)setSelectElement:(WebScriptObject *)element selectedIndex:(int)index allowingMultiple:(BOOL)allowingMultiple
{
diff --git a/Tools/MiniBrowser/mac/AppDelegate.m b/Tools/MiniBrowser/mac/AppDelegate.m
index a02193b..05631d5 100644
--- a/Tools/MiniBrowser/mac/AppDelegate.m
+++ b/Tools/MiniBrowser/mac/AppDelegate.m
@@ -60,7 +60,7 @@ void didRecieveMessageFromInjectedBundle(WKContextRef context, WKStringRef messa
WKRelease(newMessageBody);
}
-#pragma mark History Client Callbacks
+// MARK: History Client Callbacks
static void didNavigateWithNavigationData(WKContextRef context, WKPageRef page, WKNavigationDataRef navigationData, WKFrameRef frame, const void *clientInfo)
{
diff --git a/Tools/MiniBrowser/mac/BrowserWindowController.m b/Tools/MiniBrowser/mac/BrowserWindowController.m
index 0fa4755..ad3fcab 100644
--- a/Tools/MiniBrowser/mac/BrowserWindowController.m
+++ b/Tools/MiniBrowser/mac/BrowserWindowController.m
@@ -247,7 +247,7 @@
});
}
-#pragma mark Loader Client Callbacks
+// MARK: Loader Client Callbacks
static void didStartProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
{
@@ -356,7 +356,7 @@ static void didChangeBackForwardList(WKPageRef page, const void *clientInfo)
[(BrowserWindowController *)clientInfo validateToolbar];
}
-#pragma mark Policy Client Callbacks
+// MARK: Policy Client Callbacks
static void decidePolicyForNavigationAction(WKPageRef page, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRef url, WKFrameRef frame, WKFramePolicyListenerRef listener, const void *clientInfo)
{
@@ -375,7 +375,7 @@ static void decidePolicyForMIMEType(WKPageRef page, WKStringRef MIMEType, WKURLR
WKFramePolicyListenerUse(listener);
}
-#pragma mark UI Client Callbacks
+// MARK: UI Client Callbacks
static WKPageRef createNewPage(WKPageRef page, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton button, const void* clientInfo)
{
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 70dab5b..848bdc5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-28 Daniel Bates <dbates at rim.com>
+
+ Reviewed by Sam Weinig.
+
+ Substitute // MARK: for compiler-specific #pragma mark
+ https://bugs.webkit.org/show_bug.cgi?id=51657
+
+ Fix compilation warnings about "#pragma mark" on GTK+ bots by
+ substituting "// MARK:" for "#pragma mark", which provides
+ analogous code-bookmarking functionality under Xcode.
+
+ * platform/graphics/cg/PathCG.cpp:
+ * platform/graphics/mac/WebLayer.mm:
+
2010-12-28 Jan Erik Hanssen <jhanssen at sencha.com>
Reviewed by Eric Seidel.
diff --git a/WebCore/platform/graphics/cg/PathCG.cpp b/WebCore/platform/graphics/cg/PathCG.cpp
index b47ed02..d6a1e6e 100644
--- a/WebCore/platform/graphics/cg/PathCG.cpp
+++ b/WebCore/platform/graphics/cg/PathCG.cpp
@@ -254,8 +254,8 @@ FloatPoint Path::currentPoint() const
return CGPathGetCurrentPoint(m_path);
}
-#pragma mark -
-#pragma mark Path Management
+// MARK: -
+// MARK: Path Management
struct PathApplierInfo {
void* info;
diff --git a/WebCore/platform/graphics/mac/WebLayer.mm b/WebCore/platform/graphics/mac/WebLayer.mm
index 128e63b..4154c10 100644
--- a/WebCore/platform/graphics/mac/WebLayer.mm
+++ b/WebCore/platform/graphics/mac/WebLayer.mm
@@ -183,7 +183,7 @@ void setLayerNeedsDisplayInRect(CALayer *layer, WebCore::GraphicsLayer* layerCon
@end // implementation WebLayer
-#pragma mark -
+// MARK: -
#ifndef NDEBUG
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index f7308f3..7221dca 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-28 Daniel Bates <dbates at rim.com>
+
+ Reviewed by Sam Weinig.
+
+ Substitute // MARK: for compiler-specific #pragma mark
+ https://bugs.webkit.org/show_bug.cgi?id=51657
+
+ For consistency, we should substitute "// MARK:" for compiler-
+ specific "#pragma mark" in the source files for the Mac port.
+
+ * History/WebHistory.mm:
+ * Plugins/WebBaseNetscapePluginView.mm:
+ * Plugins/WebNetscapePluginView.mm:
+ * WebCoreSupport/WebInspectorClient.mm:
+ * WebCoreSupport/WebSecurityOrigin.mm:
+ * WebView/WebPDFView.mm:
+ * WebView/WebVideoFullscreenController.mm:
+ * WebView/WebVideoFullscreenHUDWindowController.mm:
+
2010-12-23 Yongjun Zhang <yongjun_zhang at apple.com>
Reviewed by Darin Adler.
diff --git a/WebKit/mac/History/WebHistory.mm b/WebKit/mac/History/WebHistory.mm
index af40a24..00cee78 100644
--- a/WebKit/mac/History/WebHistory.mm
+++ b/WebKit/mac/History/WebHistory.mm
@@ -110,7 +110,7 @@ private:
@implementation WebHistoryPrivate
-#pragma mark OBJECT FRAMEWORK
+// MARK: OBJECT FRAMEWORK
+ (void)initialize
{
@@ -146,7 +146,7 @@ private:
[super finalize];
}
-#pragma mark MODIFYING CONTENTS
+// MARK: MODIFYING CONTENTS
static void getDayBoundaries(NSTimeInterval interval, NSTimeInterval& beginningOfDay, NSTimeInterval& beginningOfNextDay)
{
@@ -399,7 +399,7 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date)
[self addItem:entry discardDuplicate:NO];
}
-#pragma mark DATE-BASED RETRIEVAL
+// MARK: DATE-BASED RETRIEVAL
- (NSArray *)orderedLastVisitedDays
{
@@ -431,7 +431,7 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date)
return _entriesByDate->get(dateKey).get();
}
-#pragma mark URL MATCHING
+// MARK: URL MATCHING
- (WebHistoryItem *)itemForURLString:(NSString *)URLString
{
@@ -453,7 +453,7 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date)
return [_entriesByURL allValues];
}
-#pragma mark ARCHIVING/UNARCHIVING
+// MARK: ARCHIVING/UNARCHIVING
- (void)setHistoryAgeInDaysLimit:(int)limit
{
@@ -676,7 +676,7 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date)
[super dealloc];
}
-#pragma mark MODIFYING CONTENTS
+// MARK: MODIFYING CONTENTS
- (void)_sendNotification:(NSString *)name entries:(NSArray *)entries
{
@@ -707,7 +707,7 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date)
entries:newEntries];
}
-#pragma mark DATE-BASED RETRIEVAL
+// MARK: DATE-BASED RETRIEVAL
- (NSArray *)orderedLastVisitedDays
{
@@ -719,7 +719,7 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date)
return [_historyPrivate orderedItemsLastVisitedOnDay:date];
}
-#pragma mark URL MATCHING
+// MARK: URL MATCHING
- (BOOL)containsURL:(NSURL *)URL
{
@@ -731,7 +731,7 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date)
return [_historyPrivate itemForURL:URL];
}
-#pragma mark SAVING TO DISK
+// MARK: SAVING TO DISK
- (BOOL)loadFromURL:(NSURL *)URL error:(NSError **)error
{
diff --git a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
index 7837608..7f73443 100644
--- a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
@@ -690,7 +690,7 @@ String WebHaltablePlugin::pluginName() const
}
}
-#pragma mark NOTIFICATIONS
+// MARK: NOTIFICATIONS
- (void)windowWillClose:(NSNotification *)notification
{
diff --git a/WebKit/mac/Plugins/WebNetscapePluginView.mm b/WebKit/mac/Plugins/WebNetscapePluginView.mm
index dbbe129..b215c8d 100644
--- a/WebKit/mac/Plugins/WebNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebNetscapePluginView.mm
@@ -199,7 +199,7 @@ typedef struct {
WKSendUserChangeNotifications();
}
-#pragma mark EVENTS
+// MARK: EVENTS
// The WindowRef created by -[NSWindow windowRef] has a QuickDraw GrafPort that covers
// the entire window frame (or structure region to use the Carbon term) rather then just the window content.
@@ -859,7 +859,7 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
[self didCallPlugInFunction];
}
-#pragma mark WEB_NETSCAPE_PLUGIN
+// MARK: WEB_NETSCAPE_PLUGIN
- (BOOL)isNewWindowEqualToOldWindow
{
@@ -1342,7 +1342,7 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
}
#endif
-#pragma mark NSVIEW
+// MARK: NSVIEW
- (id)initWithFrame:(NSRect)frame
pluginPackage:(WebNetscapePluginPackage *)pluginPackage
diff --git a/WebKit/mac/WebCoreSupport/WebInspectorClient.mm b/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
index b08c161..5beedcf 100644
--- a/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
@@ -69,7 +69,7 @@ using namespace WebCore;
- (void)destroyInspectorView:(bool)notifyInspectorController;
@end
-#pragma mark -
+// MARK: -
@interface WebNodeHighlighter : NSObject {
@private
@@ -81,7 +81,7 @@ using namespace WebCore;
- (void)hideHighlight;
@end
-#pragma mark -
+// MARK: -
WebInspectorClient::WebInspectorClient(WebView *webView)
@@ -208,7 +208,7 @@ void WebInspectorFrontendClient::updateWindowTitle() const
}
-#pragma mark -
+// MARK: -
@implementation WebInspectorWindowController
- (id)init
@@ -271,7 +271,7 @@ void WebInspectorFrontendClient::updateWindowTitle() const
[super dealloc];
}
-#pragma mark -
+// MARK: -
- (WebView *)webView
{
@@ -307,7 +307,7 @@ void WebInspectorFrontendClient::updateWindowTitle() const
return window;
}
-#pragma mark -
+// MARK: -
- (BOOL)windowShouldClose:(id)sender
{
@@ -385,7 +385,7 @@ void WebInspectorFrontendClient::updateWindowTitle() const
}
}
-#pragma mark -
+// MARK: -
- (void)attach
{
@@ -465,8 +465,8 @@ void WebInspectorFrontendClient::updateWindowTitle() const
[_webView close];
}
-#pragma mark -
-#pragma mark WebNodeHighlight delegate
+// MARK: -
+// MARK: WebNodeHighlight delegate
- (void)didAttachWebNodeHighlight:(WebNodeHighlight *)highlight
{
@@ -478,15 +478,15 @@ void WebInspectorFrontendClient::updateWindowTitle() const
[_inspectedWebView setCurrentNodeHighlight:nil];
}
-#pragma mark -
-#pragma mark UI delegate
+// MARK: -
+// MARK: UI delegate
- (NSUInteger)webView:(WebView *)sender dragDestinationActionMaskForDraggingInfo:(id <NSDraggingInfo>)draggingInfo
{
return WebDragDestinationActionNone;
}
-#pragma mark -
+// MARK: -
// These methods can be used by UI elements such as menu items and toolbar buttons when the inspector is the key window.
@@ -534,7 +534,7 @@ void WebInspectorFrontendClient::updateWindowTitle() const
@end
-#pragma mark -
+// MARK: -
@implementation WebNodeHighlighter
- (id)initWithInspectedWebView:(WebView *)webView
@@ -550,7 +550,7 @@ void WebInspectorFrontendClient::updateWindowTitle() const
[super dealloc];
}
-#pragma mark -
+// MARK: -
- (void)highlightNode:(DOMNode *)node
{
@@ -575,8 +575,8 @@ void WebInspectorFrontendClient::updateWindowTitle() const
_currentHighlight = nil;
}
-#pragma mark -
-#pragma mark WebNodeHighlight delegate
+// MARK: -
+// MARK: WebNodeHighlight delegate
- (void)didAttachWebNodeHighlight:(WebNodeHighlight *)highlight
{
diff --git a/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm b/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm
index f19dcb5..385d869 100644
--- a/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm
+++ b/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm
@@ -124,8 +124,8 @@ using namespace WebCore;
@end
-#pragma mark -
-#pragma mark WebQuotaManagers
+// MARK: -
+// MARK: WebQuotaManagers
@implementation WebSecurityOrigin (WebQuotaManagers)
@@ -146,8 +146,8 @@ using namespace WebCore;
@end
-#pragma mark -
-#pragma mark Deprecated
+// MARK: -
+// MARK: Deprecated
// FIXME: The following methods are deprecated and should removed later.
// Clients should instead get a WebQuotaManager, and query / set the quota via the Manager.
diff --git a/WebKit/mac/WebView/WebPDFView.mm b/WebKit/mac/WebView/WebPDFView.mm
index 0f54980..445b537 100644
--- a/WebKit/mac/WebView/WebPDFView.mm
+++ b/WebKit/mac/WebView/WebPDFView.mm
@@ -106,7 +106,7 @@ extern "C" NSString *_NSPathForSystemFramework(NSString *framework);
- (id)initWithView:(WebPDFView *)view;
@end
-#pragma mark C UTILITY FUNCTIONS
+// MARK: C UTILITY FUNCTIONS
static void _applicationInfoForMIMEType(NSString *type, NSString **name, NSImage **image)
{
@@ -151,7 +151,7 @@ static BOOL _PDFSelectionsAreEqual(PDFSelection *selectionA, PDFSelection *selec
@implementation WebPDFView
-#pragma mark WebPDFView API
+// MARK: WebPDFView API
+ (NSBundle *)PDFKitBundle
{
@@ -190,7 +190,7 @@ static BOOL _PDFSelectionsAreEqual(PDFSelection *selectionA, PDFSelection *selec
return [PDFSubview document];
}
-#pragma mark NSObject OVERRIDES
+// MARK: NSObject OVERRIDES
- (void)dealloc
{
@@ -204,7 +204,7 @@ static BOOL _PDFSelectionsAreEqual(PDFSelection *selectionA, PDFSelection *selec
[super dealloc];
}
-#pragma mark NSResponder OVERRIDES
+// MARK: NSResponder OVERRIDES
- (void)centerSelectionInVisibleArea:(id)sender
{
@@ -257,7 +257,7 @@ static BOOL _PDFSelectionsAreEqual(PDFSelection *selectionA, PDFSelection *selec
[self centerSelectionInVisibleArea:nil];
}
-#pragma mark NSView OVERRIDES
+// MARK: NSView OVERRIDES
- (BOOL)acceptsFirstResponder {
return YES;
@@ -483,7 +483,7 @@ static BOOL _PDFSelectionsAreEqual(PDFSelection *selectionA, PDFSelection *selec
firstResponderIsPDFDocumentView = NO;
}
-#pragma mark NSUserInterfaceValidations PROTOCOL IMPLEMENTATION
+// MARK: NSUserInterfaceValidations PROTOCOL IMPLEMENTATION
- (BOOL)validateUserInterfaceItemWithoutDelegate:(id <NSValidatedUserInterfaceItem>)item
{
@@ -510,7 +510,7 @@ static BOOL _PDFSelectionsAreEqual(PDFSelection *selectionA, PDFSelection *selec
return CallUIDelegateReturningBoolean(result, [self _webView], @selector(webView:validateUserInterfaceItem:defaultValidation:), item, result);
}
-#pragma mark INTERFACE BUILDER ACTIONS FOR SAFARI
+// MARK: INTERFACE BUILDER ACTIONS FOR SAFARI
// Surprisingly enough, this isn't defined in any superclass, though it is defined in assorted AppKit classes since
// it's a standard menu item IBAction.
@@ -526,7 +526,7 @@ static BOOL _PDFSelectionsAreEqual(PDFSelection *selectionA, PDFSelection *selec
[NSPasteboard _web_setFindPasteboardString:[[PDFSubview currentSelection] string] withOwner:self];
}
-#pragma mark WebFrameView UNDECLARED "DELEGATE METHODS"
+// MARK: WebFrameView UNDECLARED "DELEGATE METHODS"
// This is tested in -[WebFrameView canPrintHeadersAndFooters], but isn't declared anywhere (yuck)
- (BOOL)canPrintHeadersAndFooters
@@ -540,7 +540,7 @@ static BOOL _PDFSelectionsAreEqual(PDFSelection *selectionA, PDFSelection *selec
return [[PDFSubview document] getPrintOperationForPrintInfo:printInfo autoRotate:YES];
}
-#pragma mark WebDocumentView PROTOCOL IMPLEMENTATION
+// MARK: WebDocumentView PROTOCOL IMPLEMENTATION
- (void)setDataSource:(WebDataSource *)ds
{
@@ -574,7 +574,7 @@ static BOOL _PDFSelectionsAreEqual(PDFSelection *selectionA, PDFSelection *selec
{
}
-#pragma mark WebDocumentElement PROTOCOL IMPLEMENTATION
+// MARK: WebDocumentElement PROTOCOL IMPLEMENTATION
- (NSDictionary *)elementAtPoint:(NSPoint)point
{
@@ -592,14 +592,14 @@ static BOOL _PDFSelectionsAreEqual(PDFSelection *selectionA, PDFSelection *selec
return [self elementAtPoint:point];
}
-#pragma mark WebDocumentSearching PROTOCOL IMPLEMENTATION
+// MARK: WebDocumentSearching PROTOCOL IMPLEMENTATION
- (BOOL)searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag
{
return [self searchFor:string direction:forward caseSensitive:caseFlag wrap:wrapFlag startInSelection:NO];
}
-#pragma mark WebDocumentIncrementalSearching PROTOCOL IMPLEMENTATION
+// MARK: WebDocumentIncrementalSearching PROTOCOL IMPLEMENTATION
- (BOOL)searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag startInSelection:(BOOL)startInSelection
{
@@ -612,7 +612,7 @@ static BOOL _PDFSelectionsAreEqual(PDFSelection *selectionA, PDFSelection *selec
return YES;
}
-#pragma mark WebMultipleTextMatches PROTOCOL IMPLEMENTATION
+// MARK: WebMultipleTextMatches PROTOCOL IMPLEMENTATION
- (void)setMarkedTextMatchesAreHighlighted:(BOOL)newValue
{
@@ -696,7 +696,7 @@ static BOOL isFrameInRange(WebFrame *frame, DOMRange *range)
return result;
}
-#pragma mark WebDocumentText PROTOCOL IMPLEMENTATION
+// MARK: WebDocumentText PROTOCOL IMPLEMENTATION
- (BOOL)supportsTextEncoding
{
@@ -750,7 +750,7 @@ static BOOL isFrameInRange(WebFrame *frame, DOMRange *range)
[PDFSubview clearSelection];
}
-#pragma mark WebDocumentViewState PROTOCOL IMPLEMENTATION
+// MARK: WebDocumentViewState PROTOCOL IMPLEMENTATION
// Even though to WebKit we are the "docView", in reality a PDFView contains its own scrollview and docView.
// And it even turns out there is another PDFKit view between the docView and its enclosing ScrollView, so
@@ -809,7 +809,7 @@ static BOOL isFrameInRange(WebFrame *frame, DOMRange *range)
[PDFSubview setScaleFactor:[[state objectAtIndex:i++] floatValue]];
}
-#pragma mark _WebDocumentTextSizing PROTOCOL IMPLEMENTATION
+// MARK: _WebDocumentTextSizing PROTOCOL IMPLEMENTATION
- (IBAction)_zoomOut:(id)sender
{
@@ -841,7 +841,7 @@ static BOOL isFrameInRange(WebFrame *frame, DOMRange *range)
return [PDFSubview scaleFactor] != 1.0;
}
-#pragma mark WebDocumentSelection PROTOCOL IMPLEMENTATION
+// MARK: WebDocumentSelection PROTOCOL IMPLEMENTATION
- (NSRect)selectionRect
{
@@ -934,7 +934,7 @@ static BOOL isFrameInRange(WebFrame *frame, DOMRange *range)
[pasteboard setString:[self selectedString] forType:NSStringPboardType];
}
-#pragma mark PDFView DELEGATE METHODS
+// MARK: PDFView DELEGATE METHODS
- (void)PDFViewWillClickOnLink:(PDFView *)sender withURL:(NSURL *)URL
{
diff --git a/WebKit/mac/WebView/WebVideoFullscreenController.mm b/WebKit/mac/WebView/WebVideoFullscreenController.mm
index 2687b14..93e3d8c 100644
--- a/WebKit/mac/WebView/WebVideoFullscreenController.mm
+++ b/WebKit/mac/WebView/WebVideoFullscreenController.mm
@@ -219,8 +219,8 @@ static const NSTimeInterval tickleTimerInterval = 1.0;
}
-#pragma mark -
-#pragma mark Exposed Interface
+// MARK: -
+// MARK: Exposed Interface
static void constrainFrameToRatioOfFrame(NSRect *frameToConstrain, const NSRect *frame)
{
@@ -422,8 +422,8 @@ static NSWindow *createBackgroundFullscreenWindow(NSRect frame, int level)
#endif
}
-#pragma mark -
-#pragma mark Window callback
+// MARK: -
+// MARK: Window callback
- (void)_requestExit
{
@@ -452,8 +452,8 @@ static NSWindow *createBackgroundFullscreenWindow(NSRect frame, int level)
[_hudController fadeWindowIn];
}
-#pragma mark -
-#pragma mark QTMovie callbacks
+// MARK: -
+// MARK: QTMovie callbacks
- (void)rateChanged:(NSNotification *)unusedNotification
{
diff --git a/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm b/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
index 6907311..0a5aca4 100644
--- a/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
+++ b/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
@@ -623,7 +623,7 @@ static NSString *timeToString(double time)
return timeToString([_delegate mediaElement]->currentTime());
}
-#pragma mark NSResponder
+// MARK: NSResponder
- (void)mouseEntered:(NSEvent *)theEvent
{
@@ -659,7 +659,7 @@ static NSString *timeToString(double time)
[_delegate requestExitFullscreen];
}
-#pragma mark NSWindowDelegate
+// MARK: NSWindowDelegate
- (void)windowDidExpose:(NSNotification *)notification
{
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list