| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2012 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 369 const MultiColumnFragmentainerGroup& row = fragmentainerGroupAtVisualPoint(p
oint); | 369 const MultiColumnFragmentainerGroup& row = fragmentainerGroupAtVisualPoint(p
oint); |
| 370 LayoutPoint flowThreadPoint = row.visualPointToFlowThreadPoint(point + row.o
ffsetFromColumnSet()); | 370 LayoutPoint flowThreadPoint = row.visualPointToFlowThreadPoint(point + row.o
ffsetFromColumnSet()); |
| 371 // Then drill into the flow thread, where we'll find the actual content. | 371 // Then drill into the flow thread, where we'll find the actual content. |
| 372 return flowThread()->positionForPoint(flowThreadPoint); | 372 return flowThread()->positionForPoint(flowThreadPoint); |
| 373 } | 373 } |
| 374 | 374 |
| 375 LayoutUnit LayoutMultiColumnSet::columnGap() const | 375 LayoutUnit LayoutMultiColumnSet::columnGap() const |
| 376 { | 376 { |
| 377 LayoutBlockFlow* parentBlock = multiColumnBlockFlow(); | 377 LayoutBlockFlow* parentBlock = multiColumnBlockFlow(); |
| 378 if (parentBlock->style()->hasNormalColumnGap()) | 378 if (parentBlock->style()->hasNormalColumnGap()) |
| 379 return LayoutUnit(parentBlock->style()->fontDescription().computedPixelS
ize()); // "1em" is recommended as the normal gap setting. Matches <p> margins. | 379 return LayoutUnit(parentBlock->style()->getFontDescription().computedPix
elSize()); // "1em" is recommended as the normal gap setting. Matches <p> margin
s. |
| 380 return LayoutUnit(parentBlock->style()->columnGap()); | 380 return LayoutUnit(parentBlock->style()->columnGap()); |
| 381 } | 381 } |
| 382 | 382 |
| 383 unsigned LayoutMultiColumnSet::actualColumnCount() const | 383 unsigned LayoutMultiColumnSet::actualColumnCount() const |
| 384 { | 384 { |
| 385 // FIXME: remove this method. It's a meaningless question to ask the set "ho
w many columns do | 385 // FIXME: remove this method. It's a meaningless question to ask the set "ho
w many columns do |
| 386 // you actually have?", since that may vary for each row. | 386 // you actually have?", since that may vary for each row. |
| 387 return firstFragmentainerGroup().actualColumnCount(); | 387 return firstFragmentainerGroup().actualColumnCount(); |
| 388 } | 388 } |
| 389 | 389 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 | 452 |
| 453 LayoutRect LayoutMultiColumnSet::flowThreadPortionRect() const | 453 LayoutRect LayoutMultiColumnSet::flowThreadPortionRect() const |
| 454 { | 454 { |
| 455 LayoutRect portionRect(LayoutUnit(), logicalTopInFlowThread(), pageLogicalWi
dth(), logicalHeightInFlowThread()); | 455 LayoutRect portionRect(LayoutUnit(), logicalTopInFlowThread(), pageLogicalWi
dth(), logicalHeightInFlowThread()); |
| 456 if (!isHorizontalWritingMode()) | 456 if (!isHorizontalWritingMode()) |
| 457 return portionRect.transposedRect(); | 457 return portionRect.transposedRect(); |
| 458 return portionRect; | 458 return portionRect; |
| 459 } | 459 } |
| 460 | 460 |
| 461 } // namespace blink | 461 } // namespace blink |
| OLD | NEW |