<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[187221] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187221">187221</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-07-23 02:18:01 -0700 (Thu, 23 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove files that were meant to be removed in <a href="http://trac.webkit.org/projects/webkit/changeset/165014">r165014</a>
* WebProcess/WebPage/mac/WKAccessibilityWebPageObject.h: Removed.
* WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWKAccessibilityWebPageObjecth">trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWKAccessibilityWebPageObjectmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187220 => 187221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-23 08:23:25 UTC (rev 187220)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-23 09:18:01 UTC (rev 187221)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2015-07-23 Tim Horton <timothy_horton@apple.com>
+
+ Remove files that were meant to be removed in r165014
+
+ * WebProcess/WebPage/mac/WKAccessibilityWebPageObject.h: Removed.
+ * WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm: Removed.
+
</ins><span class="cx"> 2015-07-23 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add API to allow executing editing commands that require an argument
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWKAccessibilityWebPageObjecth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.h (187220 => 187221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.h 2015-07-23 08:23:25 UTC (rev 187220)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.h 2015-07-23 09:18:01 UTC (rev 187221)
</span><span class="lines">@@ -1,51 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WKAccessibilityWebPageObject_h
-#define WKAccessibilityWebPageObject_h
-
-#if PLATFORM(MAC)
-
-namespace WebKit {
-class WebPage;
-}
-
-@interface WKAccessibilityWebPageObject : NSObject {
- WebKit::WebPage* m_page;
-
- id m_parent;
- NSArray* m_attributeNames;
- NSMutableArray* m_accessibilityChildren;
-}
-
-- (void)setWebPage:(WebKit::WebPage*)page;
-
-- (void)setRemoteParent:(id)parent;
-
-@end
-
-#endif // PLATFORM(MAC)
-
-#endif // WKAccessibilityWebPageObject_h
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWKAccessibilityWebPageObjectmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm (187220 => 187221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm 2015-07-23 08:23:25 UTC (rev 187220)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm 2015-07-23 09:18:01 UTC (rev 187221)
</span><span class="lines">@@ -1,260 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "WKAccessibilityWebPageObject.h"
-
-#if PLATFORM(MAC)
-
-#import "WebFrame.h"
-#import "WebPage.h"
-#import "WKArray.h"
-#import "WKNumber.h"
-#import "WKRetainPtr.h"
-#import "WKSharedAPICast.h"
-#import "WKString.h"
-#import "WKStringCF.h"
-#import <WebCore/AXObjectCache.h>
-#import <WebCore/FrameView.h>
-#import <WebCore/MainFrame.h>
-#import <WebCore/Page.h>
-#import <WebCore/ScrollView.h>
-#import <WebCore/Scrollbar.h>
-#import <WebKitSystemInterface.h>
-#import <wtf/ObjcRuntimeExtras.h>
-
-using namespace WebCore;
-using namespace WebKit;
-
-@implementation WKAccessibilityWebPageObject
-
-- (id)accessibilityRootObjectWrapper
-{
- if (!WebCore::AXObjectCache::accessibilityEnabled())
- WebCore::AXObjectCache::enableAccessibility();
-
- NSObject* mainFramePluginAccessibilityObjectWrapper = m_page->accessibilityObjectForMainFramePlugin();
- if (mainFramePluginAccessibilityObjectWrapper)
- return mainFramePluginAccessibilityObjectWrapper;
-
- WebCore::Page* page = m_page->corePage();
- if (!page)
- return nil;
-
- WebCore::Frame& core = page->mainFrame();
- if (!core.document())
- return nil;
-
- AccessibilityObject* root = core.document()->axObjectCache()->rootObject();
- if (!root)
- return nil;
-
- return root->wrapper();
-}
-
-- (void)setWebPage:(WebPage*)page
-{
- m_page = page;
-}
-
-- (void)setRemoteParent:(id)parent
-{
- if (parent != m_parent) {
- [m_parent release];
- m_parent = [parent retain];
- }
-}
-
-- (void)dealloc
-{
- WKUnregisterUniqueIdForElement(self);
- [m_accessibilityChildren release];
- [m_attributeNames release];
- [m_parent release];
- [super dealloc];
-}
-
-- (BOOL)accessibilityIsIgnored
-{
- return NO;
-}
-
-- (NSArray *)accessibilityAttributeNames
-{
- if (!m_attributeNames)
- m_attributeNames = [[NSArray alloc] initWithObjects:
- NSAccessibilityRoleAttribute, NSAccessibilityRoleDescriptionAttribute, NSAccessibilityFocusedAttribute,
- NSAccessibilityParentAttribute, NSAccessibilityWindowAttribute, NSAccessibilityTopLevelUIElementAttribute,
- NSAccessibilityPositionAttribute, NSAccessibilitySizeAttribute, NSAccessibilityChildrenAttribute, nil];
-
- return m_attributeNames;
-}
-
-- (NSArray *)accessibilityParameterizedAttributeNames
-{
- WKRetainPtr<WKArrayRef> result = adoptWK(m_page->pageOverlayCopyAccessibilityAttributesNames(true));
- if (!result)
- return nil;
-
- NSMutableArray *names = [NSMutableArray array];
- size_t count = WKArrayGetSize(result.get());
- for (size_t k = 0; k < count; k++) {
- WKTypeRef item = WKArrayGetItemAtIndex(result.get(), k);
- if (toImpl(item)->type() == API::String::APIType) {
- RetainPtr<CFStringRef> name = adoptCF(WKStringCopyCFString(kCFAllocatorDefault, (WKStringRef)item));
- [names addObject:(NSString *)name.get()];
- }
- }
-
- return names;
-}
-
-- (BOOL)accessibilityIsAttributeSettable:(NSString *)attribute
-{
- return NO;
-}
-
-- (void)accessibilitySetValue:(id)value forAttribute:(NSString *)attribute
-{
- return;
-}
-
-- (NSArray *)accessibilityActionNames
-{
- return [NSArray array];
-}
-
-- (NSArray *)accessibilityChildren
-{
- id wrapper = [self accessibilityRootObjectWrapper];
- if (!wrapper)
- return [NSArray array];
-
- return [NSArray arrayWithObject:wrapper];
-}
-
-- (id)accessibilityAttributeValue:(NSString *)attribute
-{
- if (!WebCore::AXObjectCache::accessibilityEnabled())
- WebCore::AXObjectCache::enableAccessibility();
-
- if ([attribute isEqualToString:NSAccessibilityParentAttribute])
- return m_parent;
- if ([attribute isEqualToString:NSAccessibilityWindowAttribute])
- return [m_parent accessibilityAttributeValue:NSAccessibilityWindowAttribute];
- if ([attribute isEqualToString:NSAccessibilityTopLevelUIElementAttribute])
- return [m_parent accessibilityAttributeValue:NSAccessibilityTopLevelUIElementAttribute];
- if ([attribute isEqualToString:NSAccessibilityRoleAttribute])
- return NSAccessibilityGroupRole;
- if ([attribute isEqualToString:NSAccessibilityRoleDescriptionAttribute])
- return NSAccessibilityRoleDescription(NSAccessibilityGroupRole, nil);
- if ([attribute isEqualToString:NSAccessibilityFocusedAttribute])
- return [NSNumber numberWithBool:NO];
-
- if (!m_page)
- return nil;
-
- if ([attribute isEqualToString:NSAccessibilityPositionAttribute]) {
- const WebCore::FloatPoint& point = m_page->accessibilityPosition();
- return [NSValue valueWithPoint:NSMakePoint(point.x(), point.y())];
- }
- if ([attribute isEqualToString:NSAccessibilitySizeAttribute]) {
- const IntSize& s = m_page->size();
- return [NSValue valueWithSize:NSMakeSize(s.width(), s.height())];
- }
- if ([attribute isEqualToString:NSAccessibilityChildrenAttribute])
- return [self accessibilityChildren];
-
- return nil;
-}
-
-- (NSPoint)_convertScreenPointToRootView:(NSPoint)point
-{
- return m_page->screenToRootView(IntPoint(point.x, point.y));
-}
-
-- (id)accessibilityAttributeValue:(NSString *)attribute forParameter:(id)parameter
-{
- WKRetainPtr<WKTypeRef> pageOverlayParameter = 0;
-
- if ([parameter isKindOfClass:[NSValue class]] && strcmp([(NSValue*)parameter objCType], @encode(NSPoint)) == 0) {
- NSPoint point = [self _convertScreenPointToRootView:[(NSValue *)parameter pointValue]];
- pageOverlayParameter = WKPointCreate(WKPointMake(point.x, point.y));
- }
-
- WKRetainPtr<WKStringRef> attributeRef = adoptWK(WKStringCreateWithCFString((CFStringRef)attribute));
- WKRetainPtr<WKTypeRef> result = adoptWK(m_page->pageOverlayCopyAccessibilityAttributeValue(attributeRef.get(), pageOverlayParameter.get()));
- if (!result)
- return nil;
-
- if (toImpl(result.get())->type() == API::String::APIType)
- return CFBridgingRelease(WKStringCopyCFString(kCFAllocatorDefault, (WKStringRef)result.get()));
- else if (toImpl(result.get())->type() == API::Boolean::APIType)
- return [NSNumber numberWithBool:WKBooleanGetValue(static_cast<WKBooleanRef>(result.get()))];
-
- return nil;
-}
-
-- (BOOL)accessibilityShouldUseUniqueId
-{
- return YES;
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-- (id)accessibilityHitTest:(NSPoint)point
-{
- // Hit-test point comes in as bottom-screen coordinates. Needs to be normalized to the frame of the web page.
- NSPoint remotePosition = [[self accessibilityAttributeValue:NSAccessibilityPositionAttribute] pointValue];
- NSSize remoteSize = [[self accessibilityAttributeValue:NSAccessibilitySizeAttribute] sizeValue];
-
- // Get the y position of the WKView (we have to screen-flip and go from bottom left to top left).
- CGFloat screenHeight = [(NSScreen *)[[NSScreen screens] objectAtIndex:0] frame].size.height;
- remotePosition.y = (screenHeight - remotePosition.y) - remoteSize.height;
-
- point.y = screenHeight - point.y;
-
- // Re-center point into the web page's frame.
- point.y -= remotePosition.y;
- point.x -= remotePosition.x;
-
- WebCore::FrameView* frameView = m_page ? m_page->mainFrameView() : 0;
- if (frameView) {
- point.y += frameView->scrollPosition().y();
- point.x += frameView->scrollPosition().x();
- }
-
- return [[self accessibilityRootObjectWrapper] accessibilityHitTest:point];
-}
-#pragma clang diagnostic pop
-
-- (id)accessibilityFocusedUIElement
-{
- return [[self accessibilityRootObjectWrapper] accessibilityFocusedUIElement];
-}
-
-@end
-
-#endif // PLATFORM(MAC)
</del></span></pre>
</div>
</div>
</body>
</html>