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

Side by Side Diff: third_party/WebKit/WebCore/rendering/RenderTextControl.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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
OLDNEW
1 /** 1 /**
2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 507
508 setPrefWidthsDirty(false); 508 setPrefWidthsDirty(false);
509 } 509 }
510 510
511 void RenderTextControl::selectionChanged(bool userTriggered) 511 void RenderTextControl::selectionChanged(bool userTriggered)
512 { 512 {
513 cacheSelection(selectionStart(), selectionEnd()); 513 cacheSelection(selectionStart(), selectionEnd());
514 514
515 if (Frame* frame = document()->frame()) { 515 if (Frame* frame = document()->frame()) {
516 if (frame->selection()->isRange() && userTriggered) 516 if (frame->selection()->isRange() && userTriggered)
517 node()->dispatchEventForType(eventNames().selectEvent, true, false); 517 static_cast<EventTargetNode*>(node())->dispatchEventForType(eventNam es().selectEvent, true, false);
518 } 518 }
519 } 519 }
520 520
521 void RenderTextControl::addFocusRingRects(GraphicsContext* graphicsContext, int tx, int ty) 521 void RenderTextControl::addFocusRingRects(GraphicsContext* graphicsContext, int tx, int ty)
522 { 522 {
523 graphicsContext->addFocusRingRect(IntRect(tx, ty, width(), height())); 523 graphicsContext->addFocusRingRect(IntRect(tx, ty, width(), height()));
524 } 524 }
525 525
526 void RenderTextControl::autoscroll() 526 void RenderTextControl::autoscroll()
527 { 527 {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 { 582 {
583 return m_innerText.get(); 583 return m_innerText.get();
584 } 584 }
585 585
586 FormControlElement* RenderTextControl::formControlElement() const 586 FormControlElement* RenderTextControl::formControlElement() const
587 { 587 {
588 return toFormControlElement(static_cast<Element*>(node())); 588 return toFormControlElement(static_cast<Element*>(node()));
589 } 589 }
590 590
591 } // namespace WebCore 591 } // namespace WebCore
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/rendering/RenderText.cpp ('k') | third_party/WebKit/WebCore/rendering/RenderTreeAsText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698