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

Side by Side Diff: Source/core/layout/LayoutRuby.cpp

Issue 1045723009: Move core/layout/style to core/style (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 5 years, 8 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 | « Source/core/layout/LayoutQuote.h ('k') | Source/core/layout/LayoutScrollbar.h » ('j') | 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 16 matching lines...) Expand all
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 32
33 #include "core/layout/LayoutRuby.h" 33 #include "core/layout/LayoutRuby.h"
34 34
35 #include "core/frame/UseCounter.h" 35 #include "core/frame/UseCounter.h"
36 #include "core/layout/LayoutRubyRun.h" 36 #include "core/layout/LayoutRubyRun.h"
37 #include "core/layout/style/ComputedStyle.h" 37 #include "core/style/ComputedStyle.h"
38 #include "wtf/RefPtr.h" 38 #include "wtf/RefPtr.h"
39 39
40 namespace blink { 40 namespace blink {
41 41
42 // === generic helper functions to avoid excessive code duplication === 42 // === generic helper functions to avoid excessive code duplication ===
43 43
44 static inline bool isAnonymousRubyInlineBlock(const LayoutObject* object) 44 static inline bool isAnonymousRubyInlineBlock(const LayoutObject* object)
45 { 45 {
46 ASSERT(!object 46 ASSERT(!object
47 || !object->parent()->isRuby() 47 || !object->parent()->isRuby()
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 return; 319 return;
320 } 320 }
321 321
322 // Otherwise find the containing run and remove it from there. 322 // Otherwise find the containing run and remove it from there.
323 LayoutRubyRun* run = findRubyRunParent(child); 323 LayoutRubyRun* run = findRubyRunParent(child);
324 ASSERT(run); 324 ASSERT(run);
325 run->removeChild(child); 325 run->removeChild(child);
326 } 326 }
327 327
328 } // namespace blink 328 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutQuote.h ('k') | Source/core/layout/LayoutScrollbar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698