Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(869)

Side by Side Diff: Source/web/mac/WebSubstringUtil.mm

Issue 209663002: Hack to fix Mac64 build break from r169638. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Another approach Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2005, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 11 matching lines...) Expand all
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32 // Temporary hack to avoid breaking build during WebFrame -> WebLocalFrame trans ition.
33 #if __LP64__
34 #define NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES 1
35 #endif
36
32 #include "config.h" 37 #include "config.h"
33 #include "WebSubstringUtil.h" 38 #include "WebSubstringUtil.h"
34 39
35 #import <Cocoa/Cocoa.h> 40 #import <Cocoa/Cocoa.h>
36 41
37 #include "WebFrameImpl.h" 42 #include "WebFrameImpl.h"
38 #include "bindings/v8/ExceptionStatePlaceholder.h" 43 #include "bindings/v8/ExceptionStatePlaceholder.h"
39 #include "core/dom/Document.h" 44 #include "core/dom/Document.h"
40 #include "core/dom/Element.h" 45 #include "core/dom/Element.h"
41 #include "core/dom/Node.h" 46 #include "core/dom/Node.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 Element* editable = frame->selection().rootEditableElementOrDocumentElement( ); 159 Element* editable = frame->selection().rootEditableElementOrDocumentElement( );
155 ASSERT(editable); 160 ASSERT(editable);
156 RefPtr<Range> range(PlainTextRange(location, location + length).createRange( *editable)); 161 RefPtr<Range> range(PlainTextRange(location, location + length).createRange( *editable));
157 if (!range) 162 if (!range)
158 return nil; 163 return nil;
159 164
160 return attributedSubstringFromRange(range.get()); 165 return attributedSubstringFromRange(range.get());
161 } 166 }
162 167
163 } // namespace blink 168 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698